Release v7.13

macOS.yml: Cleanup workflows

.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: |
@@ -79,11 +76,8 @@ jobs:
           brew update
           brew install --cask xquartz
           brew install  bison \
-                        faudio \
                         gphoto2 \
                         gst-plugins-base \
-                        jxrlib \
-                        little-cms2 \
                         mingw-w64 \
                         molten-vk \
                         mpg123

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/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/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/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/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch

@@ -121,7 +121,7 @@ index cacb7ea7751..19a807c1624 100644
 +            WINE_TRACE("Process still running, but returning anyway\n");
 +            errorlevel = 0;
 +          } else {
-+            WINE_TRACE("Process ended, errorlevel %d\n", errorlevel);
++            WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel);
 +          }
 +
 +          CloseHandle(pe.hProcess);
@@ -160,7 +160,7 @@ index cacb7ea7751..19a807c1624 100644
 -        GetExitCodeProcess (pe.hProcess, &errorlevel);
 -        if (errorlevel == STILL_ACTIVE) errorlevel = 0;
 +      if (!status) {
-+        WINE_TRACE("Failed to launch via CreateProcess, rc %d (%d)\n",
++        WINE_TRACE("Failed to launch via CreateProcess, rc %d (%ld)\n",
 +                   status, GetLastError());
 +        break;
 +      }
@@ -180,7 +180,7 @@ index cacb7ea7751..19a807c1624 100644
 +        WINE_TRACE("Process still running, but returning anyway\n");
 +        errorlevel = 0;
 +      } else {
-+        WINE_TRACE("Process ended, errorlevel %d\n", errorlevel);
++        WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel);
 +      }
 +
 +      CloseHandle(pe.hProcess);

patches/configure-dwarf4/0001-configure.ac-let-dwarf4-be-Wine-s-default-debug-form.patch

@@ -1,36 +0,0 @@
-From 5d62ab1fd576aa9e11a387a6b2a1b250aecc1803 Mon Sep 17 00:00:00 2001
-From: Eric Pouech <eric.pouech@gmail.com>
-Date: Fri, 5 Nov 2021 07:56:04 +1100
-Subject: [PATCH] configure.ac: let dwarf4 be Wine's default debug format
-
----
- configure.ac | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 57bd9a6f9ec..0196af56783 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1051,8 +1051,7 @@ then
-         if test "x$ac_debug_format_seen" = x
-         then
-           case $CROSSDEBUG in
--            *dwarf)  WINE_TRY_CROSSCFLAGS([-gdwarf-2])
--                     WINE_TRY_CROSSCFLAGS([-gstrict-dwarf]) ;;
-+            *dwarf)  WINE_TRY_CROSSCFLAGS([-gdwarf-4]) ;;
-             pdb)     WINE_TRY_CROSSCFLAGS([-gcodeview]) ;;
-           esac
-         fi
-@@ -1865,8 +1864,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy=
-   done
-   if test "x$ac_debug_format_seen" = xdefault
-   then
--    WINE_TRY_CFLAGS([-gdwarf-2])
--    WINE_TRY_CFLAGS([-gstrict-dwarf])
-+    WINE_TRY_CFLAGS([-gdwarf-4])
-   fi
- 
-   dnl Disable gcc builtins except for Mingw
--- 
-2.33.0
-

patches/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch

@@ -1,4 +1,4 @@
-From a5045503cf3310058cc64814ff9626f4877a13bb Mon Sep 17 00:00:00 2001
+From 12a9a9cb506aede4748611c8fa3339afcee7c070 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Fri, 5 Jul 2019 13:20:23 +0800
 Subject: [PATCH] cryptext: Implement CryptExtOpenCER.
@@ -17,10 +17,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  create mode 100644 dlls/cryptext/tests/cryptext.c
 
 diff --git a/configure b/configure
-index db592f0868d..ba13abacc46 100755
+index 20bcb96a2a6..b8fd60dbb53 100755
 --- a/configure
 +++ b/configure
-@@ -20291,6 +20291,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -20910,6 +20910,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
  wine_fn_config_makefile dlls/cryptdlg enable_cryptdlg
  wine_fn_config_makefile dlls/cryptdll enable_cryptdll
  wine_fn_config_makefile dlls/cryptext enable_cryptext
@@ -29,10 +29,10 @@ index db592f0868d..ba13abacc46 100755
  wine_fn_config_makefile dlls/cryptnet/tests enable_tests
  wine_fn_config_makefile dlls/cryptsp enable_cryptsp
 diff --git a/configure.ac b/configure.ac
-index d449b88fb19..af75e0e80ab 100644
+index 6cbd947bf31..c68c5975e63 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3029,6 +3029,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -2361,6 +2361,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
@@ -113,7 +113,7 @@ index 537ba66cd3b..f9e34d1f8c5 100644
 +    PCCERT_CONTEXT ctx;
 +    CRYPTUI_VIEWCERTIFICATE_STRUCTW info;
 +
-+    TRACE("(%p, %p, %s, %u)\n", hwnd, hinst, debugstr_w(filename), showcmd);
++    TRACE("(%p, %p, %s, %lu)\n", hwnd, hinst, debugstr_w(filename), showcmd);
 +
 +    if (!CryptQueryObject(CERT_QUERY_OBJECT_FILE, filename, CERT_QUERY_CONTENT_FLAG_CERT,
 +                          CERT_QUERY_FORMAT_FLAG_ALL, 0, NULL, NULL, NULL, NULL, NULL,
@@ -142,7 +142,7 @@ index 537ba66cd3b..f9e34d1f8c5 100644
 +    HRESULT hr;
 +    LPWSTR filenameW;
 +
-+    TRACE("(%p, %p, %s, %u)\n", hwnd, hinst, debugstr_a(filename), showcmd);
++    TRACE("(%p, %p, %s, %lu)\n", hwnd, hinst, debugstr_a(filename), showcmd);
 +
 +    filenameW = heap_strdupAtoW(filename);
 +    hr = CryptExtOpenCERW(hwnd, hinst, filenameW, showcmd);
@@ -212,10 +212,10 @@ index 00000000000..cc62a772b59
 +
 +    SetLastError(0xdeadbeef);
 +    hr = pCryptExtOpenCER(0, 0, "dead.beef", SW_HIDE);
-+    ok(hr == S_OK, "got %#x\n", hr);
++    ok(hr == S_OK, "got %#lx\n", hr);
 +
 +    hr = pCryptExtOpenCER(0, 0, "VeriSign Class 3 Public Primary Certification Authority - G4.txt", SW_SHOW);
-+    ok(hr == S_OK, "got %#x\n", hr);
++    ok(hr == S_OK, "got %#lx\n", hr);
 +}
 +
 +START_TEST(cryptext)
@@ -227,5 +227,5 @@ index 00000000000..cc62a772b59
 +    test_CryptExtOpenCER();
 +}
 -- 
-2.33.0
+2.34.1
 

patches/d3drm-IDirect3D3-support/0001-d3drm-Support-IDirect3D3-when-creating-device.patch

@@ -1,76 +0,0 @@
-From 9ea60091ba885b5f63266374f49f0d63e2cf2767 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 16 Dec 2020 11:07:05 +1100
-Subject: [PATCH] d3drm: Support IDirect3D3 when creating device
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39346
----
- dlls/d3drm/device.c | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c
-index 2e1b5f2d24f..fff272197bf 100644
---- a/dlls/d3drm/device.c
-+++ b/dlls/d3drm/device.c
-@@ -124,7 +124,9 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw
-     IDirectDrawSurface *ds = NULL;
-     IDirect3DDevice *device1 = NULL;
-     IDirect3DDevice2 *device2 = NULL;
-+    IDirect3DDevice3 *device3 = NULL;
-     IDirect3D2 *d3d2 = NULL;
-+    IDirect3D3 *d3d3 = NULL;
-     DDSURFACEDESC desc, surface_desc;
-     HRESULT hr;
- 
-@@ -171,19 +173,29 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw
- 
-     if (version == 1)
-         hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirect3DRGBDevice, (void **)&device1);
--    else
-+    else if (version == 2)
-     {
-         IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D2, (void**)&d3d2);
-         hr = IDirect3D2_CreateDevice(d3d2, &IID_IDirect3DRGBDevice, surface, &device2);
-         IDirect3D2_Release(d3d2);
-     }
-+    else
-+    {
-+        IDirectDrawSurface4 *surface4 = NULL;
-+
-+        IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface4, (void**)&surface4);
-+        IDirectDraw_QueryInterface(ddraw, &IID_IDirect3D3, (void**)&d3d3);
-+        hr = IDirect3D3_CreateDevice(d3d3, &IID_IDirect3DRGBDevice, surface4, &device3, NULL);
-+        IDirectDrawSurface4_Release(surface4);
-+        IDirect3D3_Release(d3d3);
-+    }
-     if (FAILED(hr))
-     {
-         IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
-         return hr;
-     }
- 
--    if (version != 1)
-+    if (version == 2)
-     {
-         hr = IDirect3DDevice2_QueryInterface(device2, &IID_IDirect3DDevice, (void**)&device1);
-         IDirect3DDevice2_Release(device2);
-@@ -193,6 +205,16 @@ HRESULT d3drm_device_init(struct d3drm_device *device, UINT version, IDirectDraw
-             return hr;
-         }
-     }
-+    else if (version == 3)
-+    {
-+        hr = IDirect3DDevice3_QueryInterface(device3, &IID_IDirect3DDevice, (void**)&device1);
-+        IDirect3DDevice3_Release(device3);
-+        if (FAILED(hr))
-+        {
-+            IDirectDrawSurface_DeleteAttachedSurface(surface, 0, ds);
-+            return hr;
-+        }
-+    }
-     device->device = device1;
-     device->width = desc.dwWidth;
-     device->height = desc.dwHeight;
--- 
-2.29.2
-

patches/d3drm-IDirect3D3-support/definition

@@ -1 +0,0 @@
-Fixes: [39346] Support IDirect3D3 when creating device.

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