OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- There's really no need anymore to dynamically load RawInput, considering it has been in Windows since XP.

Browse source
This commit is contained in:
Christoph Oelckers 2019-07-14 17:41:25 +02:00
commit 293aa2e6da
6 changed files with 45 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/win32/i_keyboard.cpp
View file

@ -40,7 +40,7 @@
#include "i_input.h"
#include "d_event.h"
#include "rawinput.h"
// MACROS ------------------------------------------------------------------
@ -423,15 +423,12 @@ FRawKeyboard::FRawKeyboard()
FRawKeyboard::~FRawKeyboard()
{
if (MyRegisterRawInputDevices != NULL)
{
RAWINPUTDEVICE rid;
rid.usUsagePage = HID_GENERIC_DESKTOP_PAGE;
rid.usUsage = HID_GDP_KEYBOARD;
rid.dwFlags = RIDEV_REMOVE;
rid.hwndTarget = NULL;
MyRegisterRawInputDevices(&rid, 1, sizeof(rid));
}
RAWINPUTDEVICE rid;
rid.usUsagePage = HID_GENERIC_DESKTOP_PAGE;
rid.usUsage = HID_GDP_KEYBOARD;
rid.dwFlags = RIDEV_REMOVE;
rid.hwndTarget = NULL;
RegisterRawInputDevices(&rid, 1, sizeof(rid));
}
//==========================================================================
@ -446,15 +443,11 @@ bool FRawKeyboard::GetDevice()
{
RAWINPUTDEVICE rid;
if (MyRegisterRawInputDevices == NULL)
{
return false;
}
rid.usUsagePage = HID_GENERIC_DESKTOP_PAGE;
rid.usUsage = HID_GDP_KEYBOARD;
rid.dwFlags = RIDEV_INPUTSINK;
rid.hwndTarget = Window;
if (!MyRegisterRawInputDevices(&rid, 1, sizeof(rid)))
if (!RegisterRawInputDevices(&rid, 1, sizeof(rid)))
{
return false;
}