ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Remove hardcoded devices from GetRawInputDeviceList. 

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
Signed-off-by: Arkadiusz Hiler <ahiler@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Rémi Bernon 2021-04-26 12:38:03 +02:00 committed by Alexandre Julliard
parent f2759829f8
commit 0ac619ae7a
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/user32/rawinput.c
View File

@ -408,29 +408,24 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun
if (!devices) if (!devices)
{ {
*device_count = 2 + rawinput_devices_count; *device_count = rawinput_devices_count;
return 0; return 0;
} }
if (*device_count < 2 + rawinput_devices_count) if (*device_count < rawinput_devices_count)
{ {
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
*device_count = 2 + rawinput_devices_count; *device_count = rawinput_devices_count;
return ~0U; 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) for (i = 0; i < rawinput_devices_count; ++i)
{ {
devices[2 + i].hDevice = rawinput_devices[i].handle; devices[i].hDevice = rawinput_devices[i].handle;
devices[2 + i].dwType = rawinput_devices[i].info.dwType; devices[i].dwType = rawinput_devices[i].info.dwType;
} }
return 2 + rawinput_devices_count; return rawinput_devices_count;
} }
/*********************************************************************** /***********************************************************************