Rémi Bernon : dinput: Correctly parse instance numbers for joystick semantics.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1d4fdb5aca786222f2c4200716af2f82452ab93a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1d4fdb5aca786222f2c420071...

Author: Rémi Bernon 
Date:   Wed Oct 13 09:21:20 2021 +0200

dinput: Correctly parse instance numbers for joystick semantics.

This should fix the last BuildActionMap / EnumDevicesBySemantics test
failures when a joystick is plugged in.

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

---

dlls/dinput/device.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
index 8f57d32dee2..e2d2e551d02 100644
--- a/dlls/dinput/device.c
+++ b/dlls/dinput/device.c
@@ -651,21 +651,20 @@ static int id_to_offset(const DataFormat *df, int id)
 static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic)
 {
     DWORD type = (0x0000ff00 & dwSemantic) >> 8;
-    DWORD offset = 0x000000ff & dwSemantic;
-    DWORD obj_instance = 0;
+    BOOL byofs = (dwSemantic & 0x80000000) != 0;
+    DWORD value = (dwSemantic & 0x000000ff);
     BOOL found = FALSE;
+    DWORD instance;
     int i;

-    for (i = 0; i < This->data_format.wine_df->dwNumObjs; i++)
+    for (i = 0; i < This->data_format.wine_df->dwNumObjs && !found; i++)
     {
         LPDIOBJECTDATAFORMAT odf = dataformat_to_odf(This->data_format.wine_df, i);

-        if (odf->dwOfs == offset)
-        {
-            obj_instance = DIDFT_GETINSTANCE(odf->dwType);
-            found = TRUE;
-            break;
-        }
+        if (byofs && value != odf->dwOfs) continue;
+        if (!byofs && value != DIDFT_GETINSTANCE(odf->dwType)) continue;
+        instance = DIDFT_GETINSTANCE(odf->dwType);
+        found = TRUE;
     }

if (!found) return 0;
@@ -673,7 +672,7 @@ static DWORD semantic_to_obj_id(IDirectInputDeviceImpl* This, DWORD dwSemantic)
     if (type & DIDFT_AXIS)   type = DIDFT_RELAXIS;
     if (type & DIDFT_BUTTON) type = DIDFT_PSHBUTTON;

-    return type | (0x0000ff00 & (obj_instance << 8));
+    return type | (0x0000ff00 & (instance << 8));
 }

/*