Remove unused m_bEnableKeyboardHook in CXkeymacsDll and related code.

Rename ReleaseHook to ReleaseHooks in CXkeymacsDll and rewrite it
with ReleaseHooks and SetHooks.

diff --git a/xkeymacs/mainfrm.cpp b/xkeymacs/mainfrm.cpp
index 57f3fa5..6575c0d 100644 (file)
--- a/xkeymacs/mainfrm.cpp
+++ b/xkeymacs/mainfrm.cpp
@@ -206,7 +206,6 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
                                                                  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CHANGE_CURSOR)), 0));\r
 \r
        CXkeymacsDll::SetHooks();\r
-       CXkeymacsDll::EnableKeyboardHook();\r
        StartPollThread();\r
 \r
        return 0;\r
@@ -577,7 +576,7 @@ void CMainFrame::OnExport()
 void CMainFrame::OnReset() \r
 {\r
        TerminatePollThread();\r
-       CXkeymacsDll::ResetHook();\r
+       CXkeymacsDll::ResetHooks();\r
        StartPollThread();\r
        CXkeymacsApp *pApp = static_cast<CXkeymacsApp *>(AfxGetApp());\r
        if (!pApp->SendIPCMessage(XKEYMACS_RESET))\r

diff --git a/xkeymacs/xkeymacs64.cpp b/xkeymacs/xkeymacs64.cpp
index 08e1bc8..4ae33e3 100644 (file)
--- a/xkeymacs/xkeymacs64.cpp
+++ b/xkeymacs/xkeymacs64.cpp
@@ -60,11 +60,10 @@ UINT PollIPCMessage(LPVOID lpParam)
                        goto exit;\r
                        break;\r
                case XKEYMACS_RELOAD:\r
-                       if (CXkeymacsDll::LoadConfig())\r
-                               CXkeymacsDll::EnableKeyboardHook();\r
+                       CXkeymacsDll::LoadConfig();\r
                        break;\r
                case XKEYMACS_RESET:\r
-                       //CXkeymacsDll::ResetHook();\r
+                       //CXkeymacsDll::ResetHooks();\r
                        break;\r
                }\r
        }\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 19c2b2a..f094391 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -229,7 +229,6 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 #include "xkeymacsDll.h"\r
 #pragma data_seg(".xkmcs")\r
        BOOL    CXkeymacsDll::m_bHookAltRelease = FALSE;\r
-       BOOL    CXkeymacsDll::m_bEnableKeyboardHook = FALSE;\r
        HHOOK   CXkeymacsDll::m_hHookCallWnd = NULL;\r
        HHOOK   CXkeymacsDll::m_hHookCallWndRet = NULL;\r
        HHOOK   CXkeymacsDll::m_hHookGetMessage = NULL;\r
@@ -319,35 +318,21 @@ void CXkeymacsDll::SetHooks()
        g_hHookKeyboard = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)KeyboardProc, g_hDllInst, 0);\r
 }\r
 \r
-void CXkeymacsDll::EnableKeyboardHook()\r
-{\r
-       m_bEnableKeyboardHook = TRUE;\r
-}\r
-\r
 inline void unhook(HHOOK &hh) {\r
        if (hh)\r
                UnhookWindowsHookEx(hh);\r
        hh = NULL;\r
 }\r
 \r
-void CXkeymacsDll::ResetHook() \r
+void CXkeymacsDll::ResetHooks() \r
 {\r
-       unhook(m_hHookCallWnd);\r
-       unhook(m_hHookCallWndRet);\r
-       unhook(m_hHookGetMessage);\r
-       unhook(m_hHookShell);\r
-       unhook(g_hHookKeyboard);\r
-       m_hHookCallWnd = SetWindowsHookEx(WH_CALLWNDPROC, (HOOKPROC)CallWndProc, g_hDllInst, 0);\r
-       m_hHookCallWndRet = SetWindowsHookEx(WH_CALLWNDPROCRET, (HOOKPROC)CallWndRetProc, g_hDllInst, 0);\r
-       m_hHookGetMessage = SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC)GetMsgProc, g_hDllInst, 0);\r
-       m_hHookShell = SetWindowsHookEx(WH_SHELL, (HOOKPROC)ShellProc, g_hDllInst, 0);\r
-       g_hHookKeyboard = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)KeyboardProc, g_hDllInst, 0);\r
+       ReleaseHooks();\r
+       SetHooks();\r
 }\r
 \r
 // release hooks\r
 void CXkeymacsDll::ReleaseHooks()\r
 {\r
-       m_bEnableKeyboardHook = FALSE;\r
        unhook(m_hHookCallWnd);\r
        unhook(m_hHookCallWndRet);\r
        unhook(m_hHookGetMessage);\r
@@ -806,7 +791,7 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
        static BYTE nOneShotModifier[MAX_KEY] = {'\0'};\r
        static BOOL bCherryOneShotModifier = FALSE;\r
 \r
-//     CUtils::Log(_T("nCode = %#x, nKey = %#x, lParam = %p, en = %d, %d, %d"), nCode, nKey, lParam, m_bEnableKeyboardHook, IsDll64, Is64ProcessHwnd(GetForegroundWindow()));\r
+//     CUtils::Log(_T("nCode = %#x, nKey = %#x, lParam = %p, %d, %d"), nCode, nKey, lParam, IsDll64, Is64ProcessHwnd(GetForegroundWindow()));\r
 \r
        if (Is64ProcessHwnd(GetForegroundWindow()) != IsDll64 || CUtils::IsXkeymacs())\r
                return CallNextHookEx(g_hHookKeyboard, nCode, wParam, lParam);\r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index c081f67..eed2513 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -76,8 +76,7 @@ public:
        static void SetIgnoreUndefinedC_x(int nApplicationID, BOOL bIgnoreUndefinedC_x);\r
        static void SetIgnoreUndefinedMetaCtrl(int nApplicationID, BOOL bIgnoreUndefinedMetaCtrl);\r
        static void SetHooks();\r
-       static void EnableKeyboardHook();\r
-       static void ResetHook();\r
+       static void ResetHooks();\r
        static void SetSettingStyle(int nApplicationID, int nSettingStyle);\r
        static void SetUseDialogSetting(int nApplicationID, BOOL bUseDialogSetting);\r
        static void AddKillRing(BOOL bNewData = TRUE);\r
@@ -114,7 +113,6 @@ private:
        static HHOOK m_hHookCallWndRet;\r
        static LRESULT CALLBACK CallWndRetProc(int nCode, WPARAM wParam, LPARAM lParam);\r
        static BOOL IsMatchWindowText(CString szWindowText);\r
-       static BOOL m_bEnableKeyboardHook;\r
        static HHOOK m_hHookCallWnd;\r
        static HHOOK m_hHookGetMessage;\r
        static HHOOK m_hHookShell;\r