Release v7.1

macos doesn't support SO_PROTOCOL.

patches/Compiler_Warnings/0026-dwrite-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,18 +1,17 @@
-From b51fdc7e211f676d169c937209bf689e57252c5d Mon Sep 17 00:00:00 2001
+From 7e3c4d732bacaeaf37ab8f32a7548715825eff4d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:58:40 +0100
 Subject: [PATCH] dwrite: Avoid implicit cast of interface pointer.
 
 ---
- dlls/dwrite/font.c   | 4 ++--
- dlls/dwrite/layout.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ dlls/dwrite/font.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
-index aa51c744297..7cad015480f 100644
+index 2296c74c1e3..2b5e18aab19 100644
 --- a/dlls/dwrite/font.c
 +++ b/dlls/dwrite/font.c
-@@ -2130,7 +2130,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
+@@ -2514,7 +2514,7 @@ static struct dwrite_font *unsafe_impl_from_IDWriteFont(IDWriteFont *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontVtbl*)&dwritefontvtbl);
@@ -21,7 +20,7 @@ index aa51c744297..7cad015480f 100644
  }
  
  struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
-@@ -2138,7 +2138,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
+@@ -2522,7 +2522,7 @@ struct dwrite_fontface *unsafe_impl_from_IDWriteFontFace(IDWriteFontFace *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (IDWriteFontFaceVtbl*)&dwritefontfacevtbl);
@@ -30,19 +29,6 @@ index aa51c744297..7cad015480f 100644
  }
  
  static struct dwrite_fontfacereference *unsafe_impl_from_IDWriteFontFaceReference(IDWriteFontFaceReference *iface)
-diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index 1f6201a6a93..35791d5c22e 100644
---- a/dlls/dwrite/layout.c
-+++ b/dlls/dwrite/layout.c
-@@ -5886,7 +5886,7 @@ static const IDWriteTextFormat3Vtbl dwritetextformatvtbl =
- static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface)
- {
-     return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ?
--        CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
-+        CONTAINING_RECORD((IDWriteTextFormat3 *)iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL;
- }
- 
- HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight,
 -- 
-2.29.2
+2.34.1
 

patches/Compiler_Warnings/0031-include-Check-element-type-in-CONTAINING_RECORD-and-.patch

@@ -1,4 +1,4 @@
-From a349cc8bdcc3a083ea507dbbdeba9053e3a338e4 Mon Sep 17 00:00:00 2001
+From bd6e11aee0fbe2f880f87bec8b3d145b3de15dab Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 23:08:30 +0100
 Subject: [PATCH] include: Check element type in CONTAINING_RECORD and similar
@@ -31,31 +31,31 @@ index b4d681fe0f3..287ad394fae 100644
  
  #endif  /* __WINE_SERVER_LIST_H */
 diff --git a/include/wine/rbtree.h b/include/wine/rbtree.h
-index 8aae29c8c10..330b3e8fbc9 100644
+index 4e86f3cfb84..694dc039cb1 100644
 --- a/include/wine/rbtree.h
 +++ b/include/wine/rbtree.h
 @@ -23,8 +23,14 @@
  #ifndef __WINE_WINE_RBTREE_H
  #define __WINE_WINE_RBTREE_H
  
--#define WINE_RB_ENTRY_VALUE(element, type, field) \
+-#define RB_ENTRY_VALUE(element, type, field) \
 -    ((type *)((char *)(element) - offsetof(type, field)))
 +#ifdef __GNUC__
-+# define WINE_RB_ENTRY_VALUE(element, type, field) ({       \
++# define RB_ENTRY_VALUE(element, type, field) ({       \
 +     const typeof(((type *)0)->field) *__ptr = (element);   \
 +     (type *)((char *)__ptr - offsetof(type, field)); })
 +#else
-+# define WINE_RB_ENTRY_VALUE(element, type, field) \
++# define RB_ENTRY_VALUE(element, type, field) \
 +     ((type *)((char *)(element) - offsetof(type, field)))
 +#endif
  
- struct wine_rb_entry
+ struct rb_entry
  {
 diff --git a/include/winnt.h b/include/winnt.h
-index 46e17c546a7..d5c65d2017b 100644
+index 9296a3dc555..c7406b8db39 100644
 --- a/include/winnt.h
 +++ b/include/winnt.h
-@@ -793,8 +793,14 @@ typedef struct _MEMORY_BASIC_INFORMATION
+@@ -840,8 +840,14 @@ typedef struct _WIN32_MEMORY_RANGE_ENTRY
  #define RTL_FIELD_SIZE(type, field) (sizeof(((type *)0)->field))
  #define RTL_SIZEOF_THROUGH_FIELD(type, field) (FIELD_OFFSET(type, field) + RTL_FIELD_SIZE(type, field))
  
@@ -73,5 +73,5 @@ index 46e17c546a7..d5c65d2017b 100644
  #define ARRAYSIZE(x) (sizeof(x) / sizeof((x)[0]))
  #ifdef __WINESRC__
 -- 
-2.26.2
+2.34.1
 

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch

@@ -1,4 +1,4 @@
-From e3a6b75cbce69e18742135fdd8e105132d8ca9dd Mon Sep 17 00:00:00 2001
+From ea3579b5b3d701647f5c7f16de658f1cd7fe876d Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Fri, 30 Jul 2021 15:57:29 +1000
 Subject: [PATCH] d3dx11_43: Implement D3DX11GetImageInfoFromMemory
@@ -38,7 +38,7 @@ index ccd4319ace2..6854c73ebcb 100644
  EXTRADLLFLAGS = -Wb,--prefer-native
  
 diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c
-index 950f6d76f5c..00c1db35e42 100644
+index 5dad027864f..00c1db35e42 100644
 --- a/dlls/d3dx11_43/main.c
 +++ b/dlls/d3dx11_43/main.c
 @@ -66,12 +66,3 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP
@@ -49,13 +49,13 @@ index 950f6d76f5c..00c1db35e42 100644
 -HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
 -        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
 -{
--    FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n",
+-    FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n",
 -            src_data, src_data_size, pump, img_info, hresult);
 -
 -    return E_NOTIMPL;
 -}
 diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index ee6808d76d6..8addf4f84d3 100644
+index 81ac8ee6db7..6881eec107d 100644
 --- a/dlls/d3dx11_43/texture.c
 +++ b/dlls/d3dx11_43/texture.c
 @@ -15,14 +15,190 @@
@@ -155,7 +155,7 @@ index ee6808d76d6..8addf4f84d3 100644
 +    GUID container_format;
 +    HRESULT hr;
 +
-+    TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n",
++    TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n",
 +            src_data, src_data_size, pump, img_info, hresult);
 +
 +    if (!src_data || !src_data_size || !img_info)
@@ -250,5 +250,5 @@ index ee6808d76d6..8addf4f84d3 100644
          SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
          ID3D11ShaderResourceView **view, HRESULT *hresult)
 -- 
-2.33.0
+2.34.1
 

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch

@@ -1,4 +1,4 @@
-From 2f65959901f62bfc6a48c683e6eaa5d6ed5f7416 Mon Sep 17 00:00:00 2001
+From 5be34c9e347d4379179eeba742b25986152d4e4f Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 3 Aug 2021 11:13:18 +1000
 Subject: [PATCH] d3dx11_42: Implement D3DX11CreateTextureFromMemory
@@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  1 file changed, 342 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index 8addf4f84d3..f47b8583c6c 100644
+index 6881eec107d..b91bd8d881a 100644
 --- a/dlls/d3dx11_43/texture.c
 +++ b/dlls/d3dx11_43/texture.c
 @@ -22,6 +22,7 @@
@@ -239,7 +239,7 @@ index 8addf4f84d3..f47b8583c6c 100644
 +        SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
          ID3D11Resource **texture, HRESULT *hresult)
  {
--    FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
+-    FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
 -            device, data, data_size, load_info, pump, texture, hresult);
 +    unsigned int frame_count, width, height, stride, frame_size;
 +    IWICFormatConverter *converter = NULL;
@@ -259,7 +259,7 @@ index 8addf4f84d3..f47b8583c6c 100644
 +    HRESULT hr;
  
 -    return E_NOTIMPL;
-+    TRACE("device %p, src_data %p, src_data_size %lu, load_info %p, pump %p, texture %p, hresult %p.\n",
++    TRACE("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n",
 +            device, src_data, src_data_size, load_info, pump, texture, hresult);
 +
 +    if (!src_data || !src_data_size || !texture)
@@ -391,5 +391,5 @@ index 8addf4f84d3..f47b8583c6c 100644
  
  HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture,
 -- 
-2.30.2
+2.34.1
 

patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch

@@ -1,4 +1,4 @@
-From b094a7cf3f804ea40e5bd05ad738c48b5464e0bb Mon Sep 17 00:00:00 2001
+From ec5d4d8435795cb193909159ed2e692d330f2f1a 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,23 +9,23 @@ 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 22be2612eeb..f3f31eb3671 100644
+index abb440ffbe6..d200e891c8e 100644
 --- a/dlls/dbghelp/Makefile.in
 +++ b/dlls/dbghelp/Makefile.in
 @@ -2,7 +2,7 @@ MODULE    = dbghelp.dll
  IMPORTLIB = dbghelp
  IMPORTS   = $(ZLIB_PE_LIBS)
  EXTRAINCL = $(ZLIB_PE_CFLAGS)
--EXTRADEFS = -D_IMAGEHLP_SOURCE_
-+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
+-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_
++EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
  DELAYIMPORTS = version
  
  C_SRCS = \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index 553b212c526..3584a27953e 100644
+index def8b444e4e..7e664f8074a 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
-@@ -1451,6 +1451,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
+@@ -1445,6 +1445,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
          load_elf.elf_info    = elf_info;
  
          ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
@@ -34,5 +34,5 @@ index 553b212c526..3584a27953e 100644
      }
  
 -- 
-2.33.0
+2.34.1
 

patches/dwrite-FontFallback/0004-dwrite-Use-font-fallback-when-mapping-characters.patch

@@ -1,4 +1,4 @@
-From 0c01c25728780e3419f37ef612b14cc7e29f65f5 Mon Sep 17 00:00:00 2001
+From 8c7187f5501fff70df81612dfbdd084e67605189 Mon Sep 17 00:00:00 2001
 From: Lucian Poston <lucianposton@pm.me>
 Date: Mon, 21 May 2018 18:13:00 -0700
 Subject: [PATCH] dwrite: Use font fallback when mapping characters
@@ -11,10 +11,10 @@ Signed-off-by: Lucian Poston <lucianposton@pm.me>
  3 files changed, 74 insertions(+), 63 deletions(-)
 
 diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
-index 7112ca71932..43f8c659bfd 100644
+index 13ccf8e4434..c535b0cf49d 100644
 --- a/dlls/dwrite/analyzer.c
 +++ b/dlls/dwrite/analyzer.c
-@@ -2088,6 +2088,7 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback,
+@@ -2094,6 +2094,7 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback,
          IDWriteFont **mapped_font)
  {
      const struct fallback_mapping *mapping;
@@ -22,7 +22,7 @@ index 7112ca71932..43f8c659bfd 100644
      HRESULT hr;
      UINT32 i;
  
-@@ -2099,9 +2100,15 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback,
+@@ -2105,9 +2106,15 @@ static HRESULT fallback_get_fallback_font(struct dwrite_fontfallback *fallback,
          return E_FAIL;
      }
  
@@ -39,7 +39,7 @@ index 7112ca71932..43f8c659bfd 100644
                  weight, style, stretch, mapped_font);
          if (hr == S_OK) {
              TRACE("Created fallback font using family %s.\n", debugstr_w(mapping->families[i]));
-@@ -2158,32 +2165,66 @@ static HRESULT WINAPI fontfallback_MapCharacters(IDWriteFontFallback1 *iface, ID
+@@ -2164,32 +2171,66 @@ static HRESULT WINAPI fontfallback_MapCharacters(IDWriteFontFallback1 *iface, ID
  
      if (basefamily && *basefamily) {
          hr = create_matching_font(basecollection, basefamily, weight, style, stretch, ret_font);
@@ -124,10 +124,10 @@ index 7112ca71932..43f8c659bfd 100644
      free(buff);
      return hr;
 diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
-index f28c71082c0..9a884824b76 100644
+index d4aa49c6a6c..cda50c20777 100644
 --- a/dlls/dwrite/layout.c
 +++ b/dlls/dwrite/layout.c
-@@ -964,6 +964,12 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout)
+@@ -725,6 +725,12 @@ static HRESULT layout_resolve_fonts(struct dwrite_textlayout *layout)
                  goto fatal;
              }
  
@@ -141,10 +141,10 @@ index f28c71082c0..9a884824b76 100644
              IDWriteFont_Release(font);
              if (FAILED(hr)) {
 diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c
-index a1bff0d26d6..929d6ec1cc2 100644
+index 096fc554253..b622aeb4239 100644
 --- a/dlls/dwrite/tests/layout.c
 +++ b/dlls/dwrite/tests/layout.c
-@@ -3368,35 +3368,23 @@ todo_wine
+@@ -3368,35 +3368,23 @@ static void test_GetMetrics(void)
  
      count = 0;
      hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count);
@@ -189,7 +189,7 @@ index a1bff0d26d6..929d6ec1cc2 100644
      ok(mappedlength == 1, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
+-    todo_wine
      ok(font != NULL, "got %p\n", font);
  if (font) {
      IDWriteFont_Release(font);
@@ -202,7 +202,7 @@ index a1bff0d26d6..929d6ec1cc2 100644
      ok(mappedlength == 3, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
+-    todo_wine
      ok(font != NULL, "got %p\n", font);
 -if (font) {
 -    IDWriteFont_Release(font);
@@ -222,7 +222,7 @@ index a1bff0d26d6..929d6ec1cc2 100644
      ok(mappedlength == 1, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
+-    todo_wine
      ok(font != NULL, "got %p\n", font);
 -if (font) {
      IDWriteFont_Release(font);
@@ -239,7 +239,7 @@ index a1bff0d26d6..929d6ec1cc2 100644
      ok(mappedlength == 1, "got %u\n", mappedlength);
 -}
      ok(scale == 1.0f, "got %f\n", scale);
--todo_wine
+-    todo_wine
      ok(font != NULL, "got %p\n", font);
 -if (font) {
      IDWriteFont_Release(font);
@@ -304,5 +304,5 @@ index a1bff0d26d6..929d6ec1cc2 100644
      IDWriteTextLayout_Release(layout);
  
 -- 
-2.33.0
+2.34.1
 

patches/eventfd_synchronization/0013-server-Create-eventfd-file-descriptors-for-process-o.patch

@@ -1,4 +1,4 @@
-From 24fa0367db3de31fdc2da7bd61c27699c091cdaa Mon Sep 17 00:00:00 2001
+From 3e714e2eb10fe17f12b747731c0ce7e18fd4b7a0 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 15:11:12 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for process objects.
@@ -49,7 +49,7 @@ index 7ca4ca89394..6a0a367124d 100644
  void esync_init(void);
 +int esync_create_fd( int initval, int flags );
 diff --git a/server/process.c b/server/process.c
-index ca9844c5c90..eca2f8f4bca 100644
+index da972a41955..91b26d00ec0 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -63,6 +63,7 @@
@@ -86,7 +86,7 @@ index ca9844c5c90..eca2f8f4bca 100644
      list_init( &process->thread_list );
      list_init( &process->locks );
 @@ -741,6 +744,9 @@ struct process *create_process( int fd, struct process *parent, unsigned int fla
-     if (!token_assign_label( process->token, security_high_label_sid ))
+     if (!token_assign_label( process->token, &high_label_sid ))
          goto error;
  
 +    if (do_esync())

patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch

@@ -1,4 +1,4 @@
-From 1dc7cd6e5621505199c8ff8ad8f4e67845c478e3 Mon Sep 17 00:00:00 2001
+From ba211cf9d8ca7a462c24a62334813c68d41b3fc0 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 30 Aug 2021 15:16:06 +1000
 Subject: [PATCH] ntoskrnl.exe: Add FltBuildDefaultSecurityDescriptor test
@@ -10,10 +10,10 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  2 files changed, 66 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in
-index ab1db85adbb..9c89e44e70a 100644
+index 052a8618a81..9028a392002 100644
 --- a/dlls/ntoskrnl.exe/tests/Makefile.in
 +++ b/dlls/ntoskrnl.exe/tests/Makefile.in
-@@ -1,7 +1,7 @@
+@@ -2,7 +2,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES
  TESTDLL   = ntoskrnl.exe
  IMPORTS   = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid
  
@@ -23,7 +23,7 @@ index ab1db85adbb..9c89e44e70a 100644
  driver2_IMPORTS = winecrt0 ntoskrnl hal
  driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native
 diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
-index deccc04bc2b..90f5b0ec965 100644
+index dabb3b73f15..187f00c8bcb 100644
 --- a/dlls/ntoskrnl.exe/tests/driver.c
 +++ b/dlls/ntoskrnl.exe/tests/driver.c
 @@ -32,6 +32,7 @@
@@ -113,5 +113,5 @@ index deccc04bc2b..90f5b0ec965 100644
      IoMarkIrpPending(irp);
      IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp);
 -- 
-2.33.0
+2.34.1
 

patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch

@@ -1,4 +1,4 @@
-From eee60c1777c710cfcb4283922990a306361548ba Mon Sep 17 00:00:00 2001
+From 088f9f0bf9b30749221e28d51d88d910ed458d9c 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.
@@ -18,10 +18,11 @@ FIXME: Needs splitting.
  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 f4b1d4b915f..79121e16c94 100644
 --- a/dlls/inseng/Makefile.in
 +++ b/dlls/inseng/Makefile.in
-@@ -1,8 +1,11 @@
+@@ -1,9 +1,12 @@
+ EXTRADEFS = -DWINE_NO_LONG_TYPES
  MODULE    = inseng.dll
 -IMPORTS   = uuid ole32 advapi32
 +IMPORTS   = uuid ole32 advapi32 urlmon shlwapi
@@ -3862,5 +3863,5 @@ index 8a3f4c4d270..82927418a99 100644
 +cpp_quote("HRESULT WINAPI GetICifFileFromFile(ICifFile **, const char *);")
 +cpp_quote("HRESULT WINAPI GetICifRWFileFromFile(ICifRWFile **, const char *);")
 -- 
-2.33.0
+2.34.1
 

patches/mmsystem.dll16-MIDIHDR_Refcount/0002-mmsystem.dll16-Translate-MidiIn-messages.patch

@@ -1,19 +1,19 @@
-From e741e408304cd80852ec392fe491f1cde403e283 Mon Sep 17 00:00:00 2001
+From dbe39014190d350ed1379569edce909fa29d69d9 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 26 Feb 2016 04:04:12 +0100
-Subject: mmsystem.dll16: Translate MidiIn messages.
+Subject: [PATCH] mmsystem.dll16: Translate MidiIn messages.
 
 ---
- dlls/mmsystem.dll16/message16.c | 128 +++++++++++++++++++++++++++++++++++++++-
+ dlls/mmsystem.dll16/message16.c | 128 +++++++++++++++++++++++++++++++-
  1 file changed, 126 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c
-index 26e47b2..05a1995 100644
+index c6a10f57188..08dbce26d88 100644
 --- a/dlls/mmsystem.dll16/message16.c
 +++ b/dlls/mmsystem.dll16/message16.c
 @@ -95,7 +95,78 @@ static  void	                MMSYSTDRV_Mixer_MapCB(DWORD uMsg, DWORD_PTR* dwUser
   */
- static  MMSYSTEM_MapType	MMSYSTDRV_MidiIn_Map16To32W  (UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2)
+ static  MMSYSTEM_MapType	MMSYSTDRV_MidiIn_Map16To32W  (DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2)
  {
 -    return MMSYSTEM_MAP_MSGERROR;
 +    MMSYSTEM_MapType ret = MMSYSTEM_MAP_MSGERROR;
@@ -91,9 +91,9 @@ index 26e47b2..05a1995 100644
  }
  
  /**************************************************************************
-@@ -103,7 +174,60 @@ static  MMSYSTEM_MapType	MMSYSTDRV_MidiIn_Map16To32W  (UINT wMsg, DWORD_PTR* lpP
+@@ -103,7 +174,60 @@ static  MMSYSTEM_MapType	MMSYSTDRV_MidiIn_Map16To32W  (DWORD wMsg, DWORD_PTR* lp
   */
- static  MMSYSTEM_MapType	MMSYSTDRV_MidiIn_UnMap16To32W(UINT wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret)
+ static  MMSYSTEM_MapType	MMSYSTDRV_MidiIn_UnMap16To32W(DWORD wMsg, DWORD_PTR* lpParam1, DWORD_PTR* lpParam2, MMRESULT fn_ret)
  {
 -    return MMSYSTEM_MAP_MSGERROR;
 +    MMSYSTEM_MapType    ret = MMSYSTEM_MAP_MSGERROR;
@@ -154,5 +154,5 @@ index 26e47b2..05a1995 100644
  
  /**************************************************************************
 -- 
-2.7.1
+2.34.1
 

patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch

@@ -1,4 +1,4 @@
-From f1500a8dcd6e90680d69fb04ff4f01c1ea4f9fae Mon Sep 17 00:00:00 2001
+From c1208e9a19cb0d0752c8d76d6a17f8b848ff0728 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Tue, 8 Sep 2020 18:43:52 +0200
 Subject: [PATCH] msxml3: Implement FreeThreadedXMLHTTP60.
@@ -15,10 +15,11 @@ Update from Gijs Vermeulen <gijsvrm@gmail.com>
  7 files changed, 905 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
-index 2bf789732da..e2d737599b1 100644
+index 7e3eccc0139..b14723d60fd 100644
 --- a/dlls/msxml3/Makefile.in
 +++ b/dlls/msxml3/Makefile.in
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
+ EXTRADEFS = -DWINE_NO_LONG_TYPES
  MODULE    = msxml3.dll
 -IMPORTS   = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
 +IMPORTS   = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 rtworkq
@@ -577,10 +578,10 @@ index 934d580064f..65232bbc8af 100644
  }
 +
 diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
-index 07ed09fb480..6b45cc63a9e 100644
+index 8003c1a9650..59b8c29845d 100644
 --- a/dlls/msxml3/msxml_private.h
 +++ b/dlls/msxml3/msxml_private.h
-@@ -365,6 +365,7 @@ extern HRESULT XMLDocument_create(void**) DECLSPEC_HIDDEN;
+@@ -367,6 +367,7 @@ extern HRESULT XMLDocument_create(void**) DECLSPEC_HIDDEN;
  extern HRESULT SAXXMLReader_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN;
  extern HRESULT SAXAttributes_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN;
  extern HRESULT XMLHTTPRequest_create(void **) DECLSPEC_HIDDEN;
@@ -1065,5 +1066,5 @@ index 333d4f3d3c7..1b4f0452c5f 100644
  /*
   * Note that because of a #define in msxml2.h, we end up initializing
 -- 
-2.33.0
+2.34.1
 

patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-virtual-memory-allocation-order.patch

@@ -1,4 +1,4 @@
-From e127c088e6f4cfae3066b31adcd73c4eee9008ed Mon Sep 17 00:00:00 2001
+From 0cb1d81c14522afe45b1bb5a8194efd2470efe27 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Mon, 25 Nov 2019 12:19:20 +0300
 Subject: [PATCH] ntdll: Force virtual memory allocation order.
@@ -12,14 +12,14 @@ are from higher memory than they expect.
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48175
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46568
 ---
- dlls/ntdll/unix/virtual.c | 421 ++++++++++++++++++--------------------
- 1 file changed, 204 insertions(+), 217 deletions(-)
+ dlls/ntdll/unix/virtual.c | 417 ++++++++++++++++++--------------------
+ 1 file changed, 202 insertions(+), 215 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 606e136dfaa..4899fc7b443 100644
+index 7654055f59b..e971e0523ba 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1217,44 +1217,6 @@ static struct file_view *find_view_range( const void *addr, size_t size )
+@@ -1202,44 +1202,6 @@ static struct file_view *find_view_range( const void *addr, size_t size )
  }
  
  
@@ -64,7 +64,7 @@ index 606e136dfaa..4899fc7b443 100644
  /***********************************************************************
   *           try_map_free_area
   *
-@@ -1287,110 +1249,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1272,110 +1234,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
      return NULL;
  }
  
@@ -94,7 +94,7 @@ index 606e136dfaa..4899fc7b443 100644
 -            start = ROUND_ADDR( (char *)view->base - size, granularity_mask );
 -            /* stop if remaining space is not large enough */
 -            if (!start || start >= end || start < base) return NULL;
--            first = wine_rb_prev( first );
+-            first = rb_prev( first );
 -        }
 -    }
 -    else
@@ -110,7 +110,7 @@ index 606e136dfaa..4899fc7b443 100644
 -            start = ROUND_ADDR( (char *)view->base + view->size + granularity_mask, granularity_mask );
 -            /* stop if remaining space is not large enough */
 -            if (!start || start >= end || (char *)end - (char *)start < size) return NULL;
--            first = wine_rb_next( first );
+-            first = rb_next( first );
 -        }
 -    }
 -
@@ -175,7 +175,7 @@ index 606e136dfaa..4899fc7b443 100644
  /***********************************************************************
   *           add_reserved_area
   *
-@@ -1548,8 +1406,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
+@@ -1533,8 +1391,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
  {
      if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size );
      set_page_vprot( view->base, view->size, 0 );
@@ -185,7 +185,7 @@ index 606e136dfaa..4899fc7b443 100644
      wine_rb_remove( &views_tree, &view->entry );
      *(struct file_view **)view = next_free_view;
      next_free_view = view;
-@@ -1597,8 +1454,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
+@@ -1582,8 +1439,7 @@ static NTSTATUS create_view( struct file_view **view_ret, void *base, size_t siz
      set_page_vprot( base, size, vprot );
  
      wine_rb_put( &views_tree, view->base, &view->entry );
@@ -195,7 +195,7 @@ index 606e136dfaa..4899fc7b443 100644
  
      *view_ret = view;
  
-@@ -1812,51 +1668,218 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
+@@ -1797,51 +1653,218 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
  
  struct alloc_area
  {
@@ -219,15 +219,15 @@ index 606e136dfaa..4899fc7b443 100644
  {
 -    struct alloc_area *alloc = arg;
 -    void *end = (char *)start + size;
+-
+-    if (start < address_space_start) start = address_space_start;
+-    if (is_beyond_limit( start, size, alloc->limit )) end = alloc->limit;
+-    if (start >= end) return 0;
 +    char *intersect_start, *intersect_end;
 +    char *end = (char *)start + size;
 +    struct alloc_area *area = arg;
 +    char *alloc_start;
  
--    if (start < address_space_start) start = address_space_start;
--    if (is_beyond_limit( start, size, alloc->limit )) end = alloc->limit;
--    if (start >= end) return 0;
--
 -    /* make sure we don't touch the preloader reserved range */
 -    if (preload_reserve_end >= start)
 +    if (area->top_down)
@@ -250,23 +250,19 @@ index 606e136dfaa..4899fc7b443 100644
          {
 -            if (preload_reserve_start <= start) return 0;  /* no space in that area */
 -            if (preload_reserve_start < end) end = preload_reserve_start;
--        }
--        else if (preload_reserve_start <= start) start = preload_reserve_end;
--        else
--        {
--            /* range is split in two by the preloader reservation, try first part */
--            if ((alloc->result = find_reserved_free_area( start, preload_reserve_start, alloc->size,
--                                                          alloc->top_down )))
 +            alloc_start = ROUND_ADDR( (char *)area->map_area_end - size, granularity_mask );
 +            if ((area->result = try_map_free_area( intersect_end, alloc_start + size, area->step,
 +                    alloc_start, area->size, area->unix_prot )))
-                 return 1;
--            /* then fall through to try second part */
--            start = preload_reserve_end;
++                return 1;
          }
+-        else if (preload_reserve_start <= start) start = preload_reserve_end;
+-        else
 +
 +        if (intersect_end - intersect_start >= area->size)
-+        {
+         {
+-            /* range is split in two by the preloader reservation, try first part */
+-            if ((alloc->result = find_reserved_free_area( start, preload_reserve_start, alloc->size,
+-                                                          alloc->top_down )))
 +            alloc_start = ROUND_ADDR( intersect_end - area->size, granularity_mask );
 +            if ((area->result = anon_mmap_fixed( alloc_start, area->size,
 +                    area->unix_prot, 0 )) != alloc_start)
@@ -298,8 +294,10 @@ index 606e136dfaa..4899fc7b443 100644
 +        {
 +            if ((area->result = try_map_free_area( area->map_area_start, intersect_start, area->step,
 +                    area->map_area_start, area->size, area->unix_prot )))
-+                return 1;
-+        }
+                 return 1;
+-            /* then fall through to try second part */
+-            start = preload_reserve_end;
+         }
 +
 +        if (intersect_end - intersect_start >= area->size)
 +        {
@@ -445,7 +443,7 @@ index 606e136dfaa..4899fc7b443 100644
  /***********************************************************************
   *           map_fixed_area
   *
-@@ -1928,48 +1951,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -1913,48 +1936,11 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
          if (status != STATUS_SUCCESS) return status;
          ptr = base;
      }
@@ -497,7 +495,7 @@ index 606e136dfaa..4899fc7b443 100644
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
      return status;
-@@ -2695,6 +2681,7 @@ void virtual_init(void)
+@@ -2680,6 +2666,7 @@ void virtual_init(void)
              if (preload_reserve_start)
                  address_space_start = min( address_space_start, preload_reserve_start );
          }
@@ -506,5 +504,5 @@ index 606e136dfaa..4899fc7b443 100644
  
      /* try to find space in a reserved area for the views and pages protection table */
 -- 
-2.30.2
+2.34.1
 

patches/ntdll-ForceBottomUpAlloc/0004-ntdll-Exclude-natively-mapped-areas-from-free-areas-.patch

@@ -184,11 +184,11 @@ index 4899fc7b443..cee739bd942 100644
 +            if (prev && (char *)prev->base >= native_mapped_end)
 +            {
 +                next = prev;
-+                prev = WINE_RB_ENTRY_VALUE( wine_rb_prev( &next->entry ), struct file_view, entry );
++                prev = WINE_RB_ENTRY_VALUE( rb_prev( &next->entry ), struct file_view, entry );
 +            }
 +            else if (prev)
 +            {
-+                next = WINE_RB_ENTRY_VALUE( wine_rb_next( &prev->entry ), struct file_view, entry );
++                next = WINE_RB_ENTRY_VALUE( rb_next( &prev->entry ), struct file_view, entry );
 +            }
 +            else
 +            {

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

@@ -1,4 +1,4 @@
-From 8250683de1ca5e4c1c975e6365f7a817b33461b4 Mon Sep 17 00:00:00 2001
+From 62e3109b6bd1b3324827063531ae0826571c751b 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,10 +9,11 @@ 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 ed15c51339f..e4ae568532e 100644
+index 7e0272498fa..a2c716d11d4 100644
 --- a/dlls/ntdll/tests/Makefile.in
 +++ b/dlls/ntdll/tests/Makefile.in
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
+ EXTRADEFS = -DWINE_NO_LONG_TYPES
  TESTDLL   = ntdll.dll
 -IMPORTS   = user32 advapi32
 +IMPORTS   = user32 ole32 advapi32
@@ -20,7 +21,7 @@ index ed15c51339f..e4ae568532e 100644
  C_SRCS = \
  	atom.c \
 diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
-index 897be4fcd12..e7fef1a79ad 100644
+index c0168884a0a..c25a9185fad 100644
 --- a/dlls/ntdll/tests/rtl.c
 +++ b/dlls/ntdll/tests/rtl.c
 @@ -27,6 +27,9 @@
@@ -53,7 +54,7 @@ index 897be4fcd12..e7fef1a79ad 100644
          pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
          pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
      }
-@@ -3664,6 +3673,76 @@ static void test_RtlDestroyHeap(void)
+@@ -3682,6 +3691,76 @@ static void test_RtlDestroyHeap(void)
      RtlRemoveVectoredExceptionHandler( handler );
  }
  
@@ -130,7 +131,7 @@ index 897be4fcd12..e7fef1a79ad 100644
  START_TEST(rtl)
  {
      InitFunctionPtrs();
-@@ -3702,6 +3781,7 @@ START_TEST(rtl)
+@@ -3721,6 +3800,7 @@ START_TEST(rtl)
      test_RtlInitializeCriticalSectionEx();
      test_RtlLeaveCriticalSection();
      test_LdrEnumerateLoadedModules();
@@ -139,5 +140,5 @@ index 897be4fcd12..e7fef1a79ad 100644
      test_LdrRegisterDllNotification();
      test_DbgPrint();
 -- 
-2.29.2
+2.34.1
 

patches/nvapi-Stub_DLL/0020-d3d11-Introduce-a-COM-interface-to-retrieve-the-wine.patch

@@ -1,4 +1,4 @@
-From 2a1f587297f97e8c8f3d1327f2dfd3f5f1fd2300 Mon Sep 17 00:00:00 2001
+From 0b292f9ebd14638de48420184e065ce7ec9c4126 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Sat, 22 May 2021 18:05:40 -0500
 Subject: [PATCH] d3d11: Introduce a COM interface to retrieve the
@@ -11,18 +11,18 @@ Subject: [PATCH] d3d11: Introduce a COM interface to retrieve the
  3 files changed, 112 insertions(+)
 
 diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
-index f4c66ca4ce9..8dc8ecc88db 100644
+index efe26551258..6079a8ad2db 100644
 --- a/dlls/d3d11/d3d11_private.h
 +++ b/dlls/d3d11/d3d11_private.h
-@@ -545,6 +545,7 @@ struct d3d11_device_context
- {
+@@ -546,6 +546,7 @@ struct d3d11_device_context
      ID3D11DeviceContext1 ID3D11DeviceContext1_iface;
      ID3D11Multithread ID3D11Multithread_iface;
+     ID3DUserDefinedAnnotation ID3DUserDefinedAnnotation_iface;
 +    IWineD3DDeviceContext IWineD3DDeviceContext_iface;
      LONG refcount;
  
      D3D11_DEVICE_CONTEXT_TYPE type;
-@@ -561,6 +562,7 @@ struct d3d_device
+@@ -562,6 +563,7 @@ struct d3d_device
      ID3D11Device2 ID3D11Device2_iface;
      ID3D10Device1 ID3D10Device1_iface;
      ID3D10Multithread ID3D10Multithread_iface;
@@ -31,10 +31,10 @@ index f4c66ca4ce9..8dc8ecc88db 100644
      IUnknown *outer_unk;
      LONG refcount;
 diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
-index b5b97c83aba..626e9d47e81 100644
+index f0cbb1741ab..82419b2a5bc 100644
 --- a/dlls/d3d11/device.c
 +++ b/dlls/d3d11/device.c
-@@ -3223,11 +3223,67 @@ static const struct ID3D11MultithreadVtbl d3d11_multithread_vtbl =
+@@ -3191,6 +3191,61 @@ static const struct ID3D11MultithreadVtbl d3d11_multithread_vtbl =
      d3d11_multithread_GetMultithreadProtected,
  };
  
@@ -93,16 +93,18 @@ index b5b97c83aba..626e9d47e81 100644
 +    context_d3d_device_context_get_wined3d_device_context,
 +};
 +
- static void d3d11_device_context_init(struct d3d11_device_context *context, struct d3d_device *device,
-         D3D11_DEVICE_CONTEXT_TYPE type)
- {
+ /* ID3DUserDefinedAnnotation methods */
+ 
+ static inline struct d3d11_device_context *impl_from_ID3DUserDefinedAnnotation(ID3DUserDefinedAnnotation *iface)
+@@ -3271,6 +3326,7 @@ static void d3d11_device_context_init(struct d3d11_device_context *context, stru
      context->ID3D11DeviceContext1_iface.lpVtbl = &d3d11_device_context_vtbl;
      context->ID3D11Multithread_iface.lpVtbl = &d3d11_multithread_vtbl;
+     context->ID3DUserDefinedAnnotation_iface.lpVtbl = &d3d11_user_defined_annotation_vtbl;
 +    context->IWineD3DDeviceContext_iface.lpVtbl = &context_d3d_device_context_vtbl;
      context->refcount = 1;
      context->type = type;
  
-@@ -6631,6 +6687,49 @@ static const struct ID3D10MultithreadVtbl d3d10_multithread_vtbl =
+@@ -6695,6 +6751,49 @@ static const struct ID3D10MultithreadVtbl d3d10_multithread_vtbl =
      d3d10_multithread_GetMultithreadProtected,
  };
  
@@ -152,7 +154,7 @@ index b5b97c83aba..626e9d47e81 100644
  /* IWineDXGIDeviceParent IUnknown methods */
  
  static inline struct d3d_device *device_from_dxgi_device_parent(IWineDXGIDeviceParent *iface)
-@@ -6834,6 +6933,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown)
+@@ -6898,6 +6997,7 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown)
      device->ID3D11Device2_iface.lpVtbl = &d3d11_device_vtbl;
      device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl;
      device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl;
@@ -179,5 +181,5 @@ index 83012047ea7..3c910376cc7 100644
 +    struct wined3d_device_context *get_wined3d_device_context();
 +}
 -- 
-2.30.2
+2.34.1
 

patches/nvcuda-CUDA_Support/0016-nvcuda-Make-nvcuda-attempt-to-load-libcuda.so.1.patch

@@ -0,0 +1,29 @@
+From c70b2b402ac1ca3a923822ddd2128a09ce5de81a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sveinar=20S=C3=B8pler?= <cybermax@dexter.no>
+Date: Mon, 24 Jan 2022 16:02:35 +0100
+Subject: [PATCH] nvcuda: Make nvcuda attempt to load libcuda.so.1
+
+libcuda.so is not available when running under steam runtime
+container. Adding this will make nvcuda attempt to load
+libcuda.so.1 which will be available inside the steam runtime.
+---
+ dlls/nvcuda/nvcuda.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
+index 2cb3a0e2ecf..84da77941c6 100644
+--- a/dlls/nvcuda/nvcuda.c
++++ b/dlls/nvcuda/nvcuda.c
+@@ -424,7 +424,8 @@ static BOOL load_functions(void)
+         "/usr/local/cuda/lib/libcuda.dylib",
+         "/usr/local/cuda/lib/libcuda.6.0.dylib",
+     #else
+-        "libcuda.so"
++        "libcuda.so",
++        "libcuda.so.1"
+     #endif
+     };
+     int i;
+-- 
+2.34.1
+

patches/oleaut32-OLEPictureImpl_SaveAsFile/0002-oleaut32-Implement-a-better-stub-for-IPicture-SaveAs.patch

@@ -1,24 +1,25 @@
-From bbb052887041a94a770154f5b9e266b17876fe9a Mon Sep 17 00:00:00 2001
+From 209317c803637eda7411ec3094dfb3cfa3ada93a Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 24 Nov 2015 17:22:02 +0800
-Subject: oleaut32: Implement a better stub for IPicture::SaveAsFile.
+Subject: [PATCH] oleaut32: Implement a better stub for IPicture::SaveAsFile.
 
 Based on OLEPictureImpl_Save implementation.
 
 For bug 8532.
 ---
- dlls/oleaut32/olepicture.c       | 92 ++++++++++++++++++++++++++++++++++------
+ dlls/oleaut32/olepicture.c       | 92 +++++++++++++++++++++++++++-----
  dlls/oleaut32/tests/olepicture.c |  9 ----
  2 files changed, 79 insertions(+), 22 deletions(-)
 
 diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
-index 44157de..c57b878 100644
+index a3bbdc52a0f..ad4aff2aecc 100644
 --- a/dlls/oleaut32/olepicture.c
 +++ b/dlls/oleaut32/olepicture.c
-@@ -834,19 +834,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface)
+@@ -859,19 +859,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface)
+   return S_OK;
  }
  
- /************************************************************************
+-/************************************************************************
 - * OLEPictureImpl_SaveAsFile
 - */
 -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface,
@@ -31,11 +32,10 @@ index 44157de..c57b878 100644
 -  return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize);
 -}
 -
--/************************************************************************
+ /************************************************************************
   * OLEPictureImpl_get_Attributes
   */
- static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface,
-@@ -1859,6 +1846,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax(
+@@ -1915,6 +1902,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax(
    return E_NOTIMPL;
  }
  
@@ -122,58 +122,58 @@ index 44157de..c57b878 100644
  /************************************************************************
   *    IDispatch
 diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
-index 0903298..0c69cbd 100644
+index 0582bd2266e..ce87dd3d4d4 100644
 --- a/dlls/oleaut32/tests/olepicture.c
 +++ b/dlls/oleaut32/tests/olepicture.c
-@@ -1079,18 +1079,14 @@ static void test_load_save_bmp(void)
+@@ -1178,18 +1178,14 @@ static void test_load_save_bmp(void)
      size = -1;
      hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size);
      ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr);
--todo_wine
+-    todo_wine
      ok(size == 66, "expected 66, got %d\n", size);
      mem = GlobalLock(hmem);
--todo_wine
+-    todo_wine
      ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]);
      GlobalUnlock(hmem);
  
      size = -1;
      hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size);
--todo_wine
+-    todo_wine
      ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr);
--todo_wine
+-    todo_wine
      ok(size == -1, "expected -1, got %d\n", size);
  
      offset.QuadPart = 0;
-@@ -1157,15 +1153,12 @@ static void test_load_save_icon(void)
- todo_wine
+@@ -1256,15 +1252,12 @@ static void test_load_save_icon(void)
+     todo_wine
      ok(size == 766, "expected 766, got %d\n", size);
      mem = GlobalLock(hmem);
--todo_wine
+-    todo_wine
      ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]);
      GlobalUnlock(hmem);
  
      size = -1;
      hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size);
--todo_wine
+-    todo_wine
      ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr);
--todo_wine
+-    todo_wine
      ok(size == -1, "expected -1, got %d\n", size);
  
      offset.QuadPart = 0;
-@@ -1231,13 +1224,11 @@ static void test_load_save_empty_picture(void)
+@@ -1330,13 +1323,11 @@ static void test_load_save_empty_picture(void)
      size = -1;
      hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size);
      ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr);
--todo_wine
+-    todo_wine
      ok(size == -1, "expected -1, got %d\n", size);
  
      size = -1;
      hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size);
      ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr);
--todo_wine
+-    todo_wine
      ok(size == -1, "expected -1, got %d\n", size);
  
      hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);
 -- 
-2.7.1
+2.34.1
 

patches/packager-DllMain/0001-packager-Prefer-native-version.patch

@@ -1,4 +1,4 @@
-From b8164026e54c8bb9e9401d4952ebe07d3811bc45 Mon Sep 17 00:00:00 2001
+From cea29373b287ae84e28adca9834ffdbb97844ffe 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.
@@ -8,10 +8,10 @@ Subject: [PATCH] packager: Prefer native version.
  1 file changed, 2 insertions(+)
 
 diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in
-index a2b2daa0cea..55482167bc1 100644
+index f539cb6f095..faef8deb263 100644
 --- a/dlls/packager/Makefile.in
 +++ b/dlls/packager/Makefile.in
-@@ -1,6 +1,8 @@
+@@ -2,6 +2,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES
  MODULE = packager.dll
  IMPORTS = uuid shell32 shlwapi user32
  
@@ -21,5 +21,5 @@ index a2b2daa0cea..55482167bc1 100644
  	packager_main.c
  
 -- 
-2.33.0
+2.34.1
 

patches/patchinstall.sh

@@ -51,13 +51,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "b2f75a026f14805888a4b91d8a2e2c60a35fc1b7"
+	echo "594e431e36d65e470bcbe930eb3d0f2bbca17736"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 7.0-rc6"
+	echo "Wine Staging 7.1"
 	echo "Copyright (C) 2014-2019 the Wine Staging project authors."
 	echo "Copyright (C) 2018-2020 Alistair Leslie-Hughes"
 	echo ""
@@ -237,6 +237,7 @@ patch_enable_all ()
 	enable_wined3d_SWVP_shaders="$1"
 	enable_wined3d_Silence_FIXMEs="$1"
 	enable_wined3d_WINED3DFMT_B8G8R8X8_UNORM="$1"
+	enable_wined3d_bindless_texture="$1"
 	enable_wined3d_mesa_texture_download="$1"
 	enable_wined3d_unset_flip_gdi="$1"
 	enable_wined3d_wined3d_guess_gl_vendor="$1"
@@ -264,10 +265,12 @@ patch_enable_all ()
 	enable_winmm_mciSendCommandA="$1"
 	enable_wintab32_improvements="$1"
 	enable_wintrust_WTHelperGetProvCertFromChain="$1"
+	enable_ws2_32_SIO_IDEAL_SEND_BACKLOG_QUERY="$1"
 	enable_wscript_support_d_u_switches="$1"
 	enable_xactengine_initial="$1"
 	enable_xactengine3_7_Notification="$1"
 	enable_xactengine3_7_PrepareWave="$1"
+	enable_xactengine3_7_callbacks="$1"
 }
 
 # Enable or disable a specific patchset
@@ -739,6 +742,9 @@ patch_enable ()
 		wined3d-WINED3DFMT_B8G8R8X8_UNORM)
 			enable_wined3d_WINED3DFMT_B8G8R8X8_UNORM="$2"
 			;;
+		wined3d-bindless-texture)
+			enable_wined3d_bindless_texture="$2"
+			;;
 		wined3d-mesa_texture_download)
 			enable_wined3d_mesa_texture_download="$2"
 			;;
@@ -820,6 +826,9 @@ patch_enable ()
 		wintrust-WTHelperGetProvCertFromChain)
 			enable_wintrust_WTHelperGetProvCertFromChain="$2"
 			;;
+		ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY)
+			enable_ws2_32_SIO_IDEAL_SEND_BACKLOG_QUERY="$2"
+			;;
 		wscript-support-d-u-switches)
 			enable_wscript_support_d_u_switches="$2"
 			;;
@@ -832,6 +841,9 @@ patch_enable ()
 		xactengine3_7-PrepareWave)
 			enable_xactengine3_7_PrepareWave="$2"
 			;;
+		xactengine3_7-callbacks)
+			enable_xactengine3_7_callbacks="$2"
+			;;
 		*)
 			return 1
 			;;
@@ -1179,6 +1191,13 @@ patch_apply()
 }
 
 
+if test "$enable_xactengine3_7_callbacks" -eq 1; then
+	if test "$enable_xactengine3_7_Notification" -gt 1; then
+		abort "Patchset xactengine3_7-Notification disabled, but xactengine3_7-callbacks depends on that."
+	fi
+	enable_xactengine3_7_Notification=1
+fi
+
 if test "$enable_winex11_WM_WINDOWPOSCHANGING" -eq 1; then
 	if test "$enable_winex11__NET_ACTIVE_WINDOW" -gt 1; then
 		abort "Patchset winex11-_NET_ACTIVE_WINDOW disabled, but winex11-WM_WINDOWPOSCHANGING depends on that."
@@ -1370,8 +1389,8 @@ fi
 # | Modified files:
 # |   *	dlls/bcrypt/gnutls.c, dlls/d2d1/bitmap.c, dlls/d2d1/brush.c, dlls/d2d1/dc_render_target.c, dlls/d2d1/geometry.c,
 # | 	dlls/d2d1/hwnd_render_target.c, dlls/d2d1/state_block.c, dlls/d3d10/effect.c, dlls/d3d11/view.c, dlls/d3d8/texture.c,
-# | 	dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dwrite/font.c, dlls/dwrite/layout.c, dlls/dxgi/output.c,
-# | 	dlls/msctf/range.c, dlls/msxml3/schema.c, dlls/ntdll/unix/virtual.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c,
+# | 	dlls/d3d9/texture.c, dlls/ddraw/viewport.c, dlls/dwrite/font.c, dlls/dxgi/output.c, dlls/msctf/range.c,
+# | 	dlls/msxml3/schema.c, dlls/ntdll/unix/virtual.c, dlls/oleaut32/oleaut.c, dlls/rpcrt4/cstub.c,
 # | 	dlls/rpcrt4/ndr_marshall.c, dlls/rpcrt4/ndr_typelib.c, dlls/vbscript/vbdisp.c, dlls/wbemdisp/locator.c,
 # | 	dlls/windowscodecs/info.c, dlls/wsdapi/msgparams.c, include/wine/list.h, include/wine/rbtree.h, include/winnt.h
 # |
@@ -2593,6 +2612,7 @@ if test "$enable_nvcuda_CUDA_Support" -eq 1; then
 	patch_apply nvcuda-CUDA_Support/0013-nvcuda-Update-spec-file.patch
 	patch_apply nvcuda-CUDA_Support/0014-nvcuda-Implement-cuDeviceGetUuid-and-cuDeviceGetLuid.patch
 	patch_apply nvcuda-CUDA_Support/0015-nvcuda-Expand-the-Unknown1-table.patch
+	patch_apply nvcuda-CUDA_Support/0016-nvcuda-Make-nvcuda-attempt-to-load-libcuda.so.1.patch
 fi
 
 # Patchset nvapi-Stub_DLL
@@ -3622,6 +3642,19 @@ if test "$enable_wined3d_WINED3DFMT_B8G8R8X8_UNORM" -eq 1; then
 	patch_apply wined3d-WINED3DFMT_B8G8R8X8_UNORM/0001-wined3d-Implement-WINED3DFMT_B8G8R8X8_UNORM-to-WINED.patch
 fi
 
+# Patchset wined3d-bindless-texture
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#44514] - wined3d: Use bindless textures for GLSL shaders.
+# |
+# | Modified files:
+# |   *	dlls/wined3d/adapter_gl.c, dlls/wined3d/context_gl.c, dlls/wined3d/device.c, dlls/wined3d/glsl_shader.c,
+# | 	dlls/wined3d/texture.c, dlls/wined3d/view.c, dlls/wined3d/wined3d_gl.h, dlls/wined3d/wined3d_private.h
+# |
+if test "$enable_wined3d_bindless_texture" -eq 1; then
+	patch_apply wined3d-bindless-texture/0001-wined3d-Use-bindless-textures-for-GLSL-shaders.patch
+fi
+
 # Patchset wined3d-mesa_texture_download
 # |
 # | This patchset fixes the following Wine bugs:
@@ -3942,6 +3975,18 @@ if test "$enable_wintrust_WTHelperGetProvCertFromChain" -eq 1; then
 	patch_apply wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch
 fi
 
+# Patchset ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#49412] ws2_32: Support WSAIoctl SIO_IDEAL_SEND_BACKLOG_QUERY
+# |
+# | Modified files:
+# |   *	dlls/ntdll/unix/socket.c, dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c, include/wine/afd.h
+# |
+if test "$enable_ws2_32_SIO_IDEAL_SEND_BACKLOG_QUERY" -eq 1; then
+	patch_apply ws2_32-SIO_IDEAL_SEND_BACKLOG_QUERY/0001-ws2_32-Return-a-valid-value-for-WSAIoctl-SIO_IDEAL_S.patch
+fi
+
 # Patchset wscript-support-d-u-switches
 # |
 # | This patchset fixes the following Wine bugs:
@@ -3998,6 +4043,23 @@ if test "$enable_xactengine3_7_PrepareWave" -eq 1; then
 	patch_apply xactengine3_7-PrepareWave/0003-xactengine3_7-Implement-IXACT3Engine-PrepareInMemory.patch
 fi
 
+# Patchset xactengine3_7-callbacks
+# |
+# | This patchset has the following (direct or indirect) dependencies:
+# |   *	xactengine3_7-Notification
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#49678] - xactengine: Implement callback notifications.
+# |
+# | Modified files:
+# |   *	dlls/xactengine3_7/xact_dll.c, libs/faudio/include/FACT.h, libs/faudio/src/FACT.c, libs/faudio/src/FACT_internal.h
+# |
+if test "$enable_xactengine3_7_callbacks" -eq 1; then
+	patch_apply xactengine3_7-callbacks/0001-Add-support-for-private-contexts.patch
+	patch_apply xactengine3_7-callbacks/0002-xactengine3_7-notifications.patch
+	patch_apply xactengine3_7-callbacks/0003-Send-NOTIFY_CUESTOP-when-Stop-is-called.patch
+fi
+
 if test "$enable_autoconf" -eq 1; then
 	if ! update_configure; then
 		abort "'autoreconf -f' failed."

patches/secur32-InitializeSecurityContextW/0001-secur32-Input-Parameter-should-be-NULL-on-first-call.patch

@@ -1,4 +1,4 @@
-From 3b7ee6a45c7b33aeccc9ccf7460d1e4d69cc7023 Mon Sep 17 00:00:00 2001
+From 1f31bae540fcdd419eda6d012317f904860ec445 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Wed, 21 Apr 2021 21:06:55 +1000
 Subject: [PATCH] secur32: Input Parameter should be NULL on first call to
@@ -13,11 +13,11 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c
-index 32181b3b35f..bca15750bc9 100644
+index 141a191c7c6..443bf8f3d6c 100644
 --- a/dlls/secur32/schannel.c
 +++ b/dlls/secur32/schannel.c
-@@ -724,7 +724,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
-         ptsExpiry->HighPart = 0;
+@@ -734,7 +734,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW(
+             return SEC_E_INSUFFICIENT_MEMORY;
      }
  
 -    if (!phContext)
@@ -26,10 +26,10 @@ index 32181b3b35f..bca15750bc9 100644
          ULONG_PTR handle;
          struct create_session_params create_params;
 diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c
-index 7cb3871193c..27381d60b38 100644
+index 6c15addf2fc..47f7ca0ef3a 100644
 --- a/dlls/secur32/tests/schannel.c
 +++ b/dlls/secur32/tests/schannel.c
-@@ -1319,7 +1319,7 @@ todo_wine
+@@ -1397,7 +1397,7 @@ todo_wine
      status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost",
          ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM,
          0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL);
@@ -38,8 +38,8 @@ index 7cb3871193c..27381d60b38 100644
      if (status != SEC_I_CONTINUE_NEEDED)
      {
          skip("skipping remaining renegotiate test\n");
-@@ -1357,7 +1357,7 @@ todo_wine
-             ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL);
+@@ -1439,7 +1439,7 @@ todo_wine
+             ISC_REQ_USE_SUPPLIED_CREDS, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL);
          buffers[1].pBuffers[0].cbBuffer = buf_size;
      }
 -    ok (status == SEC_E_OK, "got %08x\n", status);
@@ -47,7 +47,7 @@ index 7cb3871193c..27381d60b38 100644
  
      buf = &buffers[0].pBuffers[0];
      buf->cbBuffer = buf_size;
-@@ -1367,7 +1367,7 @@ todo_wine
+@@ -1449,7 +1449,7 @@ todo_wine
      buffers[0].pBuffers[0].BufferType = SECBUFFER_DATA;
      buffers[0].pBuffers[1].BufferType = SECBUFFER_EMPTY;
      status = DecryptMessage(&context, &buffers[0], 0, NULL);
@@ -57,5 +57,5 @@ index 7cb3871193c..27381d60b38 100644
      {
          ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_STREAM_HEADER, "Expected first buffer to be SECBUFFER_STREAM_HEADER\n");
 -- 
-2.33.0
+2.34.1