dinput: Ignore objects without a collection in init_pid_caps.

This makes sure we don't try to set effect_state report id from objects without a collection, causing some false warnings. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dinput: Ignore objects without a collection in init_pid_caps.
531297a8 · Rémi Bernon · Alexandre Julliard · e5131028 · 531297a8
Commit 531297a8 authored Dec 20, 2021 by Rémi Bernon Committed by Alexandre Julliard Dec 20, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

joystick_hid.c dlls/dinput/joystick_hid.c +3 -0

No files found.
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -1732,6 +1732,9 @@ static BOOL init_pid_caps( struct hid_joystick *impl, struct hid_value_caps *cap
            FIXME( "multiple " #rep " report ids!\n" );                \
    } while (0)

+    if (!instance->wCollectionNumber)
+        return DIENUM_CONTINUE;
+
    if (instance->wCollectionNumber == effect_state->collection)
        SET_REPORT_ID( effect_state );