Release v8.4

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

@@ -1,18 +1,17 @@
-From e7104770d4b57539d5b64a67212504910692e920 Mon Sep 17 00:00:00 2001
+From 01097ee44ab6835a4c139261c188ae6535bfb311 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.
 
 ---
- dlls/dinput/device.c        | 77 ++++++++++++++++++++++++++++++-------
- dlls/dinput/tests/device8.c | 50 ++++++++++++++++++++++++
- 2 files changed, 113 insertions(+), 14 deletions(-)
+ dlls/dinput/device.c | 77 ++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 63 insertions(+), 14 deletions(-)
 
 diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c
-index 6cc190ee7fb..2fd9329aa68 100644
+index c001d1ef29a..d1ff222a653 100644
 --- a/dlls/dinput/device.c
 +++ b/dlls/dinput/device.c
-@@ -364,12 +364,26 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic )
+@@ -341,12 +341,26 @@ static DWORD semantic_to_obj_id( struct dinput_device *This, DWORD dwSemantic )
      return type | (0x0000ff00 & (instance << 8));
  }
  
@@ -40,7 +39,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
  {
      static const WCHAR *subkey = L"Software\\Wine\\DirectInput\\Mappings\\%s\\%s\\%s";
      HKEY hkey;
-@@ -380,8 +394,11 @@ static HKEY get_mapping_key(const WCHAR *device, const WCHAR *username, const WC
+@@ -357,8 +371,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 +53,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
  
      free( keyname );
  
-@@ -401,7 +418,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
+@@ -378,7 +395,9 @@ static HRESULT save_mapping_settings(IDirectInputDevice8W *iface, LPDIACTIONFORM
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return DI_SETTINGSNOTSAVED;
  
@@ -65,7 +64,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
  
      if (!hkey)
      {
-@@ -436,7 +455,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -413,7 +432,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
      HKEY hkey;
      WCHAR *guid_str;
      DIDEVICEINSTANCEW didev;
@@ -74,7 +73,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
  
      didev.dwSize = sizeof(didev);
      IDirectInputDevice8_GetDeviceInfo(&This->IDirectInputDevice8W_iface, &didev);
-@@ -444,7 +463,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -421,7 +440,7 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
      if (StringFromCLSID(&lpdiaf->guidActionMap, &guid_str) != S_OK)
          return FALSE;
  
@@ -83,7 +82,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
  
      if (!hkey)
      {
-@@ -464,15 +483,20 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
+@@ -441,15 +460,20 @@ static BOOL load_mapping_settings( struct dinput_device *This, LPDIACTIONFORMATW
          {
              lpdiaf->rgoAction[i].dwObjID = id;
              lpdiaf->rgoAction[i].guidInstance = didev.guidInstance;
@@ -107,7 +106,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
  }
  
  static BOOL set_app_data( struct dinput_device *dev, int offset, UINT_PTR app_data )
-@@ -1935,13 +1959,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
+@@ -1896,13 +1920,18 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
          load_success = load_mapping_settings( impl, format, username_buf );
      }
  
@@ -130,7 +129,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
          genre = format->rgoAction[i].dwSemantic & DIGENRE_ANY;
          if (devMask == genre || (devMask == DIGENRE_ANY && genre != DIMOUSE_MASK && genre != DIKEYBOARD_MASK))
          {
-@@ -1973,6 +2002,14 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
+@@ -1934,6 +1963,14 @@ static HRESULT WINAPI dinput_device_BuildActionMap( IDirectInputDevice8W *iface,
          }
      }
  
@@ -145,7 +144,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
      if (!has_actions) return DI_NOEFFECT;
      if (flags & (DIDBAM_DEFAULT|DIDBAM_PRESERVE|DIDBAM_INITIALIZE|DIDBAM_HWDEFAULTS))
          FIXME( "Unimplemented flags %#lx\n", flags );
-@@ -1990,6 +2027,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
+@@ -1951,6 +1988,7 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
      DIPROPSTRING dps;
      WCHAR username_buf[MAX_PATH];
      DWORD username_len = MAX_PATH;
@@ -153,7 +152,7 @@ index 6cc190ee7fb..2fd9329aa68 100644
      int i, action = 0, num_actions = 0;
      unsigned int offset = 0;
      const DIDATAFORMAT *df;
-@@ -2022,12 +2060,23 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
+@@ -1983,12 +2021,23 @@ static HRESULT WINAPI dinput_device_SetActionMap( IDirectInputDevice8W *iface, D
      data_format.dwFlags = DIDF_RELAXIS;
      data_format.dwDataSize = format->dwDataSize;
  
@@ -178,81 +177,6 @@ index 6cc190ee7fb..2fd9329aa68 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 2586736cb1d..e2be36ad7d3 100644
---- a/dlls/dinput/tests/device8.c
-+++ b/dlls/dinput/tests/device8.c
-@@ -48,6 +48,8 @@ struct enum_data {
- /* Dummy GUID */
- static const GUID ACTION_MAPPING_GUID = { 0x1, 0x2, 0x3, { 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb } };
- 
-+static const GUID NULL_GUID = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
-+
- enum {
-     DITEST_AXIS,
-     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=%#lx\n", hr);
- 
-+        /* Test that after changing actionformat SetActionMap has effect and that second
-+         * SetActionMap call with same empty actionformat has no effect */
-+        af.dwDataSize = 4 * 1;
-+        af.dwNumActions = 1;
-+
-+        hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0);
-+        ok (hr != DI_NOEFFECT, "SetActionMap should have effect as actionformat has changed hr=%08x\n", hr);
-+
-+        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);
-+
-         af.dwDataSize = 4 * ARRAY_SIZE(actionMapping);
-         af.dwNumActions = ARRAY_SIZE(actionMapping);
- 
-@@ -663,6 +676,43 @@ static void test_save_settings(void)
-         "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 */
-+    af.rgoAction[0].dwObjID = 0;
-+    af.rgoAction[0].dwHow = 0;
-+    memset(&af.rgoAction[0].guidInstance, 0, sizeof(GUID));
-+    af.rgoAction[1].dwObjID = 0;
-+    af.rgoAction[1].dwHow = 0;
-+    memset(&af.rgoAction[1].guidInstance, 0, sizeof(GUID));
-+
-+    hr = IDirectInputDevice8_SetActionMap(pKey, &af, NULL, DIDSAM_FORCESAVE);
-+    ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr);
-+
-+    if (hr == DI_SETTINGSNOTSAVED)
-+    {
-+        skip ("Can't test saving settings if SetActionMap returns DI_SETTINGSNOTSAVED\n");
-+        return;
-+    }
-+
-+    af.rgoAction[0].dwObjID = other_results[0];
-+    af.rgoAction[0].dwHow = DIAH_USERCONFIG;
-+    af.rgoAction[0].guidInstance = GUID_SysKeyboard;
-+    af.rgoAction[1].dwObjID = other_results[1];
-+    af.rgoAction[1].dwHow = DIAH_USERCONFIG;
-+    af.rgoAction[1].guidInstance = GUID_SysKeyboard;
-+
-+    hr = IDirectInputDevice8_BuildActionMap(pKey, &af, NULL, 0);
-+    ok (SUCCEEDED(hr), "BuildActionMap failed hr=%08x\n", hr);
-+
-+    ok (other_results[0] == af.rgoAction[0].dwObjID,
-+        "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[0], af.rgoAction[0].dwObjID);
-+    ok (af.rgoAction[0].dwHow == DIAH_UNMAPPED, "dwHow should have been DIAH_UNMAPPED\n");
-+    ok (IsEqualGUID(&NULL_GUID, &af.rgoAction[0].guidInstance), "Action should not be mapped\n");
-+
-+    ok (other_results[1] == af.rgoAction[1].dwObjID,
-+        "Mapped incorrectly expected: 0x%08x got: 0x%08x\n", other_results[1], af.rgoAction[1].dwObjID);
-+    ok (af.rgoAction[1].dwHow == DIAH_UNMAPPED, "dwHow should have been DIAH_UNMAPPED\n");
-+    ok (IsEqualGUID(&NULL_GUID, &af.rgoAction[1].guidInstance), "Action should not be mapped\n");
-+
-     IDirectInputDevice_Release(pKey);
-     IDirectInput_Release(pDI);
- }
 -- 
-2.34.1
+2.39.2
 

patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

@@ -1,4 +1,4 @@
-From be7001f58850fb46ee07e9b4fba310c64157ee0f Mon Sep 17 00:00:00 2001
+From 2a1229098b39f923ff6e9a13bde05e161c797b0a Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 9 Jul 2019 14:13:28 +1000
 Subject: [PATCH] user32: Do not enumerate the registry in
@@ -13,10 +13,10 @@ not the complete list from the registry.
  3 files changed, 36 insertions(+), 33 deletions(-)
 
 diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 2f4dc06f6ce..7345b78eaeb 100644
+index 8f3cd8acae7..072f1fab23a 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
+@@ -499,7 +499,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
      return FALSE;
  }
  
@@ -25,10 +25,10 @@ index 2f4dc06f6ce..7345b78eaeb 100644
  {
      SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL);
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index ee39b11fc12..35670ca7538 100644
+index 8f3d5750c2f..3bdfd042e85 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -4899,6 +4899,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
+@@ -5091,6 +5091,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
      CloseHandle( info.hProcess );
  }
  
@@ -69,7 +69,7 @@ index ee39b11fc12..35670ca7538 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4949,6 +4983,7 @@ START_TEST(input)
+@@ -5142,6 +5176,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
@@ -78,10 +78,10 @@ index ee39b11fc12..35670ca7538 100644
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index 36f2a45f4ef..bf4e871d107 100644
+index 11bb129134c..9864d80ceff 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -1187,11 +1187,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -1250,11 +1250,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index 36f2a45f4ef..bf4e871d107 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -1205,33 +1201,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -1268,33 +1264,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
@@ -111,10 +111,10 @@ index 36f2a45f4ef..bf4e871d107 100644
 -            tmp = wcstoul( key_info->Name, NULL, 16 );
 -            if (query_reg_ascii_value( subkey, "Layout Id", value_info, sizeof(buffer) ) &&
 -                value_info->Type == REG_SZ)
--                tmp = MAKELONG( LOWORD( tmp ),
--                                0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff) );
+-                tmp = 0xf000 | (wcstoul( (const WCHAR *)value_info->Data, NULL, 16 ) & 0xfff);
 -            NtClose( subkey );
 -
+-            tmp = MAKELONG( LOWORD( layout ), LOWORD( tmp ) );
 -            if (layout == UlongToHandle( tmp )) continue;
 -
 -            count++;

patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -1,4 +1,4 @@
-From 3c8ddcd9f29524479004800c91a39ec04456bd08 Mon Sep 17 00:00:00 2001
+From b7ce843ce7c536b452aee408ab127a8300412909 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 17 Jan 2016 00:50:50 +0100
 Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -20,7 +20,7 @@ index 90deb5865f8..428ebde23b3 100644
  C_SRCS = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index a7c43a46e07..9088d222b47 100644
+index 3a5564fc6b8..5408fc4b7da 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -28,6 +28,9 @@
@@ -53,7 +53,7 @@ index a7c43a46e07..9088d222b47 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3788,6 +3797,76 @@ static void test_RtlFirstFreeAce(void)
+@@ -3608,6 +3617,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -127,10 +127,10 @@ index a7c43a46e07..9088d222b47 100644
 +    CoUninitialize();
 +}
 +
- static void test_TlsIndex(void)
+ START_TEST(rtl)
  {
-     LIST_ENTRY *root = &NtCurrentTeb()->Peb->LdrData->InLoadOrderModuleList;
-@@ -3852,6 +3931,7 @@ START_TEST(rtl)
+     InitFunctionPtrs();
+@@ -3647,6 +3726,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
@@ -139,5 +139,5 @@ index a7c43a46e07..9088d222b47 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-2.39.0
+2.39.2
 

patches/riched20-IText_Interface/0003-riched20-Stub-for-ITextPara-interface-and-implement-.patch

@@ -1,4 +1,4 @@
-From 0ed959d4122e705d8728a7064ff260d2a6955af5 Mon Sep 17 00:00:00 2001
+From ff8f658065ac9b61fbbf3d2adc95fb63bf75bb6e Mon Sep 17 00:00:00 2001
 From: Jactry Zeng <wine@jactry.com>
 Date: Sun, 10 Aug 2014 22:17:57 +0800
 Subject: [PATCH] riched20: Stub for ITextPara interface and implement
@@ -10,7 +10,7 @@ Subject: [PATCH] riched20: Stub for ITextPara interface and implement
  2 files changed, 477 insertions(+)
 
 diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
-index afecd34dc2a..6b94ee89902 100644
+index 90496742e36..7b7e4e49ef0 100644
 --- a/dlls/riched20/richole.c
 +++ b/dlls/riched20/richole.c
 @@ -3563,6 +3563,16 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface)
@@ -559,11 +559,11 @@ index afecd34dc2a..6b94ee89902 100644
  }
  
 diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c
-index a01f4e21db8..e44ffc767e7 100644
+index fb5177b83e9..cde2a9ab4c3 100644
 --- a/dlls/riched20/tests/richole.c
 +++ b/dlls/riched20/tests/richole.c
-@@ -5439,6 +5439,274 @@ static void test_undo_control(void)
-   release_interfaces(&inst.hwnd, &reole, &inst.doc, &selection);
+@@ -5565,6 +5565,274 @@ static void test_freeze(void)
+   release_interfaces(&hwnd, &reole, &doc, &selection);
  }
  
 +static void test_ITextRange_SetStart(void)
@@ -837,7 +837,7 @@ index a01f4e21db8..e44ffc767e7 100644
  START_TEST(richole)
  {
    /* Must explicitly LoadLibrary(). The test has no references to functions in
-@@ -5459,6 +5727,13 @@ START_TEST(richole)
+@@ -5585,6 +5853,13 @@ START_TEST(richole)
    test_ITextRange_SetRange();
    test_ITextRange_GetDuplicate();
    test_ITextRange_Collapse();
@@ -852,5 +852,5 @@ index a01f4e21db8..e44ffc767e7 100644
    test_IOleWindow_GetWindow();
    test_IOleInPlaceSite_GetWindow();
 -- 
-2.35.1
+2.39.2
 

patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch

@@ -1,4 +1,4 @@
-From 3cf817bf6bc7a3c6c40b72eac0e7dbed0f2967b2 Mon Sep 17 00:00:00 2001
+From d25b2276d2e5bcc46998a29ce1607e0091372203 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 28 May 2021 12:34:37 +1000
 Subject: [PATCH] include: Add windows.networking.connectivity.idl
@@ -10,17 +10,17 @@ Subject: [PATCH] include: Add windows.networking.connectivity.idl
  create mode 100644 include/windows.networking.connectivity.idl
 
 diff --git a/include/Makefile.in b/include/Makefile.in
-index c581fbd80f1..2bba6acea34 100644
+index 410aab03ac8..65e2a30c30f 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -823,6 +823,7 @@ SOURCES = \
+@@ -824,6 +824,7 @@ SOURCES = \
  	windows.media.idl \
  	windows.media.speechrecognition.idl \
  	windows.media.speechsynthesis.idl \
 +	windows.networking.connectivity.idl \
+ 	windows.perception.spatial.idl \
+ 	windows.perception.spatial.surfaces.idl \
  	windows.security.credentials.idl \
- 	windows.security.cryptography.idl \
- 	windows.storage.streams.idl \
 diff --git a/include/windows.networking.connectivity.idl b/include/windows.networking.connectivity.idl
 new file mode 100644
 index 00000000000..3ccefca02fa

patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch

@@ -1,4 +1,4 @@
-From 233f0289061fb756563c41de851064142839a455 Mon Sep 17 00:00:00 2001
+From 865590e19a61d9d20601cd1925be794e89c368d5 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 1 Jun 2021 10:26:28 +1000
 Subject: [PATCH] include: Add windows.networking.idl
@@ -11,17 +11,17 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  create mode 100644 include/windows.networking.idl
 
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 2bba6acea34..9d2034063e5 100644
+index 65e2a30c30f..798535839d1 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -823,6 +823,7 @@ SOURCES = \
+@@ -824,6 +824,7 @@ SOURCES = \
  	windows.media.idl \
  	windows.media.speechrecognition.idl \
  	windows.media.speechsynthesis.idl \
 +	windows.networking.idl \
  	windows.networking.connectivity.idl \
- 	windows.security.credentials.idl \
- 	windows.security.cryptography.idl \
+ 	windows.perception.spatial.idl \
+ 	windows.perception.spatial.surfaces.idl \
 diff --git a/include/windows.networking.idl b/include/windows.networking.idl
 new file mode 100644
 index 00000000000..67d8e6a8d0b

patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch

@@ -1,4 +1,4 @@
-From 7f3f9c61bf10459c607d29e4b359a6ed0894ccb6 Mon Sep 17 00:00:00 2001
+From 034dd5bc24c566781bd2012e84b58bb08abb2813 Mon Sep 17 00:00:00 2001
 From: Esdras Tarsis <esdrastarsis@gmail.com>
 Date: Wed, 2 Sep 2020 23:41:19 -0300
 Subject: [PATCH] windows.networking.connectivity: Add stub dll.
@@ -16,17 +16,17 @@ Signed-off-by: Esdras Tarsis <esdrastarsis@gmail.com>
  create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
 
 diff --git a/configure.ac b/configure.ac
-index 6410f8a0e42..b34adab1ad3 100644
+index 1957181ee31..c9fd784fd50 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3128,6 +3128,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
+@@ -3127,6 +3127,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
  WINE_CONFIG_MAKEFILE(dlls/windows.media)
  WINE_CONFIG_MAKEFILE(dlls/windows.media/tests)
  WINE_CONFIG_MAKEFILE(dlls/windows.networking)
 +WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity)
+ WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub)
+ WINE_CONFIG_MAKEFILE(dlls/windows.perception.stub/tests)
  WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers)
- WINE_CONFIG_MAKEFILE(dlls/windows.system.profile.systemmanufacturers/tests)
- WINE_CONFIG_MAKEFILE(dlls/windows.ui)
 diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in
 new file mode 100644
 index 00000000000..6fc24a72feb
@@ -93,5 +93,5 @@ index 00000000000..96ff0ea5af2
 +}
 \ No newline at end of file
 -- 
-2.39.0
+2.39.2
 

patches/wined3d-SWVP-shaders/0005-wined3d-Support-SWVP-mode-vertex-shaders.patch

@@ -1,4 +1,4 @@
-From a4d28ab4e362bd30c52442e8fa6bf4706194775e Mon Sep 17 00:00:00 2001
+From b63e72c627b1d258d22b48897b918c768fa617be Mon Sep 17 00:00:00 2001
 From: Paul Gofman <gofmanp@gmail.com>
 Date: Mon, 25 Feb 2019 15:23:33 +0300
 Subject: [PATCH] wined3d: Support SWVP mode vertex shaders.
@@ -14,10 +14,10 @@ Subject: [PATCH] wined3d: Support SWVP mode vertex shaders.
  7 files changed, 104 insertions(+), 49 deletions(-)
 
 diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
-index 21bd83fc1e0..360650f9723 100644
+index 4cd2a93f7e9..ec088871a6c 100644
 --- a/dlls/d3d9/tests/device.c
 +++ b/dlls/d3d9/tests/device.c
-@@ -7460,15 +7460,11 @@ float4 main(const float4 color : COLOR) : SV_TARGET
+@@ -7478,15 +7478,11 @@ float4 main(const float4 color : COLOR) : SV_TARGET
  
      vs = NULL;
      hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_256, &vs);
@@ -35,7 +35,7 @@ index 21bd83fc1e0..360650f9723 100644
  
      refcount = IDirect3DDevice9_Release(device);
      ok(!refcount, "Device has %lu references left.\n", refcount);
-@@ -7485,20 +7481,16 @@ float4 main(const float4 color : COLOR) : SV_TARGET
+@@ -7503,20 +7499,16 @@ float4 main(const float4 color : COLOR) : SV_TARGET
      ok(hr == D3D_OK, "Got unexpected hr %#lx.\n", hr);
  
      hr = IDirect3DDevice9_CreateVertexShader(device, vs_1_256, &vs);
@@ -59,10 +59,10 @@ index 21bd83fc1e0..360650f9723 100644
  cleanup:
      refcount = IDirect3DDevice9_Release(device);
 diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
-index 290e37728f9..92cdbfe8167 100644
+index 410639c51e7..88d7a188da5 100644
 --- a/dlls/d3d9/tests/visual.c
 +++ b/dlls/d3d9/tests/visual.c
-@@ -25110,7 +25110,6 @@ static void test_mvp_software_vertex_shaders(void)
+@@ -25152,7 +25152,6 @@ static void test_mvp_software_vertex_shaders(void)
      hr = IDirect3DDevice9_CreateVertexShader(device, reladdr_shader_code, &reladdr_shader);
      ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
      hr = IDirect3DDevice9_CreateVertexShader(device, pure_sw_shader_code, &pure_sw_shader);
@@ -70,7 +70,7 @@ index 290e37728f9..92cdbfe8167 100644
      ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
      hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration);
      ok(SUCCEEDED(hr), "Got unexpected hr %#lx.\n", hr);
-@@ -25148,7 +25147,7 @@ static void test_mvp_software_vertex_shaders(void)
+@@ -25190,7 +25189,7 @@ static void test_mvp_software_vertex_shaders(void)
  
      expected_color = 0x00ff0000; /* Color from vertex data and not from the shader. */
      color = getPixelColor(device, 5, 5);
@@ -79,7 +79,7 @@ index 290e37728f9..92cdbfe8167 100644
              expected_color, color);
  
      hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);
-@@ -25167,7 +25166,6 @@ static void test_mvp_software_vertex_shaders(void)
+@@ -25209,7 +25208,6 @@ static void test_mvp_software_vertex_shaders(void)
  
      expected_color = 0x00ffffff;
      color = getPixelColor(device, 5, 5);
@@ -87,7 +87,7 @@ index 290e37728f9..92cdbfe8167 100644
      ok(color == expected_color, "Expected color 0x%08x, got 0x%08x (sw shader in sw mode).\n",
              expected_color, color);
  
-@@ -25217,7 +25215,6 @@ static void test_mvp_software_vertex_shaders(void)
+@@ -25259,7 +25257,6 @@ static void test_mvp_software_vertex_shaders(void)
  
      expected_color = 0x0000ffff; /* c[256] is c_color for SW shader. */
      color = getPixelColor(device, 5, 5);
@@ -96,10 +96,10 @@ index 290e37728f9..92cdbfe8167 100644
              expected_color, color);
  
 diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
-index f205e95c3b5..07de7a962cc 100644
+index 1e96cb206de..99d29f86307 100644
 --- a/dlls/wined3d/device.c
 +++ b/dlls/wined3d/device.c
-@@ -4682,6 +4682,14 @@ void CDECL wined3d_device_set_software_vertex_processing(struct wined3d_device *
+@@ -4866,6 +4866,14 @@ void CDECL wined3d_device_set_software_vertex_processing(struct wined3d_device *
          warned = TRUE;
      }
  
@@ -115,7 +115,7 @@ index f205e95c3b5..07de7a962cc 100644
  }
  
 diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
-index 53de4803a3f..e8835d88de7 100644
+index 6a133d28cbf..972b6cb96da 100644
 --- a/dlls/wined3d/glsl_shader.c
 +++ b/dlls/wined3d/glsl_shader.c
 @@ -134,7 +134,9 @@ struct shader_glsl_priv
@@ -138,7 +138,7 @@ index 53de4803a3f..e8835d88de7 100644
      GLint uniform_i_locations[WINED3D_MAX_CONSTS_I];
      GLint uniform_b_locations[WINED3D_MAX_CONSTS_B];
      GLint pos_fixup_location;
-@@ -1189,7 +1191,7 @@ static void bind_and_orphan_consts_ubo(const struct wined3d_gl_info *gl_info, st
+@@ -1187,7 +1189,7 @@ static void bind_and_orphan_consts_ubo(const struct wined3d_gl_info *gl_info, st
  {
      GL_EXTCALL(glBindBuffer(GL_UNIFORM_BUFFER, priv->ubo_vs_c));
      checkGLcall("glBindBuffer");
@@ -147,7 +147,7 @@ index 53de4803a3f..e8835d88de7 100644
              NULL, GL_STREAM_DRAW));
      checkGLcall("glBufferData");
  }
-@@ -1197,14 +1199,16 @@ static void bind_and_orphan_consts_ubo(const struct wined3d_gl_info *gl_info, st
+@@ -1195,14 +1197,16 @@ static void bind_and_orphan_consts_ubo(const struct wined3d_gl_info *gl_info, st
  /* Context activation is done by the caller. */
  static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info,
          const struct wined3d_vec4 *constants, const GLint *constant_locations, const struct constant_heap *heap,
@@ -165,7 +165,7 @@ index 53de4803a3f..e8835d88de7 100644
          unsigned max_const_used;
  
          if (priv->ubo_vs_c == -1)
-@@ -1214,22 +1218,32 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co
+@@ -1212,22 +1216,32 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co
          }
  
          bind_and_orphan_consts_ubo(gl_info, priv);
@@ -204,7 +204,7 @@ index 53de4803a3f..e8835d88de7 100644
          checkGLcall("glBufferSubData");
          return;
      }
-@@ -1595,7 +1609,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
+@@ -1593,7 +1607,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
                  GL_EXTCALL(glGenBuffers(1, &priv->ubo_vs_c));
                  GL_EXTCALL(glBindBuffer(GL_UNIFORM_BUFFER, priv->ubo_vs_c));
                  checkGLcall("glBindBuffer (UBO)");
@@ -213,7 +213,7 @@ index 53de4803a3f..e8835d88de7 100644
                          NULL, GL_STREAM_DRAW));
                  checkGLcall("glBufferData");
              }
-@@ -1607,7 +1621,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
+@@ -1605,7 +1619,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
  
      if (update_mask & WINED3D_SHADER_CONST_VS_F)
          shader_glsl_load_constants_f(vshader, gl_info, state->vs_consts_f,
@@ -223,7 +223,7 @@ index 53de4803a3f..e8835d88de7 100644
  
      if (update_mask & WINED3D_SHADER_CONST_VS_I)
          shader_glsl_load_constants_i(vshader, gl_info, state->vs_consts_i,
-@@ -1760,7 +1775,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
+@@ -1758,7 +1773,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context
  
      if (update_mask & WINED3D_SHADER_CONST_PS_F)
          shader_glsl_load_constants_f(pshader, gl_info, state->ps_consts_f,
@@ -233,7 +233,7 @@ index 53de4803a3f..e8835d88de7 100644
  
      if (update_mask & WINED3D_SHADER_CONST_PS_I)
          shader_glsl_load_constants_i(pshader, gl_info, state->ps_consts_i,
-@@ -1905,7 +1921,7 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev
+@@ -1903,7 +1919,7 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev
      if (priv->consts_ubo)
          return;
  
@@ -242,7 +242,7 @@ index 53de4803a3f..e8835d88de7 100644
      {
          update_heap_entry(heap, i, priv->next_constant_version);
      }
-@@ -2277,7 +2293,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
+@@ -2275,7 +2291,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c
          shader_addline(buffer,"layout(std140) uniform vs_c_ubo\n"
                  "{ \n"
                  "    vec4 %s_c[%u];\n"
@@ -251,7 +251,7 @@ index 53de4803a3f..e8835d88de7 100644
      }
      else if (shader->limits->constant_float > 0)
      {
-@@ -10056,12 +10072,13 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *
+@@ -10054,12 +10070,13 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info *
      }
      else if (!priv->consts_ubo)
      {
@@ -267,7 +267,7 @@ index 53de4803a3f..e8835d88de7 100644
      }
  
      for (i = 0; i < WINED3D_MAX_CONSTS_I; ++i)
-@@ -10379,6 +10396,10 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl,
+@@ -10377,6 +10394,10 @@ static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl,
          vs_list = &ffp_shader->linked_programs;
      }
  
@@ -278,7 +278,7 @@ index 53de4803a3f..e8835d88de7 100644
      hshader = state->shader[WINED3D_SHADER_TYPE_HULL];
      if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program)
          hs_id = ctx_data->glsl_program->hs.id;
-@@ -11133,7 +11154,7 @@ static void constant_heap_free(struct constant_heap *heap)
+@@ -11131,7 +11152,7 @@ static void constant_heap_free(struct constant_heap *heap)
  static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct wined3d_vertex_pipe_ops *vertex_pipe,
          const struct wined3d_fragment_pipe_ops *fragment_pipe)
  {
@@ -287,7 +287,7 @@ index 53de4803a3f..e8835d88de7 100644
      const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
      struct fragment_caps fragment_caps;
      void *vertex_priv, *fragment_priv;
-@@ -11144,6 +11165,18 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
+@@ -11142,6 +11163,18 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
  
      priv->consts_ubo = (device->adapter->d3d_info.wined3d_creation_flags & WINED3D_LEGACY_SHADER_CONSTANTS)
              && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT];
@@ -306,7 +306,7 @@ index 53de4803a3f..e8835d88de7 100644
      string_buffer_list_init(&priv->string_buffers);
  
      if (!(vertex_priv = vertex_pipe->vp_alloc(&glsl_shader_backend, priv)))
-@@ -11173,7 +11206,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
+@@ -11171,7 +11204,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win
          goto fail;
      }
  
@@ -316,10 +316,10 @@ index 53de4803a3f..e8835d88de7 100644
          ERR("Failed to initialize vertex shader constant heap\n");
          goto fail;
 diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
-index 982e8dd3748..6c815faae0c 100644
+index 2a9d76622f6..67597bb2ea9 100644
 --- a/dlls/wined3d/shader.c
 +++ b/dlls/wined3d/shader.c
-@@ -590,7 +590,7 @@ static void shader_delete_constant_list(struct list *clist)
+@@ -540,7 +540,7 @@ static void shader_delete_constant_list(struct list *clist)
      list_init(clist);
  }
  
@@ -328,7 +328,7 @@ index 982e8dd3748..6c815faae0c 100644
  {
      static const struct limits_entry
      {
-@@ -613,6 +613,19 @@ static void shader_set_limits(struct wined3d_shader *shader)
+@@ -563,6 +563,19 @@ static void shader_set_limits(struct wined3d_shader *shader)
          {WINED3D_SHADER_VERSION(4, 1), WINED3D_SHADER_VERSION(5, 0), {16,  0,   0,  0, 32,  0}},
          {0}
      },
@@ -348,7 +348,7 @@ index 982e8dd3748..6c815faae0c 100644
      hs_limits[] =
      {
          /* min_version, max_version, sampler, constant_int, constant_float, constant_bool, packed_output, packet_input */
-@@ -657,7 +670,7 @@ static void shader_set_limits(struct wined3d_shader *shader)
+@@ -607,7 +620,7 @@ static void shader_set_limits(struct wined3d_shader *shader)
              FIXME("Unexpected shader type %u found.\n", shader->reg_maps.shader_version.type);
              /* Fall-through. */
          case WINED3D_SHADER_TYPE_VERTEX:
@@ -357,7 +357,7 @@ index 982e8dd3748..6c815faae0c 100644
              break;
          case WINED3D_SHADER_TYPE_HULL:
              limits_array = hs_limits;
-@@ -1025,7 +1038,7 @@ static HRESULT shader_scan_output_signature(struct wined3d_shader *shader)
+@@ -975,7 +988,7 @@ static HRESULT shader_scan_output_signature(struct wined3d_shader *shader)
  }
  
  /* Note that this does not count the loop register as an address register. */
@@ -366,7 +366,7 @@ index 982e8dd3748..6c815faae0c 100644
  {
      struct wined3d_shader_signature_element input_signature_elements[max(MAX_ATTRIBS, MAX_REG_INPUT)];
      struct wined3d_shader_signature_element output_signature_elements[MAX_REG_OUTPUT];
-@@ -1051,7 +1064,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co
+@@ -1001,7 +1014,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, DWORD co
      prev_ins = current_ins = ptr;
      reg_maps->shader_version = shader_version;
  
@@ -375,7 +375,7 @@ index 982e8dd3748..6c815faae0c 100644
  
      if (!(reg_maps->constf = heap_calloc(((min(shader->limits->constant_float, constf_size) + 31) / 32),
              sizeof(*reg_maps->constf))))
-@@ -3328,7 +3341,7 @@ static unsigned int shader_max_version_from_feature_level(enum wined3d_feature_l
+@@ -2079,7 +2092,7 @@ static unsigned int shader_max_version_from_feature_level(enum wined3d_feature_l
  }
  
  static HRESULT shader_set_function(struct wined3d_shader *shader, struct wined3d_device *device,
@@ -384,16 +384,16 @@ index 982e8dd3748..6c815faae0c 100644
  {
      const struct wined3d_d3d_info *d3d_info = &shader->device->adapter->d3d_info;
      struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;
-@@ -3353,7 +3366,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, struct wined3d
-         shader_trace_init(fe, shader->frontend_data);
+@@ -2099,7 +2112,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, struct wined3d
+         return WINED3DERR_INVALIDCALL;
+     }
  
-     /* Second pass: figure out which registers are used, what the semantics are, etc. */
 -    if (FAILED(hr = shader_get_registers_used(shader, float_const_count)))
 +    if (FAILED(hr = shader_get_registers_used(shader, float_const_count, swvp)))
          return hr;
  
      if (version->type != type)
-@@ -3699,14 +3712,19 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_
+@@ -2510,14 +2523,19 @@ static HRESULT vertex_shader_init(struct wined3d_shader *shader, struct wined3d_
          const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops)
  {
      struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps;
@@ -414,7 +414,7 @@ index 982e8dd3748..6c815faae0c 100644
      {
          shader_cleanup(shader);
          return hr;
-@@ -3864,7 +3882,7 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader,
+@@ -2675,7 +2693,7 @@ static HRESULT geometry_shader_init_stream_output(struct wined3d_shader *shader,
      {
          shader->reg_maps.shader_version = shader_version;
          shader->reg_maps.shader_version.type = WINED3D_SHADER_TYPE_GEOMETRY;
@@ -423,7 +423,7 @@ index 982e8dd3748..6c815faae0c 100644
          if (FAILED(hr = shader_scan_output_signature(shader)))
              return hr;
      }
-@@ -3914,7 +3932,7 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3
+@@ -2725,7 +2743,7 @@ static HRESULT geometry_shader_init(struct wined3d_shader *shader, struct wined3
          goto fail;
  
      if (shader->function
@@ -432,7 +432,7 @@ index 982e8dd3748..6c815faae0c 100644
          goto fail;
  
      return WINED3D_OK;
-@@ -4246,7 +4264,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d
+@@ -3057,7 +3075,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d
          return hr;
  
      if (FAILED(hr = shader_set_function(shader, device,
@@ -441,7 +441,7 @@ index 982e8dd3748..6c815faae0c 100644
      {
          shader_cleanup(shader);
          return hr;
-@@ -4338,7 +4356,7 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru
+@@ -3149,7 +3167,7 @@ HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const stru
          return hr;
      }
  
@@ -450,7 +450,7 @@ index 982e8dd3748..6c815faae0c 100644
      {
          shader_cleanup(object);
          heap_free(object);
-@@ -4372,7 +4390,7 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru
+@@ -3183,7 +3201,7 @@ HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const stru
          return hr;
      }
  
@@ -459,7 +459,7 @@ index 982e8dd3748..6c815faae0c 100644
      {
          shader_cleanup(object);
          heap_free(object);
-@@ -4434,7 +4452,7 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru
+@@ -3245,7 +3263,7 @@ HRESULT CDECL wined3d_shader_create_hs(struct wined3d_device *device, const stru
          return hr;
      }
  
@@ -482,10 +482,10 @@ index ed4af5a0409..991f96b6dd1 100644
          WARN("Invalid shader version %u.%u (%#lx).\n", major, minor, *byte_code);
          return NULL;
 diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
-index c4ac93c2d58..76e2eb63c8a 100644
+index 808a9a00136..de5e8f37b7a 100644
 --- a/dlls/wined3d/wined3d_private.h
 +++ b/dlls/wined3d/wined3d_private.h
-@@ -4073,6 +4073,13 @@ static inline void wined3d_device_bo_map_unlock(struct wined3d_device *device)
+@@ -4100,6 +4100,13 @@ static inline void wined3d_device_bo_map_unlock(struct wined3d_device *device)
      LeaveCriticalSection(&device->bo_map_lock);
  }
  
@@ -500,5 +500,5 @@ index c4ac93c2d58..76e2eb63c8a 100644
  {
      const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info;
 -- 
-2.38.1
+2.39.2
 

patches/winepulse-PulseAudio_Support/0001-winepulse.drv-Use-a-separate-mainloop-and-ctx-for-pu.patch

@@ -1,18 +1,18 @@
-From 2700c7d5ef1b90ecb2140736e8380c07a1decd13 Mon Sep 17 00:00:00 2001
+From bc89b07a911b8af2a171b26defec4794fc408881 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Wed, 4 Nov 2015 02:57:56 +0100
 Subject: [PATCH] winepulse.drv: Use a separate mainloop and ctx for
  pulse_test_connect.
 
 ---
- dlls/winepulse.drv/pulse.c | 62 ++++++++++++++++++--------------------
- 1 file changed, 30 insertions(+), 32 deletions(-)
+ dlls/winepulse.drv/pulse.c | 64 ++++++++++++++++++--------------------
+ 1 file changed, 30 insertions(+), 34 deletions(-)
 
 diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
-index cbd9b3b97ae..abd0f286ffc 100644
+index 28afb5b788d..67116899da7 100644
 --- a/dlls/winepulse.drv/pulse.c
 +++ b/dlls/winepulse.drv/pulse.c
-@@ -669,7 +669,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
+@@ -681,7 +681,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
      fmt->dwChannelMask = pa_mask;
  }
  
@@ -22,7 +22,7 @@ index cbd9b3b97ae..abd0f286ffc 100644
  {
      WAVEFORMATEX *wfx = &fmt->Format;
      pa_stream *stream;
-@@ -692,7 +693,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -704,7 +705,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
      attr.minreq = attr.fragsize = pa_frame_size(&ss);
      attr.prebuf = 0;
  
@@ -31,7 +31,7 @@ index cbd9b3b97ae..abd0f286ffc 100644
      if (stream)
          pa_stream_set_state_callback(stream, pulse_stream_state, NULL);
      if (!stream)
-@@ -703,7 +704,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -715,7 +716,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
      else
          ret = pa_stream_connect_record(stream, pulse_name, &attr, PA_STREAM_START_CORKED|PA_STREAM_FIX_RATE|PA_STREAM_FIX_CHANNELS|PA_STREAM_EARLY_REQUESTS);
      if (ret >= 0) {
@@ -40,7 +40,7 @@ index cbd9b3b97ae..abd0f286ffc 100644
                  pa_stream_get_state(stream) == PA_STREAM_CREATING)
          {}
          if (pa_stream_get_state(stream) == PA_STREAM_READY) {
-@@ -714,7 +715,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -726,7 +727,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
              else
                  length = pa_stream_get_buffer_attr(stream)->fragsize;
              pa_stream_disconnect(stream);
@@ -49,10 +49,10 @@ index cbd9b3b97ae..abd0f286ffc 100644
                      pa_stream_get_state(stream) == PA_STREAM_READY)
              {}
          }
-@@ -761,31 +762,32 @@ static NTSTATUS pulse_test_connect(void *args)
-     PhysDevice *dev;
+@@ -774,34 +775,33 @@ static NTSTATUS pulse_test_connect(void *args)
      pa_operation *o;
      int ret;
+     char *name = wstr_to_str(params->name);
 +    pa_mainloop *ml;
 +    pa_context *ctx;
  
@@ -61,11 +61,14 @@ index cbd9b3b97ae..abd0f286ffc 100644
 +    ml = pa_mainloop_new();
  
 -    pa_mainloop_set_poll_func(pulse_ml, pulse_poll_func, NULL);
+-
+-    pulse_ctx = pa_context_new(pa_mainloop_get_api(pulse_ml), name);
 +    pa_mainloop_set_poll_func(ml, pulse_poll_func, NULL);
  
--    pulse_ctx = pa_context_new(pa_mainloop_get_api(pulse_ml), params->name);
++    ctx = pa_context_new(pa_mainloop_get_api(ml), name);
+     free(name);
+-
 -    if (!pulse_ctx) {
-+    ctx = pa_context_new(pa_mainloop_get_api(ml), params->name);
 +    if (!ctx) {
          ERR("Failed to create context\n");
 -        pa_mainloop_free(pulse_ml);
@@ -93,7 +96,7 @@ index cbd9b3b97ae..abd0f286ffc 100644
  
          if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED)
              goto fail;
-@@ -794,12 +796,12 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -810,12 +810,12 @@ static NTSTATUS pulse_test_connect(void *args)
              break;
      }
  
@@ -109,7 +112,7 @@ index cbd9b3b97ae..abd0f286ffc 100644
  
      free_phys_device_lists();
      list_init(&g_phys_speakers);
-@@ -808,34 +810,32 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -824,34 +824,32 @@ static NTSTATUS pulse_test_connect(void *args)
      pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio");
      pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio");
  
@@ -152,7 +155,7 @@ index cbd9b3b97ae..abd0f286ffc 100644
  
      pulse_unlock();
  
-@@ -843,10 +843,8 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -859,10 +857,8 @@ static NTSTATUS pulse_test_connect(void *args)
      return STATUS_SUCCESS;
  
  fail:
@@ -166,5 +169,5 @@ index cbd9b3b97ae..abd0f286ffc 100644
      params->priority = Priority_Unavailable;
      return STATUS_SUCCESS;
 -- 
-2.35.1
+2.39.2
 

patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch

@@ -1,7 +1,7 @@
-From acd27b95daa9e118fc2c1b4191fd9a7c828ae017 Mon Sep 17 00:00:00 2001
+From 311a382432c4dd6a6d2ded5e6c10c6fe83767646 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Thu, 5 Jan 2023 21:16:38 +0100
-Subject: [PATCH 1/9] winecfg: Move input config options to a dedicated tab.
+Subject: [PATCH] winecfg: Move input config options to a dedicated tab.
 
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30984
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
@@ -18,17 +18,17 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
  create mode 100644 programs/winecfg/input.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 276471287da..fa155217267 100644
+index 9d60385414f..a88bff34a92 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -179,6 +179,7 @@ F:	dlls/user32/input.c
+@@ -181,6 +181,7 @@ F:	dlls/user32/input.c
  F:	dlls/win32u/input.c
  F:	dlls/win32u/rawinput.c
  F:	server/queue.c
 +F:	programs/winecfg/input.c
  
  Input methods
- M:	Aric Stewart <aric@codeweavers.com>
+ M:	Rémi Bernon <rbernon@codeweavers.com>
 diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
 index 80d2f1991dc..5c46b935234 100644
 --- a/programs/winecfg/Makefile.in
@@ -353,5 +353,5 @@ index 215cd6534a2..cd7b7552a1e 100644
  		    break;
  		}
 -- 
-2.39.1
+2.39.2
 

patches/winex11-Fixed-scancodes/0005-winex11-Use-the-user-configured-keyboard-layout-if-a.patch

@@ -1,7 +1,7 @@
-From 95f66fcd054ff2bae4e35e25a632b88a63aa4bb1 Mon Sep 17 00:00:00 2001
+From 7701298b62301e551fd7514f79f19eabacc66cac Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Fri, 6 Jan 2023 08:09:11 +0100
-Subject: [PATCH 5/9] winex11: Use the user configured keyboard layout if any.
+Subject: [PATCH] winex11: Use the user configured keyboard layout if any.
 
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30984
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
@@ -12,10 +12,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
  3 files changed, 33 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
-index 187979c4494..26548c9256e 100644
+index 7406aabdf40..4fc502cfe5d 100644
 --- a/dlls/winex11.drv/keyboard.c
 +++ b/dlls/winex11.drv/keyboard.c
-@@ -934,7 +934,6 @@ static const struct {
+@@ -931,7 +931,6 @@ static const struct {
  
   {0, NULL, NULL, NULL, NULL} /* sentinel */
  };
@@ -23,7 +23,7 @@ index 187979c4494..26548c9256e 100644
  
  /* maybe more of these scancodes should be extended? */
                  /* extended must be set for ALT_R, CTRL_R,
-@@ -1089,6 +1088,26 @@ static const WORD xfree86_vendor_key_vkey[256] =
+@@ -1086,6 +1085,26 @@ static const WORD xfree86_vendor_key_vkey[256] =
      0, 0, 0, 0, 0, 0, 0, 0                                      /* 1008FFF8 */
  };
  
@@ -50,7 +50,7 @@ index 187979c4494..26548c9256e 100644
  WCHAR *x11drv_get_keyboard_layout_list( DWORD *length )
  {
      WCHAR *tmp, *layouts = calloc( 1, sizeof(WCHAR) );
-@@ -1442,11 +1461,11 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev )
+@@ -1432,11 +1451,11 @@ BOOL X11DRV_KeyEvent( HWND hwnd, XEvent *xev )
   *  whichever matches most closely.
   * kbd_section must be held.
   */
@@ -64,15 +64,15 @@ index 187979c4494..26548c9256e 100644
    KeySym keysym = 0;
    const char (*lkey)[MAIN_LEN][4];
    unsigned max_seq = 0;
-@@ -1546,6 +1565,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display )
+@@ -1534,6 +1553,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display )
          main_key_tab[kbd_layout].comment);
  
    TRACE("detected layout is \"%s\"\n", main_key_tab[kbd_layout].comment);
 +  return kbd_layout;
  }
  
- static HKL get_locale_kbd_layout(void)
-@@ -1614,7 +1634,7 @@ void X11DRV_InitKeyboard( Display *display )
+ 
+@@ -1569,7 +1589,7 @@ void X11DRV_InitKeyboard( Display *display )
          { 0x41, 0x5a }, /* VK_A - VK_Z */
          { 0, 0 }
      };
@@ -81,7 +81,7 @@ index 187979c4494..26548c9256e 100644
  
      pthread_mutex_lock( &kbd_mutex );
      XDisplayKeycodes(display, &min_keycode, &max_keycode);
-@@ -1648,8 +1668,9 @@ void X11DRV_InitKeyboard( Display *display )
+@@ -1601,8 +1621,9 @@ void X11DRV_InitKeyboard( Display *display )
      }
      XFreeModifiermap(mmp);
  
@@ -94,10 +94,10 @@ index 187979c4494..26548c9256e 100644
      syms = (keysyms_per_keycode > 4) ? 4 : keysyms_per_keycode;
  
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 7d96ec648d1..c02a6c67111 100644
+index 12be88a31c5..653d2fe80e3 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -443,6 +443,7 @@ extern BOOL use_system_cursors DECLSPEC_HIDDEN;
+@@ -455,6 +455,7 @@ extern BOOL use_system_cursors DECLSPEC_HIDDEN;
  extern BOOL show_systray DECLSPEC_HIDDEN;
  extern BOOL grab_pointer DECLSPEC_HIDDEN;
  extern BOOL grab_fullscreen DECLSPEC_HIDDEN;
@@ -105,7 +105,7 @@ index 7d96ec648d1..c02a6c67111 100644
  extern BOOL usexcomposite DECLSPEC_HIDDEN;
  extern BOOL managed_mode DECLSPEC_HIDDEN;
  extern BOOL decorated_mode DECLSPEC_HIDDEN;
-@@ -711,6 +712,7 @@ extern void init_recursive_mutex( pthread_mutex_t *mutex ) DECLSPEC_HIDDEN;
+@@ -723,6 +724,7 @@ extern void init_recursive_mutex( pthread_mutex_t *mutex ) DECLSPEC_HIDDEN;
  
  /* keyboard.c */
  
@@ -114,10 +114,10 @@ index 7d96ec648d1..c02a6c67111 100644
  
  #define DEPTH_COUNT 3
 diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
-index 66dbc3c8270..dc2eb716d0b 100644
+index 751bf2b4449..7056cf6643d 100644
 --- a/dlls/winex11.drv/x11drv_main.c
 +++ b/dlls/winex11.drv/x11drv_main.c
-@@ -79,6 +79,7 @@ BOOL use_system_cursors = TRUE;
+@@ -76,6 +76,7 @@ BOOL use_system_cursors = TRUE;
  BOOL show_systray = TRUE;
  BOOL grab_pointer = TRUE;
  BOOL grab_fullscreen = FALSE;
@@ -125,7 +125,7 @@ index 66dbc3c8270..dc2eb716d0b 100644
  BOOL managed_mode = TRUE;
  BOOL decorated_mode = TRUE;
  BOOL private_color_map = FALSE;
-@@ -580,6 +581,9 @@ static void setup_options(void)
+@@ -578,6 +579,9 @@ static void setup_options(void)
      if (!get_config_key( hkey, appkey, "GrabFullscreen", buffer, sizeof(buffer) ))
          grab_fullscreen = IS_OPTION_TRUE( buffer[0] );
  
@@ -136,5 +136,5 @@ index 66dbc3c8270..dc2eb716d0b 100644
      if (p) set_reg_string_value( hkey, "KeyboardLayoutList", p, len * sizeof(WCHAR) );
      free( p );
 -- 
-2.39.1
+2.39.2
 

staging/VERSION

@@ -1,2 +1 @@
-Wine Staging 8.3
-
+Wine Staging 8.4

staging/upstream-commit

@@ -1 +1 @@
-e796002ee61bf5dfb2718e8f4fb8fa928ccdc236
+15aec461174ae2f2568d63fa83f32576ede05a9c