[PATCH 5/6] dinput: Only load mappings that have not yet been set.

[Rémi Bernon]

From: Rémi Bernon

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=57919
---
 dlls/dinput/device.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index d8e5aed8ead..6288eeb3c2a 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -415,16 +415,17 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
     /* Try to read each action in the DIACTIONFORMAT from registry */
     for (i = 0; i < lpdiaf->dwNumActions; i++)
     {
+        DIACTIONW *action = lpdiaf->rgoAction + i;
         DWORD id, size = sizeof(DWORD);
         WCHAR label[9];

swprintf( label, 9, L"%x", lpdiaf->rgoAction[i].dwSemantic );

-        if (!RegQueryValueExW(hkey, label, 0, NULL, (LPBYTE) &id, &size))
+        if (!action->dwHow && !RegQueryValueExW( hkey, label, 0, NULL, (BYTE *)&id, &size ))
         {
-            lpdiaf->rgoAction[i].dwObjID = id;
-            lpdiaf->rgoAction[i].guidInstance = didev.guidInstance;
-            lpdiaf->rgoAction[i].dwHow = DIAH_DEFAULT;
+            action->dwObjID = id;
+            action->guidInstance = didev.guidInstance;
+            action->dwHow = DIAH_DEFAULT;
             mapped += 1;
         }
     }