Release v8.21

Sync to latest code - macos issue

patches/d3d12core-D3D12GetInterface/0001-d3d12core-Add-D3D12GetInterface-stub.patch

@@ -18,7 +18,7 @@ index 8778b66138b..94d8fd4da00 100644
 @@ -1 +1,4 @@
  MODULE = d3d12core.dll
 +
-+C_SRCS = \
++SOURCES = \
 +	d3d12core_main.c
 diff --git a/dlls/d3d12core/d3d12core.spec b/dlls/d3d12core/d3d12core.spec
 index c9c73bd4ee4..3f3e0a0f2e1 100644

patches/eventfd_synchronization/0003-ntdll-Create-eventfd-based-objects-for-semaphores.patch

@@ -1,4 +1,4 @@
-From d4094baaba721220b0a81170d1f9e6c276dae4ae Mon Sep 17 00:00:00 2001
+From 05ebaac121b440567aa88de7a77d0ef19a8d9242 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:09:22 -0500
 Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
@@ -16,10 +16,10 @@ Subject: [PATCH] ntdll: Create eventfd-based objects for semaphores.
  create mode 100644 dlls/ntdll/unix/esync.h
 
 diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
-index f8ca3e689ec..82af2152595 100644
+index 74e6da5bb56..a2b498759a9 100644
 --- a/dlls/ntdll/Makefile.in
 +++ b/dlls/ntdll/Makefile.in
-@@ -47,6 +47,7 @@ C_SRCS = \
+@@ -48,6 +48,7 @@ SOURCES = \
  	unix/cdrom.c \
  	unix/debug.c \
  	unix/env.c \
@@ -345,7 +345,7 @@ index 00000000000..a50a755149a
 +
 +extern int receive_fd( obj_handle_t *handle ) DECLSPEC_HIDDEN;
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 5b8b6962b4a..92855f7cccc 100644
+index 42b5aa9d84e..974a3624a28 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
 @@ -87,6 +87,7 @@
@@ -354,9 +354,9 @@ index 5b8b6962b4a..92855f7cccc 100644
  #include "unix_private.h"
 +#include "esync.h"
  #include "wine/list.h"
+ #include "ntsyscalls.h"
  #include "wine/debug.h"
- 
-@@ -2055,6 +2056,7 @@ static void start_main_thread(void)
+@@ -1811,6 +1812,7 @@ static void start_main_thread(void)
      signal_alloc_thread( teb );
      dbg_init();
      startup_info_size = server_init_process();
@@ -365,7 +365,7 @@ index 5b8b6962b4a..92855f7cccc 100644
      init_cpu_info();
      init_files();
 diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c
-index 227784448d3..99563e43cc3 100644
+index 7211457387c..cd8dbbdcc10 100644
 --- a/dlls/ntdll/unix/server.c
 +++ b/dlls/ntdll/unix/server.c
 @@ -103,7 +103,7 @@ sigset_t server_block_set;  /* signals to block during server calls */
@@ -377,7 +377,7 @@ index 227784448d3..99563e43cc3 100644
  
  /* atomically exchange a 64-bit value */
  static inline LONG64 interlocked_xchg64( LONG64 *dest, LONG64 val )
-@@ -907,7 +907,7 @@ void wine_server_send_fd( int fd )
+@@ -918,7 +918,7 @@ void wine_server_send_fd( int fd )
   *
   * Receive a file descriptor passed from the server.
   */
@@ -387,7 +387,7 @@ index 227784448d3..99563e43cc3 100644
      struct iovec vec;
      struct msghdr msghdr;
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index d1e4e5ee111..b5299c323e3 100644
+index bfbcaf4a851..f21ceb80298 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
 @@ -63,6 +63,7 @@
@@ -421,5 +421,5 @@ index 35b4833fd4c..75ef586df30 100644
  int do_esync(void)
  {
 -- 
-2.40.1
+2.42.0
 

patches/mountmgr-DosDevices/0001-mountmgr.sys-Write-usable-device-paths-into-HKLM-SYS.patch

@@ -1,4 +1,4 @@
-From 281a1753e7a075b7b3bdbba2692a1da5bec081f3 Mon Sep 17 00:00:00 2001
+From b98e363f0809d5f5092854eb3ab207a908bf6bd8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 30 Mar 2015 04:01:51 +0200
 Subject: [PATCH] mountmgr.sys: Write usable device paths into
@@ -11,14 +11,14 @@ Based on a patch by Bernhard Übelacker.
 ---
  dlls/mountmgr.sys/device.c   |  4 ++--
  dlls/mountmgr.sys/mountmgr.c | 11 +++++++++--
- dlls/mountmgr.sys/mountmgr.h |  3 ++-
- 3 files changed, 13 insertions(+), 5 deletions(-)
+ dlls/mountmgr.sys/mountmgr.h |  2 +-
+ 3 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
-index 8fd9dc0757e..f40f70b06d7 100644
+index 1ee82e92c97..58db9284ff3 100644
 --- a/dlls/mountmgr.sys/device.c
 +++ b/dlls/mountmgr.sys/device.c
-@@ -1045,8 +1045,8 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive,
+@@ -1051,8 +1051,8 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive,
          id = disk_device->unix_mount;
          id_len = strlen( disk_device->unix_mount ) + 1;
      }
@@ -30,10 +30,10 @@ index 8fd9dc0757e..f40f70b06d7 100644
      return STATUS_SUCCESS;
  }
 diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c
-index 9f72eedb33b..19cb71b4eb6 100644
+index ad3c034fe0f..52bc6536693 100644
 --- a/dlls/mountmgr.sys/mountmgr.c
 +++ b/dlls/mountmgr.sys/mountmgr.c
-@@ -46,14 +46,21 @@ struct mount_point
+@@ -44,14 +44,21 @@ struct mount_point
  static struct list mount_points_list = LIST_INIT(mount_points_list);
  static HKEY mount_key;
  
@@ -58,18 +58,17 @@ index 9f72eedb33b..19cb71b4eb6 100644
      else mount->id_len = 0;
  }
 diff --git a/dlls/mountmgr.sys/mountmgr.h b/dlls/mountmgr.sys/mountmgr.h
-index 143401e3b9b..bad875dd9bc 100644
+index b1de312dffb..d7b7fad5c76 100644
 --- a/dlls/mountmgr.sys/mountmgr.h
 +++ b/dlls/mountmgr.sys/mountmgr.h
-@@ -108,6 +108,7 @@ extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICOD
+@@ -108,6 +108,6 @@ extern struct mount_point *add_dosdev_mount_point( DEVICE_OBJECT *device, UNICOD
  extern struct mount_point *add_volume_mount_point( DEVICE_OBJECT *device, UNICODE_STRING *device_name,
-                                                    const GUID *guid ) DECLSPEC_HIDDEN;
- extern void delete_mount_point( struct mount_point *mount ) DECLSPEC_HIDDEN;
--extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len ) DECLSPEC_HIDDEN;
-+
-+extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len, int drive ) DECLSPEC_HIDDEN;
+                                                    const GUID *guid );
+ extern void delete_mount_point( struct mount_point *mount );
+-extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len );
++extern void set_mount_point_id( struct mount_point *mount, const void *id, unsigned int id_len, int drive );
  
  #endif /* __WINE_MOUNTMGR_H */
 -- 
-2.38.1
+2.42.0
 

patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch

@@ -1,4 +1,4 @@
-From af5cd4a865337f9e37ad3e8548e325fcb0f51d54 Mon Sep 17 00:00:00 2001
+From 4dd82c635bcf8c2c7d070d6c5786787ff2d7d887 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 5 Aug 2017 03:38:38 +0200
 Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection /
  1 file changed, 34 insertions(+)
 
 diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
-index 34af6b780cf..27de37d5b88 100644
+index a7967a6c242..8b088f9d3c3 100644
 --- a/dlls/ntdll/ntdll_misc.h
 +++ b/dlls/ntdll/ntdll_misc.h
-@@ -26,6 +26,7 @@
+@@ -28,6 +28,7 @@
  #include "winnt.h"
  #include "winternl.h"
  #include "unixlib.h"
@@ -20,9 +20,9 @@ index 34af6b780cf..27de37d5b88 100644
  #include "wine/asm.h"
  
  #define DECLARE_CRITICAL_SECTION(cs) \
-@@ -88,6 +89,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN;
- extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, va_list args ) DECLSPEC_HIDDEN;
- extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, va_list args ) DECLSPEC_HIDDEN;
+@@ -94,6 +95,39 @@ extern struct _KUSER_SHARED_DATA *user_shared_data;
+ extern int CDECL NTDLL__vsnprintf( char *str, SIZE_T len, const char *format, va_list args );
+ extern int CDECL NTDLL__vsnwprintf( WCHAR *str, SIZE_T len, const WCHAR *format, va_list args );
  
 +/* inline version of RtlEnterCriticalSection */
 +static inline void enter_critical_section( RTL_CRITICAL_SECTION *crit )
@@ -61,5 +61,5 @@ index 34af6b780cf..27de37d5b88 100644
  {
      ULONG size;
 -- 
-2.33.0
+2.42.0
 

patches/ntdll-HashLinks/0001-ntdll-Implement-HashLinks-field-in-LDR-module-data.patch

@@ -1,4 +1,4 @@
-From 5f029b7fcffc7b537a02523dc793ec2b4069390a Mon Sep 17 00:00:00 2001
+From a97f56374e65a2c1edb0d9b2bbd6ca433e598aca Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 05:30:27 +0200
 Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Implement HashLinks field in LDR module data.
  2 files changed, 117 insertions(+)
 
 diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
-index 2c9e97d7fc7..9a538edf7ab 100644
+index ec6f2d5c6a7..654a83c92f9 100644
 --- a/dlls/kernel32/tests/loader.c
 +++ b/dlls/kernel32/tests/loader.c
 @@ -28,6 +28,7 @@
@@ -20,7 +20,7 @@ index 2c9e97d7fc7..9a538edf7ab 100644
  #include "wine/test.h"
  #include "delayloadhandler.h"
  
-@@ -4205,6 +4206,79 @@ static void test_Wow64Transition(void)
+@@ -4207,6 +4208,79 @@ static void test_Wow64Transition(void)
              debugstr_wn(name->SectionFileName.Buffer, name->SectionFileName.Length / sizeof(WCHAR)));
  }
  
@@ -100,7 +100,7 @@ index 2c9e97d7fc7..9a538edf7ab 100644
  START_TEST(loader)
  {
      int argc;
-@@ -4286,6 +4360,7 @@ START_TEST(loader)
+@@ -4288,6 +4362,7 @@ START_TEST(loader)
      test_InMemoryOrderModuleList();
      test_LoadPackagedLibrary();
      test_wow64_redirection();
@@ -109,10 +109,10 @@ index 2c9e97d7fc7..9a538edf7ab 100644
      test_dll_file( "kernel32.dll" );
      test_dll_file( "advapi32.dll" );
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index d548ecea944..95ed846dc10 100644
+index f1ec6848f56..60e219e9f6b 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -132,6 +132,9 @@ struct file_id
+@@ -133,6 +133,9 @@ struct file_id
      BYTE ObjectId[16];
  };
  
@@ -122,7 +122,7 @@ index d548ecea944..95ed846dc10 100644
  /* internal representation of loaded modules */
  typedef struct _wine_modref
  {
-@@ -501,6 +504,33 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
+@@ -548,6 +551,33 @@ static void call_ldr_notifications( ULONG reason, LDR_DATA_TABLE_ENTRY *module )
      }
  }
  
@@ -156,7 +156,7 @@ index d548ecea944..95ed846dc10 100644
  /*************************************************************************
   *		get_modref
   *
-@@ -1475,7 +1505,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
+@@ -1522,7 +1552,12 @@ static WINE_MODREF *alloc_module( HMODULE hModule, const UNICODE_STRING *nt_name
                     &wm->ldr.InLoadOrderLinks);
      InsertTailList(&NtCurrentTeb()->Peb->LdrData->InMemoryOrderModuleList,
                     &wm->ldr.InMemoryOrderLinks);
@@ -169,7 +169,7 @@ index d548ecea944..95ed846dc10 100644
  
      if (!(nt->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT))
      {
-@@ -2153,6 +2188,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
+@@ -2214,6 +2249,7 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
              /* the module has only be inserted in the load & memory order lists */
              RemoveEntryList(&wm->ldr.InLoadOrderLinks);
              RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -177,7 +177,7 @@ index d548ecea944..95ed846dc10 100644
  
              /* FIXME: there are several more dangling references
               * left. Including dlls loaded by this dll before the
-@@ -3830,6 +3866,7 @@ static void free_modref( WINE_MODREF *wm )
+@@ -3896,6 +3932,7 @@ static void free_modref( WINE_MODREF *wm )
  
      RemoveEntryList(&wm->ldr.InLoadOrderLinks);
      RemoveEntryList(&wm->ldr.InMemoryOrderLinks);
@@ -185,15 +185,15 @@ index d548ecea944..95ed846dc10 100644
      if (wm->ldr.InInitializationOrderLinks.Flink)
          RemoveEntryList(&wm->ldr.InInitializationOrderLinks);
  
-@@ -4205,6 +4242,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
-         ANSI_STRING ctrl_routine = RTL_CONSTANT_STRING( "CtrlRoutine" );
+@@ -4275,6 +4312,7 @@ void loader_init( CONTEXT *context, void **entry )
+         MEMORY_BASIC_INFORMATION meminfo;
          WINE_MODREF *kernel32;
          PEB *peb = NtCurrentTeb()->Peb;
 +        unsigned int i;
  
          NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation,
                                &meminfo, sizeof(meminfo), NULL );
-@@ -4223,6 +4261,10 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+@@ -4293,6 +4331,10 @@ void loader_init( CONTEXT *context, void **entry )
          RtlSetBits( peb->TlsBitmap, 0, NtCurrentTeb()->WowTebOffset ? WOW64_TLS_MAX_NUMBER : 1 );
          RtlSetBits( peb->TlsBitmap, NTDLL_TLS_ERRNO, 1 );
  
@@ -205,5 +205,5 @@ index d548ecea944..95ed846dc10 100644
          load_global_options();
          version_init();
 -- 
-2.40.1
+2.42.0
 

patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch

@@ -182,7 +182,7 @@ index 0204139631f..117c238cf44 100644
 +    sigaction(SIGSYS, sig_act, NULL);
 +
 +    frame->syscall_flags = syscall_flags;
-+    frame->syscall_table = KeServiceDescriptorTable;
++
 +
 +    test_syscall = mmap((void *)0x600000000000, 0x1000, PROT_EXEC | PROT_READ | PROT_WRITE,
 +            MAP_PRIVATE | MAP_ANON, -1, 0);

patches/ntdll-WRITECOPY/0003-ntdll-Setup-a-temporary-signal-handler-during-proces.patch

@@ -1,4 +1,4 @@
-From 3986e2d381e2b78d0bc572b7014f2445aa4bc6fd Mon Sep 17 00:00:00 2001
+From 8846243fcf799dc8a439aba399ccbb412c263de8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 4 Oct 2014 02:53:22 +0200
 Subject: [PATCH] ntdll: Setup a temporary signal handler during process
@@ -15,10 +15,10 @@ Subject: [PATCH] ntdll: Setup a temporary signal handler during process
  7 files changed, 74 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
-index 3cde6b726a2..f4a20d052c8 100644
+index fdda50575d1..f7afa327391 100644
 --- a/dlls/ntdll/unix/loader.c
 +++ b/dlls/ntdll/unix/loader.c
-@@ -2398,6 +2398,8 @@ void __wine_main( int argc, char *argv[], char *envp[] )
+@@ -2129,6 +2129,8 @@ DECLSPEC_EXPORT void __wine_main( int argc, char *argv[], char *envp[] )
  #endif
  
      virtual_init();
@@ -28,10 +28,10 @@ index 3cde6b726a2..f4a20d052c8 100644
  
  #ifdef __APPLE__
 diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c
-index 28cb2222809..b3b55a11e4f 100644
+index f255328fc73..798f683c5bd 100644
 --- a/dlls/ntdll/unix/signal_arm.c
 +++ b/dlls/ntdll/unix/signal_arm.c
-@@ -1566,6 +1566,12 @@ void signal_init_process(void)
+@@ -1605,6 +1605,12 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -45,10 +45,10 @@ index 28cb2222809..b3b55a11e4f 100644
  /***********************************************************************
   *           call_init_thunk
 diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c
-index d98268bcd54..2b92bbd7ed3 100644
+index 0208913010d..188c8fc205c 100644
 --- a/dlls/ntdll/unix/signal_arm64.c
 +++ b/dlls/ntdll/unix/signal_arm64.c
-@@ -1594,6 +1594,12 @@ void signal_init_process(void)
+@@ -1654,6 +1654,12 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -62,10 +62,10 @@ index d98268bcd54..2b92bbd7ed3 100644
  /***********************************************************************
   *           syscall_dispatcher_return_slowpath
 diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
-index 11bdd9c1ea6..f688795ab91 100644
+index 67221a4028c..46b298dfc69 100644
 --- a/dlls/ntdll/unix/signal_i386.c
 +++ b/dlls/ntdll/unix/signal_i386.c
-@@ -1839,6 +1839,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
+@@ -1861,6 +1861,30 @@ static BOOL handle_syscall_trap( ucontext_t *sigcontext )
  }
  
  
@@ -96,7 +96,7 @@ index 11bdd9c1ea6..f688795ab91 100644
  /**********************************************************************
   *		segv_handler
   *
-@@ -2408,6 +2432,34 @@ void signal_init_process(void)
+@@ -2431,6 +2455,34 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -132,10 +132,10 @@ index 11bdd9c1ea6..f688795ab91 100644
  /***********************************************************************
   *           call_init_thunk
 diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
-index 0204139631f..f8831b80a2b 100644
+index 28841de98f1..4440b60557c 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
-@@ -2455,6 +2455,12 @@ void signal_init_process(void)
+@@ -2644,6 +2644,12 @@ void signal_init_process(void)
      exit(1);
  }
  
@@ -149,22 +149,22 @@ index 0204139631f..f8831b80a2b 100644
  /***********************************************************************
   *           call_init_thunk
 diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
-index e1cace7ba78..0ea15f48787 100644
+index e09d0b41981..b6def005b91 100644
 --- a/dlls/ntdll/unix/unix_private.h
 +++ b/dlls/ntdll/unix/unix_private.h
-@@ -268,6 +268,7 @@ extern void signal_init_threading(void) DECLSPEC_HIDDEN;
- extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN;
- extern void signal_free_thread( TEB *teb ) DECLSPEC_HIDDEN;
- extern void signal_init_process(void) DECLSPEC_HIDDEN;
-+extern void signal_init_early(void) DECLSPEC_HIDDEN;
+@@ -276,6 +276,7 @@ extern void signal_init_threading(void);
+ extern NTSTATUS signal_alloc_thread( TEB *teb );
+ extern void signal_free_thread( TEB *teb );
+ extern void signal_init_process(void);
++extern void signal_init_early(void);
  extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg,
-                                                    BOOL suspend, TEB *teb ) DECLSPEC_HIDDEN;
- extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN;
+                                                    BOOL suspend, TEB *teb );
+ extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4];
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index b5fdeb5707b..03ce50d0677 100644
+index cc446de6250..f93740e9f4f 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -3703,7 +3703,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )
+@@ -3958,7 +3958,7 @@ NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack )
      }
  #endif
  
@@ -174,5 +174,5 @@ index b5fdeb5707b..03ce50d0677 100644
          struct thread_stack_info stack_info;
          if (!is_inside_thread_stack( page, &stack_info ))
 -- 
-2.40.1
+2.42.0
 

patches/sapi-ISpObjectToken-CreateInstance/0004-sapi-ISpObjectToken-CreateInstance-support-ISpAudio.patch

@@ -68,7 +68,7 @@ index 6cc7ccd6d73..79594301c35 100644
 +
 +    if (!ref)
 +    {
-+        heap_free(audio);
++        free(audio);
 +    }
 +
 +    return ref;
@@ -274,7 +274,7 @@ index 6cc7ccd6d73..79594301c35 100644
 +
 +static HRESULT speech_audio_create(void **obj)
 +{
-+    struct speech_audio *This = heap_alloc(sizeof(*This));
++    struct speech_audio *This = malloc(sizeof(*This));
 +
 +    if (!This)
 +        return E_OUTOFMEMORY;

patches/vkd3d-latest/0002-include-D3D12_RT_FORMAT_ARRAY-remove-typedef-to-make.patch

@@ -0,0 +1,41 @@
+From 3f1c1723467f9d51372f39d0865d22ea951486ff Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 24 Nov 2023 19:06:32 +1100
+Subject: [PATCH] include: D3D12_RT_FORMAT_ARRAY remove typedef to make header
+ compatible with windows
+
+windows d3d12.idl doesn't have this as a typedef.
+---
+ libs/vkd3d/libs/vkd3d/state.c         | 2 +-
+ libs/vkd3d/libs/vkd3d/vkd3d_private.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libs/vkd3d/libs/vkd3d/state.c b/libs/vkd3d/libs/vkd3d/state.c
+index de0e04ea1e6..6665a1fd6cb 100644
+--- a/libs/vkd3d/libs/vkd3d/state.c
++++ b/libs/vkd3d/libs/vkd3d/state.c
+@@ -1839,7 +1839,7 @@ static HRESULT pipeline_state_desc_from_d3d12_stream_desc(struct d3d12_pipeline_
+         [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_INPUT_LAYOUT]    = DCL_SUBOBJECT_INFO(D3D12_INPUT_LAYOUT_DESC, input_layout),
+         [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_IB_STRIP_CUT_VALUE] = DCL_SUBOBJECT_INFO(D3D12_INDEX_BUFFER_STRIP_CUT_VALUE, strip_cut_value),
+         [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_PRIMITIVE_TOPOLOGY] = DCL_SUBOBJECT_INFO(D3D12_PRIMITIVE_TOPOLOGY_TYPE, primitive_topology_type),
+-        [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(D3D12_RT_FORMAT_ARRAY, rtv_formats),
++        [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_RENDER_TARGET_FORMATS] = DCL_SUBOBJECT_INFO(struct D3D12_RT_FORMAT_ARRAY, rtv_formats),
+         [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_DEPTH_STENCIL_FORMAT]  = DCL_SUBOBJECT_INFO(DXGI_FORMAT, dsv_format),
+         [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_SAMPLE_DESC]     = DCL_SUBOBJECT_INFO(DXGI_SAMPLE_DESC, sample_desc),
+         [D3D12_PIPELINE_STATE_SUBOBJECT_TYPE_NODE_MASK]       = DCL_SUBOBJECT_INFO(UINT, node_mask),
+diff --git a/libs/vkd3d/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/libs/vkd3d/vkd3d_private.h
+index 231bc615e5c..b2dec06aaed 100644
+--- a/libs/vkd3d/libs/vkd3d/vkd3d_private.h
++++ b/libs/vkd3d/libs/vkd3d/vkd3d_private.h
+@@ -1336,7 +1336,7 @@ struct d3d12_pipeline_state_desc
+     D3D12_INPUT_LAYOUT_DESC input_layout;
+     D3D12_INDEX_BUFFER_STRIP_CUT_VALUE strip_cut_value;
+     D3D12_PRIMITIVE_TOPOLOGY_TYPE primitive_topology_type;
+-    D3D12_RT_FORMAT_ARRAY rtv_formats;
++    struct D3D12_RT_FORMAT_ARRAY rtv_formats;
+     DXGI_FORMAT dsv_format;
+     DXGI_SAMPLE_DESC sample_desc;
+     D3D12_VIEW_INSTANCING_DESC view_instancing_desc;
+-- 
+2.42.0
+

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

@@ -38,7 +38,7 @@ index 00000000000..6fc24a72feb
 +
 +EXTRADLLFLAGS = -mno-cygwin
 +
-+C_SRCS = \
++SOURCES = \
 +	windows.networking.connectivity_main.c
 diff --git a/dlls/windows.networking.connectivity/windows.networking.connectivity.spec b/dlls/windows.networking.connectivity/windows.networking.connectivity.spec
 new file mode 100644

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

@@ -1,4 +1,4 @@
-From bc89b07a911b8af2a171b26defec4794fc408881 Mon Sep 17 00:00:00 2001
+From 82a9000e59fbec65e788ee7c3b3037b364aacce2 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
@@ -9,10 +9,10 @@ Subject: [PATCH] winepulse.drv: Use a separate mainloop and ctx for
  1 file changed, 30 insertions(+), 34 deletions(-)
 
 diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c
-index 28afb5b788d..67116899da7 100644
+index 62658fc98e6..6958950e0f6 100644
 --- a/dlls/winepulse.drv/pulse.c
 +++ b/dlls/winepulse.drv/pulse.c
-@@ -681,7 +681,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
+@@ -693,7 +693,8 @@ static void convert_channel_map(const pa_channel_map *pa_map, WAVEFORMATEXTENSIB
      fmt->dwChannelMask = pa_mask;
  }
  
@@ -22,7 +22,7 @@ index 28afb5b788d..67116899da7 100644
  {
      WAVEFORMATEX *wfx = &fmt->Format;
      pa_stream *stream;
-@@ -704,7 +705,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -716,7 +717,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 28afb5b788d..67116899da7 100644
      if (stream)
          pa_stream_set_state_callback(stream, pulse_stream_state, NULL);
      if (!stream)
-@@ -715,7 +716,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -727,7 +728,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 28afb5b788d..67116899da7 100644
                  pa_stream_get_state(stream) == PA_STREAM_CREATING)
          {}
          if (pa_stream_get_state(stream) == PA_STREAM_READY) {
-@@ -726,7 +727,7 @@ static void pulse_probe_settings(int render, const char *pulse_name, WAVEFORMATE
+@@ -738,7 +739,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,7 +49,7 @@ index 28afb5b788d..67116899da7 100644
                      pa_stream_get_state(stream) == PA_STREAM_READY)
              {}
          }
-@@ -774,34 +775,33 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -786,34 +787,33 @@ static NTSTATUS pulse_test_connect(void *args)
      pa_operation *o;
      int ret;
      char *name = wstr_to_str(params->name);
@@ -96,7 +96,7 @@ index 28afb5b788d..67116899da7 100644
  
          if (state == PA_CONTEXT_FAILED || state == PA_CONTEXT_TERMINATED)
              goto fail;
-@@ -810,12 +810,12 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -822,12 +822,12 @@ static NTSTATUS pulse_test_connect(void *args)
              break;
      }
  
@@ -112,9 +112,9 @@ index 28afb5b788d..67116899da7 100644
  
      free_phys_device_lists();
      list_init(&g_phys_speakers);
-@@ -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");
+@@ -837,34 +837,32 @@ static NTSTATUS pulse_test_connect(void *args)
+     pulse_add_device(&g_phys_speakers, NULL, 0, Speakers, 0, "", "PulseAudio Output");
+     pulse_add_device(&g_phys_sources, NULL, 0, Microphone, 0, "", "PulseAudio Input");
  
 -    o = pa_context_get_sink_info_list(pulse_ctx, &pulse_phys_speakers_cb, NULL);
 +    o = pa_context_get_sink_info_list(ctx, &pulse_phys_speakers_cb, NULL);
@@ -155,7 +155,7 @@ index 28afb5b788d..67116899da7 100644
  
      pulse_unlock();
  
-@@ -859,10 +857,8 @@ static NTSTATUS pulse_test_connect(void *args)
+@@ -872,10 +870,8 @@ static NTSTATUS pulse_test_connect(void *args)
      return STATUS_SUCCESS;
  
  fail:
@@ -169,5 +169,5 @@ index 28afb5b788d..67116899da7 100644
      params->priority = Priority_Unavailable;
      return STATUS_SUCCESS;
 -- 
-2.39.2
+2.42.0
 

staging/VERSION

@@ -1 +1 @@
-Wine Staging 8.20
+Wine Staging 8.21

staging/upstream-commit

@@ -1 +1 @@
-3a8d71041c159d76a76856867caa1de8ca297151
+13c43cf3d06178dc39d98981f55d27e3cbd79ad0