Some minor modifications.

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 50eb3e6..6c1fd26 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -134,7 +134,7 @@ static const int MAX_KEYNAME = _countof(KeyNames);
 static AFX_EXTENSION_MODULE XkeymacsdllDLL = { NULL, NULL };\r
 \r
 static HINSTANCE g_hDllInst = NULL;\r
-static DWORD g_TlsIndex = NULL;\r
+static DWORD g_TlsIndex = 0;\r
 \r
 extern "C" int APIENTRY\r
 DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)\r
@@ -242,7 +242,7 @@ BOOL CXkeymacsDll::SaveConfig()
        if (hFile == INVALID_HANDLE_VALUE)\r
                return FALSE;\r
        DWORD written;\r
-       BOOL res = WriteFile(hFile, &m_Config, sizeof(m_Config), &written, NULL) || written != sizeof(m_Config);\r
+       BOOL res = WriteFile(hFile, &m_Config, sizeof(m_Config), &written, NULL) && written == sizeof(m_Config);\r
        CloseHandle(hFile);\r
        return res;\r
 }\r
@@ -445,7 +445,7 @@ UINT CXkeymacsDll::GetModifierState(BOOL bPhysicalKey)
        return result;\r
 }\r
 \r
-void CXkeymacsDll::SetModifierState(const UINT after, const UINT before)\r
+void CXkeymacsDll::SetModifierState(UINT after, UINT before)\r
 {\r
        if (after & SHIFT && !(before & SHIFT))\r
                DepressKey(VK_SHIFT);\r
@@ -488,10 +488,8 @@ BOOL CXkeymacsDll::IsDown(BYTE bVk, BOOL bPhysicalKey)
        return bPhysicalKey ? GetAsyncKeyState(bVk) < 0 : GetKeyState(bVk) < 0;\r
 }\r
 \r
-// Do keybd_event\r
 void CXkeymacsDll::DoKeybd_event(BYTE bVk, DWORD dwFlags)\r
 {\r
-       // Set KEYEVENTF_EXTENDEDKEY if needed\r
        switch (bVk) {\r
        case VK_CONTROL:\r
                if (m_bRightControl)\r
@@ -535,7 +533,6 @@ void CXkeymacsDll::DoKeybd_event(BYTE bVk, DWORD dwFlags)
 //     CUtils::Log(_T("a: %x, %x, %x, %#hx, %#hx"), bVk, dwFlags, GetMessageExtraInfo(), GetKeyState(bVk), GetAsyncKeyState(bVk));\r
 }\r
 \r
-// the key is being depressed\r
 void CXkeymacsDll::DepressKey(BYTE bVk, BOOL bOriginal)        // bVk is virtual-key code, MSDN said\r
 {\r
        if (bOriginal) {\r
@@ -547,13 +544,11 @@ void CXkeymacsDll::DepressKey(BYTE bVk, BOOL bOriginal)   // bVk is virtual-key co
        DoKeybd_event(bVk, 0);\r
 }\r
 \r
-// the key is being released\r
 void CXkeymacsDll::ReleaseKey(BYTE bVk)        // bVk is virtual-key code, MSDN said\r
 {\r
        DoKeybd_event(bVk, KEYEVENTF_KEYUP);\r
 }\r
 \r
-// bVk down, bVk up\r
 void CXkeymacsDll::Kdu(BYTE bVk, DWORD n, BOOL bOriginal)\r
 {\r
        while (n--) {\r
@@ -601,7 +596,7 @@ void CXkeymacsDll::InitKeyboardProc(BOOL bImeComposition)
        CCommands::Reset();\r
 }\r
 \r
-int CXkeymacsDll::GetAppID(const LPCSTR szName, const int fallback)\r
+int CXkeymacsDll::GetAppID(LPCSTR szName, int fallback)\r
 {\r
        for (int i = 0; i < MAX_APP; ++i)\r
                if (!_tcsicmp(m_Config.szSpecialApp[i], szName))\r
@@ -714,12 +709,14 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
                nType &= ~CONTROLX;\r
        }\r
        // Ignore undefined Meta Ctrl+?\r
-       if (CCommands::bM_() && nType & CONTROL && fCommand(nType) == NULL && nFunctionID < 0) {\r
-               if (m_Config.bIgnoreUndefinedMetaCtrl[m_nAppID]) {\r
-                       if (CheckOriginal(CONTROL, nKey))\r
-                               goto DO_NOTHING;\r
-                       CCommands::Reset(GOTO_HOOK);\r
-                       goto HOOK;\r
+       if (CCommands::bM_() && nType & CONTROL) {\r
+               if (fCommand(nType) == NULL && nFunctionID < 0) {\r
+                       if (m_Config.bIgnoreUndefinedMetaCtrl[m_nAppID]) {\r
+                               if (CheckOriginal(CONTROL, nKey))\r
+                                       goto DO_NOTHING;\r
+                               CCommands::Reset(GOTO_HOOK);\r
+                               goto HOOK;\r
+                       }\r
                        nType &= ~META;\r
                }\r
        }\r
@@ -729,9 +726,8 @@ LRESULT CALLBACK CXkeymacsDll::KeyboardProc(int nCode, WPARAM wParam, LPARAM lPa
                nVirtualType &= ~CONTROL;\r
        if (nOrigKey == VK_MENU)\r
                nVirtualType &= ~META;\r
-       if (CheckOriginal(nVirtualType, nOrigKey)) {\r
+       if (CheckOriginal(nVirtualType, nOrigKey))\r
                goto DO_NOTHING;\r
-       }\r
 \r
        int (*const fCommand)() = fCommand(nType);\r
        if (fCommand == CCommands::EnableOrDisableXKeymacs) {\r
@@ -898,7 +894,7 @@ RECURSIVE_COMMAND:
        case GOTO_HOOKX:\r
                bLocked = FALSE;\r
                goto HOOKX;\r
-               case GOTO_HOOK0_9:\r
+       case GOTO_HOOK0_9:\r
                bLocked = FALSE;\r
                goto HOOK0_9;\r
        }\r
@@ -938,7 +934,6 @@ void CXkeymacsDll::SetModifierIcons()
        SendIconMessage(msg, 6);\r
 }\r
 \r
-// Clear data of nAppID\r
 void CXkeymacsDll::Clear(int nAppID)\r
 {\r
        if (0 <= nAppID && nAppID < MAX_APP) {\r
@@ -994,13 +989,13 @@ void CXkeymacsDll::CancelMarkWithShift(BYTE nKey, bool bRelease)
                        goto exit;\r
        } while (++bVk);\r
        if (!bRelease) {\r
-               bShift = TRUE;\r
+               bShift = true;\r
                return;\r
        }\r
        if (bShift)\r
                CCommands::SetMark(FALSE);\r
 exit:\r
-       bShift = FALSE;\r
+       bShift = false;\r
        return;\r
 }\r
 \r
@@ -1533,7 +1528,7 @@ BOOL CXkeymacsDll::Get326Compatible()
        return m_Config.b326Compatible[m_nAppID];\r
 }\r
 \r
-void CXkeymacsDll::InvokeM_x(const TCHAR *const szPath)\r
+void CXkeymacsDll::InvokeM_x(LPCTSTR szPath)\r
 {\r
 //     CUtils::Log("M-x: szPath=_%s_", szPath);\r
        int (*fCommand)() = NULL;\r
@@ -1554,7 +1549,7 @@ void CXkeymacsDll::InvokeM_x(const TCHAR *const szPath)
        }\r
 }\r
 \r
-void CXkeymacsDll::SetM_xTip(const TCHAR *const szPath)\r
+void CXkeymacsDll::SetM_xTip(LPCTSTR szPath)\r
 {\r
        _tcscpy_s(m_M_xTip, "M-x LED");\r
        if (szPath && _tcslen(szPath) < 128 - 5)\r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index c822b9a..123f13b 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -63,7 +63,7 @@ public:
        static BOOL SaveConfig();\r
        static BOOL LoadConfig();\r
        static void SetConfig(const CONFIG& config);\r
-       static void SetM_xTip(const TCHAR *const szPath);\r
+       static void SetM_xTip(LPCTSTR szPath);\r
        static BOOL Get326Compatible();\r
        static void SetCursorData(HCURSOR hEnable, HCURSOR hDisableTMP, HCURSOR hDisableWOCQ, HICON hDisable, BOOL bEnable);\r
        static unsigned int GetMaxKeyInterval(void);\r
@@ -86,7 +86,7 @@ public:
        static CClipboardSnap* GetKillRing(CClipboardSnap *pSnap, BOOL bForce = TRUE);\r
        static void IncreaseKillRingIndex(int nKillRing = 1);\r
        static UINT GetModifierState(BOOL bPhysicalKey = TRUE);\r
-       static void SetModifierState(const UINT before, const UINT after);\r
+       static void SetModifierState(UINT before, UINT after);\r
        static BOOL IsDown(BYTE bVk, BOOL bPhysicalKey = TRUE);\r
        static void Kdu(BYTE bVk, DWORD n = 1, BOOL bOriginal = TRUE);\r
        static void ReleaseKey(BYTE bVk);\r
@@ -99,7 +99,7 @@ private:
        static bool m_bEnableKeyboardHook;\r
        static DWORD m_nHookAltRelease;\r
        static TCHAR m_M_xTip[128];\r
-       static void InvokeM_x(const TCHAR* const szPath);\r
+       static void InvokeM_x(LPCTSTR szPath);\r
        static BOOL UpdateKeyboardState(BYTE bVK, BYTE bState);\r
        static void LogCallWndProcMessage(WPARAM wParam, LPARAM lParam);\r
        static void DoSetCursor();\r
@@ -122,7 +122,7 @@ private:
        static LRESULT CALLBACK CallWndProc(int nCode, WPARAM wParam, LPARAM lParam);\r
        static LRESULT CALLBACK GetMsgProc(int nCode, WPARAM wParam, LPARAM lParam);\r
        static LRESULT CALLBACK ShellProc(int nCode, WPARAM wParam, LPARAM lParam);\r
-       static int GetAppID(const LPCSTR szName, const int fallback);\r
+       static int GetAppID(LPCSTR szName, int fallback);\r
        static KeyBind ParseKey(LPCTSTR& def);\r
        static BYTE a2v(TCHAR nAscii);\r
        static BOOL IsShift(TCHAR nAscii);\r