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>

user32: Remove hardcoded devices from GetRawInputDeviceList.
0ac619ae · Rémi Bernon · Alexandre Julliard · f2759829 · 0ac619ae
Commit 0ac619ae authored Apr 26, 2021 by Rémi Bernon Committed by Alexandre Julliard May 03, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 11 deletions

rawinput.c dlls/user32/rawinput.c +6 -11

No files found.
--- 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;
 }

 /***********************************************************************