Take some member variables of CCommands and CXkeymacsDll outside of

the shared section. Different processes can't or shouldn't share them.

diff --git a/xkeymacsdll/Commands.cpp b/xkeymacsdll/Commands.cpp
index dd2a117..0f958c7 100644 (file)
--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -281,15 +281,16 @@ BOOL CCommands::m_bDefaultNumericArgument = TRUE;
 BOOL CCommands::m_bNegativeNumericArgument = FALSE;\r
 BOOL CCommands::m_bC_u = FALSE;\r
 SEARCH_DIRECTION CCommands::m_SearchDirection = NA;\r
-int (*CCommands::m_LastKillCommand)() = NULL;\r
-int (*CCommands::m_LastCommand)() = NULL;\r
 BOOL CCommands::m_bFirstFindDialog = FALSE;\r
 BOOL CCommands::m_bTemporarilyDisableXKeymacs = FALSE;\r
-CArray<CClipboardSnap *, CClipboardSnap *> CCommands::m_oClipboardData;\r
 OriginalWindowPosition CCommands::m_OriginalWindowPosition[MAX_WINDOW] = {'\0'};\r
 BOOL CCommands::m_bIsSu = FALSE;\r
 #pragma data_seg()\r
 \r
+int (*CCommands::m_LastKillCommand)() = NULL;\r
+int (*CCommands::m_LastCommand)() = NULL;\r
+CArray<CClipboardSnap *, CClipboardSnap *> CCommands::m_oClipboardData;\r
+\r
 void CCommands::DepressKey(BYTE bVk)\r
 {\r
        CXkeymacsDll::DepressKey(bVk);\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 1b74239..50eb3e6 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -211,10 +211,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
        BOOL    CXkeymacsDll::m_bRightAlt               = FALSE;\r
        BOOL    CXkeymacsDll::m_bRightShift             = FALSE;\r
        BOOL    CXkeymacsDll::m_bHook                   = TRUE;\r
-       CList<CClipboardSnap *, CClipboardSnap *> CXkeymacsDll::m_oKillRing;\r
-       int             CXkeymacsDll::m_nKillRing = 0;\r
        BYTE    CXkeymacsDll::m_nOriginal[MAX_COMMAND_TYPE][MAX_KEY] = {'\0'};\r
-       int             CXkeymacsDll::m_nAppID = 0;\r
        int             CXkeymacsDll::m_nAccelerate = 0;\r
        int             CXkeymacsDll::m_nKeyboardSpeed = 31;\r
        HCURSOR CXkeymacsDll::m_hCursor[MAX_STATUS] = {'\0'};\r
@@ -227,6 +224,9 @@ HHOOK CXkeymacsDll::m_hHookCallWnd = NULL;
 HHOOK CXkeymacsDll::m_hHookCallWndRet = NULL;\r
 HHOOK CXkeymacsDll::m_hHookGetMessage = NULL;\r
 HHOOK CXkeymacsDll::m_hHookShell = NULL;\r
+int CXkeymacsDll::m_nAppID = 0;\r
+CList<CClipboardSnap *, CClipboardSnap *> CXkeymacsDll::m_oKillRing;\r
+int CXkeymacsDll::m_nKillRing = 0;\r
 BOOL CXkeymacsDll::m_bRecordingMacro = FALSE;\r
 BOOL CXkeymacsDll::m_bDown[MAX_KEY] = {0};\r
 std::list<KbdMacro> CXkeymacsDll::m_Macro;\r