Rename SetKeyboardHook and ReleaseKeyboardHook to SetHooks and ReleaseHooks

in CXkeymacsDll. Drop their return values.

diff --git a/xkeymacs/mainfrm.cpp b/xkeymacs/mainfrm.cpp
index 4ab3300..7ef3874 100644 (file)
--- a/xkeymacs/mainfrm.cpp
+++ b/xkeymacs/mainfrm.cpp
@@ -197,7 +197,7 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
                                                                  (HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_DISABLE_CURSOR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),\r
                                                                  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CHANGE_CURSOR)), 0));\r
 \r
-       m_pXkeymacsDll->SetKeyboardHook();\r
+       m_pXkeymacsDll->SetHooks();\r
 \r
        return 0;\r
 }\r
@@ -420,7 +420,7 @@ void CMainFrame::OnQuit()
                CloseDialog(m_p109KeyboardDlg[i], &m_nResultKeyboardDlg[JAPANESE_KEYBOARD][i]);\r
        }\r
 \r
-       m_pXkeymacsDll->ReleaseKeyboardHook();\r
+       m_pXkeymacsDll->ReleaseHooks();\r
        m_pXkeymacsDll->DeleteAllShell_NotifyIcon();\r
 \r
        PostQuitMessage(0);\r
@@ -474,8 +474,8 @@ void CMainFrame::OnExport()
 void CMainFrame::OnReset() \r
 {\r
        // TODO: Add your command handler code here\r
-       m_pXkeymacsDll->ReleaseKeyboardHook();\r
-       m_pXkeymacsDll->SetKeyboardHook();\r
+       m_pXkeymacsDll->ReleaseHooks();\r
+       m_pXkeymacsDll->SetHooks();\r
 }\r
 \r
 void CMainFrame::OnHelpFinder() \r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 762aace..9c61792 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -203,62 +203,34 @@ void CXkeymacsDll::DeleteShell_NotifyIcon(ICON_TYPE icon)
        DoShell_NotifyIcon(icon, NIM_DELETE);\r
 }\r
 \r
-// set keyboard hook\r
-BOOL CXkeymacsDll::SetKeyboardHook()\r
+// set hooks\r
+void CXkeymacsDll::SetHooks()\r
 {\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, g_hDllInst, 0);\r
-\r
-       m_hHookCallWndRet = ::SetWindowsHookEx(WH_CALLWNDPROCRET, (HOOKPROC)CallWndRetProc, g_hDllInst, 0);\r
-\r
-       m_hHookGetMessage = ::SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC)GetMsgProc, g_hDllInst, 0);\r
-\r
-       m_hHookShell = ::SetWindowsHookEx(WH_SHELL, (HOOKPROC)ShellProc, g_hDllInst, 0);\r
-\r
-       AddShell_NotifyIcon(MAIN_ICON);\r
-\r
-       return TRUE;\r
+       m_hHookKeyboard = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)KeyboardProc, g_hDllInst, 0);\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
 }\r
 \r
-// release keyboard hook\r
-BOOL CXkeymacsDll::ReleaseKeyboardHook()\r
+// release hooks\r
+void CXkeymacsDll::ReleaseHooks()\r
 {\r
-       BOOL bKeyboard = TRUE;\r
-       BOOL bCallWnd = TRUE;\r
-       BOOL bCallWndRet = TRUE;\r
-       BOOL bGetMessage = TRUE;\r
-       BOOL bShell = TRUE;\r
-\r
-       if (m_hHookKeyboard) {\r
-               bKeyboard = ::UnhookWindowsHookEx(m_hHookKeyboard);\r
-       }\r
+       if (m_hHookKeyboard)\r
+               UnhookWindowsHookEx(m_hHookKeyboard);\r
        m_hHookKeyboard = NULL;\r
-\r
-       if (m_hHookCallWnd) {\r
-               bCallWnd = ::UnhookWindowsHookEx(m_hHookCallWnd);\r
-       }\r
+       if (m_hHookCallWnd)\r
+               UnhookWindowsHookEx(m_hHookCallWnd);\r
        m_hHookCallWnd = NULL;\r
-\r
-       if (m_hHookCallWndRet) {\r
-               bCallWndRet = ::UnhookWindowsHookEx(m_hHookCallWndRet);\r
-       }\r
+       if (m_hHookCallWndRet)\r
+               UnhookWindowsHookEx(m_hHookCallWndRet);\r
        m_hHookCallWndRet = NULL;\r
-\r
-       if (m_hHookGetMessage) {\r
-               bGetMessage = ::UnhookWindowsHookEx(m_hHookGetMessage);\r
-       }\r
+       if (m_hHookGetMessage)\r
+               UnhookWindowsHookEx(m_hHookGetMessage);\r
        m_hHookGetMessage = NULL;\r
-\r
-       if (m_hHookShell) {\r
-               bShell = ::UnhookWindowsHookEx(m_hHookShell);\r
-       }\r
+       if (m_hHookShell)\r
+               UnhookWindowsHookEx(m_hHookShell);\r
        m_hHookShell = NULL;\r
-\r
-       return bKeyboard && bCallWnd && bCallWndRet && bGetMessage && bShell;\r
 }\r
 \r
 void CXkeymacsDll::SetKeyboardHookFlag(BOOL bFlag)\r
@@ -452,8 +424,8 @@ LRESULT CALLBACK CXkeymacsDll::CallWndProc(int nCode, WPARAM wParam, LPARAM lPar
                        case PBT_APMRESUMECRITICAL: // 0x0006\r
                        case PBT_APMRESUMESUSPEND:  // 0x0007\r
                        case PBT_APMRESUMESTANDBY:  // 0x0008\r
-                               ReleaseKeyboardHook();\r
-                               SetKeyboardHook();\r
+                               ReleaseHooks();\r
+                               SetHooks();\r
                                break;\r
                        default:\r
                                break;\r
@@ -1157,7 +1129,7 @@ DO_NOTHING:
                bDefiningMacro = m_bDefiningMacro;\r
        }\r
 \r
-       return ::CallNextHookEx(m_hHookKeyboard, nCode, wParam, lParam);\r
+       return CallNextHookEx(m_hHookKeyboard, nCode, wParam, lParam);\r
 \r
 RECURSIVE:\r
        Kdu(RECURSIVE_KEY, 1, FALSE);\r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index 51c567c..4aa2c53 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -193,11 +193,11 @@ public:
        void SetCommandID(int nApplicationID, int nCommandType, int nKey, int nCommandID);\r
        void SetAtIbeamCursorOnly(int nApplicationID, int nCommandType, int nKey, BOOL bAtIbeamCursorOnly);\r
        void SetApplicationName(int nApplicationID, CString szApplicationName);\r
-       static BOOL ReleaseKeyboardHook();\r
+       static void ReleaseHooks();\r
        void SetEnableCUA(int nApplicationID, BOOL bEnableCUA);\r
        void SetIgnoreUndefinedC_x(int nApplicationID, BOOL bIgnoreUndefinedC_x);\r
        void SetIgnoreUndefinedMetaCtrl(int nApplicationID, BOOL bIgnoreUndefinedMetaCtrl);\r
-       static BOOL SetKeyboardHook();\r
+       static void SetHooks();\r
        void SetSettingStyle(int nApplicationID, int nSettingStyle);\r
        void SetUseDialogSetting(int nApplicationID, BOOL bUseDialogSetting);\r
        static void AddKillRing(BOOL bNewData = TRUE);\r