Define almost data members out of the shared section.

Rename m_kbdMacro to m_KbdMacro in CCommands.

diff --git a/xkeymacsdll/Commands.cpp b/xkeymacsdll/Commands.cpp
index 3c6761f..71ad912 100644 (file)
--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -10,27 +10,24 @@
 #include <math.h>\r
 #include <Imm.h>\r
 \r
-#pragma data_seg(".xkmcs")\r
-DWORD CCommands::m_nNumericArgument = 1;\r
-BOOL CCommands::m_bSetMark = FALSE;\r
-BOOL CCommands::m_bC_ = FALSE;\r
-BOOL CCommands::m_bC_x = FALSE;\r
-BOOL CCommands::m_bM_ = FALSE;\r
-BOOL CCommands::m_bM_x = FALSE;\r
-BOOL CCommands::m_bDefaultNumericArgument = TRUE;\r
-BOOL CCommands::m_bNegativeNumericArgument = FALSE;\r
-BOOL CCommands::m_bC_u = FALSE;\r
-SEARCH_DIRECTION CCommands::m_SearchDirection = NA;\r
-BOOL CCommands::m_bFirstFindDialog = FALSE;\r
-BOOL CCommands::m_bTemporarilyDisableXKeymacs = FALSE;\r
+KbdMacro CCommands::m_KbdMacro;\r
 OriginalWindowPosition CCommands::m_OriginalWindowPosition[MAX_WINDOW] = {'\0'};\r
-BOOL CCommands::m_bIsSu = FALSE;\r
-#pragma data_seg()\r
-\r
-KbdMacro CCommands::m_kbdMacro;\r
+CArray<CClipboardSnap *, CClipboardSnap *> CCommands::m_oClipboardData;\r
+BOOL CCommands::m_bTemporarilyDisableXKeymacs = FALSE;\r
+BOOL CCommands::m_bFirstFindDialog = FALSE;\r
+BOOL CCommands::m_bC_ = FALSE;\r
 int (*CCommands::m_LastKillCommand)() = NULL;\r
 int (*CCommands::m_LastCommand)() = NULL;\r
-CArray<CClipboardSnap *, CClipboardSnap *> CCommands::m_oClipboardData;\r
+SEARCH_DIRECTION CCommands::m_SearchDirection = NA;\r
+BOOL CCommands::m_bC_u = FALSE;\r
+BOOL CCommands::m_bNegativeNumericArgument = FALSE;\r
+BOOL CCommands::m_bDefaultNumericArgument = TRUE;\r
+BOOL CCommands::m_bM_x = FALSE;\r
+BOOL CCommands::m_bM_ = FALSE;\r
+BOOL CCommands::m_bC_x = FALSE;\r
+BOOL CCommands::m_bSetMark = FALSE;\r
+DWORD CCommands::m_nNumericArgument = 1;\r
+BOOL CCommands::m_bIsSu = FALSE;\r
 \r
 void CCommands::DepressKey(BYTE bVk)\r
 {\r
@@ -2533,9 +2530,9 @@ int CCommands::StartKbdMacro()
                SdKduSu(VK_F1);\r
        else {\r
                if (bC_u())\r
-                       m_kbdMacro.Call();\r
-               m_kbdMacro.Start();\r
-               CXkeymacsDll::SetKbMacro(&m_kbdMacro);\r
+                       m_KbdMacro.Call();\r
+               m_KbdMacro.Start();\r
+               CXkeymacsDll::SetKbMacro(&m_KbdMacro);\r
        }\r
        return Reset(GOTO_HOOK);\r
 }\r
@@ -2548,7 +2545,7 @@ int CCommands::EndKbdMacro()
        else if (CUtils::IsHidemaru())\r
                SdKduSu(VK_F1);\r
        else {\r
-               m_kbdMacro.End();\r
+               m_KbdMacro.End();\r
                CXkeymacsDll::SetKbMacro(NULL);\r
        }\r
        return Reset(GOTO_HOOK);\r
@@ -2569,7 +2566,7 @@ int CCommands::CallLastKbdMacro()
        } else {\r
                EndKbdMacro();\r
                while (m_nNumericArgument--)\r
-                       m_kbdMacro.Call();\r
+                       m_KbdMacro.Call();\r
        }\r
        return Reset(GOTO_HOOK);\r
 }\r

diff --git a/xkeymacsdll/Commands.h b/xkeymacsdll/Commands.h
index 65246aa..3106ae1 100644 (file)
--- a/xkeymacsdll/Commands.h
+++ b/xkeymacsdll/Commands.h
@@ -173,7 +173,7 @@ public:
        static int ForwardChar();\r
 \r
 private:\r
-       static KbdMacro m_kbdMacro;\r
+       static KbdMacro m_KbdMacro;\r
        static BOOL CutFollowingWord();\r
        static int CaseWord(CASE_WORD nCase);\r
        static BOOL CopyCurrentLine();\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 9a74713..5a93dfa 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -92,12 +92,6 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 Config CXkeymacsDll::m_Config = {0};\r
 bool CXkeymacsDll::m_bEnableKeyboardHook = false;\r
 BOOL CXkeymacsDll::m_bHook = TRUE;\r
-DWORD CXkeymacsDll::m_nHookAltRelease = 0;\r
-BOOL CXkeymacsDll::m_bRightShift = FALSE;\r
-BOOL CXkeymacsDll::m_bRightControl = FALSE;\r
-BOOL CXkeymacsDll::m_bRightAlt = FALSE;\r
-TCHAR CXkeymacsDll::m_M_xTip[128] = "";\r
-BYTE CXkeymacsDll::m_nOriginal[MAX_COMMAND_TYPE][MAX_KEY] = {'\0'};\r
 int CXkeymacsDll::m_nAccelerate = 0;\r
 int CXkeymacsDll::m_nKeyboardSpeed = 31;\r
 HCURSOR CXkeymacsDll::m_hCurrentCursor = NULL;\r
@@ -112,6 +106,12 @@ HHOOK CXkeymacsDll::m_hHookCallWnd = NULL;
 HHOOK CXkeymacsDll::m_hHookCallWndRet = NULL;\r
 HHOOK CXkeymacsDll::m_hHookGetMessage = NULL;\r
 HHOOK CXkeymacsDll::m_hHookShell = NULL;\r
+DWORD CXkeymacsDll::m_nHookAltRelease = 0;\r
+BOOL CXkeymacsDll::m_bRightShift = FALSE;\r
+BOOL CXkeymacsDll::m_bRightControl = FALSE;\r
+BOOL CXkeymacsDll::m_bRightAlt = FALSE;\r
+TCHAR CXkeymacsDll::m_M_xTip[128] = "";\r
+BYTE CXkeymacsDll::m_nOriginal[MAX_COMMAND_TYPE][MAX_KEY] = {'\0'};\r
 CList<CClipboardSnap *, CClipboardSnap *> CXkeymacsDll::m_oKillRing;\r
 int CXkeymacsDll::m_nKillRing = 0;\r
 KbdMacro* CXkeymacsDll::m_kbdMacro = NULL;\r