From f3b9d36bcc05f77720700da1ccc3c0db3710ee75 Mon Sep 17 00:00:00 2001 From: rc-swag <58423624+rc-swag@users.noreply.github.com> Date: Thu, 27 Oct 2022 09:03:22 +1000 Subject: [PATCH] chore(windows): apply suggestions from code review Co-authored-by: Marc Durdin --- windows/src/engine/keyman32/k32_dbg.cpp | 2 +- windows/src/engine/keyman32/serialkeyeventcommon.h | 3 ++- windows/src/engine/keyman32/serialkeyeventserver.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/windows/src/engine/keyman32/k32_dbg.cpp b/windows/src/engine/keyman32/k32_dbg.cpp index 39c87da96d..9785bad5d7 100644 --- a/windows/src/engine/keyman32/k32_dbg.cpp +++ b/windows/src/engine/keyman32/k32_dbg.cpp @@ -208,7 +208,7 @@ void DebugMessage(LPMSG msg, WPARAM wParam) // I2908 wsprintf(ds, "DebugMessage(%x, wm_keymankeyup: %s lParam: %X) [message flags: %x time: %d]", PtrToInt(msg->hwnd), Debug_VirtualKey((WORD) msg->wParam), (unsigned int) msg->lParam, wParam, (int) msg->time); else if (msg->message == WM_KEYMAN_KEY_EVENT) - wsprintf(ds, "DebugMessage(%x, WM_KEYMAN_KEYEVENT: %s lParam: %X) [message flags: %x time: %d]", PtrToInt(msg->hwnd), + wsprintf(ds, "DebugMessage(%x, WM_KEYMAN_KEY_EVENT: %s lParam: %X) [message flags: %x time: %d]", PtrToInt(msg->hwnd), Debug_VirtualKey((WORD)msg->wParam), (unsigned int) msg->lParam, wParam, (int) msg->time); else if(msg->message == WM_KEYDOWN || msg->message == WM_KEYUP || msg->message == WM_SYSKEYDOWN || msg->message == WM_SYSKEYUP) wsprintf(ds, "DebugMessage(%x, %s, wParam: %s, lParam: %X) [message flags: %x time: %d extra: %x]", diff --git a/windows/src/engine/keyman32/serialkeyeventcommon.h b/windows/src/engine/keyman32/serialkeyeventcommon.h index d48bcff131..74530f5c7f 100644 --- a/windows/src/engine/keyman32/serialkeyeventcommon.h +++ b/windows/src/engine/keyman32/serialkeyeventcommon.h @@ -17,7 +17,8 @@ #define GLOBAL_KEY_MUTEX_NAME "KeymanEngine_KeyMutex" /** -WM_USER private messages +WM_USER private messages -- used only for communication +between low level keyboard hook and serial key event server */ #define WM_KEYMAN_KEY_EVENT (WM_USER + 1) #define WM_KEYMAN_MODIFIER_EVENT (WM_USER + 2) diff --git a/windows/src/engine/keyman32/serialkeyeventserver.cpp b/windows/src/engine/keyman32/serialkeyeventserver.cpp index 04659d1d63..fb7a1c76b9 100644 --- a/windows/src/engine/keyman32/serialkeyeventserver.cpp +++ b/windows/src/engine/keyman32/serialkeyeventserver.cpp @@ -487,7 +487,7 @@ private: if (msg == WM_KEYMAN_KEY_EVENT) { // We track changes to modifiers with WM_KEYMAN_MODIFIER_EVENT, but only ever - // pass them on to the app when we receive them with the WM_KEYMAN_KEYEVENT + // pass them on to the app when we receive them with the WM_KEYMAN_KEY_EVENT // message. if (!SendInput(2, input, sizeof(INPUT))) { DebugLastError("SendInput");