Rebase against 576cdea0d75498ed948d0ba66a3451ea426f7935.

patches/dinput-joy-mappings/0001-dinput-Allow-empty-Joystick-mappings.patch

@@ -1,4 +1,4 @@
-From 8528d4181967d00a7711d32bdaf7ecde5fe7208f Mon Sep 17 00:00:00 2001
+From e7104770d4b57539d5b64a67212504910692e920 Mon Sep 17 00:00:00 2001
 From: Jetro Jormalainen <jje-wine@jv.jetro.fi>
 Date: Tue, 30 Apr 2019 09:20:54 +1000
 Subject: [PATCH] dinput: Allow empty Joystick mappings.
@@ -9,10 +9,10 @@ Subject: [PATCH] dinput: Allow empty Joystick mappings.
  2 files changed, 113 insertions(+), 14 deletions(-)
 
 diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index 1dc3c311f2b..63e6abb54eb 100644
+index 6cc190ee7fb..2fd9329aa68 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
-@@ -357,12 +357,26 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic )
+@@ -364,12 +364,26 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic )
      return type | (0x0000ff00 & (instance << 8));
  }
  
@@ -40,7 +40,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
  {
      static const WCHAR *subkey = L"Software\\Wine\\DirectInput\\Mappings\\%s\\%s\\%s";
      HKEY hkey;
-@@ -373,8 +387,11 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
+@@ -380,8 +394,11 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
      swprintf( keyname, len, subkey, username, device, guid );
  
      /* The key used is HKCU\Software\Wine\DirectInput\Mappings\[username]\[device]\[mapping_guid] */
@@ -54,7 +54,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
  
      free( keyname );
  
-@@ -394,7 +411,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
+@@ -401,7 +418,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return DI_SETTINGSNOTSAVED;
  
@@ -65,7 +65,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
  
      if (!hkey)
      {
-@@ -429,7 +448,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -436,7 +455,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
      HKEY hkey;
      WCHAR *guid_str;
      DIDEVICEINSTANCEW didev;
@@ -74,7 +74,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
  
      didev.dwSize = sizeof(didev);
      IDirectInputDevice8_GetDeviceInfo(&This->IDirectInputDevice8W_iface, &didev);
-@@ -437,7 +456,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -444,7 +463,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return FALSE;
  
@@ -83,7 +83,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
  
      if (!hkey)
      {
-@@ -457,15 +476,20 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -464,15 +483,20 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
          {
              lpdiaf->rgoAction[i].dwObjID = id;
              lpdiaf->rgoAction[i].guidInstance = didev.guidInstance;
@@ -107,7 +107,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
  }
  
  static BOOL set_app_data( struct dinput_device *dev, int offset, UINT_PTR app_data )
-@@ -1914,13 +1938,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
+@@ -1935,13 +1959,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
          load_success = load_mapping_settings( impl, format, username_buf );
      }
  
@@ -130,7 +130,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
          genre = format->rgoAction[i].dwSemantic & DIGENRE_ANY;
          if (devMask == genre || (devMask == DIGENRE_ANY && genre != DIMOUSE_MASK && genre != DIKEYBOARD_MASK))
          {
-@@ -1952,6 +1981,14 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
+@@ -1973,6 +2002,14 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
          }
      }
  
@@ -144,8 +144,8 @@ index 1dc3c311f2b..63e6abb54eb 100644
 +
      if (!has_actions) return DI_NOEFFECT;
      if (flags & (DIDBAM_DEFAULT|DIDBAM_PRESERVE|DIDBAM_INITIALIZE|DIDBAM_HWDEFAULTS))
-         FIXME("Unimplemented flags %#x\n", flags);
-@@ -1969,6 +2006,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
+         FIXME( "Unimplemented flags %#lx\n", flags );
+@@ -1990,6 +2027,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
      DIPROPSTRING dps;
      WCHAR username_buf[MAX_PATH];
      DWORD username_len = MAX_PATH;
@@ -153,7 +153,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
      int i, action = 0, num_actions = 0;
      unsigned int offset = 0;
      const DIDATAFORMAT *df;
-@@ -2001,12 +2039,23 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
+@@ -2022,12 +2060,23 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
      data_format.dwFlags = DIDF_RELAXIS;
      data_format.dwDataSize = format->dwDataSize;
  
@@ -179,7 +179,7 @@ index 1dc3c311f2b..63e6abb54eb 100644
      /* Construct the dataformat and actionmap */
      obj_df = malloc( sizeof(DIOBJECTDATAFORMAT) * num_actions );
 diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c
-index 817e843e33c..ad9ee1f006b 100644
+index 2586736cb1d..e2be36ad7d3 100644
 --- a/dlls/dinput/tests/device8.c
 +++ b/dlls/dinput/tests/device8.c
 @@ -48,6 +48,8 @@ struct enum_data {
@@ -193,7 +193,7 @@ index 817e843e33c..ad9ee1f006b 100644
      DITEST_BUTTON,
 @@ -472,6 +474,17 @@ static void test_action_mapping(void)
          hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0);
-         ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%08x\n", hr);
+         ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%#lx\n", hr);
  
 +        /* Test that after changing actionformat SetActionMap has effect and that second
 +         * SetActionMap call with same empty actionformat has no effect */
@@ -210,7 +210,7 @@ index 817e843e33c..ad9ee1f006b 100644
          af.dwNumActions = ARRAY_SIZE(actionMapping);
  
 @@ -663,6 +676,43 @@ static void test_save_settings(void)
-         "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[1], af.rgoAction[1].dwObjID);
+         "Mapped incorrectly expected: 0x%#lx got: 0x%#lx\n", other_results[1], af.rgoAction[1].dwObjID);
      ok (IsEqualGUID(&GUID_SysKeyboard, &af.rgoAction[1].guidInstance), "Action should be mapped to keyboard\n");
  
 +    /* Save and load empty mapping */

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "54b8c8c7eaafd19780cb4d91b763fe2f20327f50"
+	echo "576cdea0d75498ed948d0ba66a3451ea426f7935"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-54b8c8c7eaafd19780cb4d91b763fe2f20327f50
+576cdea0d75498ed948d0ba66a3451ea426f7935