Release v8.21

Sync to latest code - macos issue

patches/Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch

@@ -1,38 +1,17 @@
-From 81a36b530261731d6020e09770237ae5bf58166d Mon Sep 17 00:00:00 2001
+From ebe00ceb4f2d24f2611dbec87486d6597a3466a9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 2 May 2014 20:46:19 +0200
 Subject: [PATCH] user32: Decrease minimum SetTimer interval to 5 ms. (try 2)
 
 ---
- dlls/user32/tests/msg.c | 2 ++
- dlls/win32u/message.c   | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
+ dlls/win32u/message.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index 4519da6962d..304a3b87f46 100644
---- a/dlls/user32/tests/msg.c
-+++ b/dlls/user32/tests/msg.c
-@@ -10709,6 +10709,7 @@ static void test_timers(void)
-     start = GetTickCount();
-     while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
-         DispatchMessageA(&msg);
-+todo_wine
-     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
-        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */,
-@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void)
-     start = GetTickCount();
-     while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
-         DispatchMessageA(&msg);
-+todo_wine
-     ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */
-        || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */
-        || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */,
 diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c
-index d00178e6aa4..513150a3d61 100644
+index d2909339983..337d4a2cc1d 100644
 --- a/dlls/win32u/message.c
 +++ b/dlls/win32u/message.c
-@@ -170,7 +170,7 @@ UINT_PTR WINAPI NtUserSetSystemTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIME
+@@ -3975,7 +3975,7 @@ UINT_PTR WINAPI NtUserSetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC
  
      if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE );
  
@@ -42,5 +21,5 @@ index d00178e6aa4..513150a3d61 100644
      SERVER_START_REQ( set_win_timer )
      {
 -- 
-2.35.1
+2.42.0
 

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/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From d51057f7c91016d2c6f5c3b21d201f86d7c085b5 Mon Sep 17 00:00:00 2001
+From 9d274e6d152c3f3961212f3cbd71dc8f14641367 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -9,7 +9,7 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
-index 3657fa7db12..c8114677bc6 100644
+index 152ef80611a..06ebb65e2af 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
@@ -19,10 +19,10 @@ index 3657fa7db12..c8114677bc6 100644
 -EXTRADEFS = -D_IMAGEHLP_SOURCE_
 +EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
  
- C_SRCS = \
+ SOURCES = \
  	coff.c \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index a2a60752a68..a2bca11048f 100644
+index 5ada8c70c9b..a9a6303c8d7 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
 @@ -1457,6 +1457,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,

patches/ddraw-GetPickRecords/0001-ddraw-Implement-Pick-and-GetPickRecords.patch

@@ -70,7 +70,7 @@ index 80556e96787..b3b63d7b361 100644
          }
  
 +        if (This->pick_record_size > 0)
-+            heap_free(This->pick_records);
++            free(This->pick_records);
 +
          TRACE("Releasing render target %p.\n", This->rt_iface);
          rt_iface = This->rt_iface;
@@ -353,7 +353,7 @@ index 13e639eda3f..bb050fe16b8 100644
 +                                    {
 +                                        if (device->pick_record_size == 0) device->pick_record_size = 1;
 +                                        device->pick_record_size *= 2;
-+                                        device->pick_records = heap_realloc(device->pick_records,
++                                        device->pick_records = realloc(device->pick_records,
 +                                            sizeof(*device->pick_records) * device->pick_record_size);
 +                                    }
 +

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/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch

@@ -1,40 +1,38 @@
-From c62655b9d54ce8b692bd84d41abe09cc40ae10e1 Mon Sep 17 00:00:00 2001
+From f76d5c65c07a184d56a9be4e8f77fa92886bb309 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 5 Sep 2016 15:31:29 +0200
 Subject: [PATCH] inseng: Implement CIF reader and download functions.
 
 FIXME: Needs splitting.
 ---
- dlls/inseng/Makefile.in      |    7 +-
+ dlls/inseng/Makefile.in      |    4 +-
  dlls/inseng/icif.c           | 1745 ++++++++++++++++++++++++++++++++++
  dlls/inseng/inf.c            |  443 +++++++++
  dlls/inseng/inseng.spec      |    4 +-
- dlls/inseng/inseng_main.c    |  990 ++++++++++++++++++-
+ dlls/inseng/inseng_main.c    |  989 ++++++++++++++++++-
  dlls/inseng/inseng_private.h |   79 ++
  include/inseng.idl           |  276 +++++-
- 7 files changed, 3490 insertions(+), 54 deletions(-)
+ 7 files changed, 3488 insertions(+), 52 deletions(-)
  create mode 100644 dlls/inseng/icif.c
  create mode 100644 dlls/inseng/inf.c
  create mode 100644 dlls/inseng/inseng_private.h
 
 diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
-index 0217203791a..ba2388c97ed 100644
+index 40eda55661a..72fa3533930 100644
 --- a/dlls/inseng/Makefile.in
 +++ b/dlls/inseng/Makefile.in
-@@ -1,8 +1,11 @@
+@@ -1,8 +1,10 @@
  MODULE    = inseng.dll
 -IMPORTS   = uuid ole32 advapi32
 +IMPORTS   = uuid ole32 advapi32 urlmon shlwapi
  
  EXTRADLLFLAGS = -Wb,--prefer-native
  
--C_SRCS = inseng_main.c
-+C_SRCS = \
+ SOURCES = \
 +	icif.c \
 +	inf.c \
-+	inseng_main.c
- 
- IDL_SRCS = inseng_classes.idl
+ 	inseng_classes.idl \
+ 	inseng_main.c
 diff --git a/dlls/inseng/icif.c b/dlls/inseng/icif.c
 new file mode 100644
 index 00000000000..27f6f6dfd93
@@ -2249,7 +2247,7 @@ index 82c0b4d5fe1..7ae46fad3a7 100644
 +@ stdcall GetICifRWFileFromFile(ptr str)
  @ stub PurgeDownloadDirectory
 diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c
-index c72a12955b8..87d11472ff0 100644
+index f7ce3f173c2..81eb1ec4f13 100644
 --- a/dlls/inseng/inseng_main.c
 +++ b/dlls/inseng/inseng_main.c
 @@ -2,6 +2,7 @@
@@ -2260,7 +2258,7 @@ index c72a12955b8..87d11472ff0 100644
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
-@@ -28,17 +29,68 @@
+@@ -28,16 +29,68 @@
  #include "winuser.h"
  #include "ole2.h"
  #include "rpcproxy.h"
@@ -2272,7 +2270,6 @@ index c72a12955b8..87d11472ff0 100644
 +#include "inseng_private.h"
 +
  #include "wine/debug.h"
--#include "wine/heap.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(inseng);
  
@@ -2330,7 +2327,7 @@ index c72a12955b8..87d11472ff0 100644
  };
  
  static inline InstallEngine *impl_from_IInstallEngine2(IInstallEngine2 *iface)
-@@ -46,6 +98,250 @@ static inline InstallEngine *impl_from_IInstallEngine2(IInstallEngine2 *iface)
+@@ -45,6 +98,250 @@ static inline InstallEngine *impl_from_IInstallEngine2(IInstallEngine2 *iface)
      return CONTAINING_RECORD(iface, InstallEngine, IInstallEngine2_iface);
  }
  
@@ -2581,7 +2578,7 @@ index c72a12955b8..87d11472ff0 100644
  static HRESULT WINAPI InstallEngine_QueryInterface(IInstallEngine2 *iface, REFIID riid, void **ppv)
  {
      InstallEngine *This = impl_from_IInstallEngine2(iface);
-@@ -59,13 +355,16 @@ static HRESULT WINAPI InstallEngine_QueryInterface(IInstallEngine2 *iface, REFII
+@@ -58,13 +355,16 @@ static HRESULT WINAPI InstallEngine_QueryInterface(IInstallEngine2 *iface, REFII
      }else if(IsEqualGUID(&IID_IInstallEngine2, riid)) {
          TRACE("(%p)->(IID_IInstallEngine2 %p)\n", This, ppv);
          *ppv = &This->IInstallEngine2_iface;
@@ -2600,7 +2597,7 @@ index c72a12955b8..87d11472ff0 100644
      return S_OK;
  }
  
-@@ -86,181 +385,726 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface)
+@@ -85,181 +385,726 @@ static ULONG WINAPI InstallEngine_Release(IInstallEngine2 *iface)
  
      TRACE("(%p) ref=%ld\n", This, ref);
  
@@ -2610,9 +2607,9 @@ index c72a12955b8..87d11472ff0 100644
 +        if (This->icif)
 +            ICifFile_Release(This->icif);
 +
-+        heap_free(This->baseurl);
-+        heap_free(This->downloaddir);
-         heap_free(This);
++        free(This->baseurl);
++        free(This->downloaddir);
+         free(This);
 +    }
  
      return ref;
@@ -3363,7 +3360,7 @@ index c72a12955b8..87d11472ff0 100644
      InstallEngine_QueryInterface,
      InstallEngine_AddRef,
      InstallEngine_Release,
-@@ -290,6 +1134,70 @@ static const IInstallEngine2Vtbl InstallEngine2Vtbl = {
+@@ -289,6 +1134,70 @@ static const IInstallEngine2Vtbl InstallEngine2Vtbl = {
      InstallEngine2_GetICifFile
  };
  
@@ -3434,12 +3431,12 @@ index c72a12955b8..87d11472ff0 100644
  static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv)
  {
      *ppv = NULL;
-@@ -334,12 +1242,14 @@ static HRESULT WINAPI InstallEngineCF_CreateInstance(IClassFactory *iface, IUnkn
+@@ -333,12 +1242,14 @@ static HRESULT WINAPI InstallEngineCF_CreateInstance(IClassFactory *iface, IUnkn
  
      TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), ppv);
  
--    engine = heap_alloc(sizeof(*engine));
-+    engine = heap_alloc_zero(sizeof(*engine));
+-    engine = malloc(sizeof(*engine));
++    engine = calloc(1, sizeof(*engine));
      if(!engine)
          return E_OUTOFMEMORY;
  
@@ -3862,5 +3859,5 @@ index 8a3f4c4d270..82927418a99 100644
 +cpp_quote("HRESULT WINAPI GetICifFileFromFile(ICifFile **, const char *);")
 +cpp_quote("HRESULT WINAPI GetICifRWFileFromFile(ICifRWFile **, const char *);")
 -- 
-2.34.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-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch

@@ -1,4 +1,4 @@
-From 3242c225381a5beb2690402b8e37179bb9f3e71f Mon Sep 17 00:00:00 2001
+From fa493586583e4dd534b01b72812c7ab79c0aecca 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.
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
  2 files changed, 81 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
-index 90deb5865f8..428ebde23b3 100644
+index 3ca77a03053..7508e1ad796 100644
 --- a/dlls/ntdll/tests/Makefile.in
 +++ b/dlls/ntdll/tests/Makefile.in
 @@ -1,5 +1,5 @@
@@ -17,10 +17,10 @@ index 90deb5865f8..428ebde23b3 100644
 -IMPORTS   = user32 advapi32
 +IMPORTS   = user32 ole32 advapi32
  
- C_SRCS = \
+ SOURCES = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index 117d9eed067..1255ad93dd8 100644
+index 88f62b0b588..8ca339dde0f 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -29,6 +29,9 @@
@@ -53,7 +53,7 @@ index 117d9eed067..1255ad93dd8 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3609,6 +3618,76 @@ static void test_RtlFirstFreeAce(void)
+@@ -3611,6 +3620,76 @@ static void test_RtlFirstFreeAce(void)
      HeapFree(GetProcessHeap(), 0, acl);
  }
  
@@ -130,7 +130,7 @@ index 117d9eed067..1255ad93dd8 100644
  static void test_RtlInitializeSid(void)
  {
      SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
-@@ -3688,6 +3767,7 @@ START_TEST(rtl)
+@@ -3690,6 +3769,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
@@ -139,5 +139,5 @@ index 117d9eed067..1255ad93dd8 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-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/packager-DllMain/0001-packager-Prefer-native-version.patch

@@ -1,25 +1,23 @@
-From cea29373b287ae84e28adca9834ffdbb97844ffe Mon Sep 17 00:00:00 2001
+From bc118983b67f87ed7858711d03cff34050b92770 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 6 Aug 2017 02:50:23 +0200
 Subject: [PATCH] packager: Prefer native version.
 
 ---
- dlls/packager/Makefile.in | 2 ++
- 1 file changed, 2 insertions(+)
+ dlls/packager/Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in
-index f539cb6f095..faef8deb263 100644
+index 5fc89d807a8..3589b37be9c 100644
 --- a/dlls/packager/Makefile.in
 +++ b/dlls/packager/Makefile.in
-@@ -2,6 +2,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES
+@@ -1,5 +1,6 @@
  MODULE = packager.dll
  IMPORTS = uuid shell32 shlwapi user32
- 
 +EXTRADLLFLAGS = -Wb,--prefer-native
-+
- C_SRCS = \
- 	packager_main.c
  
+ SOURCES = \
+ 	packager.rc \
 -- 
-2.34.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/setupapi-DiskSpaceList/0006-setupapi-Implement-SetupAddInstallSectionToDiskSpace.patch

@@ -1,4 +1,4 @@
-From c3ba1fbd5560fa0aaa791d8099ed25be93176b97 Mon Sep 17 00:00:00 2001
+From 0830c90120a304cd215f3891f02fef42e3aa45ed Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 4 Mar 2016 04:54:37 +0100
 Subject: [PATCH] setupapi: Implement SetupAddInstallSectionToDiskSpaceList.
@@ -312,28 +312,28 @@ index 8e2eb88bf93..5643f930d9d 100644
 +    test_SetupAddInstallSectionToDiskSpaceListA();
  }
 diff --git a/include/setupapi.h b/include/setupapi.h
-index 21992ead500..41a0f720c7c 100644
+index 831efdd4f50..031bd97f721 100644
 --- a/include/setupapi.h
 +++ b/include/setupapi.h
-@@ -1420,6 +1420,18 @@ typedef enum {
- void     WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show );
- void     WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show );
- #define         InstallHinfSection WINELIB_NAME_AW(InstallHinfSection)
-+BOOL     WINAPI IsUserAdmin(VOID);
-+PWSTR    WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage);
-+VOID     WINAPI MyFree(PVOID lpMem);
-+PVOID    WINAPI MyMalloc(DWORD dwSize);
-+PVOID    WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize);
-+DWORD    WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *);
-+LONG     WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD);
+@@ -1426,6 +1426,18 @@ typedef enum {
+ WINSETUPAPI void     WINAPI InstallHinfSectionA( HWND hwnd, HINSTANCE handle, PCSTR cmdline, INT show );
+ WINSETUPAPI void     WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline, INT show );
+ #define                     InstallHinfSection WINELIB_NAME_AW(InstallHinfSection)
++WINSETUPAPI BOOL     WINAPI IsUserAdmin(VOID);
++WINSETUPAPI PWSTR    WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage);
++WINSETUPAPI VOID     WINAPI MyFree(PVOID lpMem);
++WINSETUPAPI PVOID    WINAPI MyMalloc(DWORD dwSize);
++WINSETUPAPI PVOID    WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize);
++WINSETUPAPI DWORD    WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *);
++WINSETUPAPI LONG     WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD);
 +/* RetreiveFileSecurity is not a typo, as per Microsoft's dlls */
-+DWORD    WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *);
-+BOOL     WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, PVOID, UINT);
-+BOOL     WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, PVOID, UINT);
++WINSETUPAPI DWORD    WINAPI RetreiveFileSecurity(PCWSTR, PSECURITY_DESCRIPTOR *);
++WINSETUPAPI BOOL     WINAPI SetupAddInstallSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, PVOID, UINT);
++WINSETUPAPI BOOL     WINAPI SetupAddInstallSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, PVOID, UINT);
 +#define         SetupAddInstallSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddInstallSectionToDiskSpaceList)
- BOOL     WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, UINT, PVOID, UINT);
- BOOL     WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, UINT, PVOID, UINT);
- #define         SetupAddSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddSectionToDiskSpaceList)
+ WINSETUPAPI BOOL     WINAPI SetupAddSectionToDiskSpaceListA(HDSKSPC, HINF, HINF, PCSTR, UINT, PVOID, UINT);
+ WINSETUPAPI BOOL     WINAPI SetupAddSectionToDiskSpaceListW(HDSKSPC, HINF, HINF, PCWSTR, UINT, PVOID, UINT);
+ #define                     SetupAddSectionToDiskSpaceList WINELIB_NAME_AW(SetupAddSectionToDiskSpaceList)
 -- 
 2.42.0
 

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
+