Release v8.2

Deprected, replaced by staging/patchinstall.py.

Maintaining the patchinstall.sh script is an annoyance, often missed when modifying patches, which then results in fixup commits. The "new" patchinstall.py script (which has been around for multiple years now) is a complete replacement, and avoids this problem by just generating the list when applying. Precomputing the list is hardly worthwhile anyway.

.github/workflows/macOS.yml

@@ -14,12 +14,11 @@ jobs:
 
       - name: Install dependencies
         run: |
-          brew update
           brew install --cask xquartz
           brew install  bison \
                         gphoto2 \
                         gst-plugins-base \
-                        gcenx/wine/mingw-w64@9 \
+                        mingw-w64 \
                         molten-vk \
                         sdl2
 
@@ -28,19 +27,19 @@ jobs:
           set -eu
           echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
           echo "$(brew --prefix krb5)/bin" >> $GITHUB_PATH
-          echo "$(brew --prefix mingw-w64@9)/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)
+          git fetch git://source.winehq.org/git/wine.git $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit) --depth=1
+          git checkout $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit)
 
-      - name: Run patchinstall.sh --all
+      - name: Run patchinstall.py --all
         run: |
-          $GITHUB_WORKSPACE/patches/patchinstall.sh DESTDIR=$GITHUB_WORKSPACE/wine --all
+          cd wine
+          $GITHUB_WORKSPACE/staging/patchinstall.py DESTDIR=. --all
 
       - name: Configure wine64
         env:
@@ -62,71 +61,6 @@ jobs:
                         --x-lib=/opt/X11/lib
 
       - name: Build wine64
-        # mingw-w64 brew formula bumped binutils 2.38 causing a regression in parallel builds
-        # use gcenx/wine/mingw-w64@9 this uses binutils 2.37
-        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 \
-                        gcenx/wine/mingw-w64@9 \
-                        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
-          echo "$(brew --prefix mingw-w64@9)/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
-        # mingw-w64 brew formula bumped binutils 2.38 causing a regression in parallel builds
-        # use gcenx/wine/mingw-w64@9 this uses binutils 2.37
         run: |
           cd $GITHUB_WORKSPACE/wine
           make -j$(sysctl -n hw.ncpu 2>/dev/null)

.gitignore

@@ -1,3 +1,2 @@
 staging/wine
 *.pyc
-.patchupdate.cache

README.md

@@ -33,11 +33,11 @@ of information about that is collected in the
 [WineHQ Wiki](http://wiki.winehq.org/BuildingWine).
 
 In order to apply all Wine Staging patches it is recommended to use the
-`patchinstall.sh` utility which takes care of applying all patches in the
+`patchinstall.py` utility which takes care of applying all patches in the
 correct order. For reference, the possible commandline arguments are:
 
 ```
-Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]
+Usage: ./staging/patchinstall.py [DESTDIR=path] [-W patchset] [patchset ...]
 
 Autogenerated script to apply all Wine Staging patches on your Wine
 source tree.
@@ -55,17 +55,14 @@ Configuration:
 
 Backends:
   --backend=patch      Use regular 'patch' utility to apply patches (default)
-  --backend=eapply     Use 'eapply' to apply patches (Gentoo only)
-  --backend=epatch     Use 'epatch' to apply patches (Gentoo only, deprecated)
   --backend=git-am     Use 'git am' to apply patches
   --backend=git-apply  Use 'git apply' to apply patches
-  --backend=stg        Import the patches using stacked git
 ```
 
 If you want to apply *all* patches with the `patch` utility, the commandline
 should look similar to this:
 ```
-./patches/patchinstall.sh DESTDIR="/path/to/wine" --all
+./staging/patchinstall.py DESTDIR="/path/to/wine" --all
 ```
 
 Before you proceed with the compilation, please make sure that you installed all
@@ -94,17 +91,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 4edf58f26172ec7f931eab57d14aca564d8b58e3 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 1cba26f5ca4..df88fb70469 100644
 --- a/dlls/d2d1/bitmap.c
 +++ b/dlls/d2d1/bitmap.c
-@@ -617,5 +617,5 @@ struct d2d_bitmap *unsafe_impl_from_ID2D1Bitmap(ID2D1Bitmap *iface)
+@@ -762,5 +762,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 98aa889aa5f..52fc0a9854a 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 30eafe361d1..0a38aa8613a 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 d6ee91de005..781e9aa8511 100644
 --- a/dlls/d2d1/geometry.c
 +++ b/dlls/d2d1/geometry.c
-@@ -2982,7 +2982,7 @@ static const struct ID2D1GeometrySinkVtbl d2d_geometry_sink_vtbl =
+@@ -3360,7 +3360,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)
+@@ -4233,7 +4233,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:
+@@ -4945,7 +4945,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
+@@ -5229,7 +5229,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 4d3fe43a1b3..ccb7067fabf 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,16 +130,16 @@ 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 770c165fd90..a3b48095436 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
-     if (!iface)
+@@ -191,5 +191,5 @@ struct d2d_state_block *unsafe_impl_from_ID2D1DrawingStateBlock(ID2D1DrawingStat
+         WARN("Unexpected state block vtbl %p.\n", iface->lpVtbl);
          return NULL;
-     assert(iface->lpVtbl == (ID2D1DrawingStateBlockVtbl *)&d2d_state_block_vtbl);
+     }
 -    return CONTAINING_RECORD(iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
 +    return CONTAINING_RECORD((ID2D1DrawingStateBlock1*)iface, struct d2d_state_block, ID2D1DrawingStateBlock1_iface);
  }
 -- 
-2.17.1
+2.38.1
 

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

@@ -1,25 +0,0 @@
-From e35d665256d08ebccee30361867ba57f790d519f Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 22 Mar 2016 23:01:32 +0100
-Subject: rpcrt4: Avoid implicit cast of interface pointer.
-
----
- dlls/rpcrt4/cstub.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c
-index 838ed03..992c235 100644
---- a/dlls/rpcrt4/cstub.c
-+++ b/dlls/rpcrt4/cstub.c
-@@ -59,7 +59,7 @@ typedef struct
- 
- static inline cstdstubbuffer_delegating_t *impl_from_delegating( IRpcStubBuffer *iface )
- {
--    return CONTAINING_RECORD(iface, cstdstubbuffer_delegating_t, stub_buffer);
-+    return CONTAINING_RECORD((void *)iface, cstdstubbuffer_delegating_t, stub_buffer);
- }
- 
- HRESULT CStdStubBuffer_Construct(REFIID riid,
--- 
-2.7.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/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 49de5f50cf6eb5a3c4ab07be05ca25f96991ab8a 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 7fb2da63a0b..e9ea24f2680 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2572,6 +2572,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-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 00000000000..6382d85272b
---- /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 00000000000..c167f5e753e
---- /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 00000000000..3e282758f41
---- /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;
-+}
--- 
-2.34.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 adf1cce491f1580f73599ba2ec951a4004b4e091 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 +++
- ...xt-ms-win-appmodel-usercontext-l1-1-0.spec |  3 ++
- .../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 e9ea24f2680..54c8fcb183b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2572,6 +2572,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-xaml-pal-l1-1-0)
- WINE_CONFIG_MAKEFILE(dlls/faultrep)
- WINE_CONFIG_MAKEFILE(dlls/faultrep/tests)
-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 00000000000..16eee7588ff
---- /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 00000000000..7642d156c94
---- /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 00000000000..7a9e75f7109
---- /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.34.1
-

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

@@ -67,7 +67,7 @@ index cacb7ea7751..19a807c1624 100644
 -           Note: Launching internal wine processes cannot specify a full path to exe */
 -        status = CreateProcessW(thisDir,
 -                                command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe);
--        heap_free(st.lpReserved2);
+-        free(st.lpReserved2);
 -        if ((opt_c || opt_k) && !opt_s && !status
 -            && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
 -          /* strip first and last quote WCHARacters and try again */
@@ -143,7 +143,7 @@ index cacb7ea7751..19a807c1624 100644
 +      WINE_TRACE("Launching via CreateProcess\n");
 +      status = CreateProcessW(thisDir,
 +                              command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe);
-+      heap_free(st.lpReserved2);
++      free(st.lpReserved2);
 +      if ((opt_c || opt_k) && !opt_s && !status
 +          && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
 +        /* strip first and last quote WCHARacters and try again */

patches/comctl32-version_6/0001-comctl32-Bump-version-to-6.0.patch

@@ -1,4 +1,4 @@
-From c88a1acf9ac625cb2a7cbfc90ac3bb2d426889a0 Mon Sep 17 00:00:00 2001
+From 7362e037e8160046fffcf062a663ea8e7ac45290 Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 12 Nov 2019 18:13:20 +0800
 Subject: [PATCH] comctl32: Bump version to 6.0.
@@ -14,10 +14,10 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
-index 66b341ae5ad..1af9baea7ee 100644
+index 7dfdf089eb1..17ec7eeab40 100644
 --- a/dlls/comctl32/comctl32.h
 +++ b/dlls/comctl32/comctl32.h
-@@ -193,7 +193,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
+@@ -194,7 +194,7 @@ BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc) DECLSPEC_HIDDEN;
  BOOL Str_SetPtrWtoA (LPSTR *lppDest, LPCWSTR lpSrc) DECLSPEC_HIDDEN;
  BOOL imagelist_has_alpha(HIMAGELIST, UINT) DECLSPEC_HIDDEN;
  
@@ -40,12 +40,12 @@ index c9aa1ba6253..be6e2425193 100644
  #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
  
 diff --git a/include/commctrl.h b/include/commctrl.h
-index dfd2f4a37d2..0784478ce14 100644
+index a54de13d8b2..e0b0e22d4dc 100644
 --- a/include/commctrl.h
 +++ b/include/commctrl.h
-@@ -51,7 +51,7 @@ enum _LI_METRIC
- HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
- HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
+@@ -59,7 +59,7 @@ enum _LI_METRIC
+ WINCOMMCTRLAPI HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
+ WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
  
 -#define COMCTL32_VERSION                5  /* dll version */
 +#define COMCTL32_VERSION                6  /* dll version */
@@ -53,5 +53,5 @@ index dfd2f4a37d2..0784478ce14 100644
  #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
  #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
 -- 
-2.25.1
+2.35.1
 

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

@@ -1,4 +1,4 @@
-From 12a9a9cb506aede4748611c8fa3339afcee7c070 Mon Sep 17 00:00:00 2001
+From eddc40dbf4048ceea1fda7f842adad340865723b 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,29 +17,29 @@ Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
  create mode 100644 dlls/cryptext/tests/cryptext.c
 
 diff --git a/configure b/configure
-index 20bcb96a2a6..b8fd60dbb53 100755
+index 6425e4da5f8..c97671cdfc6 100755
 --- a/configure
 +++ b/configure
-@@ -20910,6 +20910,7 @@ wine_fn_config_makefile dlls/crypt32/tests enable_tests
+@@ -21346,6 +21346,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
 +wine_fn_config_makefile dlls/cryptext/tests enable_tests
  wine_fn_config_makefile dlls/cryptnet enable_cryptnet
  wine_fn_config_makefile dlls/cryptnet/tests enable_tests
- wine_fn_config_makefile dlls/cryptsp enable_cryptsp
+ wine_fn_config_makefile dlls/cryptowinrt enable_cryptowinrt
 diff --git a/configure.ac b/configure.ac
-index 6cbd947bf31..c68c5975e63 100644
+index b5a3b0069fb..73b1b1c8c2b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2361,6 +2361,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
+@@ -2450,6 +2450,7 @@ WINE_CONFIG_MAKEFILE(dlls/crypt32/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptdlg)
  WINE_CONFIG_MAKEFILE(dlls/cryptdll)
  WINE_CONFIG_MAKEFILE(dlls/cryptext)
 +WINE_CONFIG_MAKEFILE(dlls/cryptext/tests)
  WINE_CONFIG_MAKEFILE(dlls/cryptnet)
  WINE_CONFIG_MAKEFILE(dlls/cryptnet/tests)
- WINE_CONFIG_MAKEFILE(dlls/cryptsp)
+ WINE_CONFIG_MAKEFILE(dlls/cryptowinrt)
 diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
 index 0ec2b8a2045..76accca43eb 100644
 --- a/dlls/cryptext/Makefile.in
@@ -67,7 +67,7 @@ index ee3e155f457..24b4794c198 100644
  @ stub CryptExtOpenCRLW
  @ stub CryptExtOpenCTL
 diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c
-index 537ba66cd3b..f9e34d1f8c5 100644
+index 537ba66cd3b..a4314518eac 100644
 --- a/dlls/cryptext/cryptext_main.c
 +++ b/dlls/cryptext/cryptext_main.c
 @@ -22,10 +22,29 @@
@@ -161,7 +161,7 @@ index 00000000000..522fc60a4af
 +	cryptext.c
 diff --git a/dlls/cryptext/tests/cryptext.c b/dlls/cryptext/tests/cryptext.c
 new file mode 100644
-index 00000000000..cc62a772b59
+index 00000000000..ab1007dbd82
 --- /dev/null
 +++ b/dlls/cryptext/tests/cryptext.c
 @@ -0,0 +1,61 @@
@@ -227,5 +227,5 @@ index 00000000000..cc62a772b59
 +    test_CryptExtOpenCER();
 +}
 -- 
-2.34.1
+2.35.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/d3dx9_36-D3DXDisassembleShader/0004-d3dx9_36-Implement-D3DXDisassembleShader.patch

@@ -1,4 +1,4 @@
-From 6c3aa646aff81104eb7783138a71d4bb8cf192a7 Mon Sep 17 00:00:00 2001
+From 0ba05ea85f8f2de3c802083340eb3a9ee8df209e Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sat, 13 Feb 2016 15:29:37 +0100
 Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
@@ -6,11 +6,11 @@ Subject: [PATCH] d3dx9_36: Implement D3DXDisassembleShader. (v2)
 Changes in v2 (by Christian Costa):
   * More generic code for D3DXDisassembleShader.
 ---
- dlls/d3dx9_36/shader.c | 332 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 327 insertions(+), 5 deletions(-)
+ dlls/d3dx9_36/shader.c | 335 ++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 329 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index fe0f99180ac..54d0b158568 100644
+index 1aa75d64dc5..d98345e2288 100644
 --- a/dlls/d3dx9_36/shader.c
 +++ b/dlls/d3dx9_36/shader.c
 @@ -1,6 +1,7 @@
@@ -21,22 +21,27 @@ index fe0f99180ac..54d0b158568 100644
   * Copyright 2011 Travis Athougies
   *
   * This library is free software; you can redistribute it and/or
-@@ -18,7 +19,7 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+@@ -19,6 +20,7 @@
   */
  
--
+ #include <assert.h>
 +#include <stdio.h>
+ 
  #include "d3dx9_private.h"
  #include "d3dcommon.h"
- #include "d3dcompiler.h"
-@@ -2336,13 +2337,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
+@@ -2347,13 +2349,334 @@ HRESULT WINAPI D3DXGetShaderSamplers(const DWORD *byte_code, const char **sample
      return D3D_OK;
  }
  
+-HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments,
+-        ID3DXBuffer **buffer)
+-{
+-    TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer);
 +static const char *decl_usage[] = { "position", "blendweight", "blendindices", "normal", "psize", "texcoord",
 +                                    "tangent", "binormal", "tessfactor", "positiont", "color" };
-+
+ 
+-    return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0,
+-            comments, (ID3DBlob **)buffer);
 +static const char *tex_type[] = { "", "1d", "2d", "cube", "volume" };
 +
 +static int add_modifier(char *buffer, DWORD param)
@@ -298,11 +303,9 @@ index fe0f99180ac..54d0b158568 100644
 +    { D3DSIO_COMMENT,      "",              0, instr_comment, 0x0100, 0xFFFF }
 +};
 +
- HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments,
--        ID3DXBuffer **buffer)
++HRESULT WINAPI D3DXDisassembleShader(const DWORD *shader, BOOL colorcode, const char *comments,
 +        ID3DXBuffer **disassembly)
- {
--    TRACE("shader %p, colorcode %d, comments %s, buffer %p.\n", shader, colorcode, debugstr_a(comments), buffer);
++{
 +    DWORD *ptr = (DWORD *)shader;
 +    char *buffer, *buf;
 +    UINT capacity = 4096;
@@ -314,9 +317,7 @@ index fe0f99180ac..54d0b158568 100644
 +
 +    if (!shader || !disassembly)
 +        return D3DERR_INVALIDCALL;
- 
--    return D3DDisassemble(shader, D3DXGetShaderSize(shader), colorcode ? D3D_DISASM_ENABLE_COLOR_CODE : 0,
--            comments, (ID3DBlob **)buffer);
++
 +    buf = buffer = HeapAlloc(GetProcessHeap(), 0, capacity);
 +    if (!buffer)
 +        return E_OUTOFMEMORY;
@@ -370,5 +371,5 @@ index fe0f99180ac..54d0b158568 100644
  
  struct d3dx9_texture_shader
 -- 
-2.32.0
+2.39.0
 

patches/d3dx9_36-DDS/0001-d3dx9_36-Add-support-for-FOURCC-surface-to-save_dds_.patch

@@ -1,7 +1,7 @@
-From cfbee3f0f952769dbf663489c2a209493c7412d3 Mon Sep 17 00:00:00 2001
+From 5d9d9cbdb4043848aa5ebdd8a1349d9c876650e3 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:18:03 +0100
-Subject: d3dx9_36: Add support for FOURCC surface to
+Subject: [PATCH] d3dx9_36: Add support for FOURCC surface to
  save_dds_surface_to_memory.
 
 ---
@@ -9,10 +9,10 @@ Subject: d3dx9_36: Add support for FOURCC surface to
  1 file changed, 8 insertions(+)
 
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 4fa2a76..58b676d 100644
+index 26809a47e18..db334ee83f1 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -311,6 +311,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
+@@ -433,6 +433,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
          }
      }
  
@@ -24,9 +24,9 @@ index 4fa2a76..58b676d 100644
 +        return D3D_OK;
 +    }
 +
-     WARN("Unknown pixel format %#x\n", d3dformat);
+     WARN("Unknown pixel format %#x.\n", d3dformat);
      return E_NOTIMPL;
  }
 -- 
-2.6.4
+2.35.1
 

patches/d3dx9_36-UpdateSkinnedMesh/0001-d3dx9_36-Implement-ID3DXSkinInfoImpl_UpdateSkinnedMe.patch

@@ -1,16 +1,16 @@
-From 33e4e3219056f09ed8b406d154b87bafedb1ebe0 Mon Sep 17 00:00:00 2001
+From 7ba5e4a89be15deeb704078ad8321c7cc5aa02eb Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Mon, 22 Jul 2013 21:51:20 +0200
-Subject: d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
+Subject: [PATCH] d3dx9_36: Implement ID3DXSkinInfoImpl_UpdateSkinnedMesh.
 
 This patch fixes last problem of bug 32572.
 ---
- dlls/d3dx9_36/skin.c       | 86 ++++++++++++++++++++++++++++++++++++++++++++--
- dlls/d3dx9_36/tests/mesh.c | 83 ++++++++++++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/skin.c       | 86 ++++++++++++++++++++++++++++++++++++--
+ dlls/d3dx9_36/tests/mesh.c | 83 ++++++++++++++++++++++++++++++++++++
  2 files changed, 166 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c
-index aa5acf2..bd7e581 100644
+index b81fb6863d3..75ee6d44a95 100644
 --- a/dlls/d3dx9_36/skin.c
 +++ b/dlls/d3dx9_36/skin.c
 @@ -2,6 +2,7 @@
@@ -21,7 +21,7 @@ index aa5acf2..bd7e581 100644
   *
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
-@@ -375,10 +376,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface,
+@@ -399,10 +400,89 @@ static HRESULT WINAPI d3dx9_skin_info_GetDeclaration(ID3DXSkinInfo *iface,
  static HRESULT WINAPI d3dx9_skin_info_UpdateSkinnedMesh(ID3DXSkinInfo *iface, const D3DXMATRIX *bone_transforms,
          const D3DXMATRIX *bone_inv_transpose_transforms, const void *src_vertices, void *dst_vertices)
  {
@@ -115,11 +115,11 @@ index aa5acf2..bd7e581 100644
  
  static HRESULT WINAPI d3dx9_skin_info_ConvertToBlendedMesh(ID3DXSkinInfo *iface, ID3DXMesh *mesh_in,
 diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index 17c5d9c..e255eac 100644
+index 1daec158a5f..64b02276843 100644
 --- a/dlls/d3dx9_36/tests/mesh.c
 +++ b/dlls/d3dx9_36/tests/mesh.c
-@@ -5152,6 +5152,88 @@ static void test_create_skin_info(void)
-     ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#x\n", hr);
+@@ -5241,6 +5241,88 @@ static void test_create_skin_info(void)
+     ok(hr == D3DERR_INVALIDCALL, "Expected D3DERR_INVALIDCALL, got %#lx\n", hr);
  }
  
 +static void test_update_skinned_mesh(void)
@@ -207,7 +207,7 @@ index 17c5d9c..e255eac 100644
  static void test_convert_adjacency_to_point_reps(void)
  {
      HRESULT hr;
-@@ -10468,6 +10550,7 @@ START_TEST(mesh)
+@@ -11484,6 +11566,7 @@ START_TEST(mesh)
      D3DXGenerateAdjacencyTest();
      test_update_semantics();
      test_create_skin_info();
@@ -216,5 +216,5 @@ index 17c5d9c..e255eac 100644
      test_convert_point_reps_to_adjacency();
      test_weld_vertices();
 -- 
-2.1.2
+2.38.1
 

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

@@ -1,4 +1,4 @@
-From 8c78d1203c965927d0a0e6fcde31dd651cc704db Mon Sep 17 00:00:00 2001
+From f78fc333748a6c4f664bb10ee2115c86690b3b16 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Mon, 6 Oct 2014 05:06:06 +0200
 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@@ -22,7 +22,7 @@ index 22be2612eeb..2e11bb2b62d 100644
  
  C_SRCS = \
 diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
-index 404c7c11dbb..e0779e4e3a7 100644
+index 3c1e225e195..4468f7fa4ed 100644
 --- a/dlls/dbghelp/elf_module.c
 +++ b/dlls/dbghelp/elf_module.c
 @@ -1445,6 +1445,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,
@@ -30,9 +30,9 @@ index 404c7c11dbb..e0779e4e3a7 100644
  
          ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf)
 +            || search_unix_path(filename, BINDIR, elf_load_file_cb, &load_elf)
-             || search_dll_path(pcs, filename, elf_load_file_cb, &load_elf);
+             || search_dll_path(pcs, filename, IMAGE_FILE_MACHINE_UNKNOWN, elf_load_file_cb, &load_elf);
      }
  
 -- 
-2.34.1
+2.39.1