Release v7.21

esync doesn't work when partially applied, but it should at least compile, and
function with WINEESYNC=0.

.github/workflows/macOS.yml

@@ -17,14 +17,11 @@ jobs:
           brew update
           brew install --cask xquartz
           brew install  bison \
-                        faudio \
                         gphoto2 \
                         gst-plugins-base \
-                        jxrlib \
-                        little-cms2 \
                         mingw-w64 \
                         molten-vk \
-                        mpg123
+                        sdl2
 
       - name: Add bison & krb5 to $PATH
         run: |
@@ -67,63 +64,3 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE/wine
           make -j$(sysctl -n hw.ncpu 2>/dev/null)
-
-  wine-devel:
-    runs-on:  macos-latest
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install dependencies
-        run: |
-          brew update
-          brew install --cask xquartz
-          brew install  bison \
-                        faudio \
-                        gphoto2 \
-                        gst-plugins-base \
-                        jxrlib \
-                        little-cms2 \
-                        mingw-w64 \
-                        molten-vk \
-                        mpg123
-
-      - name: Add bison & krb5 to $PATH
-        run: |
-          set -eu
-          echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
-
-      - name: Get upstream-commit
-        run: |
-          mkdir $GITHUB_WORKSPACE/wine
-          cd wine
-          git init
-          git fetch git://source.winehq.org/git/wine.git $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit) --depth=1
-          git checkout $($GITHUB_WORKSPACE/patches/patchinstall.sh --upstream-commit)
-
-      - name: Configure wine64
-        env:
-          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
-          # Avoid weird linker errors with Xcode 10 and later
-          MACOSX_DEPLOYMENT_TARGET: "10.14"
-        run: |
-          cd $GITHUB_WORKSPACE/wine
-
-          cd $GITHUB_WORKSPACE/wine
-          ./configure   --enable-win64 \
-                        --without-alsa \
-                        --without-capi \
-                        --without-dbus \
-                        --without-inotify \
-                        --without-oss \
-                        --without-pulse \
-                        --without-udev \
-                        --without-v4l2 \
-                        --x-include=/opt/X11/include \
-                        --x-lib=/opt/X11/lib
-
-      - name: Build wine64
-        run: |
-          cd $GITHUB_WORKSPACE/wine
-          make -j$(sysctl -n hw.ncpu 2>/dev/null)

README.md

@@ -94,17 +94,17 @@ proper implementation. In the event that this happens, we add the patches to
 wine-staging instead, and keep them updated and maintained as well as attempt to
 clean them up to be upstreamed. We also both write and verify patches which fix
 various bugs that may not have patches, and in turn allow them run better using
-WINE. This includes testing on various hardware, games, and applications.
+WINE. This includes testing on various hardware, games and applications.
 
 Any expenses for applications, games, or hardware which we do not own comes out
 of pocket. In order to alleviate these expenses, we are now accepting donations.
 This in turn allows us to continue to perform testing, provide fixes, and get
 them upstreamed, ultimately aiming to provide a better experience for all WINE
 users. All of our work is provided publicly for free and can be found at
-<https://github.com/wine-staging/wine-staging>. We do not expect to be paid for
+<https://gitlab.winehq.org/wine/wine-staging>. We do not expect to be paid for
 any of the work provided, nor will donators receive any special benefits or
 compensation.
 
 Donations are recieved through Patreon. Anyone interested may donate here:
 
-https://www.patreon.com/winestaging
+https://www.patreon.com/winestaging

patches/Compiler_Warnings/0021-d2d1-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,4 +1,4 @@
-From a0211ba2069af11a64588a49222dcdcce1d805be Mon Sep 17 00:00:00 2001
+From 92914d4648be5dd7ee62b35d3ca2fc7376d0dbd0 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Tue, 22 Mar 2016 21:54:26 +0100
 Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
@@ -13,10 +13,10 @@ Subject: [PATCH] d2d1: Avoid implicit cast of interface pointer.
  6 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c
-index bc958e50a1..76ecc7f02a 100644
+index 971e3c7ff6b..fcd96eb6374 100644
 --- a/dlls/d2d1/bitmap.c
 +++ b/dlls/d2d1/bitmap.c
-@@ -617,5 +617,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
+@@ -646,5 +646,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
      if (!iface)
          return NULL;
      assert(iface->lpVtbl == (ID2D1BitmapVtbl *)&d2d_bitmap_vtbl);
@@ -24,10 +24,10 @@ index bc958e50a1..76ecc7f02a 100644
 +    return CONTAINING_RECORD((ID2D1Bitmap1*)iface, struct d2d_bitmap, ID2D1Bitmap1_iface);
  }
 diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c
-index 80fc0f5331..a612e683b6 100644
+index b9a673fe54c..c5a52db6b01 100644
 --- a/dlls/d2d1/brush.c
 +++ b/dlls/d2d1/brush.c
-@@ -253,7 +253,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
+@@ -259,7 +259,7 @@ static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1SolidColorBrush(ID2D1SolidColorBrush *iface)
  {
@@ -36,7 +36,7 @@ index 80fc0f5331..a612e683b6 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_solid_color_brush_QueryInterface(ID2D1SolidColorBrush *iface,
-@@ -396,7 +396,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
+@@ -402,7 +402,7 @@ HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *
  
  static inline struct d2d_brush *impl_from_ID2D1LinearGradientBrush(ID2D1LinearGradientBrush *iface)
  {
@@ -45,7 +45,7 @@ index 80fc0f5331..a612e683b6 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_linear_gradient_brush_QueryInterface(ID2D1LinearGradientBrush *iface,
-@@ -583,7 +583,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
+@@ -589,7 +589,7 @@ HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1RadialGradientBrush(ID2D1RadialGradientBrush *iface)
  {
@@ -54,7 +54,7 @@ index 80fc0f5331..a612e683b6 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_radial_gradient_brush_QueryInterface(ID2D1RadialGradientBrush *iface,
-@@ -815,7 +815,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
+@@ -821,7 +821,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory,
  
  static inline struct d2d_brush *impl_from_ID2D1BitmapBrush1(ID2D1BitmapBrush1 *iface)
  {
@@ -64,7 +64,7 @@ index 80fc0f5331..a612e683b6 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_bitmap_brush_QueryInterface(ID2D1BitmapBrush1 *iface,
 diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c
-index 47aa99697d..0efa3ebeaf 100644
+index e7e0fa57ed7..1166ae204c2 100644
 --- a/dlls/d2d1/dc_render_target.c
 +++ b/dlls/d2d1/dc_render_target.c
 @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -77,19 +77,19 @@ index 47aa99697d..0efa3ebeaf 100644
  
  static HRESULT d2d_dc_render_target_present(IUnknown *outer_unknown)
 diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
-index 79850f1c20..b9b6a32f76 100644
+index e97bae0b54a..661387b570b 100644
 --- a/dlls/d2d1/geometry.c
 +++ b/dlls/d2d1/geometry.c
-@@ -2982,7 +2982,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
+@@ -3356,7 +3356,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
  
- static inline struct d2d_geometry *impl_from_ID2D1PathGeometry(ID2D1PathGeometry *iface)
+ static inline struct d2d_geometry *impl_from_ID2D1PathGeometry1(ID2D1PathGeometry1 *iface)
  {
 -    return CONTAINING_RECORD(iface, struct d2d_geometry, ID2D1Geometry_iface);
 +    return CONTAINING_RECORD((ID2D1Geometry *)iface, struct d2d_geometry, ID2D1Geometry_iface);
  }
  
- static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry *iface, REFIID iid, void **out)
-@@ -3502,7 +3502,7 @@ void d2d_path_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2 *factor
+ static HRESULT STDMETHODCALLTYPE d2d_path_geometry_QueryInterface(ID2D1PathGeometry1 *iface, REFIID iid, void **out)
+@@ -4229,7 +4229,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1RectangleGeometry(ID2D1RectangleGeometry *iface)
  {
@@ -98,7 +98,7 @@ index 79850f1c20..b9b6a32f76 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_rectangle_geometry_QueryInterface(ID2D1RectangleGeometry *iface,
-@@ -3841,7 +3841,7 @@ fail:
+@@ -4941,7 +4941,7 @@ fail:
  
  static inline struct d2d_geometry *impl_from_ID2D1TransformedGeometry(ID2D1TransformedGeometry *iface)
  {
@@ -107,7 +107,7 @@ index 79850f1c20..b9b6a32f76 100644
  }
  
  static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_QueryInterface(ID2D1TransformedGeometry *iface,
-@@ -4122,7 +4122,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory2
+@@ -5225,7 +5225,7 @@ void d2d_transformed_geometry_init(struct d2d_geometry *geometry, ID2D1Factory *
  
  static inline struct d2d_geometry *impl_from_ID2D1GeometryGroup(ID2D1GeometryGroup *iface)
  {
@@ -117,7 +117,7 @@ index 79850f1c20..b9b6a32f76 100644
  
  static HRESULT STDMETHODCALLTYPE d2d_geometry_group_QueryInterface(ID2D1GeometryGroup *iface,
 diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c
-index 625f101eaa..f3626c42ce 100644
+index 4ce220bf433..32eeaf02c9f 100644
 --- a/dlls/d2d1/hwnd_render_target.c
 +++ b/dlls/d2d1/hwnd_render_target.c
 @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d);
@@ -130,7 +130,7 @@ index 625f101eaa..f3626c42ce 100644
  
  static HRESULT d2d_hwnd_render_target_present(IUnknown *outer_unknown)
 diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c
-index e3175146a6..b66752983e 100644
+index 114a3efd883..4f662be4549 100644
 --- a/dlls/d2d1/state_block.c
 +++ b/dlls/d2d1/state_block.c
 @@ -187,5 +187,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
@@ -141,5 +141,5 @@ index e3175146a6..b66752983e 100644
 +    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
  }
 -- 
-2.17.1
+2.35.1
 

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/Compiler_Warnings/0034-bcrypt-Stop-compile-error-when-HAVE_GNUTLS_CIPHER_IN.patch

@@ -1,4 +1,4 @@
-From 7784b62bd2b64aabd6bfef9ef39ac4f3e8c55c77 Mon Sep 17 00:00:00 2001
+From eb21fcc668da85977bc86b6105f3830cb26c93e6 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 8 Jun 2021 08:56:40 +1000
 Subject: [PATCH] bcrypt: Stop compile error when HAVE_GNUTLS_CIPHER_INIT not
@@ -20,21 +20,21 @@ Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index 37a80bdc062..64825f5b99b 100644
+index d7b4499c692..11596d5f7ac 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -25,9 +25,10 @@
+@@ -24,9 +24,10 @@
+ 
  #include "config.h"
- #include "wine/port.h"
  
 +#include <stdarg.h>
 +
  #ifdef HAVE_GNUTLS_CIPHER_INIT
  
 -#include <stdarg.h>
+ #include <stdlib.h>
  #include <assert.h>
- #include <gnutls/gnutls.h>
- #include <gnutls/crypto.h>
+ #include <sys/types.h>
 -- 
-2.30.2
+2.33.0
 

patches/Compiler_Warnings/0035-d3d10-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,17 +1,17 @@
-From 990050ed436283fb820d4fe64b08dda3ac7ea9e2 Mon Sep 17 00:00:00 2001
+From 34109c1adac6293a87db004d60d342faeb33fcfe Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 8 Jun 2021 09:34:28 +1000
-Subject: [PATCH 2/2] d3d10: Avoid implicit cast of interface pointer.
+Subject: [PATCH] d3d10: Avoid implicit cast of interface pointer.
 
 ---
  dlls/d3d10/effect.c | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c
-index 86ef50aac01..060fb69ce3e 100644
+index 3b4050460a0..b03ed2d6c89 100644
 --- a/dlls/d3d10/effect.c
 +++ b/dlls/d3d10/effect.c
-@@ -126,7 +126,7 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1
+@@ -147,7 +147,7 @@ static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVariable(ID3D1
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderVariable(ID3D10EffectShaderVariable *iface)
  {
@@ -19,8 +19,8 @@ index 86ef50aac01..060fb69ce3e 100644
 +    return CONTAINING_RECORD((ID3D10EffectVariable*)iface, struct d3d10_effect_variable, ID3D10EffectVariable_iface);
  }
  
- struct d3d10_effect_state_property_info
-@@ -4665,7 +4665,7 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab
+ static struct d3d10_effect_variable * d3d10_array_get_element(struct d3d10_effect_variable *v,
+@@ -4876,7 +4876,7 @@ static void read_variable_array_from_buffer(struct d3d10_effect_variable *variab
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectScalarVariable(ID3D10EffectScalarVariable *iface)
  {
@@ -29,7 +29,7 @@ index 86ef50aac01..060fb69ce3e 100644
  }
  
  static BOOL STDMETHODCALLTYPE d3d10_effect_scalar_variable_IsValid(ID3D10EffectScalarVariable *iface)
-@@ -5001,7 +5001,7 @@ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_
+@@ -5212,7 +5212,7 @@ static const struct ID3D10EffectScalarVariableVtbl d3d10_effect_scalar_variable_
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectVectorVariable(ID3D10EffectVectorVariable *iface)
  {
@@ -38,7 +38,7 @@ index 86ef50aac01..060fb69ce3e 100644
  }
  
  static BOOL STDMETHODCALLTYPE d3d10_effect_vector_variable_IsValid(ID3D10EffectVectorVariable *iface)
-@@ -5488,7 +5488,7 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable
+@@ -5699,7 +5699,7 @@ static void read_matrix_variable_array_from_buffer(struct d3d10_effect_variable
  
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectMatrixVariable(ID3D10EffectMatrixVariable *iface)
  {
@@ -47,7 +47,7 @@ index 86ef50aac01..060fb69ce3e 100644
  }
  
  static BOOL STDMETHODCALLTYPE d3d10_effect_matrix_variable_IsValid(ID3D10EffectMatrixVariable *iface)
-@@ -5995,7 +5995,7 @@ static void set_shader_resource_variable(ID3D10ShaderResourceView **src, ID3D10S
+@@ -6222,7 +6222,7 @@ static void set_shader_resource_variable(ID3D10ShaderResourceView **src, ID3D10S
  static inline struct d3d10_effect_variable *impl_from_ID3D10EffectShaderResourceVariable(
          ID3D10EffectShaderResourceVariable *iface)
  {
@@ -57,5 +57,5 @@ index 86ef50aac01..060fb69ce3e 100644
  
  static BOOL STDMETHODCALLTYPE d3d10_effect_shader_resource_variable_IsValid(ID3D10EffectShaderResourceVariable *iface)
 -- 
-2.30.2
+2.33.0
 

patches/Compiler_Warnings/0039-rpcrt4-Avoid-implicit-cast-of-interface-pointer.patch

@@ -1,4 +1,4 @@
-From f34ee38467781b2f7bae7e7f8a04a4210bf7d046 Mon Sep 17 00:00:00 2001
+From 6d3e24776dac1c5bf4625617c61367f506c42f92 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 8 Jun 2021 11:22:48 +1000
 Subject: [PATCH] rpcrt4: Avoid implicit cast of interface pointer.
@@ -9,7 +9,7 @@ Subject: [PATCH] rpcrt4: Avoid implicit cast of interface pointer.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c
-index 764b304a047..58ea128e8a4 100644
+index d0d2e19342c..991ec052283 100644
 --- a/dlls/rpcrt4/ndr_marshall.c
 +++ b/dlls/rpcrt4/ndr_marshall.c
 @@ -6999,7 +6999,7 @@ static unsigned char *WINAPI NdrContextHandleMarshall(
@@ -22,7 +22,7 @@ index 764b304a047..58ea128e8a4 100644
          NdrServerContextNewMarshall(pStubMsg, ctxt, rundown, pFormat);
      }
 diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c
-index f1f25885b75..126e8ec8766 100644
+index ff1d1025838..a8425a1e519 100644
 --- a/dlls/rpcrt4/ndr_typelib.c
 +++ b/dlls/rpcrt4/ndr_typelib.c
 @@ -1452,7 +1452,7 @@ struct typelib_stub
@@ -33,7 +33,7 @@ index f1f25885b75..126e8ec8766 100644
 +    struct typelib_stub *stub = CONTAINING_RECORD((CStdStubBuffer *)iface, struct typelib_stub, stub.stub_buffer);
      ULONG refcount = InterlockedDecrement(&stub->stub.stub_buffer.RefCount);
  
-     TRACE("(%p) decreasing refs to %d\n", stub, refcount);
+     TRACE("(%p) decreasing refs to %ld\n", stub, refcount);
 -- 
-2.30.2
+2.34.1
 

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

@@ -1,31 +1,18 @@
-From 40630c14377561e90a4be405d2124338002a88f7 Mon Sep 17 00:00:00 2001
+From 81a36b530261731d6020e09770237ae5bf58166d 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/message.c   | 2 +-
  dlls/user32/tests/msg.c | 2 ++
+ dlls/win32u/message.c   | 2 +-
  2 files changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/dlls/user32/message.c b/dlls/user32/message.c
-index 1336865112a..cbe9920384f 100644
---- a/dlls/user32/message.c
-+++ b/dlls/user32/message.c
-@@ -4496,7 +4496,7 @@ UINT_PTR WINAPI SetCoalescableTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMER
- 
-     if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE );
- 
--    timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM );
-+    timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM );
- 
-     SERVER_START_REQ( set_win_timer )
-     {
 diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
-index c0ba5834cf9..a6bc158e8a7 100644
+index 4519da6962d..304a3b87f46 100644
 --- a/dlls/user32/tests/msg.c
 +++ b/dlls/user32/tests/msg.c
-@@ -10282,6 +10282,7 @@ static void test_timers(void)
+@@ -10709,6 +10709,7 @@ static void test_timers(void)
      start = GetTickCount();
      while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0))
          DispatchMessageA(&msg);
@@ -33,7 +20,7 @@ index c0ba5834cf9..a6bc158e8a7 100644
      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 */,
-@@ -10352,6 +10353,7 @@ static void test_timers_no_wnd(void)
+@@ -10779,6 +10780,7 @@ static void test_timers_no_wnd(void)
      start = GetTickCount();
      while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0))
          DispatchMessageA(&msg);
@@ -41,6 +28,19 @@ index c0ba5834cf9..a6bc158e8a7 100644
      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
+--- 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
+ 
+     if (proc) winproc = alloc_winproc( (WNDPROC)proc, TRUE );
+ 
+-    timeout = min( max( USER_TIMER_MINIMUM, timeout ), USER_TIMER_MAXIMUM );
++    timeout = min( max( 5, timeout ), USER_TIMER_MAXIMUM );
+ 
+     SERVER_START_REQ( set_win_timer )
+     {
 -- 
-2.17.1
+2.35.1
 

patches/Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch

@@ -1,17 +1,18 @@
-From 7d77edaea3c4ba8067e4b73034df5c58940daebc Mon Sep 17 00:00:00 2001
+From a9cf27a493697c97249ce526483d25c871c053c4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 1 Jun 2014 22:51:32 +0200
-Subject: winex11.drv: Indicate direct rendering through OpenGL extension
+Subject: [PATCH] winex11.drv: Indicate direct rendering through OpenGL
+ extension
 
 ---
- dlls/winex11.drv/opengl.c |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ dlls/winex11.drv/opengl.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
-index 71af3db..966d32d 100644
+index 92555841f71..71e7ecbcf7c 100644
 --- a/dlls/winex11.drv/opengl.c
 +++ b/dlls/winex11.drv/opengl.c
-@@ -440,6 +440,7 @@ static int GLXErrorHandler(Display *dpy,
+@@ -410,6 +410,7 @@ static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
  static BOOL X11DRV_WineGL_InitOpenglInfo(void)
  {
      static const char legacy_extensions[] = " WGL_EXT_extensions_string WGL_EXT_swap_control";
@@ -19,14 +20,14 @@ index 71af3db..966d32d 100644
  
      int screen = DefaultScreen(gdi_display);
      Window win = 0, root = 0;
-@@ -493,16 +494,18 @@ static BOOL X11DRV_WineGL_InitOpenglInfo
+@@ -465,16 +466,18 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
      }
      gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER);
      gl_version  = (const char *)opengl_funcs.gl.p_glGetString(GL_VERSION);
 +    glx_direct = pglXIsDirect(gdi_display, ctx);
      str = (const char *) opengl_funcs.gl.p_glGetString(GL_EXTENSIONS);
--    glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+sizeof(legacy_extensions));
-+    glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+sizeof(legacy_extensions)+sizeof(direct_extension));
+-    glExtensions = malloc( strlen(str) + sizeof(legacy_extensions) );
++    glExtensions = malloc( strlen(str)+sizeof(legacy_extensions)+sizeof(direct_extension) );
      strcpy(glExtensions, str);
      strcat(glExtensions, legacy_extensions);
 +    if (glx_direct)
@@ -41,4 +42,5 @@ index 71af3db..966d32d 100644
      TRACE("GL version             : %s.\n", gl_version);
      TRACE("GL renderer            : %s.\n", gl_renderer);
 -- 
-1.7.9.5
+2.35.1
+

patches/Staging/0001-kernel32-Add-winediag-message-to-show-warning-that-t.patch

@@ -1,4 +1,4 @@
-From 916189d1cdf149f16867870121171e20f129da9f Mon Sep 17 00:00:00 2001
+From 36b4dbb687232d783cc3203da1dee4a797606ba7 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  1 file changed, 15 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 3339596944a..1d435f88755 100644
+index 255d5afef79..00add6728cc 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -44,6 +44,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index 3339596944a..1d435f88755 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3373,6 +3374,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3536,6 +3537,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,7 +28,7 @@ index 3339596944a..1d435f88755 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -3783,6 +3785,9 @@ static void init_wow64( CONTEXT *context )
+@@ -3955,6 +3957,9 @@ static void release_address_space(void)
   */
  void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR unknown3, ULONG_PTR unknown4 )
  {
@@ -36,9 +36,9 @@ index 3339596944a..1d435f88755 100644
 +    UNICODE_STRING staging_event_string;
 +    HANDLE staging_event;
      static int attach_done;
-     int i;
      NTSTATUS status;
-@@ -3869,6 +3874,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
+     ULONG_PTR cookie;
+@@ -4041,6 +4046,16 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
      if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
  #endif
  
@@ -56,5 +56,5 @@ index 3339596944a..1d435f88755 100644
      InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks );
      RtlReleasePebLock();
 -- 
-2.30.2
+2.33.0
 

patches/Staging/0002-winelib-Append-Staging-at-the-end-of-the-version-s.patch

@@ -1,25 +1,25 @@
-From cfcc687562d4fa68b507cbf2c29722ef523d26aa Mon Sep 17 00:00:00 2001
+From 8aa6fb73e3142d86ba354c204313b8a74a5fa43d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
 
 ---
- Makefile.in | 2 +-
+ configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.in b/Makefile.in
-index b52495f741f..d5a8cad20da 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -116,7 +116,7 @@ install-manpages:: manpages
- # Rules for generated source files
- 
- dlls/ntdll/unix/version.c: dummy
--	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || ($(RM) $@ && exit 1)
-+	@version=`(GIT_DIR=$(srcdir)/.git git describe HEAD 2>/dev/null || echo "wine-$(PACKAGE_VERSION)") | sed -n -e '$$s/\(.*\)/const char wine_build[] = "\1 (Staging)";/p'` && (echo $$version | cmp -s - $@) || echo $$version >$@ || (rm -f $@ && exit 1)
+diff --git a/configure.ac b/configure.ac
+index f86a5decb07..3d7f9cc96e6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3910,7 +3910,7 @@ dnl Rules for generated source files
  
+ WINE_APPEND_RULE(
+ [dlls/ntdll/unix/version.c: dummy
+-	@version=\`(GIT_DIR=${wine_srcdir}.git git describe HEAD 2>/dev/null || echo \"wine-\$(PACKAGE_VERSION)\") | sed -n -e '\$\$s/\(.*\)/const char wine_build[[]] = \"\\1\";/p'\` && (echo \$\$version | cmp -s - \$[@]) || echo \$\$version >\$[@] || (rm -f \$[@] && exit 1)
++	@version=\`(GIT_DIR=${wine_srcdir}.git git describe HEAD 2>/dev/null || echo \"wine-\$(PACKAGE_VERSION)\") | sed -n -e '\$\$s/\(.*\)/const char wine_build[[]] = \"\\1 (Staging)\";/p'\` && (echo \$\$version | cmp -s - \$[@]) || echo \$\$version >\$[@] || (rm -f \$[@] && exit 1)
  programs/winetest/build.rc: dummy
- 	@build="STRINGTABLE { 1 \"`GIT_DIR=$(srcdir)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || (rm -f $@ && exit 1)
+ 	@build=\"STRINGTABLE { 1 \\\"\`GIT_DIR=${wine_srcdir}.git git rev-parse HEAD 2>/dev/null\`\\\" }\" && (echo \$\$build | cmp -s - \$[@]) || echo \$\$build >\$[@] || (rm -f \$[@] && exit 1)
+ programs/winetest/build.nfo:
 -- 
-2.20.1
+2.33.0
 

patches/advapi32-LsaLookupPrivilegeName/0001-advapi32-Fix-error-code-when-calling-LsaOpenPolicy-f.patch

@@ -1,8 +1,8 @@
-From 971cfbe9ab8a7cb62c5b3e62fe4fe0bfc4518889 Mon Sep 17 00:00:00 2001
+From a59b5e6351edfc13baca665b4f69a5d0786e7edc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sun, 5 Mar 2017 23:04:36 +0100
-Subject: advapi32: Fix error code when calling LsaOpenPolicy for non existing
- remote machine.
+Subject: [PATCH] advapi32: Fix error code when calling LsaOpenPolicy for non
+ existing remote machine.
 
 ---
  dlls/advapi32/lsa.c       |  2 +-
@@ -10,10 +10,10 @@ Subject: advapi32: Fix error code when calling LsaOpenPolicy for non existing
  2 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c
-index bfd879bbc73..2e021a1ec2d 100644
+index b63519c0299..d8a084ff408 100644
 --- a/dlls/advapi32/lsa.c
 +++ b/dlls/advapi32/lsa.c
-@@ -659,7 +659,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
+@@ -739,7 +739,7 @@ NTSTATUS WINAPI LsaOpenPolicy(
            ObjectAttributes, DesiredAccess, PolicyHandle);
  
      ADVAPI_ForceLocalComputer(SystemName ? SystemName->Buffer : NULL,
@@ -23,10 +23,10 @@ index bfd879bbc73..2e021a1ec2d 100644
  
      if(PolicyHandle) *PolicyHandle = (LSA_HANDLE)0xcafe;
 diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c
-index 861fea0525e..bb291e65a71 100644
+index 5c00298d41e..d04f5645345 100644
 --- a/dlls/advapi32/tests/lsa.c
 +++ b/dlls/advapi32/tests/lsa.c
-@@ -39,6 +39,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+@@ -43,6 +43,8 @@ static NTSTATUS (WINAPI *pLsaGetUserName)(PUNICODE_STRING *user, PUNICODE_STRING
  
  static void test_lsa(void)
  {
@@ -35,7 +35,7 @@ index 861fea0525e..bb291e65a71 100644
      NTSTATUS status;
      LSA_HANDLE handle;
      LSA_OBJECT_ATTRIBUTES object_attributes;
-@@ -46,6 +48,14 @@ static void test_lsa(void)
+@@ -50,6 +52,14 @@ static void test_lsa(void)
      ZeroMemory(&object_attributes, sizeof(object_attributes));
      object_attributes.Length = sizeof(object_attributes);
  
@@ -49,7 +49,7 @@ index 861fea0525e..bb291e65a71 100644
 +
      status = LsaOpenPolicy( NULL, &object_attributes, POLICY_ALL_ACCESS, &handle);
      ok(status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED,
-        "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08x\n", status);
+        "LsaOpenPolicy(POLICY_ALL_ACCESS) returned 0x%08lx\n", status);
 -- 
-2.14.2
+2.34.1
 

patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch

@@ -1,94 +0,0 @@
-From 19efcf925a49a5d7e0b82eb6e4797b0ac725f2dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sun, 17 Jan 2016 17:07:35 +0100
-Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
- XamlBehaviorEnabled.
-
----
- configure.ac                                       |  1 +
- dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in        |  4 +++
- .../ext-ms-win-xaml-pal-l1-1-0.spec                |  6 ++++
- dlls/ext-ms-win-xaml-pal-l1-1-0/main.c             | 35 ++++++++++++++++++++++
- 4 files changed, 46 insertions(+)
- create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
- create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
- create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-
-diff --git a/configure.ac b/configure.ac
-index 8484c83..a9b51d2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3255,6 +3255,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comctl32-init-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-comdlg32-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-shell-shell32-l1-2-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0)
-+WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/faultrep)
- WINE_CONFIG_MAKEFILE(dlls/faultrep/tests)
- WINE_CONFIG_MAKEFILE(dlls/feclient)
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..6382d85
---- /dev/null
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in
-@@ -0,0 +1,4 @@
-+MODULE    = ext-ms-win-xaml-pal-l1-1-0.dll
-+
-+C_SRCS = \
-+	main.c
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
-new file mode 100644
-index 0000000..c167f5e
---- /dev/null
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
-@@ -0,0 +1,6 @@
-+@ stub CreatePhoneAppBarProxy
-+@ stub CreateWinTextBoxProxy
-+@ stub GetThemeServices
-+@ stdcall XamlBehaviorEnabled(ptr)
-+@ stub XamlPalInitialize
-+@ stub XamlPalUninitialize
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-new file mode 100644
-index 0000000..3e28275
---- /dev/null
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-@@ -0,0 +1,35 @@
-+/*
-+ * ext-ms-win-xaml-pal-l1-1-0
-+ *
-+ * Copyright 2016 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+
-+#include "windef.h"
-+#include "winbase.h"
-+#include "winuser.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(xaml);
-+
-+BOOL WINAPI XamlBehaviorEnabled(void *unknown)
-+{
-+    FIXME("(%p): stub\n", unknown);
-+    return TRUE;
-+}
--- 
-1.9.1
-

patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch

@@ -1,91 +0,0 @@
-From 65dda249fcbd5c1685fc89ede60e946b910508e3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sun, 17 Jan 2016 17:12:45 +0100
-Subject: [PATCH] ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub
- for UserContextExtInitialize.
-
----
- configure.ac                                       |  1 +
- .../Makefile.in                                    |  4 +++
- .../ext-ms-win-appmodel-usercontext-l1-1-0.spec    |  3 ++
- dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c | 35 ++++++++++++++++++++++
- 4 files changed, 43 insertions(+)
- create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
- create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
- create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
-
-diff --git a/configure.ac b/configure.ac
-index 53ddeea..4061187 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3238,6 +3238,7 @@ WINE_CONFIG_MAKEFILE(dlls/evr)
- WINE_CONFIG_MAKEFILE(dlls/evr/tests)
- WINE_CONFIG_MAKEFILE(dlls/explorerframe)
- WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests)
-+WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-appmodel-usercontext-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-dwmapi-ext-l1-1-0)
-diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
-new file mode 100644
-index 0000000..16eee75
---- /dev/null
-+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
-@@ -0,0 +1,4 @@
-+MODULE    = ext-ms-win-appmodel-usercontext-l1-1-0.dll
-+
-+C_SRCS = \
-+	main.c
-diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
-new file mode 100644
-index 0000000..7642d15
---- /dev/null
-+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec
-@@ -0,0 +1,3 @@
-+@ stub UserContextExtCleanup
-+@ stdcall UserContextExtInitialize()
-+@ stub UserContextExtSetToken
-diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
-new file mode 100644
-index 0000000..7a9e75f
---- /dev/null
-+++ b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
-@@ -0,0 +1,35 @@
-+/*
-+ * ext-ms-win-appmodel-usercontext-l1-1-0
-+ *
-+ * Copyright 2016 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+
-+#include "windef.h"
-+#include "winbase.h"
-+#include "winuser.h"
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(usercontext);
-+
-+HRESULT WINAPI UserContextExtInitialize(void)
-+{
-+    FIXME("(): stub\n");
-+    return S_OK;
-+}
--- 
-2.7.4
-

patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch

@@ -1,41 +0,0 @@
-From 751d2904a1ac0831cab220eaedbbd01ba8a14356 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 21 Jan 2016 00:40:29 +0100
-Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices.
-
----
- dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec | 2 +-
- dlls/ext-ms-win-xaml-pal-l1-1-0/main.c                          | 8 ++++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
-index c167f5e..042e037 100644
---- a/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec
-@@ -1,6 +1,6 @@
- @ stub CreatePhoneAppBarProxy
- @ stub CreateWinTextBoxProxy
--@ stub GetThemeServices
-+@ stdcall GetThemeServices(ptr)
- @ stdcall XamlBehaviorEnabled(ptr)
- @ stub XamlPalInitialize
- @ stub XamlPalUninitialize
-diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-index 3e28275..45353ba 100644
---- a/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-+++ b/dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
-@@ -33,3 +33,11 @@ BOOL WINAPI XamlBehaviorEnabled(void *unknown)
-     FIXME("(%p): stub\n", unknown);
-     return TRUE;
- }
-+
-+HRESULT WINAPI GetThemeServices(void **interface)
-+{
-+    FIXME("(%p): stub\n", interface);
-+
-+    *interface = NULL;
-+    return E_NOTIMPL;
-+}
--- 
-1.9.1
-

patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch

@@ -1,125 +0,0 @@
-From ffea83bdf88a4b7d35c2f9a7e1a773d3110b5771 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Tue, 12 Apr 2016 01:02:34 +0200
-Subject: [PATCH] uiautomationcore: Add dll and stub some functions.
-
----
- dlls/uiautomationcore/Makefile.in |  1 +
- dlls/uiautomationcore/uia_main.c  | 53 +++++++++++++++++++++++++++----
- 2 files changed, 48 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in
-index 71ea7b99c94..3e6c2d7688a 100644
---- a/dlls/uiautomationcore/Makefile.in
-+++ b/dlls/uiautomationcore/Makefile.in
-@@ -1,5 +1,6 @@
- MODULE = uiautomationcore.dll
- IMPORTLIB = uiautomationcore
-+IMPORTS   = uuid
- 
- EXTRADLLFLAGS = -Wb,--prefer-native
- 
-diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c
-index 2dada95af80..a32ef552f15 100644
---- a/dlls/uiautomationcore/uia_main.c
-+++ b/dlls/uiautomationcore/uia_main.c
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright 2016 Michael Müller
-  * Copyright 2017 Jacek Caban for CodeWeavers
-  *
-  * This library is free software; you can redistribute it and/or
-@@ -16,18 +17,58 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
-+#define COBJMACROS
- #include "uiautomation.h"
- 
- #include "wine/debug.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);
- 
-+static HRESULT WINAPI dummy_QueryInterface(IUnknown *iface, REFIID iid, void **ppv)
-+{
-+    TRACE("(%p, %s, %p)\n", iface, debugstr_guid(iid), ppv);
-+
-+    if (!ppv) return E_INVALIDARG;
-+
-+    if (!IsEqualIID(&IID_IUnknown, iid))
-+    {
-+        FIXME("Unknown interface: %s\n", debugstr_guid(iid));
-+        *ppv = NULL;
-+        return E_NOINTERFACE;
-+    }
-+
-+    *ppv = iface;
-+    IUnknown_AddRef((IUnknown *)*ppv);
-+    return S_OK;
-+}
-+
-+static ULONG WINAPI dummy_AddRef(IUnknown *iface)
-+{
-+    FIXME("(%p): stub\n", iface);
-+    return 1;
-+}
-+
-+static ULONG WINAPI dummy_Release(IUnknown *iface)
-+{
-+    FIXME("(%p): stub\n", iface);
-+    return 1;
-+}
-+
-+static const IUnknownVtbl dummy_Vtbl =
-+{
-+    dummy_QueryInterface,
-+    dummy_AddRef,
-+    dummy_Release,
-+};
-+
-+static IUnknown dummy = { &dummy_Vtbl };
-+
- /***********************************************************************
-  *          UiaClientsAreListening (uiautomationcore.@)
-  */
- BOOL WINAPI UiaClientsAreListening(void)
- {
--    FIXME("()\n");
-+    FIXME("(): stub\n");
-     return FALSE;
- }
- 
-@@ -36,8 +77,8 @@ BOOL WINAPI UiaClientsAreListening(void)
-  */
- HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
- {
--    FIXME("(%p) stub!\n", value);
--    *value = NULL;
-+    FIXME("(%p): stub!\n", value);
-+    *value = &dummy;
-     return S_OK;
- }
- 
-@@ -46,8 +87,8 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value)
-  */
- HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value)
- {
--    FIXME("(%p) stub!\n", value);
--    *value = NULL;
-+    FIXME("(%p): stub!\n", value);
-+    *value = &dummy;
-     return S_OK;
- }
- 
-@@ -66,7 +107,7 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid)
- LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam,
-         LPARAM lParam, IRawElementProviderSimple *elprov)
- {
--    FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov);
-+    FIXME("(%p, %lx, %lx, %p): stub!\n", hwnd, wParam, lParam, elprov);
-     return 0;
- }
- 
--- 
-2.33.0
-

patches/api-ms-win-Stub_DLLs/definition

@@ -1,5 +0,0 @@
-Fixes: Add ext-ms-win-xaml-pal-l1-1-0 dll and XamlBehaviourEnabled() stub
-Fixes: Add ext-ms-win-xaml-pal-l1-1-0.GetThemeServices() stub
-Fixes: Add ext-ms-win-appmodel-usercontext-l1-1-0 dll and UserContextExtInitialize() stub
-Fixes: Add iertutil dll
-Fixes: Return dummy interface in some uiautomationcore functions

patches/bcrypt-ECDHSecretAgreement/0001-bcrypt-Allow-multiple-backends-to-coexist.patch

@@ -1,4 +1,4 @@
-From 89c22c9894fd170b0b3a99309540c88059c64824 Mon Sep 17 00:00:00 2001
+From 1768ecfc4a7181600df254069f02655fe4e5fa0b Mon Sep 17 00:00:00 2001
 From: Derek Lesho <dlesho@codeweavers.com>
 Date: Fri, 2 Oct 2020 11:29:24 -0500
 Subject: [PATCH] bcrypt: Allow multiple backends to coexist.
@@ -7,18 +7,17 @@ Signed-off-by: Derek Lesho <dlesho@codeweavers.com>
 ---
  dlls/bcrypt/Makefile.in       |   3 +-
  dlls/bcrypt/bcrypt_internal.h |   3 +
- dlls/bcrypt/gnutls.c          |  34 ++++--
- dlls/bcrypt/macos.c           |  18 ++-
- dlls/bcrypt/unixlib.c         | 211 ++++++++++++++++++++++++++++++++++
- 5 files changed, 253 insertions(+), 16 deletions(-)
+ dlls/bcrypt/gnutls.c          |  32 ++++--
+ dlls/bcrypt/unixlib.c         | 208 ++++++++++++++++++++++++++++++++++
+ 4 files changed, 235 insertions(+), 11 deletions(-)
  create mode 100644 dlls/bcrypt/unixlib.c
 
 diff --git a/dlls/bcrypt/Makefile.in b/dlls/bcrypt/Makefile.in
-index 24803fb2d7c..46a20d473dd 100644
+index 63a731fa9d9..6dd3066d4a5 100644
 --- a/dlls/bcrypt/Makefile.in
 +++ b/dlls/bcrypt/Makefile.in
-@@ -11,6 +11,7 @@ C_SRCS = \
- 	macos.c \
+@@ -8,6 +8,7 @@ C_SRCS = \
+ 	gnutls.c \
  	md2.c \
  	sha256.c \
 -	sha512.c
@@ -39,10 +38,10 @@ index 61c367cae9d..d0697ed807e 100644
 +
  #endif /* __BCRYPT_INTERNAL_H */
 diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
-index 9c1e7b5ab06..9b716c6f536 100644
+index 7b1bceda889..66845ffc8cf 100644
 --- a/dlls/bcrypt/gnutls.c
 +++ b/dlls/bcrypt/gnutls.c
-@@ -372,9 +372,12 @@ fail:
+@@ -373,9 +373,12 @@ fail:
  
  static void gnutls_uninitialize(void)
  {
@@ -58,16 +57,7 @@ index 9c1e7b5ab06..9b716c6f536 100644
  }
  
  struct buffer
-@@ -1869,7 +1872,7 @@ static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULO
-     return status;
- }
- 
--static const struct key_funcs key_funcs =
-+static struct key_funcs key_funcs =
- {
-     key_set_property,
-     key_symmetric_init,
-@@ -1893,19 +1896,28 @@ static const struct key_funcs key_funcs =
+@@ -1894,19 +1897,28 @@ static const struct key_funcs key_funcs =
      key_import_rsa
  };
  
@@ -103,42 +93,12 @@ index 9c1e7b5ab06..9b716c6f536 100644
 +    return NULL;
 +}
 +#endif
-diff --git a/dlls/bcrypt/macos.c b/dlls/bcrypt/macos.c
-index 20e1a61e3fb..1e364ac05a3 100644
---- a/dlls/bcrypt/macos.c
-+++ b/dlls/bcrypt/macos.c
-@@ -302,11 +302,21 @@ static const struct key_funcs key_funcs =
-     key_import_rsa
- };
- 
--NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
-+struct key_funcs * macos_lib_init( DWORD reason )
- {
--    if (reason != DLL_PROCESS_ATTACH) return STATUS_SUCCESS;
--    *(const struct key_funcs **)ptr_out = &key_funcs;
--    return STATUS_SUCCESS;
-+    if (reason != DLL_PROCESS_ATTACH) return NULL;
-+    return &key_funcs;
- }
- 
-+#else
-+#include "ntstatus.h"
-+#define WIN32_NO_STATUS
-+#include "windef.h"
-+#include "winbase.h"
-+#include "winternl.h"
-+
-+struct key_funcs * macos_lib_init( DWORD reason )
-+{
-+    return NULL;
-+}
- #endif
 diff --git a/dlls/bcrypt/unixlib.c b/dlls/bcrypt/unixlib.c
 new file mode 100644
-index 00000000000..6c3aff80373
+index 00000000000..1937a8172a4
 --- /dev/null
 +++ b/dlls/bcrypt/unixlib.c
-@@ -0,0 +1,211 @@
+@@ -0,0 +1,208 @@
 +#if 0
 +#pragma makedep unix
 +#endif
@@ -271,7 +231,7 @@ index 00000000000..6c3aff80373
 +}
 +
 +static NTSTATUS CDECL key_asymmetric_decrypt( struct key *key, UCHAR *input, ULONG input_len,
-+        UCHAR *output, ULONG *output_len, ULONG *ret_len )
++        UCHAR *output, ULONG output_len, ULONG *ret)
 +{
 +    FIXME( "not implemented\n" );
 +    return STATUS_NOT_IMPLEMENTED;
@@ -310,13 +270,10 @@ index 00000000000..6c3aff80373
 +NTSTATUS CDECL __wine_init_unix_lib( HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out )
 +{
 +    struct key_funcs *gnutls_funcs = gnutls_lib_init(reason);
-+    struct key_funcs *macos_funcs = macos_lib_init(reason);
 +
 +    if (reason == DLL_PROCESS_ATTACH)
 +    {
 +#define RESOLVE_FUNC(name) \
-+        if (macos_funcs && macos_funcs->key_##name) \
-+            key_funcs.key_##name = macos_funcs->key_##name; \
 +        if (gnutls_funcs && gnutls_funcs->key_##name) \
 +            key_funcs.key_##name = gnutls_funcs->key_##name;
 +
@@ -351,5 +308,5 @@ index 00000000000..6c3aff80373
 +
 +#endif
 -- 
-2.30.2
+2.33.0