From 324e16121e18f2c7be6bfaeecc2712643402c48b Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 14 Sep 2018 15:27:29 +0200 Subject: [PATCH] Correct wrong variable types in CKeyboardWindows --- src/blackinput/win/keyboardwindows.cpp | 4 ++-- src/blackinput/win/keyboardwindows.h | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/blackinput/win/keyboardwindows.cpp b/src/blackinput/win/keyboardwindows.cpp index 11776ff77..aae609662 100644 --- a/src/blackinput/win/keyboardwindows.cpp +++ b/src/blackinput/win/keyboardwindows.cpp @@ -83,7 +83,7 @@ namespace BlackInput return true; } - void CKeyboardWindows::processKeyEvent(WPARAM vkcode, uint event) + void CKeyboardWindows::processKeyEvent(DWORD vkcode, WPARAM event) { BlackMisc::Input::CHotkeyCombination oldCombination(m_keyCombination); if ((event == WM_KEYDOWN) || (event == WM_SYSKEYDOWN)) @@ -110,7 +110,7 @@ namespace BlackInput if (nCode == HC_ACTION) { KBDLLHOOKSTRUCT *keyboardEvent = reinterpret_cast(lParam); - WPARAM vkCode = keyboardEvent->vkCode; + DWORD vkCode = keyboardEvent->vkCode; g_keyboardWindows->processKeyEvent(vkCode, wParam); } return CallNextHookEx(g_keyboardWindows->keyboardHook(), nCode, wParam, lParam); diff --git a/src/blackinput/win/keyboardwindows.h b/src/blackinput/win/keyboardwindows.h index a32cd24af..0cf940509 100644 --- a/src/blackinput/win/keyboardwindows.h +++ b/src/blackinput/win/keyboardwindows.h @@ -44,9 +44,6 @@ namespace BlackInput //! Keyboard hook handle HHOOK keyboardHook() const { return m_keyboardHook; } - //! \private - void processKeyEvent(WPARAM vkCode, uint event); - protected: //! \copydoc IKeyboard::init() virtual bool init() override; @@ -59,6 +56,7 @@ namespace BlackInput void addKey(WPARAM vkcode); void removeKey(WPARAM vkcode); + void processKeyEvent(DWORD vkCode, WPARAM event); //! Keyboard hook procedure static LRESULT CALLBACK keyboardProc(int nCode, WPARAM wParam, LPARAM lParam);