Release v7.22

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

.github/workflows/macOS.yml

@@ -19,7 +19,7 @@ jobs:
           brew install  bison \
                         gphoto2 \
                         gst-plugins-base \
-                        gcenx/wine/mingw-w64@9 \
+                        mingw-w64 \
                         molten-vk \
                         sdl2
 
@@ -28,7 +28,6 @@ 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: |
@@ -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)

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 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/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/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

@@ -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/cryptext-CryptExtOpenCER/0001-cryptext-Implement-CryptExtOpenCER.patch

@@ -1,4 +1,4 @@
-From a5045503cf3310058cc64814ff9626f4877a13bb 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 db592f0868d..ba13abacc46 100755
+index 6425e4da5f8..c97671cdfc6 100755
 --- a/configure
 +++ b/configure
-@@ -20291,6 +20291,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 d449b88fb19..af75e0e80ab 100644
+index b5a3b0069fb..73b1b1c8c2b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3029,6 +3029,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 @@
@@ -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);
@@ -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 @@
@@ -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.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-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/ddraw-Device_Caps/0001-ddraw-Don-t-set-HWTRANSFORMANDLIGHT-flag-on-d3d7-RGB.patch

@@ -1,116 +0,0 @@
-From 861cd6c6409efce4eb03aad3bc01f5df772e77fb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 6 Feb 2016 01:15:07 +0100
-Subject: [PATCH] ddraw: Don't set HWTRANSFORMANDLIGHT flag on d3d7 RGB device.
-
----
- dlls/ddraw/ddraw.c        |  9 +++++++++
- dlls/ddraw/tests/ddraw7.c | 18 ++++++++++++++++++
- 2 files changed, 27 insertions(+)
-
-diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
-index 705d0335d95..1d916f93c4f 100644
---- a/dlls/ddraw/ddraw.c
-+++ b/dlls/ddraw/ddraw.c
-@@ -49,6 +49,7 @@ static struct enum_device_entry
-     char interface_name[100];
-     char device_name[100];
-     const GUID *device_guid;
-+    DWORD remove_caps;
- } device_list7[] =
- {
-     /* T&L HAL device */
-@@ -56,6 +57,7 @@ static struct enum_device_entry
-         "WINE Direct3D7 Hardware Transform and Lighting acceleration using WineD3D",
-         "Wine D3D7 T&L HAL",
-         &IID_IDirect3DTnLHalDevice,
-+        0,
-     },
- 
-     /* HAL device */
-@@ -63,6 +65,7 @@ static struct enum_device_entry
-         "WINE Direct3D7 Hardware acceleration using WineD3D",
-         "Direct3D HAL",
-         &IID_IDirect3DHALDevice,
-+        0,
-     },
- 
-     /* RGB device */
-@@ -70,6 +73,7 @@ static struct enum_device_entry
-         "WINE Direct3D7 RGB Software Emulation using WineD3D",
-         "Wine D3D7 RGB",
-         &IID_IDirect3DRGBDevice,
-+        D3DDEVCAPS_HWTRANSFORMANDLIGHT,
-     },
- };
- 
-@@ -3749,6 +3753,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
- {
-     struct ddraw *ddraw = impl_from_IDirect3D7(iface);
-     D3DDEVICEDESC7 device_desc7;
-+    DWORD dev_caps;
-     HRESULT hr;
-     size_t i;
- 
-@@ -3765,11 +3770,15 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA
-         return hr;
-     }
- 
-+    dev_caps = device_desc7.dwDevCaps;
-+
-     for (i = 0; i < ARRAY_SIZE(device_list7); i++)
-     {
-         HRESULT ret;
- 
-         device_desc7.deviceGUID = *device_list7[i].device_guid;
-+        device_desc7.dwDevCaps  = dev_caps & ~device_list7[i].remove_caps;
-+
-         ret = callback(device_list7[i].interface_name, device_list7[i].device_name, &device_desc7, context);
-         if (ret != DDENUMRET_OK)
-         {
-diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c
-index d641595baa2..54cc18b74f2 100644
---- a/dlls/ddraw/tests/ddraw7.c
-+++ b/dlls/ddraw/tests/ddraw7.c
-@@ -577,6 +577,19 @@ static IDirect3DDevice7 *create_device_ex(HWND window, DWORD coop_level, const G
-     return device;
- }
- 
-+static HRESULT WINAPI enum_devtype_software_cb(char *desc_str, char *name, D3DDEVICEDESC7 *desc, void *ctx)
-+{
-+    BOOL *software_ok = ctx;
-+    if (IsEqualGUID(&desc->deviceGUID, &IID_IDirect3DRGBDevice))
-+    {
-+        ok(!(desc->dwDevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT),
-+           "RGB emulation device shouldn't have HWTRANSFORMANDLIGHT flag\n");
-+        *software_ok = TRUE;
-+        return DDENUMRET_CANCEL;
-+    }
-+    return DDENUMRET_OK;
-+}
-+
- static IDirect3DDevice7 *create_device(HWND window, DWORD coop_level)
- {
-     const GUID *device_guid = &IID_IDirect3DHALDevice;
-@@ -6719,6 +6732,7 @@ static void test_surface_lock(void)
-     ULONG refcount;
-     DDPIXELFORMAT z_fmt;
-     BOOL hal_ok = FALSE;
-+    BOOL software_ok = FALSE;
-     const GUID *devtype = &IID_IDirect3DHALDevice;
-     D3DDEVICEDESC7 device_desc;
-     BOOL cubemap_supported;
-@@ -6844,6 +6858,10 @@ static void test_surface_lock(void)
-     if (hal_ok)
-         devtype = &IID_IDirect3DTnLHalDevice;
- 
-+    hr = IDirect3D7_EnumDevices(d3d, enum_devtype_software_cb, &software_ok);
-+    ok(SUCCEEDED(hr), "Failed to enumerate devices, hr %#x.\n", hr);
-+    if (!software_ok) win_skip("RGB device not found, unable to check flags\n");
-+
-     memset(&z_fmt, 0, sizeof(z_fmt));
-     hr = IDirect3D7_EnumZBufferFormats(d3d, devtype, enum_z_fmt, &z_fmt);
-     if (FAILED(hr) || !z_fmt.dwSize)
--- 
-2.20.1
-

patches/ddraw-IDirect3DTexture2_Load/0001-ddraw-Allow-size-and-format-conversions-in-IDirect3D.patch

@@ -1,4 +1,4 @@
-From 7e0e8ea02fa2670a29e1c312f88205b870521a9e Mon Sep 17 00:00:00 2001
+From e2505b43f26d0517aad97c2778958886568ad58b Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 30 May 2015 02:55:03 +0200
 Subject: [PATCH] ddraw: Allow size and format conversions in
@@ -9,10 +9,10 @@ Subject: [PATCH] ddraw: Allow size and format conversions in
  1 file changed, 82 insertions(+), 71 deletions(-)
 
 diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
-index f5c3528cfa4..a8b919c05c2 100644
+index 421ce68fa1c..b2c674eba7a 100644
 --- a/dlls/ddraw/surface.c
 +++ b/dlls/ddraw/surface.c
-@@ -5316,6 +5316,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
+@@ -5321,6 +5321,46 @@ static struct ddraw_surface *get_sub_mimaplevel(struct ddraw_surface *surface)
      return impl_from_IDirectDrawSurface7(next_level);
  }
  
@@ -59,7 +59,7 @@ index f5c3528cfa4..a8b919c05c2 100644
  /*****************************************************************************
   * IDirect3DTexture2::Load
   *
-@@ -5337,7 +5377,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5342,7 +5382,7 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  {
      struct ddraw_surface *dst_surface = impl_from_IDirect3DTexture2(iface);
      struct ddraw_surface *src_surface = unsafe_impl_from_IDirect3DTexture2(src_texture);
@@ -68,7 +68,7 @@ index f5c3528cfa4..a8b919c05c2 100644
      HRESULT hr;
  
      TRACE("iface %p, src_texture %p.\n", iface, src_texture);
-@@ -5350,90 +5390,62 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5355,90 +5395,62 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
  
      wined3d_mutex_lock();
  
@@ -159,7 +159,7 @@ index f5c3528cfa4..a8b919c05c2 100644
 -            if (FAILED(hr = wined3d_resource_map(src_resource,
 -                    src_surface->sub_resource_idx, &src_map_desc, NULL, WINED3D_MAP_READ)))
 -            {
--                ERR("Failed to lock source surface, hr %#x.\n", hr);
+-                ERR("Failed to lock source surface, hr %#lx.\n", hr);
 -                wined3d_mutex_unlock();
 -                return D3DERR_TEXTURE_LOAD_FAILED;
 -            }
@@ -167,7 +167,7 @@ index f5c3528cfa4..a8b919c05c2 100644
 -            if (FAILED(hr = wined3d_resource_map(dst_resource,
 -                    dst_surface->sub_resource_idx, &dst_map_desc, NULL, WINED3D_MAP_WRITE)))
 -            {
--                ERR("Failed to lock destination surface, hr %#x.\n", hr);
+-                ERR("Failed to lock destination surface, hr %#lx.\n", hr);
 -                wined3d_resource_unmap(src_resource, src_surface->sub_resource_idx);
 -                wined3d_mutex_unlock();
 -                return D3DERR_TEXTURE_LOAD_FAILED;
@@ -191,13 +191,13 @@ index f5c3528cfa4..a8b919c05c2 100644
 +                src_surface->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_LINEAR);
 +        if (FAILED(hr))
 +        {
-+            ERR("Failed to blit surface, hr %#x.\n", hr);
++            ERR("Failed to blit surface, hr %#lx.\n", hr);
 +            wined3d_mutex_unlock();
 +            return hr;
          }
  
          if (src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_MIPMAP)
-@@ -5446,12 +5458,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
+@@ -5451,12 +5463,11 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu
          else
              dst_surface = NULL;
  
@@ -214,5 +214,5 @@ index f5c3528cfa4..a8b919c05c2 100644
  
      wined3d_mutex_unlock();
 -- 
-2.30.2
+2.34.1
 

patches/ddraw-IDirect3DTexture2_Load/0002-ddraw-tests-Add-more-tests-for-IDirect3DTexture2-Loa.patch

@@ -1,18 +1,18 @@
-From 4498bb259a9ab5e5bf6f8a55dc96b6ac24c82e09 Mon Sep 17 00:00:00 2001
+From 9028351204472aafe5d7731c8737a6cfdb09e659 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 30 May 2015 02:56:19 +0200
-Subject: ddraw/tests: Add more tests for IDirect3DTexture2::Load.
+Subject: [PATCH] ddraw/tests: Add more tests for IDirect3DTexture2::Load.
 
 ---
- dlls/ddraw/tests/d3d.c    | 373 ++++++++++++++++++++++++++++++++++++++++++++++
- dlls/ddraw/tests/ddraw2.c |  28 +++-
+ dlls/ddraw/tests/d3d.c    | 373 ++++++++++++++++++++++++++++++++++++++
+ dlls/ddraw/tests/ddraw2.c |  28 ++-
  2 files changed, 400 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
-index ec4197a..d35d0e0 100644
+index 87d0648b699..e88bbf59767 100644
 --- a/dlls/ddraw/tests/d3d.c
 +++ b/dlls/ddraw/tests/d3d.c
-@@ -1515,6 +1515,288 @@ static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY ta
+@@ -1221,6 +1221,288 @@ static BOOL colortables_check_equality(PALETTEENTRY table1[256], PALETTEENTRY ta
      return TRUE;
  }
  
@@ -301,9 +301,9 @@ index ec4197a..d35d0e0 100644
  /* test palette handling in IDirect3DTexture_Load */
  static void TextureLoadTest(void)
  {
-@@ -1578,6 +1860,97 @@ static void TextureLoadTest(void)
+@@ -1284,6 +1566,97 @@ static void TextureLoadTest(void)
      hr = IDirect3DTexture_Load(Texture2, Texture);
-     ok(hr == DD_OK, "IDirect3DTexture_Load returned %08x\n", hr);
+     ok(hr == DD_OK, "Got hr %#lx.\n", hr);
  
 +    for (i = 0; i < sizeof(load_tests) / sizeof(load_tests[0]); i++)
 +    {
@@ -400,10 +400,10 @@ index ec4197a..d35d0e0 100644
          table1[i].peRed = i;
          table1[i].peGreen = i;
 diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c
-index 0cb1ca4..a2489e4 100644
+index 2d08718d131..0a2d575e8cc 100644
 --- a/dlls/ddraw/tests/ddraw2.c
 +++ b/dlls/ddraw/tests/ddraw2.c
-@@ -1121,8 +1121,10 @@ static void test_texture_load_ckey(void)
+@@ -1495,8 +1495,10 @@ static void test_texture_load_ckey(void)
      IDirectDraw2 *ddraw = NULL;
      IDirectDrawSurface *src = NULL;
      IDirectDrawSurface *dst = NULL;
@@ -414,7 +414,7 @@ index 0cb1ca4..a2489e4 100644
      DDSURFACEDESC ddsd;
      HRESULT hr;
      DDCOLORKEY ckey;
-@@ -1134,16 +1136,31 @@ static void test_texture_load_ckey(void)
+@@ -1508,16 +1510,31 @@ static void test_texture_load_ckey(void)
  
      memset(&ddsd, 0, sizeof(ddsd));
      ddsd.dwSize = sizeof(ddsd);
@@ -431,10 +431,10 @@ index 0cb1ca4..a2489e4 100644
 +    U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x000000FF;
 +
      hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &src, NULL);
-     ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr), "Failed to create source texture, hr %#lx.\n", hr);
      ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE;
      hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &dst, NULL);
-     ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#lx.\n", hr);
  
 +    U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16;
 +    U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xf800;
@@ -445,20 +445,20 @@ index 0cb1ca4..a2489e4 100644
 +    ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr);
 +
      hr = IDirectDrawSurface_QueryInterface(src, &IID_IDirect3DTexture, (void **)&src_tex);
-     ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#lx.\n", hr);
      if (FAILED(hr))
-@@ -1154,6 +1171,8 @@ static void test_texture_load_ckey(void)
+@@ -1528,6 +1545,8 @@ static void test_texture_load_ckey(void)
      }
      hr = IDirectDrawSurface_QueryInterface(dst, &IID_IDirect3DTexture, (void **)&dst_tex);
-     ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr);
+     ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#lx.\n", hr);
 +    hr = IDirectDrawSurface_QueryInterface(dst2, &IID_IDirect3DTexture, (void **)&dst2_tex);
-+    ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr);
++    ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#lx.\n", hr);
  
      /* No surface has a color key */
      hr = IDirect3DTexture_Load(dst_tex, src_tex);
-@@ -1182,6 +1201,11 @@ static void test_texture_load_ckey(void)
-     ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue);
-     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue);
+@@ -1556,6 +1575,11 @@ static void test_texture_load_ckey(void)
+     ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceLowValue);
+     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceHighValue);
  
 +    /* Source surface has a color key but destination differs in format */
 +    ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0;
@@ -468,8 +468,8 @@ index 0cb1ca4..a2489e4 100644
      /* Both surfaces have a color key: Dest ckey is overwritten */
      ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff;
      hr = IDirectDrawSurface_SetColorKey(dst, DDCKEY_SRCBLT, &ckey);
-@@ -1206,8 +1230,10 @@ static void test_texture_load_ckey(void)
-     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue);
+@@ -1580,8 +1604,10 @@ static void test_texture_load_ckey(void)
+     ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "Got unexpected value 0x%08lx.\n", ckey.dwColorSpaceHighValue);
  
  done:
 +    if (dst2_tex) IDirect3DTexture_Release(dst2_tex);
@@ -480,5 +480,5 @@ index 0cb1ca4..a2489e4 100644
      if (src) IDirectDrawSurface_Release(src);
      if (ddraw) IDirectDraw2_Release(ddraw);
 -- 
-2.4.2
+2.35.1
 

patches/ddraw-version-check/definition

@@ -8,3 +8,4 @@
 #   The Sims Online
 Fixes: [19153] Resident Evil 1 fails to start (needs IDirect3D3::EnumDevices() to return a device named "RGB Emulation")
 Depends: ddraw-Device_Caps
+Disabled: True

patches/dinput-joy-mappings/0004-dinput-Allow-mapping-of-controls-based-of-Genre-type.patch

@@ -44,7 +44,7 @@ index e826cc89c1e..a4815f24958 100644
 +            else if (type == DIDFT_RELAXIS) type = DIDFT_AXIS;
 +
 +            obj = dataformat_to_odf_by_type(df, inst, type);
-+            TRACE("obj %p, inst 0x%08x, type 0x%08x\n", obj, inst, type);
++            TRACE("obj %p, inst 0x%08lx, type 0x%08lx\n", obj, inst, type);
 +            if(obj)
 +            {
 +                memcpy(&obj_df[action], obj, df->dwObjSize);