flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct wrong variable types in CKeyboardWindows

Browse Source
This commit is contained in:
Roland Winklmeier
2018-09-14 15:27:29 +02:00
committed by Klaus Basan
parent 23a1f86834
commit 324e16121e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackinput/win/keyboardwindows.cpp
View File

@@ -83,7 +83,7 @@ namespace BlackInput
return true; return true;
} }
void CKeyboardWindows::processKeyEvent(WPARAM vkcode, uint event) void CKeyboardWindows::processKeyEvent(DWORD vkcode, WPARAM event)
{ {
BlackMisc::Input::CHotkeyCombination oldCombination(m_keyCombination); BlackMisc::Input::CHotkeyCombination oldCombination(m_keyCombination);
if ((event == WM_KEYDOWN) || (event == WM_SYSKEYDOWN)) if ((event == WM_KEYDOWN) || (event == WM_SYSKEYDOWN))
@@ -110,7 +110,7 @@ namespace BlackInput
if (nCode == HC_ACTION) if (nCode == HC_ACTION)
{ {
KBDLLHOOKSTRUCT *keyboardEvent = reinterpret_cast<KBDLLHOOKSTRUCT *>(lParam); KBDLLHOOKSTRUCT *keyboardEvent = reinterpret_cast<KBDLLHOOKSTRUCT *>(lParam);
WPARAM vkCode = keyboardEvent->vkCode; DWORD vkCode = keyboardEvent->vkCode;
g_keyboardWindows->processKeyEvent(vkCode, wParam); g_keyboardWindows->processKeyEvent(vkCode, wParam);
} }
return CallNextHookEx(g_keyboardWindows->keyboardHook(), nCode, wParam, lParam); return CallNextHookEx(g_keyboardWindows->keyboardHook(), nCode, wParam, lParam);

4
src/blackinput/win/keyboardwindows.h
View File

@@ -44,9 +44,6 @@ namespace BlackInput
//! Keyboard hook handle //! Keyboard hook handle
HHOOK keyboardHook() const { return m_keyboardHook; } HHOOK keyboardHook() const { return m_keyboardHook; }
//! \private
void processKeyEvent(WPARAM vkCode, uint event);
protected: protected:
//! \copydoc IKeyboard::init() //! \copydoc IKeyboard::init()
virtual bool init() override; virtual bool init() override;
@@ -59,6 +56,7 @@ namespace BlackInput
void addKey(WPARAM vkcode); void addKey(WPARAM vkcode);
void removeKey(WPARAM vkcode); void removeKey(WPARAM vkcode);
void processKeyEvent(DWORD vkCode, WPARAM event);
//! Keyboard hook procedure //! Keyboard hook procedure
static LRESULT CALLBACK keyboardProc(int nCode, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK keyboardProc(int nCode, WPARAM wParam, LPARAM lParam);