Rémi Bernon : dinput: Pass output instance to get_object_info HID joystick callback.
Alexandre Julliard
julliard at winehq.org
Mon Sep 20 16:26:21 CDT 2021
Module: wine
Branch: master
Commit: d47ec6502b6be1b97399583df76f10d0cbeefba0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d47ec6502b6be1b97399583df76f10d0cbeefba0
Author: Rémi Bernon <rbernon at codeweavers.com>
Date: Mon Sep 20 10:57:21 2021 +0200
dinput: Pass output instance to get_object_info HID joystick callback.
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dinput/joystick_hid.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index 709953be8f0..1614f5e8583 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -652,11 +652,11 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D
instance->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW))
return DIERR_INVALIDPARAM;
- ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL );
+ ret = enum_value_objects( impl, &filter, DIDFT_ALL, get_object_info, instance );
if (ret != DIENUM_CONTINUE) return S_OK;
- ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL );
+ ret = enum_button_objects( impl, &filter, DIDFT_ALL, get_object_info, instance );
if (ret != DIENUM_CONTINUE) return S_OK;
- enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, NULL );
+ enum_collections_objects( impl, &filter, DIDFT_ALL, get_object_info, instance );
return S_OK;
}
More information about the wine-cvs
mailing list