Release v10.14

Squashed.

Updated to vkd3d 1.17+

patches/Staging/0001-ntdll-Print-a-warning-message-specifying-the-wine-st.patch

@@ -1,15 +1,15 @@
-From 601da0ae0c6b22f37d20e6e0f10558093277eca9 Mon Sep 17 00:00:00 2001
+From 3dc4a148d7c91afea8f589f47daca82c5c27b7c1 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  branch name and version.
 
 ---
- dlls/ntdll/loader.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
+ dlls/ntdll/loader.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 5f84ca7e23b..fabf394fbe5 100644
+index 74eb1b7f500..95639558155 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -43,6 +43,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index 5f84ca7e23b..fabf394fbe5 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3828,6 +3829,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3870,6 +3871,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,7 +28,7 @@ index 5f84ca7e23b..fabf394fbe5 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -4322,6 +4324,9 @@ static void release_address_space(void)
+@@ -4366,6 +4368,9 @@ static void release_address_space(void)
   */
  void loader_init( CONTEXT *context, void **entry )
  {
@@ -38,13 +38,13 @@ index 5f84ca7e23b..fabf394fbe5 100644
      static int attach_done;
      NTSTATUS status;
      ULONG_PTR cookie, port = 0;
-@@ -4407,7 +4412,18 @@ void loader_init( CONTEXT *context, void **entry )
+@@ -4455,6 +4460,20 @@ void loader_init( CONTEXT *context, void **entry )
          arm64ec_thread_init();
  #endif
          wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
 +        /* This hunk occasionally applies in the wrong place;
 +         * add a comment here to try to prevent that. */
-     }
++    }
 +    RtlInitUnicodeString( &staging_event_string, L"\\__wine_staging_warn_event" );
 +    InitializeObjectAttributes( &staging_event_attr, &staging_event_string, OBJ_OPENIF, NULL, NULL );
 +    if (NtCreateEvent( &staging_event, EVENT_ALL_ACCESS, &staging_event_attr, NotificationEvent, FALSE ) == STATUS_SUCCESS)
@@ -53,10 +53,12 @@ index 5f84ca7e23b..fabf394fbe5 100644
 +        FIXME_(winediag)("Please mention your exact version when filing bug reports on winehq.org.\n");
 +    }
 +    else
++    {
 +        WARN_(winediag)("wine-staging %s is a testing version containing experimental patches.\n", wine_get_version());
++        NtClose( staging_event );
+     }
  
      NtCurrentTeb()->FlsSlots = fls_alloc_data();
- 
 -- 
-2.45.2
+2.47.2
 

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

@@ -1,4 +1,4 @@
-From 8aa6fb73e3142d86ba354c204313b8a74a5fa43d Mon Sep 17 00:00:00 2001
+From fb422ad56e3549e81d3b60afc77b0a0c6a56f672 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:53:46 +0200
 Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
@@ -8,10 +8,10 @@ Subject: [PATCH] winelib: Append '(Staging)' at the end of the version string.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index f86a5decb07..3d7f9cc96e6 100644
+index b4ede761391..ea6bd2fae3c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3910,7 +3910,7 @@ dnl Rules for generated source files
+@@ -3728,7 +3728,7 @@ dnl Rules for generated source files
  
  WINE_APPEND_RULE(
  [dlls/ntdll/unix/version.c: dummy
@@ -19,7 +19,7 @@ index f86a5decb07..3d7f9cc96e6 100644
 +	@version=\`(GIT_DIR=${wine_srcdir}.git git describe HEAD 2>/dev/null || echo \"wine-\$(PACKAGE_VERSION)\") | sed -n -e '\$\$s/\(.*\)/const char wine_build[[]] = \"\\1 (Staging)\";/p'\` && (echo \$\$version | cmp -s - \$[@]) || echo \$\$version >\$[@] || (rm -f \$[@] && exit 1)
  programs/winetest/build.rc: dummy
  	@build=\"STRINGTABLE { 1 \\\"\`GIT_DIR=${wine_srcdir}.git git rev-parse HEAD 2>/dev/null\`\\\" }\" && (echo \$\$build | cmp -s - \$[@]) || echo \$\$build >\$[@] || (rm -f \$[@] && exit 1)
- programs/winetest/build.nfo:
+ dlls/wineandroid.drv/wine-debug.apk: dlls/wineandroid.drv/build.gradle ${wine_srcdir}dlls/wineandroid.drv/AndroidManifest.xml ${wine_srcdir}dlls/wineandroid.drv/WineActivity.java ${wine_srcdir}dlls/wineandroid.drv/wine.svg
 -- 
-2.33.0
+2.47.2
 

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

@@ -1,4 +1,4 @@
-From f9f5002e4ce6417dd196d53b50c51a3b224015d3 Mon Sep 17 00:00:00 2001
+From 9cf09446b0bf5da7988d1ba30c24d392c7a01f4b Mon Sep 17 00:00:00 2001
 From: Dmitry Timoshkov <dmitry@baikal.ru>
 Date: Tue, 12 Nov 2019 18:13:20 +0800
 Subject: [PATCH] comctl32: Bump version to 6.0.
@@ -8,39 +8,25 @@ and refuses to run, changing DLL version to 6.0 makes it run.
 
 Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
 ---
- dlls/comctl32/comctl32.h  | 2 +-
  dlls/comctl32/comctl32.rc | 2 +-
  include/commctrl.h        | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h
-index 51f4337add2..3fe8905abea 100644
---- a/dlls/comctl32/comctl32.h
-+++ b/dlls/comctl32/comctl32.h
-@@ -194,7 +194,7 @@ BOOL Str_SetPtrAtoW(LPWSTR *lppDest, LPCSTR lpSrc);
- BOOL Str_SetPtrWtoA(LPSTR *lppDest, LPCWSTR lpSrc);
- BOOL imagelist_has_alpha(HIMAGELIST, UINT);
- 
--#define COMCTL32_VERSION_MINOR 81
-+#define COMCTL32_VERSION_MINOR 0
- 
- /* Our internal stack structure of the window procedures to subclass */
- typedef struct _SUBCLASSPROCS {
 diff --git a/dlls/comctl32/comctl32.rc b/dlls/comctl32/comctl32.rc
-index c9aa1ba6253..be6e2425193 100644
+index 2c62dbe2720..473de211c67 100644
 --- a/dlls/comctl32/comctl32.rc
 +++ b/dlls/comctl32/comctl32.rc
-@@ -114,7 +114,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+@@ -113,7 +113,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+ 
  #define WINE_FILEDESCRIPTION_STR "Wine Common Controls"
  #define WINE_FILENAME_STR "comctl32.dll"
- #define WINE_FILEVERSION COMCTL32_VERSION, COMCTL32_VERSION_MINOR, 4704, 1100
--#define WINE_FILEVERSION_STR "5.81"
-+#define WINE_FILEVERSION_STR "6.00.4704.1100"
- #define WINE_PRODUCTVERSION WINE_FILEVERSION
- #define WINE_PRODUCTVERSION_STR WINE_FILEVERSION_STR
+-#define WINE_FILEVERSION COMCTL32_VERSION,81,4704,1100
++#define WINE_FILEVERSION COMCTL32_VERSION,0,4704,1100
+ 
+ #include "wine/wine_common_ver.rc"
  
 diff --git a/include/commctrl.h b/include/commctrl.h
-index a54de13d8b2..e0b0e22d4dc 100644
+index 235704a76dd..5a67c1284a0 100644
 --- a/include/commctrl.h
 +++ b/include/commctrl.h
 @@ -59,7 +59,7 @@ enum _LI_METRIC
@@ -53,5 +39,5 @@ index a54de13d8b2..e0b0e22d4dc 100644
  #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
  #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
 -- 
-2.40.1
+2.47.2
 

patches/comctl32_animate_avi/0001-comctl32-Animate-support-AVI-msvc-codex.patch

@@ -0,0 +1,24 @@
+From 8a9c55d23750ca2650eba518e46549d8b5d94b43 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 11 Jul 2025 14:11:36 +1000
+Subject: [PATCH] comctl32: Animate support AVI msvc codex
+
+---
+ dlls/comctl32/animate.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
+index 46e1e37b72d..717422c784f 100644
+--- a/dlls/comctl32/animate.c
++++ b/dlls/comctl32/animate.c
+@@ -644,6 +644,7 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr)
+     /* check uncompressed AVI */
+     if ((infoPtr->ash.fccHandler == mmioFOURCC('D', 'I', 'B', ' ')) ||
+        (infoPtr->ash.fccHandler == mmioFOURCC('R', 'L', 'E', ' ')) ||
++       (infoPtr->ash.fccHandler == mmioFOURCC('m', 's', 'v', 'c')) ||
+        (infoPtr->ash.fccHandler == mmioFOURCC(0, 0, 0, 0)))
+     {
+         infoPtr->hic = 0;
+-- 
+2.47.2
+

patches/comctl32_animate_avi/0002-comctl32-Animate-to-support-RLE8-codex.patch

@@ -0,0 +1,24 @@
+From b8cce6663a956f8fb8f07700672e378b44b1af1c Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 11 Jul 2025 15:21:07 +1000
+Subject: [PATCH] comctl32: Animate to support RLE8 codex
+
+---
+ dlls/comctl32/animate.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
+index 717422c784f..ca4fae85a11 100644
+--- a/dlls/comctl32/animate.c
++++ b/dlls/comctl32/animate.c
+@@ -645,6 +645,7 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr)
+     if ((infoPtr->ash.fccHandler == mmioFOURCC('D', 'I', 'B', ' ')) ||
+        (infoPtr->ash.fccHandler == mmioFOURCC('R', 'L', 'E', ' ')) ||
+        (infoPtr->ash.fccHandler == mmioFOURCC('m', 's', 'v', 'c')) ||
++       (infoPtr->ash.fccHandler == mmioFOURCC('m', 'r', 'l', 'e')) ||
+        (infoPtr->ash.fccHandler == mmioFOURCC(0, 0, 0, 0)))
+     {
+         infoPtr->hic = 0;
+-- 
+2.47.2
+

patches/comctl32_animate_avi/0003-comctl32-Animate-control-doesn-t-support-compressed-.patch

@@ -0,0 +1,119 @@
+From 2ef9715ae9fffa0a6d7cdf0dc04e8de7eb245ce4 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 11 Jul 2025 18:07:39 +1000
+Subject: [PATCH] comctl32: Animate control doesn't support compressed AVI
+
+The Animate control only supporst uncompress AVI with the excpetion of RLE8.
+---
+ dlls/comctl32/animate.c | 64 ++---------------------------------------
+ 1 file changed, 3 insertions(+), 61 deletions(-)
+
+diff --git a/dlls/comctl32/animate.c b/dlls/comctl32/animate.c
+index ca4fae85a11..74516db81f5 100644
+--- a/dlls/comctl32/animate.c
++++ b/dlls/comctl32/animate.c
+@@ -39,14 +39,6 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(animate);
+ 
+-static struct {
+-    HMODULE	hModule;
+-    HIC         (WINAPI *fnICOpen)(DWORD, DWORD, UINT);
+-    LRESULT     (WINAPI *fnICClose)(HIC);
+-    LRESULT     (WINAPI *fnICSendMessage)(HIC, UINT, DWORD_PTR, DWORD_PTR);
+-    DWORD       (WINAPIV *fnICDecompress)(HIC,DWORD,LPBITMAPINFOHEADER,LPVOID,LPBITMAPINFOHEADER,LPVOID);
+-} fnIC;
+-
+ typedef struct
+ {
+    /* reference to input stream (file or resource) */
+@@ -189,11 +181,6 @@ static void ANIMATE_Free(ANIMATE_INFO *infoPtr)
+         }
+         Free (infoPtr->lpIndex);
+         infoPtr->lpIndex = NULL;
+-        if (infoPtr->hic)
+-        {
+-            fnIC.fnICClose(infoPtr->hic);
+-            infoPtr->hic = 0;
+-        }
+         Free (infoPtr->inbih);
+         infoPtr->inbih = NULL;
+         Free (infoPtr->outbih);
+@@ -342,13 +329,6 @@ static BOOL ANIMATE_DrawFrame(ANIMATE_INFO *infoPtr, HDC hDC)
+     mmioSeek(infoPtr->hMMio, infoPtr->lpIndex[infoPtr->currFrame], SEEK_SET);
+     mmioRead(infoPtr->hMMio, infoPtr->indata, infoPtr->ash.dwSuggestedBufferSize);
+ 
+-    if (infoPtr->hic &&
+-	fnIC.fnICDecompress(infoPtr->hic, 0, infoPtr->inbih, infoPtr->indata,
+-		     infoPtr->outbih, infoPtr->outdata) != ICERR_OK) {
+-	WARN("Decompression error\n");
+-	return FALSE;
+-    }
+-
+     ANIMATE_PaintFrame(infoPtr, hDC);
+ 
+     if (infoPtr->currFrame++ >= infoPtr->nToFrame) {
+@@ -649,39 +629,12 @@ static BOOL ANIMATE_GetAviCodec(ANIMATE_INFO *infoPtr)
+        (infoPtr->ash.fccHandler == mmioFOURCC(0, 0, 0, 0)))
+     {
+         infoPtr->hic = 0;
+-	return TRUE;
+-    }
+-
+-    /* try to get a decompressor for that type */
+-    infoPtr->hic = fnIC.fnICOpen(ICTYPE_VIDEO, infoPtr->ash.fccHandler, ICMODE_DECOMPRESS);
+-    if (!infoPtr->hic) {
+-	WARN("Can't load codec for the file\n");
+-	return FALSE;
+-    }
+-
+-    outSize = fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT,
+-			    (DWORD_PTR)infoPtr->inbih, 0L);
+-
+-    if (!(infoPtr->outbih = Alloc(outSize)))
+-        return FALSE;
+-
+-    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_GET_FORMAT,
+-		      (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != ICERR_OK) 
+-    {
+-	WARN("Can't get output BIH\n");
+-	return FALSE;
++        return TRUE;
+     }
+ 
+-    if (!(infoPtr->outdata = Alloc(infoPtr->outbih->biSizeImage)))
+-        return FALSE;
++    FIXME("Unsupported %s\n", debugstr_fourcc(infoPtr->ash.fccHandler));
+ 
+-    if (fnIC.fnICSendMessage(infoPtr->hic, ICM_DECOMPRESS_BEGIN,
+-		      (DWORD_PTR)infoPtr->inbih, (DWORD_PTR)infoPtr->outbih) != ICERR_OK) {
+-	WARN("Can't begin decompression\n");
+-	return FALSE;
+-    }
+-
+-    return TRUE;
++    return FALSE;
+ }
+ 
+ 
+@@ -790,17 +743,6 @@ static BOOL ANIMATE_Create(HWND hWnd, const CREATESTRUCTW *lpcs)
+ {
+     ANIMATE_INFO *infoPtr;
+ 
+-    if (!fnIC.hModule)
+-    {
+-	fnIC.hModule = LoadLibraryW(L"msvfw32.dll");
+-	if (!fnIC.hModule) return FALSE;
+-
+-	fnIC.fnICOpen        = (void*)GetProcAddress(fnIC.hModule, "ICOpen");
+-	fnIC.fnICClose       = (void*)GetProcAddress(fnIC.hModule, "ICClose");
+-	fnIC.fnICSendMessage = (void*)GetProcAddress(fnIC.hModule, "ICSendMessage");
+-	fnIC.fnICDecompress  = (void*)GetProcAddress(fnIC.hModule, "ICDecompress");
+-    }
+-
+     /* allocate memory for info structure */
+     infoPtr = Alloc(sizeof(*infoPtr));
+     if (!infoPtr) return FALSE;
+-- 
+2.47.2
+

patches/comctl32_animate_avi/definition

@@ -0,0 +1,2 @@
+Fixes: [52278] comctl32: Animate support AVI msvc codex.
+

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

@@ -1,231 +0,0 @@
-From e6c1c1fe3fe2f4fe7d3e421b94d925c40063af22 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.
-
-Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
----
- configure                       |  1 +
- configure.ac                    |  1 +
- dlls/cryptext/Makefile.in       |  3 +-
- dlls/cryptext/cryptext.spec     |  4 +--
- dlls/cryptext/cryptext_main.c   | 64 +++++++++++++++++++++++++++++++++
- dlls/cryptext/tests/Makefile.in |  4 +++
- dlls/cryptext/tests/cryptext.c  | 61 +++++++++++++++++++++++++++++++
- 7 files changed, 135 insertions(+), 3 deletions(-)
- create mode 100644 dlls/cryptext/tests/Makefile.in
- create mode 100644 dlls/cryptext/tests/cryptext.c
-
-diff --git a/configure b/configure
-index ca6e87d4740..7033499399f 100755
---- a/configure
-+++ b/configure
-@@ -21660,6 +21660,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/cryptowinrt enable_cryptowinrt
-diff --git a/configure.ac b/configure.ac
-index cba55126869..57064a05fe5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2477,6 +2477,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/cryptowinrt)
-diff --git a/dlls/cryptext/Makefile.in b/dlls/cryptext/Makefile.in
-index 5598bfb78e0..acda4e4ac6d 100644
---- a/dlls/cryptext/Makefile.in
-+++ b/dlls/cryptext/Makefile.in
-@@ -1,4 +1,5 @@
--MODULE = cryptext.dll
-+MODULE  = cryptext.dll
-+IMPORTS = crypt32 cryptui user32
- 
- EXTRADLLFLAGS = -Wb,--prefer-native
- 
-diff --git a/dlls/cryptext/cryptext.spec b/dlls/cryptext/cryptext.spec
-index ee3e155f457..24b4794c198 100644
---- a/dlls/cryptext/cryptext.spec
-+++ b/dlls/cryptext/cryptext.spec
-@@ -12,8 +12,8 @@
- @ stub CryptExtAddSPCW
- @ stub CryptExtOpenCAT
- @ stub CryptExtOpenCATW
--@ stub CryptExtOpenCER
--@ stub CryptExtOpenCERW
-+@ stdcall CryptExtOpenCER(long ptr str long)
-+@ stdcall CryptExtOpenCERW(long ptr wstr long)
- @ stub CryptExtOpenCRL
- @ stub CryptExtOpenCRLW
- @ stub CryptExtOpenCTL
-diff --git a/dlls/cryptext/cryptext_main.c b/dlls/cryptext/cryptext_main.c
-index 537ba66cd3b..a4314518eac 100644
---- a/dlls/cryptext/cryptext_main.c
-+++ b/dlls/cryptext/cryptext_main.c
-@@ -22,10 +22,29 @@
- 
- #include "windef.h"
- #include "winbase.h"
-+#include "winnls.h"
-+#include "wincrypt.h"
-+#include "winuser.h"
-+#include "cryptuiapi.h"
-+
-+#include "wine/heap.h"
- #include "wine/debug.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(cryptext);
- 
-+static WCHAR *heap_strdupAtoW(const char *str)
-+{
-+    WCHAR *ret;
-+    INT len;
-+
-+    if (!str) return NULL;
-+    len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
-+    ret = heap_alloc(len * sizeof(WCHAR));
-+    if (ret)
-+        MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len);
-+    return ret;
-+}
-+
- /***********************************************************************
-  * CryptExtAddPFX (CRYPTEXT.@)
-  */
-@@ -43,3 +62,48 @@ HRESULT WINAPI CryptExtAddPFXW(LPCWSTR filename)
-     FIXME("stub: %s\n", debugstr_w(filename));
-     return E_NOTIMPL;
- }
-+
-+/***********************************************************************
-+ * CryptExtOpenCERW (CRYPTEXT.@)
-+ */
-+HRESULT WINAPI CryptExtOpenCERW(HWND hwnd, HINSTANCE hinst, LPCWSTR filename, DWORD showcmd)
-+{
-+    PCCERT_CONTEXT ctx;
-+    CRYPTUI_VIEWCERTIFICATE_STRUCTW info;
-+
-+    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,
-+                          (const void **)&ctx))
-+    {
-+        /* FIXME: move to the resources */
-+        static const WCHAR msg[] = {'T','h','i','s',' ','i','s',' ','n','o','t',' ','a',' ','v','a','l','i','d',' ','c','e','r','t','i','f','i','c','a','t','e',0};
-+        MessageBoxW(NULL, msg, filename, MB_OK | MB_ICONERROR);
-+        return S_OK; /* according to the tests */
-+    }
-+
-+    memset(&info, 0, sizeof(info));
-+    info.dwSize = sizeof(info);
-+    info.pCertContext = ctx;
-+    CryptUIDlgViewCertificateW(&info, NULL);
-+    CertFreeCertificateContext(ctx);
-+
-+    return S_OK;
-+}
-+
-+/***********************************************************************
-+ * CryptExtOpenCER (CRYPTEXT.@)
-+ */
-+HRESULT WINAPI CryptExtOpenCER(HWND hwnd, HINSTANCE hinst, LPCSTR filename, DWORD showcmd)
-+{
-+    HRESULT hr;
-+    LPWSTR filenameW;
-+
-+    TRACE("(%p, %p, %s, %lu)\n", hwnd, hinst, debugstr_a(filename), showcmd);
-+
-+    filenameW = heap_strdupAtoW(filename);
-+    hr = CryptExtOpenCERW(hwnd, hinst, filenameW, showcmd);
-+    heap_free(filenameW);
-+    return hr;
-+}
-diff --git a/dlls/cryptext/tests/Makefile.in b/dlls/cryptext/tests/Makefile.in
-new file mode 100644
-index 00000000000..c3f4551fc00
---- /dev/null
-+++ b/dlls/cryptext/tests/Makefile.in
-@@ -0,0 +1,4 @@
-+TESTDLL = cryptext.dll
-+
-+SOURCES = \
-+	cryptext.c
-diff --git a/dlls/cryptext/tests/cryptext.c b/dlls/cryptext/tests/cryptext.c
-new file mode 100644
-index 00000000000..ab1007dbd82
---- /dev/null
-+++ b/dlls/cryptext/tests/cryptext.c
-@@ -0,0 +1,61 @@
-+/*
-+ * Copyright 2019 Dmitry Timoshkov
-+ *
-+ * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ */
-+
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <windef.h>
-+#include <winbase.h>
-+#include <winuser.h>
-+#include <winerror.h>
-+
-+#include "wine/test.h"
-+
-+static HRESULT (WINAPI *pCryptExtOpenCER)(HWND,HINSTANCE,LPCSTR,DWORD);
-+
-+static void test_CryptExtOpenCER(void)
-+{
-+    HRESULT hr;
-+
-+    if (!pCryptExtOpenCER)
-+    {
-+        win_skip("CryptExtOpenCER is not available on this platform\n");
-+        return;
-+    }
-+
-+    if (!winetest_interactive)
-+    {
-+        skip("CryptExtOpenCER test needs user interaction\n");
-+        return;
-+    }
-+
-+    SetLastError(0xdeadbeef);
-+    hr = pCryptExtOpenCER(0, 0, "dead.beef", SW_HIDE);
-+    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 %#lx\n", hr);
-+}
-+
-+START_TEST(cryptext)
-+{
-+    HMODULE hmod = LoadLibraryA("cryptext.dll");
-+
-+    pCryptExtOpenCER = (void *)GetProcAddress(hmod, "CryptExtOpenCER");
-+
-+    test_CryptExtOpenCER();
-+}
--- 
-2.43.0
-

patches/cryptext-CryptExtOpenCER/definition

@@ -1,2 +0,0 @@
-# Taken from the mailing list - July 2019.
-Fixes: cryptext: Implement CryptExtOpenCER.

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

@@ -1,32 +0,0 @@
-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: [PATCH] d3dx9_36: Add support for FOURCC surface to
- save_dds_surface_to_memory.
-
----
- dlls/d3dx9_36/surface.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 26809a47e18..db334ee83f1 100644
---- a/dlls/d3dx9_36/surface.c
-+++ b/dlls/d3dx9_36/surface.c
-@@ -433,6 +433,14 @@ static HRESULT d3dformat_to_dds_pixel_format(struct dds_pixel_format *pixel_form
-         }
-     }
- 
-+    /* Reuse dds_fourcc_to_d3dformat as D3DFORMAT and FOURCC are DWORD with same values */
-+    if (dds_fourcc_to_d3dformat(d3dformat) != D3DFMT_UNKNOWN)
-+    {
-+        pixel_format->flags |= DDS_PF_FOURCC;
-+        pixel_format->fourcc = d3dformat;
-+        return D3D_OK;
-+    }
-+
-     WARN("Unknown pixel format %#x.\n", d3dformat);
-     return E_NOTIMPL;
- }
--- 
-2.35.1
-

patches/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch

@@ -1,118 +0,0 @@
-From 96af775034dae1c0b133b315c45b7172090d3498 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 11 Jan 2015 16:29:30 +0100
-Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
- texture to dds file.
-
----
- dlls/d3dx9_36/d3dx9_private.h |  2 ++
- dlls/d3dx9_36/surface.c       | 63 +++++++++++++++++++++++++++++++++++
- dlls/d3dx9_36/texture.c       |  5 +--
- 3 files changed, 66 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 34a9f6eec7f..878dff3fc01 100644
---- a/dlls/d3dx9_36/d3dx9_private.h
-+++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -178,6 +178,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
-         IDirect3DSurface9 **temp_surface, BOOL write);
- HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
-         IDirect3DSurface9 *temp_surface, BOOL update);
-+HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture,
-+    const PALETTEENTRY *src_palette);
- HRESULT d3dx_pixels_init(const void *data, uint32_t row_pitch, uint32_t slice_pitch,
-         const PALETTEENTRY *palette, D3DFORMAT format, uint32_t left, uint32_t top, uint32_t right, uint32_t bottom,
-         uint32_t front, uint32_t back, struct d3dx_pixels *pixels);
-diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index 31bce97bbab..212d452c654 100644
---- a/dlls/d3dx9_36/surface.c
-+++ b/dlls/d3dx9_36/surface.c
-@@ -574,6 +574,69 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
-     return D3D_OK;
- }
- 
-+static HRESULT get_surface(D3DRESOURCETYPE type, struct IDirect3DBaseTexture9 *tex,
-+        int face, UINT level, struct IDirect3DSurface9 **surf)
-+{
-+    switch (type)
-+    {
-+        case D3DRTYPE_TEXTURE:
-+            return IDirect3DTexture9_GetSurfaceLevel((IDirect3DTexture9*) tex, level, surf);
-+        case D3DRTYPE_CUBETEXTURE:
-+            return IDirect3DCubeTexture9_GetCubeMapSurface((IDirect3DCubeTexture9*) tex, face, level, surf);
-+        default:
-+            ERR("Unexpected texture type\n");
-+            return E_NOTIMPL;
-+    }
-+}
-+
-+HRESULT save_dds_texture_to_memory(ID3DXBuffer **dst_buffer, IDirect3DBaseTexture9 *src_texture, const PALETTEENTRY *src_palette)
-+{
-+    HRESULT hr;
-+    D3DRESOURCETYPE type;
-+    UINT mip_levels;
-+    IDirect3DSurface9 *surface;
-+
-+    type = IDirect3DBaseTexture9_GetType(src_texture);
-+
-+    if ((type !=  D3DRTYPE_TEXTURE) && (type != D3DRTYPE_CUBETEXTURE) && (type != D3DRTYPE_VOLUMETEXTURE))
-+        return D3DERR_INVALIDCALL;
-+
-+    if (type == D3DRTYPE_CUBETEXTURE)
-+    {
-+        FIXME("Cube texture not supported yet\n");
-+        return E_NOTIMPL;
-+    }
-+    else if (type == D3DRTYPE_VOLUMETEXTURE)
-+    {
-+        FIXME("Volume texture not supported yet\n");
-+        return E_NOTIMPL;
-+    }
-+
-+    mip_levels = IDirect3DTexture9_GetLevelCount(src_texture);
-+
-+    if (mip_levels > 1)
-+    {
-+        FIXME("Mipmap not supported yet\n");
-+        return E_NOTIMPL;
-+    }
-+
-+    if (src_palette)
-+    {
-+        FIXME("Saving surfaces with palettized pixel formats not implemented yet\n");
-+        return E_NOTIMPL;
-+    }
-+
-+    hr = get_surface(type, src_texture, D3DCUBEMAP_FACE_POSITIVE_X, 0, &surface);
-+
-+    if (SUCCEEDED(hr))
-+    {
-+        hr = save_dds_surface_to_memory(dst_buffer, surface, NULL);
-+        IDirect3DSurface9_Release(surface);
-+    }
-+
-+    return hr;
-+}
-+
- HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data,
-     const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info)
- {
-diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index b42c9db3f2d..d84bac25cfe 100644
---- a/dlls/d3dx9_36/texture.c
-+++ b/dlls/d3dx9_36/texture.c
-@@ -1847,10 +1847,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
-     if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
- 
-     if (file_format == D3DXIFF_DDS)
--    {
--        FIXME("DDS file format isn't supported yet\n");
--        return E_NOTIMPL;
--    }
-+        return save_dds_texture_to_memory(dst_buffer, src_texture, src_palette);
- 
-     type = IDirect3DBaseTexture9_GetType(src_texture);
-     switch (type)
--- 
-2.45.2
-

patches/d3dx9_36-DDS/definition

@@ -1,2 +0,0 @@
-Fixes: [26898] Support for DDS file format in D3DXSaveTextureToFileInMemory
-Disabled: True

patches/d3dx9_36-Filter_Warnings/0001-d3dx9_36-Filter-out-D3DCompile-warning-messages-that.patch

@@ -1,87 +0,0 @@
-From d258e0c4428f3d5b7c0b6f4b31058d8710244dd7 Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Wed, 14 Aug 2013 09:31:31 +0200
-Subject: d3dx9_36: Filter out D3DCompile warning messages that are not present
- with D3DCompileShader. (try 4)
-
-This patch fixes vertex processing issue of bug 33770.
-
-The problem comes from the fact that even if the call succeeds,
-the game interprets a non null error_messages pointer as an error.
-
-By calling D3DCompile we use a newer version of the compiler which is more
-strict and generates the following warning.
-  - warning X3206: 'dot': implicit truncation of vector type
-  - warning X3206: implicit truncation of vector type
-  - warning X3206: 'mul': implicit truncation of vector type
-D3DCompileShader does not generate such warnings.
-
-These is confirmed in the DX SDK release note:
-New Warning X3206: Implicit Truncation of Vector Type
-Beginning in the August 2009 release of the DirectX SDK, the compiler will warn
-when an implicit truncation of a vector type occurs.
-
-The warnings cannot be disable so this patch filters out these strings in D3DCompileShader
-and reset the error messages pointer if the resulting buffer is empty.
-
-Try 2:
-  - only filter out lines containing "X3206:" in case d3dcompiler_43 has localization
-
-Try 3:
-  - use move in place instead of copying the buffer
-
-Try 4:
-  - filter simplification by Sebastian and remove 'mul' testing left-out in search string
----
- dlls/d3dx9_36/shader.c | 35 +++++++++++++++++++++++++++++++++++
- 1 file changed, 35 insertions(+)
-
-diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
-index 5ea3d13..646d3dc 100644
---- a/dlls/d3dx9_36/shader.c
-+++ b/dlls/d3dx9_36/shader.c
-@@ -450,6 +450,41 @@ HRESULT WINAPI D3DXCompileShader(const char *data, UINT length, const D3DXMACRO
-         }
-     }
- 
-+    /* Filter out D3DCompile warning messages that are not present with D3DCompileShader */
-+    if (SUCCEEDED(hr) && error_msgs && *error_msgs)
-+    {
-+        char *messages = ID3DXBuffer_GetBufferPointer(*error_msgs);
-+        DWORD size     = ID3DXBuffer_GetBufferSize(*error_msgs);
-+
-+        /* Ensure messages are null terminated for safe processing */
-+        if (size) messages[size - 1] = 0;
-+
-+        while (size > 1)
-+        {
-+            char *prev, *next;
-+
-+            /* Warning has the form "warning X3206: ... implicit truncation of vector type"
-+               but we only search for "X3206:" in case d3dcompiler_43 has localization */
-+            prev = next = strstr(messages, "X3206:");
-+            if (!prev) break;
-+
-+            /* get pointer to beginning and end of current line */
-+            while (prev > messages && *(prev - 1) != '\n') prev--;
-+            while (next < messages + size - 1 && *next != '\n') next++;
-+            if (next < messages + size - 1 && *next == '\n') next++;
-+
-+            memmove(prev, next, messages + size - next);
-+            size -= (next - prev);
-+        }
-+
-+        /* Only return a buffer if the resulting string is not empty as some apps depend on that */
-+        if (size <= 1)
-+        {
-+            ID3DXBuffer_Release(*error_msgs);
-+            *error_msgs = NULL;
-+        }
-+    }
-+
-     return hr;
- }
- 
--- 
-2.1.2
-

patches/d3dx9_36-Filter_Warnings/definition

@@ -1 +0,0 @@
-Fixes: [33770] D3DCompileShader should filter specific warning messages

patches/d3dx9_SetRawValue/0001-d3dx9-Implement-d3dx_effect_SetRawValue.patch

@@ -1,182 +0,0 @@
-From ae80ae124a784078a9838a8aca4b3af308d645dd Mon Sep 17 00:00:00 2001
-From: Patrick Hibbs <hibbsncc1701@gmail.com>
-Date: Fri, 30 Sep 2022 17:58:15 -0400
-Subject: [PATCH] d3dx9: Implement d3dx_effect_SetRawValue
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46012
-
-Signed-off-by: Patrick Hibbs <hibbsncc1701@gmail.com>
----
- dlls/d3dx9_36/effect.c | 154 ++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 152 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
-index ea965ce789b..625af4af36b 100644
---- a/dlls/d3dx9_36/effect.c
-+++ b/dlls/d3dx9_36/effect.c
-@@ -4445,10 +4445,160 @@ static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevic
- static HRESULT WINAPI d3dx_effect_SetRawValue(ID3DXEffect *iface, D3DXHANDLE parameter, const void *data,
-         UINT byte_offset, UINT bytes)
- {
--    FIXME("iface %p, parameter %p, data %p, byte_offset %u, bytes %u stub!\n",
-+    struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
-+    struct d3dx_parameter *param = (parameter == INVALID_HANDLE_VALUE) ? NULL : get_valid_parameter(effect, parameter);
-+    const unsigned int single_size = sizeof(DWORD);
-+    unsigned int x, index_offset, remaining_byte_offset, remaining_bytes;
-+    void *raw;
-+
-+    TRACE("iface %p, parameter %p, data %p, byte_offset %u, bytes %u.\n",
-             iface, parameter, data, byte_offset, bytes);
- 
--    return E_NOTIMPL;
-+    /* pendentic */
-+    index_offset = 0;
-+    remaining_byte_offset = 0;
-+
-+    /* BOOLs and Matries with a single value copy require sanitization of the
-+        byte_offset.
-+
-+        Specificly, matries with a single value copy only allow byte shifts that
-+        are not multiples of the value (DWORD) size. For multiples, we increment
-+        the index of the promoted data type, then add any remainder as a byte
-+        offset.
-+
-+        For BOOLs, due to their value sanitization, we only care about the
-+        index of their promoted data type. Unless it's a non value size matrix.
-+        In that case we do care about the byte offset.
-+    */
-+    if (byte_offset > 0 && (param->type == D3DXPT_BOOL ||
-+            (param->class == D3DXPC_MATRIX_COLUMNS ||
-+            param->class == D3DXPC_MATRIX_ROWS)))
-+    {
-+        remaining_byte_offset = byte_offset % single_size;
-+        if (remaining_byte_offset != 0)
-+            index_offset = byte_offset / single_size;
-+        else
-+            index_offset = byte_offset;
-+        if (param->type != D3DXPT_BOOL || (bytes != single_size &&
-+                (param->class == D3DXPC_MATRIX_COLUMNS ||
-+                param->class == D3DXPC_MATRIX_ROWS)))
-+        {
-+            index_offset = index_offset * single_size;
-+            if (param->type != D3DXPT_BOOL)
-+                index_offset = index_offset * single_size;
-+        }
-+    }
-+
-+    /* If parameter is bad, we are expected to throw C0000005. */
-+    switch (param->class)
-+    {
-+        case D3DXPC_STRUCT:
-+            break;
-+        case D3DXPC_OBJECT:
-+            raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (data && bytes)
-+            {
-+                if (((char*)raw)[0] != '\0')
-+                {
-+                    memset(raw, '\0', param->bytes);
-+                    return S_OK; /* This returns a false success. */
-+                }
-+                else
-+                {
-+                    return D3DERR_INVALIDCALL;
-+                }
-+            }
-+            break;
-+        case D3DXPC_SCALAR:
-+            raw = param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (param->type == D3DXPT_BOOL)
-+                *(BOOL*)raw = *(BOOL*)data ? TRUE : FALSE;
-+            else
-+                memcpy((unsigned char*)raw + byte_offset, data, bytes);
-+            return S_OK;
-+            break;
-+        case D3DXPC_VECTOR:
-+            raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (param->type == D3DXPT_BOOL)
-+            {
-+                raw = (unsigned char*)raw + index_offset;
-+                *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE;
-+                memset((unsigned char*)raw + single_size, \
-+                        '\0', param->bytes - index_offset - single_size);
-+            }
-+            else
-+            {
-+                raw = (unsigned char*)raw + byte_offset;
-+                for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++)
-+                {
-+                    memcpy((unsigned char*)raw + (x * single_size), \
-+                            (unsigned char*)data + (x * single_size), \
-+                            single_size);
-+                }
-+            }
-+            return S_OK;
-+            break;
-+        case D3DXPC_MATRIX_COLUMNS:
-+        case D3DXPC_MATRIX_ROWS:
-+            raw = (unsigned char*)param_get_data_and_dirtify(effect, param, param->bytes, TRUE);
-+            if (param->type == D3DXPT_BOOL)
-+            {
-+                if (bytes == single_size)
-+                {
-+                    raw = (unsigned char*)raw + index_offset;
-+                    for (x = 0; (x * single_size) < param->bytes - index_offset; x++)
-+                    {
-+                        remaining_bytes = param->bytes - index_offset - \
-+                                (x * single_size) - single_size;
-+                        *(DWORD*)raw = *(DWORD*)data ? TRUE : FALSE;
-+                        memset((unsigned char*)raw + single_size, \
-+                                '\0', (remaining_bytes > (single_size * 4) ? \
-+                                single_size * 4 : remaining_bytes));
-+                        raw = (unsigned char*)raw + (remaining_bytes > (single_size * 4) ? \
-+                                single_size * 4 : remaining_bytes);
-+                    }
-+                }
-+                else
-+                {
-+                    raw = (unsigned char*)raw + index_offset;
-+                    for (x = 0; (x * single_size) < param->bytes - index_offset; x++)
-+                    {
-+                        ((DWORD*)raw)[x] = ((DWORD*)data)[x] ? TRUE : FALSE;
-+                    }
-+                }
-+            }
-+            else
-+            {
-+                if (bytes == single_size)
-+                {
-+                    raw = (unsigned char*)raw + index_offset + remaining_byte_offset;
-+                    for (x = 0; (x * single_size) + byte_offset < param->bytes && (x * single_size) < bytes; x++)
-+                    {
-+                        memcpy((unsigned char*)raw + (x * single_size), \
-+                                (unsigned char*)data + (x * single_size), \
-+                                single_size);
-+                    }
-+                }
-+                else
-+                {
-+                    raw = (unsigned char*)raw + byte_offset;
-+                    for (x = 0; byte_offset + (x * single_size) < param->bytes &&
-+                            (x * single_size) < bytes; x++)
-+                    {
-+                        memcpy((unsigned char*)raw + (x * single_size), \
-+                                (unsigned char*)data + (x * single_size), \
-+                                single_size);
-+                    }
-+                }
-+            }
-+            return S_OK;
-+            break;
-+        default:
-+            FIXME("Unhandled param class %s.\n", debug_d3dxparameter_class(param->class));
-+            break;
-+    };
-+
-+    return D3DERR_INVALIDCALL;
- }
- #endif
- 
--- 
-2.43.0
-

patches/d3dx9_SetRawValue/definition

@@ -1,3 +0,0 @@
-Fixes: [46012] d3d9: Implement ID3DXEffect::SetRawValue
-
-# https://gitlab.winehq.org/wine/wine/-/merge_requests/979

patches/eventfd_synchronization/0002-server-Create-server-objects-for-eventfd-based-synch.patch

@@ -1,4 +1,4 @@
-From 9b9b36ccc66866ba142ce1f0d12190025ac2e7f7 Mon Sep 17 00:00:00 2001
+From da832ae3626406e9aee5f9f78bce01f2a0d49691 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Thu, 7 Jun 2018 20:09:59 -0500
 Subject: [PATCH] server: Create server objects for eventfd-based
@@ -9,13 +9,13 @@ Subject: [PATCH] server: Create server objects for eventfd-based
  server/esync.c      | 318 ++++++++++++++++++++++++++++++++++++++++++++
  server/esync.h      |  24 ++++
  server/main.c       |   4 +
- server/protocol.def |  25 +++-
- 5 files changed, 371 insertions(+), 1 deletion(-)
+ server/protocol.def |  24 ++++
+ 5 files changed, 371 insertions(+)
  create mode 100644 server/esync.c
  create mode 100644 server/esync.h
 
 diff --git a/server/Makefile.in b/server/Makefile.in
-index ae502dbf17d..b164193ef20 100644
+index 7e571ac2ba6..9632c4e694f 100644
 --- a/server/Makefile.in
 +++ b/server/Makefile.in
 @@ -11,6 +11,7 @@ SOURCES = \
@@ -381,7 +381,7 @@ index 00000000000..00f9e638d83
 +extern int do_esync(void);
 +void esync_init(void);
 diff --git a/server/main.c b/server/main.c
-index ddda5f4e86e..5062d0999fa 100644
+index e014ec535ff..052667b4c6b 100644
 --- a/server/main.c
 +++ b/server/main.c
 @@ -34,6 +34,7 @@
@@ -401,20 +401,12 @@ index ddda5f4e86e..5062d0999fa 100644
 +
      if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() );
      set_current_time();
-     init_scheduler();
+     init_signals();
 diff --git a/server/protocol.def b/server/protocol.def
-index e86d3414247..03bc0aeb11e 100644
+index fa4ca4aaa9e..a9ee996a8ab 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3867,7 +3867,6 @@ struct handle_info
-     obj_handle_t handle;       /* process handle */
- @END
- 
--
- /* Iterate thread list for process */
- @REQ(get_next_thread)
-     obj_handle_t process;      /* process handle */
-@@ -3879,6 +3878,29 @@ struct handle_info
+@@ -4080,6 +4080,29 @@ struct handle_info
      obj_handle_t handle;       /* next thread handle */
  @END
  
@@ -444,11 +436,11 @@ index e86d3414247..03bc0aeb11e 100644
  
  /* Setup keyboard auto-repeat */
  @REQ(set_keyboard_repeat)
-@@ -3888,3 +3910,4 @@ struct handle_info
+@@ -4089,3 +4112,4 @@ struct handle_info
  @REPLY
      int enable;                /* previous state of auto-repeat enable */
  @END
 +
 -- 
-2.43.0
+2.47.2
 

patches/eventfd_synchronization/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch

@@ -1,4 +1,4 @@
-From 914fe97f7dc20348ec3e1a2e18bcefa9b7cab463 Mon Sep 17 00:00:00 2001
+From 16f5ebca082d65ca9abeddb857f30ef58f590ea3 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 8 Jun 2018 18:51:40 -0500
 Subject: [PATCH] server: Add an object operation to grab the esync file
@@ -44,7 +44,7 @@ Split off to decrease patch size.
  35 files changed, 71 insertions(+)
 
 diff --git a/server/async.c b/server/async.c
-index 749c547af4f..2377c737e98 100644
+index d2d929c9709..9768a4932a6 100644
 --- a/server/async.c
 +++ b/server/async.c
 @@ -78,6 +78,7 @@ static const struct object_ops async_ops =
@@ -100,7 +100,7 @@ index 91f159bc7c9..0df7fd2f18e 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/completion.c b/server/completion.c
-index f9e68c523f1..9093132efac 100644
+index 99680ae0680..3d750154d1b 100644
 --- a/server/completion.c
 +++ b/server/completion.c
 @@ -92,6 +92,7 @@ static const struct object_ops completion_wait_ops =
@@ -120,10 +120,10 @@ index f9e68c523f1..9093132efac 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/console.c b/server/console.c
-index b64283baf4a..1cc9eea6a50 100644
+index de6f4e73e31..9bdba479e8c 100644
 --- a/server/console.c
 +++ b/server/console.c
-@@ -81,6 +81,7 @@ static const struct object_ops console_ops =
+@@ -84,6 +84,7 @@ static const struct object_ops console_ops =
      console_add_queue,                /* add_queue */
      remove_queue,                     /* remove_queue */
      console_signaled,                 /* signaled */
@@ -131,7 +131,7 @@ index b64283baf4a..1cc9eea6a50 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_get_fd,                   /* get_fd */
-@@ -158,6 +159,7 @@ static const struct object_ops console_server_ops =
+@@ -161,6 +162,7 @@ static const struct object_ops console_server_ops =
      add_queue,                        /* add_queue */
      remove_queue,                     /* remove_queue */
      console_server_signaled,          /* signaled */
@@ -139,15 +139,15 @@ index b64283baf4a..1cc9eea6a50 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_server_get_fd,            /* get_fd */
-@@ -227,6 +229,7 @@ static const struct object_ops screen_buffer_ops =
-     screen_buffer_add_queue,          /* add_queue */
-     NULL,                             /* remove_queue */
-     NULL,                             /* signaled */
+@@ -230,6 +232,7 @@ static const struct object_ops screen_buffer_ops =
+     add_queue,                        /* add_queue */
+     remove_queue,                     /* remove_queue */
+     screen_buffer_signaled,           /* signaled */
 +    NULL,                             /* get_esync_fd */
-     NULL,                             /* satisfied */
+     no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      screen_buffer_get_fd,             /* get_fd */
-@@ -276,6 +279,7 @@ static const struct object_ops console_device_ops =
+@@ -279,6 +282,7 @@ static const struct object_ops console_device_ops =
      no_add_queue,                     /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
@@ -155,23 +155,23 @@ index b64283baf4a..1cc9eea6a50 100644
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      no_get_fd,                        /* get_fd */
-@@ -313,6 +317,7 @@ static const struct object_ops console_input_ops =
-     console_input_add_queue,          /* add_queue */
-     NULL,                             /* remove_queue */
-     NULL,                             /* signaled */
+@@ -318,6 +322,7 @@ static const struct object_ops console_input_ops =
+     add_queue,                        /* add_queue */
+     remove_queue,                     /* remove_queue */
+     console_input_signaled,           /* signaled */
 +    NULL,                             /* get_esync_fd */
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_input_get_fd,             /* get_fd */
-@@ -370,6 +375,7 @@ static const struct object_ops console_output_ops =
-     console_output_add_queue,         /* add_queue */
-     NULL,                             /* remove_queue */
-     NULL,                             /* signaled */
+@@ -377,6 +382,7 @@ static const struct object_ops console_output_ops =
+     add_queue,                        /* add_queue */
+     remove_queue,                     /* remove_queue */
+     console_output_signaled,          /* signaled */
 +    NULL,                             /* get_esync_fd */
      no_satisfied,                     /* satisfied */
      no_signal,                        /* signal */
      console_output_get_fd,            /* get_fd */
-@@ -428,6 +434,7 @@ static const struct object_ops console_connection_ops =
+@@ -435,6 +441,7 @@ static const struct object_ops console_connection_ops =
      no_add_queue,                     /* add_queue */
      NULL,                             /* remove_queue */
      NULL,                             /* signaled */
@@ -180,7 +180,7 @@ index b64283baf4a..1cc9eea6a50 100644
      no_signal,                        /* signal */
      console_connection_get_fd,        /* get_fd */
 diff --git a/server/debugger.c b/server/debugger.c
-index c59a0abea77..ca04d4c71ce 100644
+index 39a740e07e5..0c01ec1c0d3 100644
 --- a/server/debugger.c
 +++ b/server/debugger.c
 @@ -86,6 +86,7 @@ static const struct object_ops debug_event_ops =
@@ -200,7 +200,7 @@ index c59a0abea77..ca04d4c71ce 100644
      no_signal,                     /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/device.c b/server/device.c
-index 436dac6bfe9..f730fa81afa 100644
+index 1f93cca437d..a0608aa6164 100644
 --- a/server/device.c
 +++ b/server/device.c
 @@ -66,6 +66,7 @@ static const struct object_ops irp_call_ops =
@@ -236,7 +236,7 @@ index 436dac6bfe9..f730fa81afa 100644
      no_signal,                        /* signal */
      device_file_get_fd,               /* get_fd */
 diff --git a/server/directory.c b/server/directory.c
-index b37ec969a9e..a6c0e292071 100644
+index fd689c561bc..2894f7669db 100644
 --- a/server/directory.c
 +++ b/server/directory.c
 @@ -69,6 +69,7 @@ static const struct object_ops object_type_ops =
@@ -268,7 +268,7 @@ index 6a63c0dd5e9..f95dc5a391f 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/event.c b/server/event.c
-index f1b79b1b35e..c727bfdd1ba 100644
+index ad7c09acc99..16cea16e9c2 100644
 --- a/server/event.c
 +++ b/server/event.c
 @@ -72,6 +72,7 @@ static const struct object_ops event_ops =
@@ -288,7 +288,7 @@ index f1b79b1b35e..c727bfdd1ba 100644
      no_signal,                   /* signal */
      no_get_fd,                   /* get_fd */
 diff --git a/server/fd.c b/server/fd.c
-index 16328063df6..4ce78db5b33 100644
+index dde92beb664..b0c28e54360 100644
 --- a/server/fd.c
 +++ b/server/fd.c
 @@ -172,6 +172,7 @@ static const struct object_ops fd_ops =
@@ -336,7 +336,7 @@ index 2a839968c25..cbef0c63383 100644
      no_signal,                    /* signal */
      file_get_fd,                  /* get_fd */
 diff --git a/server/handle.c b/server/handle.c
-index e65831b3b22..e6c5707556f 100644
+index 8968df73647..3d36af360c2 100644
 --- a/server/handle.c
 +++ b/server/handle.c
 @@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops =
@@ -348,7 +348,7 @@ index e65831b3b22..e6c5707556f 100644
      no_signal,                       /* signal */
      no_get_fd,                       /* get_fd */
 diff --git a/server/hook.c b/server/hook.c
-index c2d2823cd61..ab4d0e9dd31 100644
+index ffe7206369e..921aa8aba2e 100644
 --- a/server/hook.c
 +++ b/server/hook.c
 @@ -81,6 +81,7 @@ static const struct object_ops hook_table_ops =
@@ -360,7 +360,7 @@ index c2d2823cd61..ab4d0e9dd31 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/mailslot.c b/server/mailslot.c
-index 61eceec94e2..92fe938d3b9 100644
+index c54281c2101..e4c24459f22 100644
 --- a/server/mailslot.c
 +++ b/server/mailslot.c
 @@ -81,6 +81,7 @@ static const struct object_ops mailslot_ops =
@@ -396,7 +396,7 @@ index 61eceec94e2..92fe938d3b9 100644
      no_signal,                              /* signal */
      mailslot_device_file_get_fd,            /* get_fd */
 diff --git a/server/mapping.c b/server/mapping.c
-index 2bf45780375..b84bb08a77b 100644
+index 247b28cf6f5..d8498b65054 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
 @@ -67,6 +67,7 @@ static const struct object_ops ranges_ops =
@@ -436,7 +436,7 @@ index af0efe72132..4785a830e92 100644
      mutex_signal,              /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/named_pipe.c b/server/named_pipe.c
-index dd8c14b30a9..5880b601d3a 100644
+index 6e4ae371a1b..0eebd68abe6 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
 @@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
@@ -480,7 +480,7 @@ index dd8c14b30a9..5880b601d3a 100644
      no_signal,                               /* signal */
      named_pipe_device_file_get_fd,           /* get_fd */
 diff --git a/server/object.c b/server/object.c
-index b1665fb5372..0a4d1bede06 100644
+index cd368ef724a..4d8fcc5a774 100644
 --- a/server/object.c
 +++ b/server/object.c
 @@ -108,6 +108,7 @@ static const struct object_ops apc_reserve_ops =
@@ -500,7 +500,7 @@ index b1665fb5372..0a4d1bede06 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/object.h b/server/object.h
-index 6222e3352ed..0a65d0e3892 100644
+index 1058f9bfb0a..4acf6f03572 100644
 --- a/server/object.h
 +++ b/server/object.h
 @@ -78,6 +78,8 @@ struct object_ops
@@ -513,7 +513,7 @@ index 6222e3352ed..0a65d0e3892 100644
      void (*satisfied)(struct object *,struct wait_queue_entry *);
      /* signal an object */
 diff --git a/server/process.c b/server/process.c
-index 49f5c75005f..dc83a089655 100644
+index b161e3394ba..b3676936317 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -105,6 +105,7 @@ static const struct object_ops process_ops =
@@ -541,7 +541,7 @@ index 49f5c75005f..dc83a089655 100644
      no_signal,                     /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/queue.c b/server/queue.c
-index 984d466b66e..8a95055db40 100644
+index 2d23fb0def8..19486a745be 100644
 --- a/server/queue.c
 +++ b/server/queue.c
 @@ -165,6 +165,7 @@ static const struct object_ops msg_queue_ops =
@@ -561,7 +561,7 @@ index 984d466b66e..8a95055db40 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/registry.c b/server/registry.c
-index cc9a33fff1d..c19e92c9750 100644
+index c60c737feff..34c422dcc6f 100644
 --- a/server/registry.c
 +++ b/server/registry.c
 @@ -180,6 +180,7 @@ static const struct object_ops key_ops =
@@ -573,10 +573,10 @@ index cc9a33fff1d..c19e92c9750 100644
      no_signal,               /* signal */
      no_get_fd,               /* get_fd */
 diff --git a/server/request.c b/server/request.c
-index dabcea68309..832a33917b4 100644
+index 2254315b79e..f4f5e713935 100644
 --- a/server/request.c
 +++ b/server/request.c
-@@ -90,6 +90,7 @@ static const struct object_ops master_socket_ops =
+@@ -89,6 +89,7 @@ static const struct object_ops master_socket_ops =
      no_add_queue,                  /* add_queue */
      NULL,                          /* remove_queue */
      NULL,                          /* signaled */
@@ -621,10 +621,10 @@ index 19b76d44c16..55cd6aa037e 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/sock.c b/server/sock.c
-index d2ec882554f..44a4e3b7b15 100644
+index e064f867ff4..e9e81d9ecd0 100644
 --- a/server/sock.c
 +++ b/server/sock.c
-@@ -471,6 +471,7 @@ static const struct object_ops sock_ops =
+@@ -486,6 +486,7 @@ static const struct object_ops sock_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -632,7 +632,7 @@ index d2ec882554f..44a4e3b7b15 100644
      no_satisfied,                 /* satisfied */
      no_signal,                    /* signal */
      sock_get_fd,                  /* get_fd */
-@@ -3599,6 +3600,7 @@ static const struct object_ops ifchange_ops =
+@@ -3695,6 +3696,7 @@ static const struct object_ops ifchange_ops =
      no_add_queue,            /* add_queue */
      NULL,                    /* remove_queue */
      NULL,                    /* signaled */
@@ -640,7 +640,7 @@ index d2ec882554f..44a4e3b7b15 100644
      no_satisfied,            /* satisfied */
      no_signal,               /* signal */
      ifchange_get_fd,         /* get_fd */
-@@ -3820,6 +3822,7 @@ static const struct object_ops socket_device_ops =
+@@ -3916,6 +3918,7 @@ static const struct object_ops socket_device_ops =
      no_add_queue,               /* add_queue */
      NULL,                       /* remove_queue */
      NULL,                       /* signaled */
@@ -649,7 +649,7 @@ index d2ec882554f..44a4e3b7b15 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/symlink.c b/server/symlink.c
-index dd28efd3a75..c7f34412317 100644
+index 74b60162c01..2dd9c6a798d 100644
 --- a/server/symlink.c
 +++ b/server/symlink.c
 @@ -71,6 +71,7 @@ static const struct object_ops symlink_ops =
@@ -661,10 +661,10 @@ index dd28efd3a75..c7f34412317 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/thread.c b/server/thread.c
-index 506adfc0a6f..339cdfec1fa 100644
+index c7d1c6c55c8..ac000826599 100644
 --- a/server/thread.c
 +++ b/server/thread.c
-@@ -96,6 +96,7 @@ static const struct object_ops thread_apc_ops =
+@@ -106,6 +106,7 @@ static const struct object_ops thread_apc_ops =
      add_queue,                  /* add_queue */
      remove_queue,               /* remove_queue */
      thread_apc_signaled,        /* signaled */
@@ -672,7 +672,7 @@ index 506adfc0a6f..339cdfec1fa 100644
      no_satisfied,               /* satisfied */
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
-@@ -138,6 +139,7 @@ static const struct object_ops context_ops =
+@@ -148,6 +149,7 @@ static const struct object_ops context_ops =
      add_queue,                  /* add_queue */
      remove_queue,               /* remove_queue */
      context_signaled,           /* signaled */
@@ -680,7 +680,7 @@ index 506adfc0a6f..339cdfec1fa 100644
      no_satisfied,               /* satisfied */
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
-@@ -187,6 +189,7 @@ static const struct object_ops thread_ops =
+@@ -197,6 +199,7 @@ static const struct object_ops thread_ops =
      add_queue,                  /* add_queue */
      remove_queue,               /* remove_queue */
      thread_signaled,            /* signaled */
@@ -689,7 +689,7 @@ index 506adfc0a6f..339cdfec1fa 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/timer.c b/server/timer.c
-index 96dc9d00ca1..f59902d5607 100644
+index b0b6ec81535..883f30fa97e 100644
 --- a/server/timer.c
 +++ b/server/timer.c
 @@ -76,6 +76,7 @@ static const struct object_ops timer_ops =
@@ -701,7 +701,7 @@ index 96dc9d00ca1..f59902d5607 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/token.c b/server/token.c
-index 48ee1eca8fe..479596bdbfa 100644
+index 7e20c670a16..b638ed192cb 100644
 --- a/server/token.c
 +++ b/server/token.c
 @@ -145,6 +145,7 @@ static const struct object_ops token_ops =
@@ -713,7 +713,7 @@ index 48ee1eca8fe..479596bdbfa 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/window.c b/server/window.c
-index 412592fbc71..94a70ce890f 100644
+index f7f9d5e517f..8c416d8c88f 100644
 --- a/server/window.c
 +++ b/server/window.c
 @@ -107,6 +107,7 @@ static const struct object_ops window_ops =
@@ -725,7 +725,7 @@ index 412592fbc71..94a70ce890f 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/winstation.c b/server/winstation.c
-index e5f4bfec357..50fe34aa9ce 100644
+index b3746090ccf..126b70d625a 100644
 --- a/server/winstation.c
 +++ b/server/winstation.c
 @@ -76,6 +76,7 @@ static const struct object_ops winstation_ops =
@@ -745,5 +745,5 @@ index e5f4bfec357..50fe34aa9ce 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 -- 
-2.45.2
+2.47.2
 

patches/eventfd_synchronization/0020-server-Create-eventfd-file-descriptors-for-message-q.patch

@@ -1,4 +1,4 @@
-From 27e2bc1b0d098abce9168ea46589024054817e25 Mon Sep 17 00:00:00 2001
+From 52be83d9a557eec924a964944e6b926fb1e347ad Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:01:56 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for message queues.
@@ -8,10 +8,10 @@ Subject: [PATCH] server: Create eventfd file descriptors for message queues.
  1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/server/queue.c b/server/queue.c
-index ee575724e4e..60f0c043257 100644
+index a3479055ed4..08635c047b2 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -44,6 +44,7 @@
+@@ -45,6 +45,7 @@
  #include "process.h"
  #include "request.h"
  #include "user.h"
@@ -19,15 +19,15 @@ index ee575724e4e..60f0c043257 100644
  
  #define WM_NCMOUSEFIRST WM_NCMOUSEMOVE
  #define WM_NCMOUSELAST  (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST))
-@@ -144,6 +145,7 @@ struct msg_queue
+@@ -135,6 +136,7 @@ struct msg_queue
      int                    keystate_lock;   /* owns an input keystate lock */
-     const queue_shm_t     *shared;          /* queue in session shared memory */
+     queue_shm_t           *shared;          /* queue in session shared memory */
      unsigned int           ignore_post_msg; /* ignore post messages newer than this unique id */
 +    int                    esync_fd;        /* esync file descriptor (signalled on message) */
  };
  
  struct hotkey
-@@ -160,6 +162,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
+@@ -151,6 +153,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
  static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry );
  static void msg_queue_remove_queue( struct object *obj, struct wait_queue_entry *entry );
  static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry );
@@ -35,7 +35,7 @@ index ee575724e4e..60f0c043257 100644
  static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry );
  static void msg_queue_destroy( struct object *obj );
  static void msg_queue_poll_event( struct fd *fd, int event );
-@@ -175,7 +178,7 @@ static const struct object_ops msg_queue_ops =
+@@ -166,7 +169,7 @@ static const struct object_ops msg_queue_ops =
      msg_queue_add_queue,       /* add_queue */
      msg_queue_remove_queue,    /* remove_queue */
      msg_queue_signaled,        /* signaled */
@@ -44,7 +44,7 @@ index ee575724e4e..60f0c043257 100644
      msg_queue_satisfied,       /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -313,6 +316,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+@@ -317,6 +320,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          queue->last_get_msg    = current_time;
          queue->keystate_lock   = 0;
          queue->ignore_post_msg = 0;
@@ -52,7 +52,7 @@ index ee575724e4e..60f0c043257 100644
          list_init( &queue->send_result );
          list_init( &queue->callback_result );
          list_init( &queue->pending_timers );
-@@ -335,6 +339,9 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+@@ -339,6 +343,9 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          }
          SHARED_WRITE_END;
  
@@ -62,7 +62,7 @@ index ee575724e4e..60f0c043257 100644
          thread->queue = queue;
  
          if ((desktop = get_thread_desktop( thread, 0 )))
-@@ -685,6 +692,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
+@@ -753,6 +760,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
          if (queue->keystate_lock) unlock_input_keystate( queue->input );
          queue->keystate_lock = 0;
      }
@@ -72,7 +72,7 @@ index ee575724e4e..60f0c043257 100644
  }
  
  /* check if message is matched by the filter */
-@@ -1227,6 +1237,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
+@@ -1335,6 +1345,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
      return ret || is_signaled( queue );
  }
  
@@ -86,7 +86,7 @@ index ee575724e4e..60f0c043257 100644
  static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry )
  {
      struct msg_queue *queue = (struct msg_queue *)obj;
-@@ -1278,6 +1295,7 @@ static void msg_queue_destroy( struct object *obj )
+@@ -1391,6 +1408,7 @@ static void msg_queue_destroy( struct object *obj )
      if (queue->hooks) release_object( queue->hooks );
      if (queue->fd) release_object( queue->fd );
      if (queue->shared) free_shared_object( queue->shared );
@@ -94,7 +94,7 @@ index ee575724e4e..60f0c043257 100644
  }
  
  static void msg_queue_poll_event( struct fd *fd, int event )
-@@ -3000,6 +3018,9 @@ DECL_HANDLER(set_queue_mask)
+@@ -3181,6 +3199,9 @@ DECL_HANDLER(set_queue_mask)
              }
              else wake_up( &queue->obj, 0 );
          }
@@ -104,7 +104,7 @@ index ee575724e4e..60f0c043257 100644
      }
  }
  
-@@ -3020,6 +3041,9 @@ DECL_HANDLER(get_queue_status)
+@@ -3201,6 +3222,9 @@ DECL_HANDLER(get_queue_status)
              shared->changed_bits &= ~req->clear_bits;
          }
          SHARED_WRITE_END;
@@ -114,7 +114,7 @@ index ee575724e4e..60f0c043257 100644
      }
      else reply->wake_bits = reply->changed_bits = 0;
  }
-@@ -3286,6 +3310,10 @@ DECL_HANDLER(get_message)
+@@ -3469,6 +3493,10 @@ DECL_HANDLER(get_message)
      SHARED_WRITE_END;
  
      set_error( STATUS_PENDING );  /* FIXME */
@@ -126,5 +126,5 @@ index ee575724e4e..60f0c043257 100644
  
  found_msg:
 -- 
-2.43.0
+2.47.2