Rémi Bernon : joy.cpl: Read the device path property instead of storing it.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9b4cd908505655e7109f7b63b555f2c7a19938ed
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9b4cd908505655e7109f7b63b555f2c...

Author: Rémi Bernon 
Date:   Sat Nov 26 20:47:25 2022 +0100

joy.cpl: Read the device path property instead of storing it.

---

dlls/joy.cpl/main.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index d258dee7d01..59e5facb76f 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -79,8 +79,6 @@ struct Joystick
 {
     IDirectInputDevice8W *device;
     BOOL forcefeedback;
-    BOOL is_xinput;
-    BOOL has_override;

struct list effects;
     IDirectInputEffect *effect_selected;
@@ -218,15 +216,6 @@ static BOOL CALLBACK enum_effects( const DIEFFECTINFOW *info, void *context )

static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *context)
 {
-    DIPROPGUIDANDPATH prop_guid_path =
-    {
-        .diph =
-        {
-            .dwSize = sizeof(DIPROPGUIDANDPATH),
-            .dwHeaderSize = sizeof(DIPROPHEADER),
-            .dwHow = DIPH_DEVICE,
-        },
-    };
     struct JoystickData *data = context;
     struct Joystick *joystick;
     DIPROPRANGE proprange;
@@ -249,9 +238,6 @@ static BOOL CALLBACK enum_callback(const DIDEVICEINSTANCEW *instance, void *cont

joystick->forcefeedback = caps.dwFlags & DIDC_FORCEFEEDBACK;

-    IDirectInputDevice8_GetProperty(joystick->device, DIPROP_GUIDANDPATH, &prop_guid_path.diph);
-    joystick->is_xinput = wcsstr(prop_guid_path.wszPath, L"&ig_") != NULL;
-
     list_init( &joystick->effects );
     joystick->effect_selected = NULL;

@@ -394,8 +380,20 @@ static void refresh_joystick_list(HWND hwnd, struct JoystickData *data)
     for (joy = data->joysticks, joy_end = joy + data->num_joysticks; joy != joy_end; ++joy)
     {
         DIDEVICEINSTANCEW info = {.dwSize = sizeof(DIDEVICEINSTANCEW)};
+        DIPROPGUIDANDPATH prop =
+        {
+            .diph =
+            {
+                .dwSize = sizeof(DIPROPGUIDANDPATH),
+                .dwHeaderSize = sizeof(DIPROPHEADER),
+                .dwHow = DIPH_DEVICE,
+            },
+        };
+
         if (FAILED(IDirectInputDevice8_GetDeviceInfo( joy->device, &info ))) continue;
-        if (joy->is_xinput) SendDlgItemMessageW( hwnd, IDC_XINPUTLIST, LB_ADDSTRING, 0, (LPARAM)info.tszInstanceName );
+        if (FAILED(IDirectInputDevice8_GetProperty( joy->device, DIPROP_GUIDANDPATH, &prop.diph ))) continue;
+
+        if (wcsstr( prop.wszPath, L"&ig_" )) SendDlgItemMessageW( hwnd, IDC_XINPUTLIST, LB_ADDSTRING, 0, (LPARAM)info.tszInstanceName );
         else SendDlgItemMessageW( hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM)info.tszInstanceName );
     }