Rémi Bernon : user32: Remove hardcoded devices from GetRawInputDeviceList.
Alexandre Julliard
julliard at winehq.org
Mon May 3 16:37:06 CDT 2021
Module: wine
Branch: master
Commit: 0ac619ae7ab7dd90622371a5f58a1ff12d46eb8f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ac619ae7ab7dd90622371a5f58a1ff12d46eb8f
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Mon Apr 26 12:38:03 2021 +0200
user32: Remove hardcoded devices from GetRawInputDeviceList.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Arkadiusz Hiler <ahiler at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/rawinput.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
index a2cf5769fcc..5c009624fe6 100644
--- a/dlls/user32/rawinput.c
+++ b/dlls/user32/rawinput.c
@@ -408,29 +408,24 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun
if (!devices)
{
- *device_count = 2 + rawinput_devices_count;
+ *device_count = rawinput_devices_count;
return 0;
}
- if (*device_count < 2 + rawinput_devices_count)
+ if (*device_count < rawinput_devices_count)
{
SetLastError(ERROR_INSUFFICIENT_BUFFER);
- *device_count = 2 + rawinput_devices_count;
+ *device_count = rawinput_devices_count;
return ~0U;
}
- devices[0].hDevice = WINE_MOUSE_HANDLE;
- devices[0].dwType = RIM_TYPEMOUSE;
- devices[1].hDevice = WINE_KEYBOARD_HANDLE;
- devices[1].dwType = RIM_TYPEKEYBOARD;
-
for (i = 0; i < rawinput_devices_count; ++i)
{
- devices[2 + i].hDevice = rawinput_devices[i].handle;
- devices[2 + i].dwType = rawinput_devices[i].info.dwType;
+ devices[i].hDevice = rawinput_devices[i].handle;
+ devices[i].dwType = rawinput_devices[i].info.dwType;
}
- return 2 + rawinput_devices_count;
+ return rawinput_devices_count;
}
/***********************************************************************
More information about the wine-cvs
mailing list