Release v7.10

libs-Unicode_Collation is not fully replaced upstream, but the remaining patch (0006) holds no value anymore.

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

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

patches/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/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-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/dsound-EAX/0001-dsound-Apply-filters-before-sound-is-multiplied-to-s.patch

@@ -1,4 +1,4 @@
-From 2af1ec49d958424e2b78f52ae3e3daca1d562b35 Mon Sep 17 00:00:00 2001
+From da59fcb896bc204ea0ea1d866eeddef0c9b962c4 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 28 Mar 2015 08:18:10 +0100
 Subject: [PATCH] dsound: Apply filters before sound is multiplied to speakers.
@@ -11,7 +11,7 @@ Based on a patch by Mark Harmstone.
  3 files changed, 80 insertions(+), 35 deletions(-)
 
 diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
-index 3085d86e5b5..91fa94b943e 100644
+index 346cc4ceca3..e869c4dd251 100644
 --- a/dlls/dsound/dsound.c
 +++ b/dlls/dsound/dsound.c
 @@ -234,6 +234,8 @@ static ULONG DirectSoundDevice_Release(DirectSoundDevice * device)
@@ -24,7 +24,7 @@ index 3085d86e5b5..91fa94b943e 100644
          HeapFree(GetProcessHeap(), 0, device->cp_buffer);
          HeapFree(GetProcessHeap(), 0, device->buffer);
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index 2408f80ba82..2e23f222b03 100644
+index f89588de4d9..d4e74ed0e82 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
 @@ -89,8 +89,8 @@ struct DirectSoundDevice
@@ -39,7 +39,7 @@ index 2408f80ba82..2e23f222b03 100644
      DSVOLUMEPAN                 volpan;
  
 diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c
-index 1877d61cbf0..13bff1b9ae7 100644
+index 50816b1a582..ddab45893ac 100644
 --- a/dlls/dsound/mixer.c
 +++ b/dlls/dsound/mixer.c
 @@ -283,10 +283,9 @@ static inline float get_current_sample(const IDirectSoundBufferImpl *dsb,
@@ -54,7 +54,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT committed_samples = 0;
      DWORD channel, i;
  
-@@ -302,17 +301,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
+@@ -305,17 +304,16 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count)
  
      for (; i < count; i++)
          for (channel = 0; channel < dsb->mix_channels; channel++)
@@ -75,7 +75,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT channels = dsb->mix_channels;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -340,7 +338,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -343,7 +341,7 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
              float s1 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx, channel);
              float s2 = get_current_sample(dsb, dsb->buffer->memory, dsb->buflen, idx + istride, channel);
              float result = s1 * cur_freqAcc2 + s2 * cur_freqAcc;
@@ -84,7 +84,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
          }
      }
  
-@@ -348,11 +346,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -351,11 +349,11 @@ static UINT cp_fields_resample_lq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -98,7 +98,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
      UINT committed_samples = 0;
  
      LONG64 freqAcc_start = *freqAccNum;
-@@ -422,7 +420,7 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
+@@ -430,23 +428,24 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
              float* cache = &intermediate[channel * required_input + ipos];
              for (j = 0; j < fir_used; j++)
                  sum += fir_copy[j] * cache[j];
@@ -107,7 +107,6 @@ index 1877d61cbf0..13bff1b9ae7 100644
          }
      }
  
-@@ -431,16 +429,17 @@ static UINT cp_fields_resample_hq(IDirectSoundBufferImpl *dsb, UINT count, LONG6
      return max_ipos;
  }
  
@@ -129,7 +128,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
  
      ipos = dsb->sec_mixpos + adv * dsb->pwfx->nBlockAlign;
      if (ipos >= dsb->buflen) {
-@@ -476,6 +475,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -482,6 +481,21 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
  		return buflen + ptr1 - ptr2;
  	}
  }
@@ -151,7 +150,7 @@ index 1877d61cbf0..13bff1b9ae7 100644
  /**
   * Mix at most the given amount of data into the allocated temporary buffer
   * of the given secondary buffer, starting from the dsb's first currently
-@@ -491,34 +505,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
+@@ -497,34 +511,63 @@ static inline DWORD DSOUND_BufPtrDiff(DWORD buflen, DWORD ptr1, DWORD ptr2)
   */
  static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames)
  {
@@ -211,9 +210,9 @@ index 1877d61cbf0..13bff1b9ae7 100644
 +                    hr = IMediaObjectInPlace_Process(dsb->filters[i].inplace, frames * sizeof(float) * dsb->mix_channels,
 +                                                     (BYTE *)dsb->device->dsp_buffer, 0, DMO_INPLACE_NORMAL);
 +                    if (FAILED(hr))
-+                        WARN("IMediaObjectInPlace_Process failed for filter %u\n", i);
++                        WARN("IMediaObjectInPlace_Process failed for filter %lu\n", i);
 +                } else
-+                    WARN("filter %u has no inplace object - unsupported\n", i);
++                    WARN("filter %lu has no inplace object - unsupported\n", i);
 +            }
 +        }
  
@@ -235,5 +234,5 @@ index 1877d61cbf0..13bff1b9ae7 100644
  
  static void DSOUND_MixerVol(const IDirectSoundBufferImpl *dsb, INT frames)
 -- 
-2.33.0
+2.35.1
 

patches/dsound-EAX/0004-dsound-Add-EAX-propset-stubs.patch

@@ -1,4 +1,4 @@
-From ee7fe13f2c520e1360e46f825790539b5bc2be3b Mon Sep 17 00:00:00 2001
+From c2c33dff38e55d87582d8d6526b3d321ba577570 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 22 Mar 2015 13:58:53 +0000
 Subject: [PATCH] dsound: Add EAX propset stubs.
@@ -68,7 +68,7 @@ index 304708c26da..c0e254f7a6e 100644
  void DSOUND_RecalcVolPan(PDSVOLUMEPAN volpan) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
 new file mode 100644
-index 00000000000..c30c7e1a51a
+index 00000000000..c1264f977b6
 --- /dev/null
 +++ b/dlls/dsound/eax.c
 @@ -0,0 +1,54 @@
@@ -109,7 +109,7 @@ index 00000000000..c30c7e1a51a
 +        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
 +        ULONG cbPropData, ULONG *pcbReturned)
 +{
-+    TRACE("(buf=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
++    TRACE("(buf=%p,guidPropSet=%s,dwPropID=%lu,pInstanceData=%p,cbInstanceData=%lu,pPropData=%p,cbPropData=%lu,pcbReturned=%p)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned);
 +
 +    *pcbReturned = 0;
@@ -121,11 +121,11 @@ index 00000000000..c30c7e1a51a
 +        ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
 +        ULONG cbPropData)
 +{
-+    TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",
++    TRACE("(%p,%s,%lu,%p,%lu,%p,%lu)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
 +
 +    return E_PROP_ID_UNSUPPORTED;
 +}
 -- 
-2.34.1
+2.35.1
 

patches/dsound-EAX/0006-dsound-Support-getting-and-setting-EAX-properties.patch

@@ -1,16 +1,16 @@
-From fe1de4d0856517f1ce59a3a5eb15a13f6ce4a9e6 Mon Sep 17 00:00:00 2001
+From d60cc4b9f0a45a69813d0faf172a04c32aff3990 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 22 Mar 2015 14:22:02 +0000
-Subject: dsound: Support getting and setting EAX properties.
+Subject: [PATCH] dsound: Support getting and setting EAX properties.
 
 ---
- dlls/dsound/dsound_eax.h     |   8 +++
+ dlls/dsound/dsound_eax.h     |   8 ++
  dlls/dsound/dsound_private.h |   2 +
- dlls/dsound/eax.c            | 167 +++++++++++++++++++++++++++++++++++++++++++
+ dlls/dsound/eax.c            | 167 +++++++++++++++++++++++++++++++++++
  3 files changed, 177 insertions(+)
 
 diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
-index 06d961e..c90d82d 100644
+index 06d961e006e..c90d82d9a3f 100644
 --- a/dlls/dsound/dsound_eax.h
 +++ b/dlls/dsound/dsound_eax.h
 @@ -111,6 +111,14 @@ typedef struct {
@@ -29,10 +29,10 @@ index 06d961e..c90d82d 100644
  }
  #endif
 diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
-index e4495b2..c16f770 100644
+index c0e254f7a6e..461fbd4fdc8 100644
 --- a/dlls/dsound/dsound_private.h
 +++ b/dlls/dsound/dsound_private.h
-@@ -99,6 +99,8 @@ struct DirectSoundDevice
+@@ -97,6 +97,8 @@ struct DirectSoundDevice
  
      normfunc normfunction;
  
@@ -42,7 +42,7 @@ index e4495b2..c16f770 100644
      DS3DLISTENER                ds3dl;
      BOOL                        ds3dl_need_recalc;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 57d88e7..cdd03be 100644
+index c1653a200c5..13471aec3a9 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -92,6 +92,22 @@ static const EFXEAXREVERBPROPERTIES efx_presets[] = {
@@ -145,7 +145,7 @@ index 57d88e7..cdd03be 100644
  {
 +    EAX_REVERBPROPERTIES *props;
 +
-     TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",
+     TRACE("(%p,%s,%lu,%p,%lu,%p,%lu)\n",
          buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
  
 +    if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet)) {
@@ -236,5 +236,5 @@ index 57d88e7..cdd03be 100644
      return E_PROP_ID_UNSUPPORTED;
  }
 -- 
-2.3.3
+2.35.1
 

patches/dsound-EAX/0019-dsound-Allow-disabling-of-EAX-support-in-the-registr.patch

@@ -1,4 +1,4 @@
-From af21be49d511224d7299ef3d21f08ebfee66f3a5 Mon Sep 17 00:00:00 2001
+From 38fec88e8dee99a012773648289b228245001c6c Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 5 Apr 2015 19:13:18 +0200
 Subject: [PATCH] dsound: Allow disabling of EAX support in the registry.
@@ -97,7 +97,7 @@ index 0bca36b2540..7d488ab1e45 100644
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData, ULONG *pcbReturned) DECLSPEC_HIDDEN;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index ef802b95a7d..570207709f0 100644
+index 2244565897b..3e15ac59480 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -809,6 +809,28 @@ void free_eax_buffer(IDirectSoundBufferImpl *dsb)
@@ -106,7 +106,7 @@ index ef802b95a7d..570207709f0 100644
  
 +BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSupport)
 +{
-+    TRACE("(%s,%d,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
++    TRACE("(%s,%ld,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
 +
 +    if (!ds_eax_enabled)
 +        return FALSE;
@@ -130,7 +130,7 @@ index ef802b95a7d..570207709f0 100644
          ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData,
          ULONG cbPropData, ULONG *pcbReturned)
 @@ -816,6 +838,9 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
-     TRACE("(buf=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
+     TRACE("(buf=%p,guidPropSet=%s,dwPropID=%lu,pInstanceData=%p,cbInstanceData=%lu,pPropData=%p,cbPropData=%lu,pcbReturned=%p)\n",
          buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned);
  
 +    if (!ds_eax_enabled)
@@ -140,7 +140,7 @@ index ef802b95a7d..570207709f0 100644
  
      if (IsEqualGUID(&DSPROPSETID_EAX_ReverbProperties, guidPropSet)) {
 @@ -922,6 +947,9 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
-     TRACE("(%p,%s,%d,%p,%d,%p,%d)\n",
+     TRACE("(%p,%s,%lu,%p,%lu,%p,%lu)\n",
          buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
  
 +    if (!ds_eax_enabled)
@@ -150,5 +150,5 @@ index ef802b95a7d..570207709f0 100644
          buf->device->eax.using_eax = TRUE;
  
 -- 
-2.34.1
+2.35.1
 

patches/dsound-EAX/0020-dsound-Add-stub-support-for-DSPROPSETID_EAX20_Listen.patch

@@ -1,7 +1,8 @@
-From f2c56d857f9e30ba7d15e31c67e20c0698b3df9f Mon Sep 17 00:00:00 2001
+From 3e15d6c0b64a1abe347ec4ab37fe260ee058850b Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Mon, 5 Oct 2015 21:56:15 -0600
-Subject: dsound: Add stub support for DSPROPSETID_EAX20_ListenerProperties.
+Subject: [PATCH] dsound: Add stub support for
+ DSPROPSETID_EAX20_ListenerProperties.
 
 ---
  dlls/dsound/dsound_eax.h | 21 +++++++++++++++++++++
@@ -9,7 +10,7 @@ Subject: dsound: Add stub support for DSPROPSETID_EAX20_ListenerProperties.
  2 files changed, 32 insertions(+)
 
 diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
-index a555a75..21450e8 100644
+index a555a75e458..fe85179bf01 100644
 --- a/dlls/dsound/dsound_eax.h
 +++ b/dlls/dsound/dsound_eax.h
 @@ -28,6 +28,7 @@ extern "C" {
@@ -48,7 +49,7 @@ index a555a75..21450e8 100644
  
  #define AL_EAXREVERB_MAX_REFLECTIONS_DELAY       (0.3f)
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 857f924..297d444 100644
+index 3e15ac59480..ed8dd204759 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -826,6 +826,11 @@ BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSu
@@ -68,7 +69,7 @@ index 857f924..297d444 100644
  
          return S_OK;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
@@ -78,11 +79,11 @@ index 857f924..297d444 100644
  
          return S_OK;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
      return E_PROP_ID_UNSUPPORTED;
 -- 
-2.6.0
+2.35.1
 

patches/dsound-EAX/0021-dsound-Add-stub-support-for-DSPROPSETID_EAX20_Buffer.patch

@@ -1,7 +1,8 @@
-From 6147f0b2fe272cdce45785de1efcd323084d5ac7 Mon Sep 17 00:00:00 2001
+From 84bf274c38399dad825c21a9a165730f07f6904c Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Wed, 7 Oct 2015 19:31:53 -0600
-Subject: dsound: Add stub support for DSPROPSETID_EAX20_BufferProperties.
+Subject: [PATCH] dsound: Add stub support for
+ DSPROPSETID_EAX20_BufferProperties.
 
 ---
  dlls/dsound/dsound_eax.h | 20 ++++++++++++++++++++
@@ -9,7 +10,7 @@ Subject: dsound: Add stub support for DSPROPSETID_EAX20_BufferProperties.
  2 files changed, 36 insertions(+)
 
 diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
-index fe85179..09563a0 100644
+index fe85179bf01..09563a0d615 100644
 --- a/dlls/dsound/dsound_eax.h
 +++ b/dlls/dsound/dsound_eax.h
 @@ -29,6 +29,7 @@ extern "C" {
@@ -47,7 +48,7 @@ index fe85179..09563a0 100644
  
  #define AL_EAXREVERB_MAX_REFLECTIONS_DELAY       (0.3f)
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 297d444..12c290a 100644
+index ed8dd204759..9237aa055e0 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -831,8 +831,14 @@ BOOL WINAPI EAX_QuerySupport(REFGUID guidPropSet, ULONG dwPropID, ULONG *pTypeSu
@@ -61,37 +62,37 @@ index 297d444..12c290a 100644
 +        }
      }
  
-+    FIXME("(%s,%d,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
++    FIXME("(%s,%ld,%p)\n", debugstr_guid(guidPropSet), dwPropID, pTypeSupport);
      return FALSE;
  }
  
 @@ -941,8 +947,13 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
      } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
+         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
          return E_PROP_ID_UNSUPPORTED;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
-+    FIXME("(buf=%p,guidPropSet=%s,dwPropID=%d,pInstanceData=%p,cbInstanceData=%d,pPropData=%p,cbPropData=%d,pcbReturned=%p)\n",
++    FIXME("(buf=%p,guidPropSet=%s,dwPropID=%ld,pInstanceData=%p,cbInstanceData=%ld,pPropData=%p,cbPropData=%ld,pcbReturned=%p)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData, pcbReturned);
      return E_PROP_ID_UNSUPPORTED;
  }
  
 @@ -1073,7 +1084,12 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
      } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
-         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
+         FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
          return E_PROP_ID_UNSUPPORTED;
 +    } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) {
-+        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld\n", dwPropID);
 +        return E_PROP_ID_UNSUPPORTED;
      }
  
-+    FIXME("(%p,%s,%d,%p,%d,%p,%d)\n",
++    FIXME("(%p,%s,%ld,%p,%ld,%p,%ld)\n",
 +        buf, debugstr_guid(guidPropSet), dwPropID, pInstanceData, cbInstanceData, pPropData, cbPropData);
      return E_PROP_ID_UNSUPPORTED;
  }
 -- 
-2.6.0
+2.35.1
 

patches/dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch

@@ -1,4 +1,4 @@
-From b332a35d8382c6fc77ba663c5db98a6374518bfe Mon Sep 17 00:00:00 2001
+From cb7356ad69c333277313e305cee4dc17b765a184 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Mon, 25 Jan 2021 19:14:32 +1100
 Subject: [PATCH] dsound: Fake success for EAX Set Buffer/ListenerProperties
@@ -24,25 +24,25 @@ index 39ce9101266..ba93989f372 100644
  
      return E_PROP_ID_UNSUPPORTED;
 diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c
-index 6a6d22bc031..b3f48cdb5bd 100644
+index 9237aa055e0..7034b5fca07 100644
 --- a/dlls/dsound/eax.c
 +++ b/dlls/dsound/eax.c
 @@ -1082,11 +1082,11 @@ HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet,
  
          return S_OK;
      } else if (IsEqualGUID(&DSPROPSETID_EAX20_ListenerProperties, guidPropSet)) {
--        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d\n", dwPropID);
+-        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld\n", dwPropID);
 -        return E_PROP_ID_UNSUPPORTED;
-+        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %d - Faking Success\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_ListenerProperties: %ld - Faking Success\n", dwPropID);
 +        return S_OK;
      } else if (IsEqualGUID(&DSPROPSETID_EAX20_BufferProperties, guidPropSet)) {
--        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d\n", dwPropID);
+-        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld\n", dwPropID);
 -        return E_PROP_ID_UNSUPPORTED;
-+        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %d - Faking Success\n", dwPropID);
++        FIXME("Unsupported DSPROPSETID_EAX20_BufferProperties: %ld - Faking Success\n", dwPropID);
 +        return S_OK;
      }
  
-     FIXME("(%p,%s,%d,%p,%d,%p,%d)\n",
+     FIXME("(%p,%s,%ld,%p,%ld,%p,%ld)\n",
 -- 
-2.34.1
+2.35.1
 

patches/dwmapi-DwmGetCompositionTimingInfo/0001-dwmapi-Fill-rateRefresh-rateCompose-and-qpcRefreshPe.patch

@@ -0,0 +1,134 @@
+From bdd925e61fa6ba20272960bfea8e0638d20060f1 Mon Sep 17 00:00:00 2001
+From: Jactry Zeng <jzeng@codeweavers.com>
+Date: Fri, 3 Jun 2022 02:50:29 -0500
+Subject: [PATCH 1/2] dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod
+ of DWM_TIMING_INFO from DwmGetCompositionTimingInfo().
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53038
+Signed-off-by: Jactry Zeng <jzeng@codeweavers.com>
+---
+ dlls/dwmapi/Makefile.in       |  1 +
+ dlls/dwmapi/dwmapi_main.c     | 27 ++++++++++++++++++++++++++-
+ dlls/dwmapi/tests/Makefile.in |  2 +-
+ dlls/dwmapi/tests/dwmapi.c    | 22 ++++++++++++++++++++++
+ 4 files changed, 50 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in
+index e63dbc2ea00..37411a57608 100644
+--- a/dlls/dwmapi/Makefile.in
++++ b/dlls/dwmapi/Makefile.in
+@@ -1,4 +1,5 @@
+ MODULE    = dwmapi.dll
++IMPORTS   = user32
+ IMPORTLIB = dwmapi
+ 
+ EXTRADLLFLAGS = -Wb,--prefer-native
+diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c
+index 6bb086a87d1..1fb522e389a 100644
+--- a/dlls/dwmapi/dwmapi_main.c
++++ b/dlls/dwmapi/dwmapi_main.c
+@@ -211,12 +211,28 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i
+     return E_NOTIMPL;
+ }
+ 
++static int get_display_frequency(void)
++{
++    DEVMODEA mode;
++
++    memset(&mode, 0, sizeof(mode));
++    mode.dmSize = sizeof(mode);
++    if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode))
++        return mode.dmDisplayFrequency;
++    else
++    {
++        WARN("Failed to query display frequency, returning a fallback value.\n");
++        return 60;
++    }
++}
++
+ /**********************************************************************
+  *           DwmGetCompositionTimingInfo         (DWMAPI.@)
+  */
+ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info)
+ {
+-    static int i;
++    LARGE_INTEGER performance_frequency;
++    static int i, display_frequency;
+ 
+     if (!info)
+         return E_INVALIDARG;
+@@ -229,6 +245,15 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info)
+     memset(info, 0, info->cbSize);
+     info->cbSize = sizeof(DWM_TIMING_INFO);
+ 
++    display_frequency = get_display_frequency();
++    info->rateRefresh.uiNumerator = display_frequency;
++    info->rateRefresh.uiDenominator = 1;
++    info->rateCompose.uiNumerator = display_frequency;
++    info->rateCompose.uiDenominator = 1;
++
++    QueryPerformanceFrequency(&performance_frequency);
++    info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency;
++
+     return S_OK;
+ }
+ 
+diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in
+index 6c6130401d6..e819e3ca09a 100644
+--- a/dlls/dwmapi/tests/Makefile.in
++++ b/dlls/dwmapi/tests/Makefile.in
+@@ -1,5 +1,5 @@
+ TESTDLL = dwmapi.dll
+-IMPORTS = dwmapi
++IMPORTS = dwmapi user32
+ 
+ C_SRCS = \
+ 	dwmapi.c
+diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c
+index 696aa9c9d86..29dbcbe74bd 100644
+--- a/dlls/dwmapi/tests/dwmapi.c
++++ b/dlls/dwmapi/tests/dwmapi.c
+@@ -35,7 +35,11 @@ static void test_DwmIsCompositionEnabled(void)
+ 
+ static void test_DwmGetCompositionTimingInfo(void)
+ {
++    LARGE_INTEGER performance_frequency;
++    int result, display_frequency;
+     DWM_TIMING_INFO timing_info;
++    QPC_TIME refresh_period;
++    DEVMODEA mode;
+     BOOL enabled;
+     HRESULT hr;
+ 
+@@ -56,9 +60,27 @@ static void test_DwmGetCompositionTimingInfo(void)
+     hr = DwmGetCompositionTimingInfo(NULL, &timing_info);
+     ok(hr == MILERR_MISMATCHED_SIZE, "Got hr %#lx.\n", hr);
+ 
++    memset(&mode, 0, sizeof(mode));
++    mode.dmSize = sizeof(mode);
++    result = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode);
++    ok(!!result, "Failed to get display mode %#lx.\n", GetLastError());
++    display_frequency = mode.dmDisplayFrequency;
++    ok(!!QueryPerformanceFrequency(&performance_frequency), "Failed to get performance counter frequency.\n");
++    refresh_period = performance_frequency.QuadPart / display_frequency;
++
+     timing_info.cbSize = sizeof(timing_info);
+     hr = DwmGetCompositionTimingInfo(NULL, &timing_info);
+     ok(hr == S_OK, "Got hr %#lx.\n", hr);
++    ok(timing_info.cbSize == sizeof(timing_info), "Got wrong struct size %d.\n", timing_info.cbSize);
++    ok(timing_info.rateRefresh.uiDenominator == 1 && timing_info.rateRefresh.uiNumerator == display_frequency,
++            "Got wrong monitor refresh rate %d/%d.\n", timing_info.rateRefresh.uiDenominator,
++            timing_info.rateRefresh.uiNumerator);
++    ok(timing_info.rateCompose.uiDenominator == 1 && timing_info.rateCompose.uiNumerator == display_frequency,
++            "Got wrong composition rate %d/%d.\n", timing_info.rateCompose.uiDenominator,
++            timing_info.rateCompose.uiNumerator);
++    ok(timing_info.qpcRefreshPeriod == refresh_period
++            || broken(timing_info.qpcRefreshPeriod == display_frequency), /* win10 v1507 */
++            "Got wrong monitor refresh period %s.\n", wine_dbgstr_longlong(timing_info.qpcRefreshPeriod));
+ }
+ 
+ START_TEST(dwmapi)
+-- 
+2.35.1
+