Skip to content

Commit

Permalink
Some renames
Browse files Browse the repository at this point in the history
  • Loading branch information
@Amrsatrio
Amrsatrio committed Nov 21, 2024
1 parent f80478b commit 33c4611
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 45 deletions.
36 changes: 18 additions & 18 deletions ExplorerPatcher/InputSwitch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define TB_POS_RIGHT 4
extern "C" UINT GetTaskbarLocationAndSize(POINT ptCursor, RECT* rc);

extern "C" __MIDL___MIDL_itf_inputswitchserver_0000_0000_0001 dwIMEStyle;
extern "C" INPUT_SWITCH_IDL_CLIENT_TYPE dwIMEStyle;
extern "C" HRESULT CInputSwitchControl_ModifyAnchor(UINT dwNumberOfProfiles, RECT* lpRect);

HRESULT CInputSwitchControl_ModifyAnchor(UINT dwNumberOfProfiles, RECT* lpRect)
Expand Down Expand Up @@ -84,7 +84,7 @@ class CInputSwitchControlProxy : public Microsoft::WRL::RuntimeClass<Microsoft::
{
public:
CInputSwitchControlProxy()
: m_type((__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001)-1)
: m_type((INPUT_SWITCH_IDL_CLIENT_TYPE)-1)
{
}

Expand All @@ -94,7 +94,7 @@ class CInputSwitchControlProxy : public Microsoft::WRL::RuntimeClass<Microsoft::
return S_OK;
}

STDMETHODIMP Init(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001 type) override
STDMETHODIMP Init(INPUT_SWITCH_IDL_CLIENT_TYPE type) override
{
m_type = type;
return m_original->Init(type == ISCT_IDL_DESKTOP && dwIMEStyle != ISCT_IDL_DESKTOP ? dwIMEStyle : type);
Expand All @@ -115,20 +115,20 @@ class CInputSwitchControlProxy : public Microsoft::WRL::RuntimeClass<Microsoft::

STDMETHODIMP SetCallback(IInputSwitchCallback* callback) override { return m_original->SetCallback(callback); }
STDMETHODIMP GetProfileCount(UINT* count, BOOL* bOutImePresent) override { return m_original->GetProfileCount(count, bOutImePresent); }
STDMETHODIMP GetCurrentProfile(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0002* data) override { return m_original->GetCurrentProfile(data); }
STDMETHODIMP GetCurrentProfile(INPUT_SWITCH_IDL_PROFILE_DATA* data) override { return m_original->GetCurrentProfile(data); }
STDMETHODIMP RegisterHotkeys() override { return m_original->RegisterHotkeys(); }
STDMETHODIMP ClickImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0004 type, POINT point, const RECT* rect) override { return m_original->ClickImeModeItem(type, point, rect); }
STDMETHODIMP ClickImeModeItem(INPUT_SWITCH_IDL_IME_CLICK_TYPE type, POINT point, const RECT* rect) override { return m_original->ClickImeModeItem(type, point, rect); }
STDMETHODIMP ForceHide() override { return m_original->ForceHide(); }
STDMETHODIMP ShowTouchKeyboardInputSwitch(const RECT* rect, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0006 align, int a3, DWORD a4, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0005 a5) override { return m_original->ShowTouchKeyboardInputSwitch(rect, align, a3, a4, a5); }
STDMETHODIMP ShowTouchKeyboardInputSwitch(const RECT* rect, INPUT_SWITCH_IDL_ALIGNMENT align, int a3, DWORD a4, INPUT_SWITCH_IDL_MODALITY a5) override { return m_original->ShowTouchKeyboardInputSwitch(rect, align, a3, a4, a5); }
STDMETHODIMP GetContextFlags(DWORD* flags) override { return m_original->GetContextFlags(flags); }
STDMETHODIMP SetContextOverrideMode(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0008 mode) override { return m_original->SetContextOverrideMode(mode); }
STDMETHODIMP GetCurrentImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0003* data) override { return m_original->GetCurrentImeModeItem(data); }
STDMETHODIMP SetContextOverrideMode(INPUT_SWITCH_IDL_CFOM mode) override { return m_original->SetContextOverrideMode(mode); }
STDMETHODIMP GetCurrentImeModeItem(INPUT_SWITCH_IDL_IME_MODE_ITEM_DATA* data) override { return m_original->GetCurrentImeModeItem(data); }
STDMETHODIMP ActivateInputProfile(const WCHAR* profile) override { return m_original->ActivateInputProfile(profile); }
STDMETHODIMP SetUserSid(const WCHAR* sid) override { return m_original->SetUserSid(sid); }

private:
Microsoft::WRL::ComPtr<IInputSwitchControl> m_original;
__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001 m_type;
INPUT_SWITCH_IDL_CLIENT_TYPE m_type;
};

HRESULT CInputSwitchControlProxy_CreateInstance(IInputSwitchControl* original, REFIID riid, void** ppvObject)
Expand All @@ -142,7 +142,7 @@ class CInputSwitchControlProxySV2 : public Microsoft::WRL::RuntimeClass<Microsof
{
public:
CInputSwitchControlProxySV2()
: m_type((__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001)-1)
: m_type((INPUT_SWITCH_IDL_CLIENT_TYPE)-1)
{
}

Expand All @@ -152,7 +152,7 @@ class CInputSwitchControlProxySV2 : public Microsoft::WRL::RuntimeClass<Microsof
return S_OK;
}

STDMETHODIMP Init(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001 type) override
STDMETHODIMP Init(INPUT_SWITCH_IDL_CLIENT_TYPE type) override
{
m_type = type;
return m_original->Init(type == ISCT_IDL_DESKTOP && dwIMEStyle != ISCT_IDL_DESKTOP ? dwIMEStyle : type);
Expand All @@ -173,21 +173,21 @@ class CInputSwitchControlProxySV2 : public Microsoft::WRL::RuntimeClass<Microsof

STDMETHODIMP SetCallback(IInputSwitchCallback* callback) override { return m_original->SetCallback(callback); }
STDMETHODIMP GetProfileCount(UINT* count, BOOL* bOutImePresent) override { return m_original->GetProfileCount(count, bOutImePresent); }
STDMETHODIMP GetCurrentProfile(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0002* data) override { return m_original->GetCurrentProfile(data); }
STDMETHODIMP GetCurrentProfile(INPUT_SWITCH_IDL_PROFILE_DATA* data) override { return m_original->GetCurrentProfile(data); }
STDMETHODIMP RegisterHotkeys() override { return m_original->RegisterHotkeys(); }
STDMETHODIMP ClickImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0004 type, POINT point, const RECT* rect) override { return m_original->ClickImeModeItem(type, point, rect); }
STDMETHODIMP ClickImeModeItemWithAnchor(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0004 type, IUnknown* anchor) override { return m_original->ClickImeModeItemWithAnchor(type, anchor); }
STDMETHODIMP ClickImeModeItem(INPUT_SWITCH_IDL_IME_CLICK_TYPE type, POINT point, const RECT* rect) override { return m_original->ClickImeModeItem(type, point, rect); }
STDMETHODIMP ClickImeModeItemWithAnchor(INPUT_SWITCH_IDL_IME_CLICK_TYPE type, IUnknown* anchor) override { return m_original->ClickImeModeItemWithAnchor(type, anchor); }
STDMETHODIMP ForceHide() override { return m_original->ForceHide(); }
STDMETHODIMP ShowTouchKeyboardInputSwitch(const RECT* rect, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0006 align, int a3, DWORD a4, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0005 a5) override { return m_original->ShowTouchKeyboardInputSwitch(rect, align, a3, a4, a5); }
STDMETHODIMP ShowTouchKeyboardInputSwitch(const RECT* rect, INPUT_SWITCH_IDL_ALIGNMENT align, int a3, DWORD a4, INPUT_SWITCH_IDL_MODALITY a5) override { return m_original->ShowTouchKeyboardInputSwitch(rect, align, a3, a4, a5); }
STDMETHODIMP GetContextFlags(DWORD* flags) override { return m_original->GetContextFlags(flags); }
STDMETHODIMP SetContextOverrideMode(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0008 mode) override { return m_original->SetContextOverrideMode(mode); }
STDMETHODIMP GetCurrentImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0003* data) override { return m_original->GetCurrentImeModeItem(data); }
STDMETHODIMP SetContextOverrideMode(INPUT_SWITCH_IDL_CFOM mode) override { return m_original->SetContextOverrideMode(mode); }
STDMETHODIMP GetCurrentImeModeItem(INPUT_SWITCH_IDL_IME_MODE_ITEM_DATA* data) override { return m_original->GetCurrentImeModeItem(data); }
STDMETHODIMP ActivateInputProfile(const WCHAR* profile) override { return m_original->ActivateInputProfile(profile); }
STDMETHODIMP SetUserSid(const WCHAR* sid) override { return m_original->SetUserSid(sid); }

private:
Microsoft::WRL::ComPtr<IInputSwitchControlSV2> m_original;
__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001 m_type;
INPUT_SWITCH_IDL_CLIENT_TYPE m_type;
};

HRESULT CInputSwitchControlProxySV2_CreateInstance(IInputSwitchControlSV2* original, REFIID riid, void** ppvObject)
Expand Down
56 changes: 29 additions & 27 deletions ExplorerPatcher/InputSwitch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
DEFINE_GUID(CLSID_InputSwitchControl, 0xb9bc2a50, 0x43c3, 0x41aa, 0xa0, 0x86, 0x5d, 0xb1, 0x4e, 0x18, 0x4b, 0xae);
DEFINE_GUID(IID_IInputSwitchControl, 0xb9bc2a50, 0x43c3, 0x41aa, 0xa0, 0x82, 0x5d, 0xb1, 0x4e, 0x18, 0x4b, 0xae);

enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0001
typedef enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0001
{
ISCT_IDL_DESKTOP,
ISCT_IDL_TOUCHKEYBOARD,
Expand All @@ -14,71 +14,73 @@ enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0001
ISCT_IDL_SETTINGSPANE,
ISCT_IDL_OOBE,
ISCT_IDL_USEROOBE
};
} INPUT_SWITCH_IDL_CLIENT_TYPE;

struct __MIDL___MIDL_itf_inputswitchserver_0000_0000_0002
typedef struct __MIDL___MIDL_itf_inputswitchserver_0000_0000_0002
{
int dummy; // We don't need its contents
};
} INPUT_SWITCH_IDL_PROFILE_DATA;

struct __MIDL___MIDL_itf_inputswitchserver_0000_0000_0003
typedef struct __MIDL___MIDL_itf_inputswitchserver_0000_0000_0003
{
WCHAR* pszTooltip;
HICON hIcon;
BOOL fDisabled;
BOOL fHidden;
WCHAR* pszIconGlyph;
};
} INPUT_SWITCH_IDL_IME_MODE_ITEM_DATA;

enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0004
typedef enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0004
{
INPUT_SWITCH_IDL_IME_CLICK_TYPE_LEFT,
INPUT_SWITCH_IDL_IME_CLICK_TYPE_RIGHT,
INPUT_SWITCH_IDL_IME_CLICK_TYPE_LEFT_DISABLED
};
} INPUT_SWITCH_IDL_IME_CLICK_TYPE;

enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0005
typedef enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0005
{
INPUT_SWITCH_IDL_MODALITY_STANDARDKEYBOARD = 0x1,
INPUT_SWITCH_IDL_MODALITY_SPLITKEYBOARD = 0x2,
INPUT_SWITCH_IDL_MODALITY_CLASSICKEYBOARD = 0x4,
INPUT_SWITCH_IDL_MODALITY_HANDWRITING = 0x8,
INPUT_SWITCH_IDL_MODALITY_HIDE = 0x10,
INPUT_SWITCH_IDL_MODALITY_ONEHANDEDKEYBOARD = 0x20,
};
} INPUT_SWITCH_IDL_MODALITY;

DEFINE_ENUM_FLAG_OPERATORS(INPUT_SWITCH_IDL_MODALITY);

enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0006
typedef enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0006
{
INPUT_SWITCH_IDL_ALIGN_DEFAULT,
INPUT_SWITCH_IDL_ALIGN_RIGHT_EDGE,
INPUT_SWITCH_IDL_ALIGN_LEFT_EDGE,
};
} INPUT_SWITCH_IDL_ALIGNMENT;

enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0008
typedef enum __MIDL___MIDL_itf_inputswitchserver_0000_0000_0008
{
INPUT_SWITCH_IDL_CFOM_NO_OVERRIDE,
INPUT_SWITCH_IDL_CFOM_DESKTOP,
INPUT_SWITCH_IDL_CFOM_IMMERSIVE,
};
} INPUT_SWITCH_IDL_CFOM;

interface IInputSwitchCallback;

#ifdef __cplusplus
MIDL_INTERFACE("b9bc2a50-43c3-41aa-a082-5db14e184bae")
IInputSwitchControl : IUnknown
{
virtual HRESULT STDMETHODCALLTYPE Init(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001) = 0;
virtual HRESULT STDMETHODCALLTYPE Init(INPUT_SWITCH_IDL_CLIENT_TYPE) = 0;
virtual HRESULT STDMETHODCALLTYPE SetCallback(IInputSwitchCallback*) = 0;
virtual HRESULT STDMETHODCALLTYPE ShowInputSwitch(const RECT*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetProfileCount(UINT*, BOOL*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentProfile(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0002*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentProfile(INPUT_SWITCH_IDL_PROFILE_DATA*) = 0;
virtual HRESULT STDMETHODCALLTYPE RegisterHotkeys() = 0;
virtual HRESULT STDMETHODCALLTYPE ClickImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0004, POINT, const RECT*) = 0;
virtual HRESULT STDMETHODCALLTYPE ClickImeModeItem(INPUT_SWITCH_IDL_IME_CLICK_TYPE, POINT, const RECT*) = 0;
virtual HRESULT STDMETHODCALLTYPE ForceHide() = 0;
virtual HRESULT STDMETHODCALLTYPE ShowTouchKeyboardInputSwitch(const RECT*, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0006, int, DWORD, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0005) = 0;
virtual HRESULT STDMETHODCALLTYPE ShowTouchKeyboardInputSwitch(const RECT*, INPUT_SWITCH_IDL_ALIGNMENT, int, DWORD, INPUT_SWITCH_IDL_MODALITY) = 0;
virtual HRESULT STDMETHODCALLTYPE GetContextFlags(DWORD*) = 0;
virtual HRESULT STDMETHODCALLTYPE SetContextOverrideMode(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0008) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0003*) = 0;
virtual HRESULT STDMETHODCALLTYPE SetContextOverrideMode(INPUT_SWITCH_IDL_CFOM) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentImeModeItem(INPUT_SWITCH_IDL_IME_MODE_ITEM_DATA*) = 0;
virtual HRESULT STDMETHODCALLTYPE ActivateInputProfile(const WCHAR*) = 0;
virtual HRESULT STDMETHODCALLTYPE SetUserSid(const WCHAR*) = 0;
};
Expand All @@ -90,19 +92,19 @@ typedef interface IInputSwitchControl IInputSwitchControl;
MIDL_INTERFACE("b9bc2a50-43c3-41aa-a082-5db14e184bae")
IInputSwitchControlSV2 : IUnknown
{
virtual HRESULT STDMETHODCALLTYPE Init(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0001) = 0;
virtual HRESULT STDMETHODCALLTYPE Init(INPUT_SWITCH_IDL_CLIENT_TYPE) = 0;
virtual HRESULT STDMETHODCALLTYPE SetCallback(IInputSwitchCallback*) = 0;
virtual HRESULT STDMETHODCALLTYPE ShowInputSwitch(const RECT*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetProfileCount(UINT*, BOOL*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentProfile(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0002*) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentProfile(INPUT_SWITCH_IDL_PROFILE_DATA*) = 0;
virtual HRESULT STDMETHODCALLTYPE RegisterHotkeys() = 0;
virtual HRESULT STDMETHODCALLTYPE ClickImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0004, POINT, const RECT*) = 0;
virtual HRESULT STDMETHODCALLTYPE ClickImeModeItemWithAnchor(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0004, IUnknown*) = 0;
virtual HRESULT STDMETHODCALLTYPE ClickImeModeItem(INPUT_SWITCH_IDL_IME_CLICK_TYPE, POINT, const RECT*) = 0;
virtual HRESULT STDMETHODCALLTYPE ClickImeModeItemWithAnchor(INPUT_SWITCH_IDL_IME_CLICK_TYPE, IUnknown*) = 0;
virtual HRESULT STDMETHODCALLTYPE ForceHide() = 0;
virtual HRESULT STDMETHODCALLTYPE ShowTouchKeyboardInputSwitch(const RECT*, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0006, int, DWORD, __MIDL___MIDL_itf_inputswitchserver_0000_0000_0005) = 0;
virtual HRESULT STDMETHODCALLTYPE ShowTouchKeyboardInputSwitch(const RECT*, INPUT_SWITCH_IDL_ALIGNMENT, int, DWORD, INPUT_SWITCH_IDL_MODALITY) = 0;
virtual HRESULT STDMETHODCALLTYPE GetContextFlags(DWORD*) = 0;
virtual HRESULT STDMETHODCALLTYPE SetContextOverrideMode(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0008) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentImeModeItem(__MIDL___MIDL_itf_inputswitchserver_0000_0000_0003*) = 0;
virtual HRESULT STDMETHODCALLTYPE SetContextOverrideMode(INPUT_SWITCH_IDL_CFOM) = 0;
virtual HRESULT STDMETHODCALLTYPE GetCurrentImeModeItem(INPUT_SWITCH_IDL_IME_MODE_ITEM_DATA*) = 0;
virtual HRESULT STDMETHODCALLTYPE ActivateInputProfile(const WCHAR*) = 0;
virtual HRESULT STDMETHODCALLTYPE SetUserSid(const WCHAR*) = 0;
};
Expand Down

0 comments on commit 33c4611

Please sign in to comment.