dinput: Ignore override flag for non-XInput devices.

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Ignore override flag for non-XInput devices.
a3b0cb74 · Rémi Bernon · Alexandre Julliard · cd6bab2b · a3b0cb74
Commit a3b0cb74 authored Feb 16, 2022 by Rémi Bernon Committed by Alexandre Julliard Feb 16, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

joystick_hid.c dlls/dinput/joystick_hid.c +2 -4

No files found.
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -1577,11 +1577,9 @@ static HRESULT hid_joystick_device_open( int index, DIDEVICEINSTANCEW *filter, W
        if (device_instance_is_disabled( &instance, &override ))
            goto next;

-        if (override)
+        if (override && SetupDiGetDeviceInstanceIdW( set, &devinfo, device_id, MAX_PATH, NULL ) &&
+            (tmp = wcsstr( device_id, L"&IG_" )))
        {
-            if (!SetupDiGetDeviceInstanceIdW( set, &devinfo, device_id, MAX_PATH, NULL ) ||
-                !(tmp = wcsstr( device_id, L"&IG_" )))
-                goto next;
            memcpy( tmp, L"&XI_", sizeof(L"&XI_") - sizeof(WCHAR) );
            if (!SetupDiOpenDeviceInfoW( xi_set, device_id, NULL, 0, &devinfo ))
                goto next;