Rémi Bernon : dinput: Return HID class guid in DIPROP_GUIDANDPATH property.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 85148f9ee006f338b8d434662069bf01d00980fc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=85148f9ee006f338b8d434662...

Author: Rémi Bernon 
Date:   Tue Jan  4 10:41:10 2022 +0100

dinput: Return HID class guid in DIPROP_GUIDANDPATH property.

Signed-off-by: Rémi Bernon 
Signed-off-by: Alexandre Julliard

---

dlls/dinput/joystick_hid.c    | 1 +
 dlls/dinput/tests/joystick8.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c
index 874eca6646e..2e3efd2ee8a 100644
--- a/dlls/dinput/joystick_hid.c
+++ b/dlls/dinput/joystick_hid.c
@@ -819,6 +819,7 @@ static HRESULT hid_joystick_get_property( IDirectInputDevice8W *iface, DWORD pro
     case (DWORD_PTR)DIPROP_GUIDANDPATH:
     {
         DIPROPGUIDANDPATH *value = (DIPROPGUIDANDPATH *)header;
+        value->guidClass = GUID_DEVCLASS_HIDCLASS;
         lstrcpynW( value->wszPath, impl->device_path, MAX_PATH );
         return DI_OK;
     }
diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c
index 4f9ba401673..d06b56cbf8c 100644
--- a/dlls/dinput/tests/joystick8.c
+++ b/dlls/dinput/tests/joystick8.c
@@ -889,7 +889,6 @@ static void test_simple_joystick( DWORD version )

hr = IDirectInputDevice8_GetProperty( device, DIPROP_GUIDANDPATH, &prop_guid_path.diph );
     ok( hr == DI_OK, "GetProperty DIPROP_GUIDANDPATH returned %#x\n", hr );
-    todo_wine
     ok( IsEqualGUID( &prop_guid_path.guidClass, &GUID_DEVCLASS_HIDCLASS ), "got guid %s\n",
         debugstr_guid( &prop_guid_path.guidClass ) );
     todo_wine