Remove GetThisHInst().

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 3b4eb19..762aace 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -20,11 +20,6 @@ static AFX_EXTENSION_MODULE XkeymacsdllDLL = { NULL, NULL };
 \r
 static HINSTANCE g_hDllInst = NULL;\r
 \r
-HINSTANCE GetThisHInst()\r
-{\r
-       return g_hDllInst;\r
-}\r
-\r
 extern "C" int APIENTRY\r
 DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)\r
 {\r
@@ -211,18 +206,18 @@ void CXkeymacsDll::DeleteShell_NotifyIcon(ICON_TYPE icon)
 // set keyboard hook\r
 BOOL CXkeymacsDll::SetKeyboardHook()\r
 {\r
-       m_hHookKeyboard = ::SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)KeyboardProc, GetThisHInst(), 0);\r
+       m_hHookKeyboard = ::SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)KeyboardProc, g_hDllInst, 0);\r
        if (!m_hHookKeyboard) {\r
                return FALSE;\r
        }\r
 \r
-       m_hHookCallWnd = ::SetWindowsHookEx(WH_CALLWNDPROC, (HOOKPROC)CallWndProc, GetThisHInst(), 0);\r
+       m_hHookCallWnd = ::SetWindowsHookEx(WH_CALLWNDPROC, (HOOKPROC)CallWndProc, g_hDllInst, 0);\r
 \r
-       m_hHookCallWndRet = ::SetWindowsHookEx(WH_CALLWNDPROCRET, (HOOKPROC)CallWndRetProc, GetThisHInst(), 0);\r
+       m_hHookCallWndRet = ::SetWindowsHookEx(WH_CALLWNDPROCRET, (HOOKPROC)CallWndRetProc, g_hDllInst, 0);\r
 \r
-       m_hHookGetMessage = ::SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC)GetMsgProc, GetThisHInst(), 0);\r
+       m_hHookGetMessage = ::SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC)GetMsgProc, g_hDllInst, 0);\r
 \r
-       m_hHookShell = ::SetWindowsHookEx(WH_SHELL, (HOOKPROC)ShellProc, GetThisHInst(), 0);\r
+       m_hHookShell = ::SetWindowsHookEx(WH_SHELL, (HOOKPROC)ShellProc, g_hDllInst, 0);\r
 \r
        AddShell_NotifyIcon(MAIN_ICON);\r
 \r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index 9fc55da..51c567c 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -9,8 +9,6 @@
 #pragma once\r
 #endif // _MSC_VER > 1000\r
 \r
-HINSTANCE GetThisHInst();\r
-\r
 #include "ClipboardSnap.h"\r
 \r
 enum { MAX_APP = 64 };\r