[PATCH 0/1] MR7048: dinput: Copy the device format if the user format is a subset of it.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52738

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7048

[PATCH 1/1] dinput: Copy the device format if the user format is a subset of it.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52738
---
 dlls/dinput/device.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 6ea4ef5ef79..3fc21de4827 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -229,7 +229,7 @@ LPDIOBJECTDATAFORMAT dataformat_to_odf_by_type(LPCDIDATAFORMAT df, int n, DWORD
 }
 
 static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT *user_format,
-                                 const DIOBJECTDATAFORMAT *match_obj, DWORD version )
+                                 const DIOBJECTDATAFORMAT *match_obj, DWORD version, BOOL *identical )
 {
     DWORD i, device_instance, instance = DIDFT_GETINSTANCE( match_obj->dwType );
     DIOBJECTDATAFORMAT *device_obj, *user_obj;
@@ -251,6 +251,7 @@ static BOOL match_device_object( const DIDATAFORMAT *device_format, DIDATAFORMAT
                debugstr_diobjectdataformat( device_obj ) );
 
         *user_obj = *device_obj;
+        if (user_obj->dwOfs != match_obj->dwOfs) *identical = FALSE;
         user_obj->dwOfs = match_obj->dwOfs;
         return TRUE;
     }
@@ -262,6 +263,7 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const
 {
     DIDATAFORMAT *user_format = &impl->user_format, *device_format = &impl->device_format;
     DIOBJECTDATAFORMAT *user_obj, *match_obj;
+    BOOL identical = TRUE;
     DWORD i;
 
     *user_format = *device_format;
@@ -280,18 +282,25 @@ static HRESULT dinput_device_init_user_format( struct dinput_device *impl, const
     {
         match_obj = format->rgodf + i;
 
-        if (!match_device_object( device_format, user_format, match_obj, impl->dinput->dwVersion ))
+        if (!match_device_object( device_format, user_format, match_obj, impl->dinput->dwVersion, &identical ))
         {
             WARN( "object %s not found\n", debugstr_diobjectdataformat( match_obj ) );
             if (!(match_obj->dwType & DIDFT_OPTIONAL)) goto failed;
             user_obj = user_format->rgodf + device_format->dwNumObjs + i;
             *user_obj = *match_obj;
+            identical = FALSE;
         }
     }
 
     user_obj = user_format->rgodf + user_format->dwNumObjs;
     while (user_obj-- > user_format->rgodf) user_obj->dwType &= ~DIDFT_OPTIONAL;
 
+    if (identical)
+    {
+        memcpy( user_format->rgodf, device_format->rgodf, device_format->dwNumObjs * sizeof(*user_format->rgodf) );
+        user_format->dwNumObjs = device_format->dwNumObjs;
+    }
+
     return DI_OK;
 
 failed:
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/7048