Make minor modifications in ipc.h and related files.

Remove unnecessary __declspec(align(8)) in ipc.h.
Rename CONFIG Config and rename ICONMSG IconMsg.

diff --git a/xkeymacs/mainfrm.cpp b/xkeymacs/mainfrm.cpp
index 8a553ca..fd29fbb 100644 (file)
--- a/xkeymacs/mainfrm.cpp
+++ b/xkeymacs/mainfrm.cpp
@@ -218,7 +218,7 @@ void CMainFrame::StartPollThread()
 void CMainFrame::TerminatePollThread()\r
 {\r
        m_bPollIconMessage = FALSE;\r
-       ICONMSG nul = {MAIN_ICON,};\r
+       IconMsg nul = {MAIN_ICON,};\r
        if (CXkeymacsDll::SendIconMessage(&nul, 1))\r
                WaitForSingleObject(m_hThread, 5000);\r
        CloseHandle(m_hThread);\r
@@ -228,13 +228,13 @@ DWORD WINAPI CMainFrame::PollIconMessage(LPVOID lpParam)
 {\r
        CMainFrame *pThis = reinterpret_cast<CMainFrame *>(lpParam);\r
        HANDLE hPipe = CreateNamedPipe(ICON_PIPE, PIPE_ACCESS_DUPLEX, PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, 1,\r
-                                                                       sizeof(DWORD), sizeof(ICONMSG) * MAX_ICON_TYPE, 0, NULL);\r
+                                                                       sizeof(DWORD), sizeof(IconMsg) * MAX_ICON_TYPE, 0, NULL);\r
        if (hPipe == INVALID_HANDLE_VALUE)\r
                return 1;\r
        for (; ;) {\r
                if (ConnectNamedPipe(hPipe, NULL) ? FALSE : (GetLastError() != ERROR_PIPE_CONNECTED))\r
                        break;\r
-               ICONMSG msg[MAX_ICON_TYPE];\r
+               IconMsg msg[MAX_ICON_TYPE];\r
                DWORD read;\r
                if (!ReadFile(hPipe, msg, sizeof(msg), &read, NULL))\r
                        break;\r
@@ -245,7 +245,7 @@ DWORD WINAPI CMainFrame::PollIconMessage(LPVOID lpParam)
                        break;\r
                if (!pThis->m_bPollIconMessage)\r
                        break;\r
-               for (DWORD i = 0; i < read / sizeof(ICONMSG); ++i) {\r
+               for (DWORD i = 0; i < read / sizeof(IconMsg); ++i) {\r
                        pThis->m_stNtfyIcon[msg[i].nType].hIcon = pThis->m_hIcon[msg[i].nType][msg[i].nState];\r
                        if (msg[i].nType == MX_ICON && msg[i].szTip[0] != 0)\r
                                memcpy(pThis->m_stNtfyIcon[MX_ICON].szTip, msg[i].szTip, 128);\r

diff --git a/xkeymacs/profile.cpp b/xkeymacs/profile.cpp
index 3f77876..b313d70 100644 (file)
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -304,7 +304,7 @@ static const KeyName KeyNames[] = {
        {0xff,                  _T("Fn")},\r
 };\r
 \r
-CONFIG CProfile::m_Config;\r
+Config CProfile::m_Config;\r
 TCHAR CProfile::m_szAppTitle[MAX_APP][WINDOW_TEXT_LENGTH];\r
 TASK_LIST CProfile::m_TaskList[MAX_TASKS];\r
 DWORD CProfile::m_dwTasks;\r

diff --git a/xkeymacs/profile.h b/xkeymacs/profile.h
index 2d23364..740f748 100644 (file)
--- a/xkeymacs/profile.h
+++ b/xkeymacs/profile.h
@@ -74,7 +74,7 @@ private:
        static bool GetAppTitle(CString& appTitle, const CString& windowName, int nth = 1000);\r
        static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam);\r
        static void SetDllData();\r
-       static CONFIG m_Config;\r
+       static Config m_Config;\r
        static TCHAR m_szAppTitle[MAX_APP][WINDOW_TEXT_LENGTH];\r
        static void DeleteAllRegistryData();\r
        static TASK_LIST m_TaskList[MAX_TASKS];\r

diff --git a/xkeymacsdll/ipc.h b/xkeymacsdll/ipc.h
index bc54af9..f06185b 100644 (file)
--- a/xkeymacsdll/ipc.h
+++ b/xkeymacsdll/ipc.h
@@ -7,14 +7,13 @@
 \r
 #include "defs.h"\r
 \r
-#pragma warning(disable: 4324)\r
-__declspec(align(8)) struct ICONMSG {\r
+struct IconMsg {\r
        ICON_TYPE nType;\r
        int nState;\r
        TCHAR szTip[128];\r
 };\r
 \r
-__declspec(align(8)) struct CONFIG {\r
+struct Config {\r
        BYTE b326Compatible[MAX_APP];\r
        TCHAR szWindowText[MAX_APP][WINDOW_TEXT_LENGTH];\r
        TCHAR szFunctionDefinition[MAX_FUNCTION][MAX_DEFINITION];\r
@@ -29,7 +28,6 @@ __declspec(align(8)) struct CONFIG {
        BYTE nCommandID[MAX_APP][MAX_COMMAND_TYPE][MAX_KEY];\r
        BYTE b106Keyboard;\r
 };\r
-#pragma warning(default: 4223)\r
 \r
 enum XKEYMACS_IPC { XKEYMACS_EXIT, XKEYMACS_RELOAD, XKEYMACS_RESET };\r
 \r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 476345c..006a49f 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -203,7 +203,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 //////////////////////////////////////////////////////////////////////\r
 \r
 #pragma data_seg(".xkmcs")\r
-CONFIG CXkeymacsDll::m_Config = {0};\r
+Config CXkeymacsDll::m_Config = {0};\r
 bool CXkeymacsDll::m_bEnableKeyboardHook = false;\r
 BOOL CXkeymacsDll::m_bHook = TRUE;\r
 DWORD CXkeymacsDll::m_nHookAltRelease = 0;\r
@@ -260,7 +260,7 @@ BOOL CXkeymacsDll::LoadConfig()
        return res;\r
 }\r
 \r
-void CXkeymacsDll::SetConfig(const CONFIG& config)\r
+void CXkeymacsDll::SetConfig(const Config& config)\r
 {\r
        m_Config = config;\r
 }\r
@@ -331,7 +331,7 @@ BOOL CXkeymacsDll::IsKeyboardHook()
 \r
 void CXkeymacsDll::ShowKeyboardHookState()\r
 {\r
-       ICONMSG msg = {MAIN_ICON,};\r
+       IconMsg msg = {MAIN_ICON,};\r
        if (m_bHook) {\r
                if (CCommands::IsTemporarilyDisableXKeymacs()) {\r
                        msg.nState = STATUS_DISABLE_TMP;\r
@@ -458,7 +458,7 @@ void CXkeymacsDll::InitKeyboardProc(BOOL bImeComposition)
                // Use Dialog Setting\r
                m_nAppID = GetAppID(_T("Dialog"), m_nAppID);\r
 \r
-       ICONMSG msg[3] = {\r
+       IconMsg msg[3] = {\r
                {CX_ICON, OFF_ICON, ""},\r
                {MX_ICON, OFF_ICON, ""},\r
                {META_ICON, OFF_ICON, ""}\r
@@ -847,7 +847,7 @@ void CXkeymacsDll::InvokeM_x(LPCTSTR szPath)
 \r
 void CXkeymacsDll::SetModifierIcons()\r
 {\r
-       ICONMSG msg[6] = {\r
+       IconMsg msg[6] = {\r
                {MX_ICON, CCommands::bM_x(), ""},\r
                {CX_ICON, CCommands::bC_x(), ""},\r
                {META_ICON, CCommands::bM_(), ""},\r
@@ -866,10 +866,10 @@ void CXkeymacsDll::SetM_xTip(LPCTSTR szPath)
                _stprintf_s(m_M_xTip, "M-x %s", szPath);\r
 }\r
 \r
-BOOL CXkeymacsDll::SendIconMessage(ICONMSG *pMsg, DWORD num)\r
+BOOL CXkeymacsDll::SendIconMessage(IconMsg *pMsg, DWORD num)\r
 {\r
        DWORD ack, read;\r
-       return CallNamedPipe(ICON_PIPE, pMsg, sizeof(ICONMSG) * num, &ack, sizeof(DWORD), &read, NMPWAIT_NOWAIT) && read == sizeof(DWORD);\r
+       return CallNamedPipe(ICON_PIPE, pMsg, sizeof(IconMsg) * num, &ack, sizeof(DWORD), &read, NMPWAIT_NOWAIT) && read == sizeof(DWORD);\r
 }\r
 \r
 void CXkeymacsDll::Kdu(BYTE bVk, DWORD n, BOOL bOriginal)\r

diff --git a/xkeymacsdll/xkeymacsdll.h b/xkeymacsdll/xkeymacsdll.h
index 201d5f0..2ac695b 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -23,7 +23,7 @@ class AFX_EXT_CLASS CXkeymacsDll
 public:\r
        static BOOL SaveConfig();\r
        static BOOL LoadConfig();\r
-       static void SetConfig(const CONFIG& config);\r
+       static void SetConfig(const Config& config);\r
        static void SetHooks();\r
        static void SetKeyboardHook();\r
        static void ResetHooks();\r
@@ -33,7 +33,7 @@ public:
        static BOOL IsKeyboardHook();\r
        static void ShowKeyboardHookState();\r
        static void SetM_xTip(LPCTSTR szPath);\r
-       static BOOL SendIconMessage(ICONMSG *pMsg, DWORD num);\r
+       static BOOL SendIconMessage(IconMsg *pMsg, DWORD num);\r
        static BOOL IsDown(BYTE bVk, BOOL bPhysicalKey = TRUE);\r
        static void Kdu(BYTE bVk, DWORD n = 1, BOOL bOriginal = TRUE);\r
        static void DepressKey(BYTE bVk, BOOL bOriginal = TRUE);\r
@@ -54,7 +54,7 @@ public:
        static void SetCursorData(HCURSOR hEnable, HCURSOR hDisableTMP, HCURSOR hDisableWOCQ, HICON hDisable, BOOL bEnable);\r
 \r
 private:\r
-       static CONFIG m_Config;\r
+       static Config m_Config;\r
        static HHOOK m_hHookCallWnd;\r
        static HHOOK m_hHookCallWndRet;\r
        static HHOOK m_hHookGetMessage;\r