Release v10.15

Fix crashes with the HighFleet (patch 2)
Fix drawing issue with Puyo Puyo Tetris (patch 3).

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

@@ -1,4 +1,4 @@
-From 3dc4a148d7c91afea8f589f47daca82c5c27b7c1 Mon Sep 17 00:00:00 2001
+From efd5485d5026fceb01c7a25bb47a780505adea68 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
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  1 file changed, 19 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 74eb1b7f500..95639558155 100644
+index c20d6a5d87b..717f321bc6e 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 74eb1b7f500..95639558155 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3870,6 +3871,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3879,6 +3880,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,7 +28,7 @@ index 74eb1b7f500..95639558155 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -4366,6 +4368,9 @@ static void release_address_space(void)
+@@ -4388,6 +4390,9 @@ static void release_address_space(void)
   */
  void loader_init( CONTEXT *context, void **entry )
  {
@@ -38,9 +38,9 @@ index 74eb1b7f500..95639558155 100644
      static int attach_done;
      NTSTATUS status;
      ULONG_PTR cookie, port = 0;
-@@ -4455,6 +4460,20 @@ void loader_init( CONTEXT *context, void **entry )
-         arm64ec_thread_init();
- #endif
+@@ -4485,6 +4490,20 @@ void loader_init( CONTEXT *context, void **entry )
+         }
+ 
          wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
 +        /* This hunk occasionally applies in the wrong place;
 +         * add a comment here to try to prevent that. */
@@ -60,5 +60,5 @@ index 74eb1b7f500..95639558155 100644
  
      NtCurrentTeb()->FlsSlots = fls_alloc_data();
 -- 
-2.47.2
+2.51.0
 

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/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch

@@ -1,63 +1,40 @@
-From 7285c2c90f43cd46d873a2ddb65e9c6c9d63f750 Mon Sep 17 00:00:00 2001
+From 18e01f69f4a3ad85253bb73dcd3ff197074c8810 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 3 Aug 2021 11:13:18 +1000
-Subject: [PATCH 2/2] d3dx11_42: Implement D3DX11CreateTextureFromMemory
+Subject: [PATCH] d3dx11_42: Implement D3DX11CreateTextureFromMemory
 
 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 ---
- dlls/d3dx11_43/texture.c | 359 ++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 354 insertions(+), 5 deletions(-)
+ dlls/d3dx11_43/texture.c | 365 ++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 359 insertions(+), 6 deletions(-)
 
 diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index bbf937cdab0..10dedf30c0f 100644
+index cbf3b630f58..0bc5ef9ab03 100644
 --- a/dlls/d3dx11_43/texture.c
 +++ b/dlls/d3dx11_43/texture.c
-@@ -22,6 +22,7 @@
- #include "wincodec.h"
+@@ -15,12 +15,15 @@
+  * License along with this library; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
++#define COBJMACROS
  
+ #include "d3dx11.h"
+ #include "d3dcompiler.h"
+ #include "dxhelpers.h"
+ 
++#include "wincodec.h"
  #include "wine/debug.h"
 +#include "wine/heap.h"
  
  WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
  
-@@ -43,6 +44,33 @@ file_formats[] =
-     { &GUID_ContainerFormatWmp,  D3DX11_IFF_WMP },
- };
- 
-+static const struct
-+{
-+    const GUID *wic_guid;
-+    DXGI_FORMAT dxgi_format;
-+}
-+wic_pixel_formats[] =
-+{
-+    { &GUID_WICPixelFormatBlackWhite,         DXGI_FORMAT_R1_UNORM },
-+    { &GUID_WICPixelFormat8bppAlpha,          DXGI_FORMAT_A8_UNORM },
-+    { &GUID_WICPixelFormat8bppGray,           DXGI_FORMAT_R8_UNORM },
-+    { &GUID_WICPixelFormat16bppGray,          DXGI_FORMAT_R16_UNORM },
-+    { &GUID_WICPixelFormat16bppGrayHalf,      DXGI_FORMAT_R16_FLOAT },
-+    { &GUID_WICPixelFormat32bppGrayFloat,     DXGI_FORMAT_R32_FLOAT },
-+    { &GUID_WICPixelFormat16bppBGR565,        DXGI_FORMAT_B5G6R5_UNORM },
-+    { &GUID_WICPixelFormat16bppBGRA5551,      DXGI_FORMAT_B5G5R5A1_UNORM },
-+    { &GUID_WICPixelFormat32bppBGR,           DXGI_FORMAT_B8G8R8X8_UNORM },
-+    { &GUID_WICPixelFormat32bppBGRA,          DXGI_FORMAT_B8G8R8A8_UNORM },
-+    { &GUID_WICPixelFormat32bppRGBA,          DXGI_FORMAT_R8G8B8A8_UNORM },
-+    { &GUID_WICPixelFormat32bppRGBA,          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB },
-+    { &GUID_WICPixelFormat32bppRGBA1010102,   DXGI_FORMAT_R10G10B10A2_UNORM },
-+    { &GUID_WICPixelFormat32bppRGBA1010102XR, DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM },
-+    { &GUID_WICPixelFormat64bppRGBA,          DXGI_FORMAT_R16G16B16A16_UNORM },
-+    { &GUID_WICPixelFormat64bppRGBAHalf,      DXGI_FORMAT_R16G16B16A16_FLOAT },
-+    { &GUID_WICPixelFormat96bppRGBFloat,      DXGI_FORMAT_R32G32B32_FLOAT },
-+    { &GUID_WICPixelFormat128bppRGBAFloat,    DXGI_FORMAT_R32G32B32A32_FLOAT }
-+};
-+
- static D3DX11_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *container_format)
- {
-     unsigned int i;
-@@ -95,6 +123,175 @@ static DXGI_FORMAT get_d3dx11_dds_format(DXGI_FORMAT format)
-     return format;
+@@ -277,16 +280,366 @@ HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *f
+     return E_NOTIMPL;
  }
  
+-HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data,
+-        SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
+-        ID3D11Resource **texture, HRESULT *hresult)
 +static const DXGI_FORMAT block_compressed_formats[] =
 +{
 +    DXGI_FORMAT_BC1_TYPELESS,  DXGI_FORMAT_BC1_UNORM, DXGI_FORMAT_BC1_UNORM_SRGB,
@@ -70,9 +47,12 @@ index bbf937cdab0..10dedf30c0f 100644
 +};
 +
 +static BOOL is_block_compressed(DXGI_FORMAT format)
-+{
+ {
+-    FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
+-            device, data, data_size, load_info, pump, texture, hresult);
 +    unsigned int i;
-+
+ 
+-    return E_NOTIMPL;
 +    for (i = 0; i < ARRAY_SIZE(block_compressed_formats); ++i)
 +        if (format == block_compressed_formats[i])
 +            return TRUE;
@@ -214,6 +194,33 @@ index bbf937cdab0..10dedf30c0f 100644
 +    }
 +}
 +
++static const struct
++{
++    const GUID *wic_guid;
++    DXGI_FORMAT dxgi_format;
++}
++wic_pixel_formats[] =
++{
++    { &GUID_WICPixelFormatBlackWhite,         DXGI_FORMAT_R1_UNORM },
++    { &GUID_WICPixelFormat8bppAlpha,          DXGI_FORMAT_A8_UNORM },
++    { &GUID_WICPixelFormat8bppGray,           DXGI_FORMAT_R8_UNORM },
++    { &GUID_WICPixelFormat16bppGray,          DXGI_FORMAT_R16_UNORM },
++    { &GUID_WICPixelFormat16bppGrayHalf,      DXGI_FORMAT_R16_FLOAT },
++    { &GUID_WICPixelFormat32bppGrayFloat,     DXGI_FORMAT_R32_FLOAT },
++    { &GUID_WICPixelFormat16bppBGR565,        DXGI_FORMAT_B5G6R5_UNORM },
++    { &GUID_WICPixelFormat16bppBGRA5551,      DXGI_FORMAT_B5G5R5A1_UNORM },
++    { &GUID_WICPixelFormat32bppBGR,           DXGI_FORMAT_B8G8R8X8_UNORM },
++    { &GUID_WICPixelFormat32bppBGRA,          DXGI_FORMAT_B8G8R8A8_UNORM },
++    { &GUID_WICPixelFormat32bppRGBA,          DXGI_FORMAT_R8G8B8A8_UNORM },
++    { &GUID_WICPixelFormat32bppRGBA,          DXGI_FORMAT_R8G8B8A8_UNORM_SRGB },
++    { &GUID_WICPixelFormat32bppRGBA1010102,   DXGI_FORMAT_R10G10B10A2_UNORM },
++    { &GUID_WICPixelFormat32bppRGBA1010102XR, DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM },
++    { &GUID_WICPixelFormat64bppRGBA,          DXGI_FORMAT_R16G16B16A16_UNORM },
++    { &GUID_WICPixelFormat64bppRGBAHalf,      DXGI_FORMAT_R16G16B16A16_FLOAT },
++    { &GUID_WICPixelFormat96bppRGBFloat,      DXGI_FORMAT_R32G32B32_FLOAT },
++    { &GUID_WICPixelFormat128bppRGBAFloat,    DXGI_FORMAT_R32G32B32A32_FLOAT }
++};
++
 +static const GUID *dxgi_format_to_wic_guid(DXGI_FORMAT format)
 +{
 +    unsigned int i;
@@ -225,23 +232,14 @@ index bbf937cdab0..10dedf30c0f 100644
 +    }
 +
 +    return NULL;
-+}
-+
- HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
-         D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
- {
-@@ -220,14 +417,166 @@ HRESULT WINAPI D3DX11CreateTextureFromFileW(ID3D11Device *device, const WCHAR *f
-     return E_NOTIMPL;
  }
  
--HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *data,
--        SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
++HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT sdk_version, IWICImagingFactory **imaging_factory);
++
 +HRESULT WINAPI D3DX11CreateTextureFromMemory(ID3D11Device *device, const void *src_data,
 +        SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
-         ID3D11Resource **texture, HRESULT *hresult)
- {
--    FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p stub.\n",
--            device, data, data_size, load_info, pump, texture, hresult);
++         ID3D11Resource **texture, HRESULT *hresult)
++ {
 +    unsigned int frame_count, width, height, stride, frame_size;
 +    IWICFormatConverter *converter = NULL;
 +    IWICDdsFrameDecode *dds_frame = NULL;
@@ -258,8 +256,7 @@ index bbf937cdab0..10dedf30c0f 100644
 +    BOOL can_convert;
 +    GUID src_format;
 +    HRESULT hr;
- 
--    return E_NOTIMPL;
++
 +    TRACE("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n",
 +            device, src_data, src_data_size, load_info, pump, texture, hresult);
 +
@@ -399,9 +396,11 @@ index bbf937cdab0..10dedf30c0f 100644
 +        IWICImagingFactory_Release(factory);
 +
 +    return hr;
- }
- 
++ }
++
  HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture,
+         D3DX11_IMAGE_FILE_FORMAT format, const WCHAR *filename)
+ {
 -- 
-2.40.1
+2.51.0
 

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch

@@ -1,245 +0,0 @@
-From 0fbce9fe4b69f27b7df82c6517c364aab57de63b Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Fri, 30 Jul 2021 15:57:29 +1000
-Subject: [PATCH 1/2] d3dx11_43: Implement D3DX11GetImageInfoFromMemory
-
-Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=50210
-
-Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
----
- dlls/d3dx11_42/Makefile.in |   1 +
- dlls/d3dx11_43/Makefile.in |   1 +
- dlls/d3dx11_43/main.c      |   9 --
- dlls/d3dx11_43/texture.c   | 167 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 169 insertions(+), 9 deletions(-)
-
-diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in
-index 7fcce18a8e1..78ca5f707a7 100644
---- a/dlls/d3dx11_42/Makefile.in
-+++ b/dlls/d3dx11_42/Makefile.in
-@@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=42
- MODULE    = d3dx11_42.dll
- IMPORTLIB = d3dx11_42
- IMPORTS = d3dcompiler
-+DELAYIMPORTS = windowscodecs
- PARENTSRC = ../d3dx11_43
- 
- EXTRADLLFLAGS = -Wb,--prefer-native
-diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in
-index ccd4319ace2..6854c73ebcb 100644
---- a/dlls/d3dx11_43/Makefile.in
-+++ b/dlls/d3dx11_43/Makefile.in
-@@ -2,6 +2,7 @@ EXTRADEFS = -DD3DX11_SDK_VERSION=43
- MODULE = d3dx11_43.dll
- IMPORTLIB = d3dx11
- IMPORTS   = d3dcompiler
-+DELAYIMPORTS = windowscodecs
- 
- EXTRADLLFLAGS = -Wb,--prefer-native
- 
-diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c
-index 5dad027864f..00c1db35e42 100644
---- a/dlls/d3dx11_43/main.c
-+++ b/dlls/d3dx11_43/main.c
-@@ -66,12 +66,3 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP
- 
-     return E_NOTIMPL;
- }
--
--HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
--        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
--{
--    FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n",
--            src_data, src_data_size, pump, img_info, hresult);
--
--    return E_NOTIMPL;
--}
-diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index 81ac8ee6db7..bbf937cdab0 100644
---- a/dlls/d3dx11_43/texture.c
-+++ b/dlls/d3dx11_43/texture.c
-@@ -15,14 +15,181 @@
-  * License along with this library; if not, write to the Free Software
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
-+#define COBJMACROS
- 
- #include "d3dx11.h"
- #include "d3dcompiler.h"
-+#include "wincodec.h"
- 
- #include "wine/debug.h"
- 
- WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
- 
-+HRESULT WINAPI WICCreateImagingFactory_Proxy(UINT sdk_version, IWICImagingFactory **imaging_factory);
-+
-+static const struct
-+{
-+    const GUID *wic_container_guid;
-+    D3DX11_IMAGE_FILE_FORMAT d3dx_file_format;
-+}
-+file_formats[] =
-+{
-+    { &GUID_ContainerFormatBmp,  D3DX11_IFF_BMP },
-+    { &GUID_ContainerFormatJpeg, D3DX11_IFF_JPG },
-+    { &GUID_ContainerFormatPng,  D3DX11_IFF_PNG },
-+    { &GUID_ContainerFormatDds,  D3DX11_IFF_DDS },
-+    { &GUID_ContainerFormatTiff, D3DX11_IFF_TIFF },
-+    { &GUID_ContainerFormatGif,  D3DX11_IFF_GIF },
-+    { &GUID_ContainerFormatWmp,  D3DX11_IFF_WMP },
-+};
-+
-+static D3DX11_IMAGE_FILE_FORMAT wic_container_guid_to_file_format(GUID *container_format)
-+{
-+    unsigned int i;
-+
-+    for (i = 0; i < ARRAY_SIZE(file_formats); ++i)
-+    {
-+        if (IsEqualGUID(file_formats[i].wic_container_guid, container_format))
-+            return file_formats[i].d3dx_file_format;
-+    }
-+    return D3DX11_IFF_FORCE_DWORD;
-+}
-+
-+static D3D11_RESOURCE_DIMENSION wic_dimension_to_d3dx11_dimension(WICDdsDimension wic_dimension)
-+{
-+    switch (wic_dimension)
-+    {
-+        case WICDdsTexture1D:
-+            return D3D11_RESOURCE_DIMENSION_TEXTURE1D;
-+        case WICDdsTexture2D:
-+        case WICDdsTextureCube:
-+            return D3D11_RESOURCE_DIMENSION_TEXTURE2D;
-+        case WICDdsTexture3D:
-+            return D3D11_RESOURCE_DIMENSION_TEXTURE3D;
-+        default:
-+            return D3D11_RESOURCE_DIMENSION_UNKNOWN;
-+    }
-+}
-+
-+static const DXGI_FORMAT to_be_converted_format[] =
-+{
-+    DXGI_FORMAT_UNKNOWN,
-+    DXGI_FORMAT_R8_UNORM,
-+    DXGI_FORMAT_R8G8_UNORM,
-+    DXGI_FORMAT_B5G6R5_UNORM,
-+    DXGI_FORMAT_B4G4R4A4_UNORM,
-+    DXGI_FORMAT_B5G5R5A1_UNORM,
-+    DXGI_FORMAT_B8G8R8X8_UNORM,
-+    DXGI_FORMAT_B8G8R8A8_UNORM
-+};
-+
-+static DXGI_FORMAT get_d3dx11_dds_format(DXGI_FORMAT format)
-+{
-+    unsigned int i;
-+
-+    for (i = 0; i < ARRAY_SIZE(to_be_converted_format); ++i)
-+    {
-+        if (format == to_be_converted_format[i])
-+            return DXGI_FORMAT_R8G8B8A8_UNORM;
-+    }
-+    return format;
-+}
-+
-+HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
-+        D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
-+{
-+    IWICImagingFactory *factory = NULL;
-+    IWICDdsDecoder *dds_decoder = NULL;
-+    IWICBitmapDecoder *decoder = NULL;
-+    WICDdsParameters dds_params;
-+    IWICStream *stream = NULL;
-+    GUID container_format;
-+    HRESULT hr;
-+
-+    TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n",
-+            src_data, src_data_size, pump, img_info, hresult);
-+
-+    if (!src_data || !src_data_size || !img_info)
-+        return E_FAIL;
-+    if (pump)
-+        FIXME("Thread pump is not supported yet.\n");
-+
-+    WICCreateImagingFactory_Proxy(WINCODEC_SDK_VERSION, &factory);
-+    IWICImagingFactory_CreateStream(factory, &stream);
-+    hr = IWICStream_InitializeFromMemory(stream, (BYTE *)src_data, src_data_size);
-+    if (FAILED(hr))
-+    {
-+        WARN("Failed to initialize stream.\n");
-+        goto end;
-+    }
-+    hr = IWICImagingFactory_CreateDecoderFromStream(factory, (IStream *)stream, NULL, 0, &decoder);
-+    if (FAILED(hr))
-+        goto end;
-+
-+    hr = IWICBitmapDecoder_GetContainerFormat(decoder, &container_format);
-+    if (FAILED(hr))
-+        goto end;
-+    img_info->ImageFileFormat = wic_container_guid_to_file_format(&container_format);
-+    if (img_info->ImageFileFormat == D3DX11_IFF_FORCE_DWORD)
-+    {
-+        hr = E_FAIL;
-+        WARN("Unsupported image file format %s.\n", debugstr_guid(&container_format));
-+        goto end;
-+    }
-+
-+    if (img_info->ImageFileFormat == D3DX11_IFF_DDS)
-+    {
-+        hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder);
-+        if (FAILED(hr))
-+            goto end;
-+        hr = IWICDdsDecoder_GetParameters(dds_decoder, &dds_params);
-+        if (FAILED(hr))
-+            goto end;
-+        img_info->Width = dds_params.Width;
-+        img_info->Height = dds_params.Height;
-+        img_info->ArraySize = dds_params.ArraySize;
-+        img_info->Depth = dds_params.Depth;
-+        img_info->MipLevels = dds_params.MipLevels;
-+        img_info->ResourceDimension = wic_dimension_to_d3dx11_dimension(dds_params.Dimension);
-+        img_info->Format = get_d3dx11_dds_format(dds_params.DxgiFormat);
-+        img_info->MiscFlags = 0;
-+        if (dds_params.Dimension == WICDdsTextureCube)
-+        {
-+            img_info->MiscFlags = D3D11_RESOURCE_MISC_TEXTURECUBE;
-+            img_info->ArraySize *= 6;
-+        }
-+    }
-+    else
-+    {
-+        FIXME("Unsupported image format %d\n", img_info->ImageFileFormat);
-+        img_info->Width = 1;
-+        img_info->Height = 1;
-+        img_info->ArraySize = 1;
-+        img_info->Depth = 1;
-+        img_info->MipLevels = 1;
-+        img_info->ResourceDimension = D3D11_RESOURCE_DIMENSION_TEXTURE2D;
-+        img_info->Format = DXGI_FORMAT_R8G8B8A8_UNORM;
-+        img_info->MiscFlags = 0;
-+    }
-+
-+end:
-+    if (dds_decoder)
-+        IWICDdsDecoder_Release(dds_decoder);
-+    if (decoder)
-+        IWICBitmapDecoder_Release(decoder);
-+    if (stream)
-+        IWICStream_Release(stream);
-+    if (factory)
-+        IWICImagingFactory_Release(factory);
-+
-+    if (hr != S_OK)
-+    {
-+        WARN("Invalid or unsupported image file.\n");
-+        return E_FAIL;
-+    }
-+    return S_OK;
-+}
-+
- HRESULT WINAPI D3DX11CreateShaderResourceViewFromMemory(ID3D11Device *device, const void *data,
-         SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump,
-         ID3D11ShaderResourceView **view, HRESULT *hresult)
--- 
-2.40.1
-

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx9-Add-support-for-GUID_WICPixelFormat16bppGray.patch

@@ -0,0 +1,25 @@
+From 3c5ed75d72440b3c1ff668c3aece8216b561bece Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 13 Sep 2025 08:17:15 +1000
+Subject: [PATCH] d3dx9: Add support for GUID_WICPixelFormat16bppGray
+
+Stop error with HighFleet on startup.
+---
+ dlls/d3dx9_36/d3dx_helpers.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/dlls/d3dx9_36/d3dx_helpers.c b/dlls/d3dx9_36/d3dx_helpers.c
+index 60394ca1d9b..26b00191b68 100644
+--- a/dlls/d3dx9_36/d3dx_helpers.c
++++ b/dlls/d3dx9_36/d3dx_helpers.c
+@@ -140,6 +140,7 @@ static const struct
+     { &GUID_WICPixelFormat2bppIndexed, D3DX_PIXEL_FORMAT_P2_UINT },
+     { &GUID_WICPixelFormat4bppIndexed, D3DX_PIXEL_FORMAT_P4_UINT },
+     { &GUID_WICPixelFormat8bppGray,    D3DX_PIXEL_FORMAT_L8_UNORM },
++    { &GUID_WICPixelFormat16bppGray,   D3DX_PIXEL_FORMAT_R16_UNORM },
+     { &GUID_WICPixelFormat16bppBGR555, D3DX_PIXEL_FORMAT_B5G5R5X1_UNORM },
+     { &GUID_WICPixelFormat16bppBGR565, D3DX_PIXEL_FORMAT_B5G6R5_UNORM },
+     { &GUID_WICPixelFormat24bppBGR,    D3DX_PIXEL_FORMAT_B8G8R8_UNORM },
+-- 
+2.51.0
+

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0003-d3dx11_43-D3DX11GetImageInfoFromMemory-Only-use-fram.patch

@@ -1,56 +0,0 @@
-From 30d677139afe2af3f72c68ba11f1bbaead6f1c11 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 2 Aug 2023 08:24:11 +1000
-Subject: [PATCH] d3dx11_43: D3DX11GetImageInfoFromMemory - Only use frame for
- non DDS images
-
----
- dlls/d3dx11_43/texture.c | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c
-index 10dedf30c0f..f3f7d350131 100644
---- a/dlls/d3dx11_43/texture.c
-+++ b/dlls/d3dx11_43/texture.c
-@@ -295,6 +295,7 @@ static const GUID *dxgi_format_to_wic_guid(DXGI_FORMAT format)
- HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump,
-         D3DX11_IMAGE_INFO *img_info, HRESULT *hresult)
- {
-+    IWICBitmapFrameDecode *frame = NULL;
-     IWICImagingFactory *factory = NULL;
-     IWICDdsDecoder *dds_decoder = NULL;
-     IWICBitmapDecoder *decoder = NULL;
-@@ -358,9 +359,18 @@ HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat
-     }
-     else
-     {
--        FIXME("Unsupported image format %d\n", img_info->ImageFileFormat);
--        img_info->Width = 1;
--        img_info->Height = 1;
-+        unsigned int frame_count;
-+
-+        hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count);
-+        if (FAILED(hr) || !frame_count)
-+            goto end;
-+        hr = IWICBitmapDecoder_GetFrame(decoder, 0, &frame);
-+        if (FAILED(hr))
-+            goto end;
-+        hr = IWICBitmapFrameDecode_GetSize(frame, &img_info->Width, &img_info->Height);
-+        if (FAILED(hr))
-+            goto end;
-+
-         img_info->ArraySize = 1;
-         img_info->Depth = 1;
-         img_info->MipLevels = 1;
-@@ -372,6 +382,8 @@ HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_dat
- end:
-     if (dds_decoder)
-         IWICDdsDecoder_Release(dds_decoder);
-+    if (frame)
-+        IWICBitmapFrameDecode_Release(frame);
-     if (decoder)
-         IWICBitmapDecoder_Release(decoder);
-     if (stream)
--- 
-2.40.1
-

patches/d3dx11_43-D3DX11CreateTextureFromMemory/0003-d3dx9_36-Use-correct-pixel-type-for-DXT-format.patch

@@ -0,0 +1,49 @@
+From 9d0bf8024bf5d97540fd1fa7456766fea808bc20 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Sat, 13 Sep 2025 08:17:15 +1000
+Subject: [PATCH] d3dx9_36: Use correct pixel type for DXT* format
+
+Required for Puyo-Puyo tetris.
+---
+ dlls/d3dx9_36/d3dx_helpers.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3dx9_36/d3dx_helpers.c b/dlls/d3dx9_36/d3dx_helpers.c
+index 26b00191b68..694b1b53548 100644
+--- a/dlls/d3dx9_36/d3dx_helpers.c
++++ b/dlls/d3dx9_36/d3dx_helpers.c
+@@ -290,8 +290,8 @@ static enum d3dx_pixel_format_id d3dx_pixel_format_id_from_dds_pixel_format(cons
+ {
+     uint32_t i;
+ 
+-    TRACE("pixel_format: size %lu, flags %#lx, fourcc %#lx, bpp %lu.\n", pixel_format->size,
+-            pixel_format->flags, pixel_format->fourcc, pixel_format->bpp);
++    TRACE("pixel_format: size %lu, flags %#lx, fourcc %s, bpp %lu.\n", pixel_format->size,
++            pixel_format->flags, debugstr_fourcc(pixel_format->fourcc), pixel_format->bpp);
+     TRACE("rmask %#lx, gmask %#lx, bmask %#lx, amask %#lx.\n", pixel_format->rmask, pixel_format->gmask,
+             pixel_format->bmask, pixel_format->amask);
+ 
+@@ -1152,6 +1152,20 @@ static HRESULT d3dx_initialize_image_from_dds(const void *src_data, uint32_t src
+         if ((image->format = d3dx_pixel_format_id_from_dds_pixel_format(&header->pixel_format)) == D3DX_PIXEL_FORMAT_COUNT)
+             return D3DXERR_INVALIDDATA;
+ 
++        switch (image->format)
++        {
++        case D3DX_PIXEL_FORMAT_DXT1_UNORM:
++        case D3DX_PIXEL_FORMAT_DXT2_UNORM:
++        case D3DX_PIXEL_FORMAT_DXT3_UNORM:
++        case D3DX_PIXEL_FORMAT_DXT4_UNORM:
++        case D3DX_PIXEL_FORMAT_DXT5_UNORM:
++            image->format  = D3DX_PIXEL_FORMAT_R8G8B8A8_UNORM;
++            break;
++        default:
++            /* Leave format as is */
++            break;
++        }
++
+         image->image_file_format = D3DX_IMAGE_FILE_FORMAT_DDS;
+         image->layer_count = 1;
+         if (header->flags & DDS_DEPTH)
+-- 
+2.51.0
+

patches/d3dx11_43-D3DX11CreateTextureFromMemory/definition

@@ -1,4 +1 @@
-Fixes: [50210] - Implement D3DX11GetImageInfoFromMemory
 Fixes: [45533] - Implement D3DX11CreateTextureFromMemory
-
-# This patchset will need to wait until the new wined3dx dll implemented.

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

@@ -1,118 +0,0 @@
-From 71d1c176af87bdc48326d5883fbea608314ee0a4 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 6a9b3e12b7b..0c6374f35ca 100644
---- a/dlls/d3dx9_36/d3dx9_private.h
-+++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -316,6 +316,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, enum d3dx_pixel_format_id 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 9d2dc96a979..912a3e3c849 100644
---- a/dlls/d3dx9_36/surface.c
-+++ b/dlls/d3dx9_36/surface.c
-@@ -628,6 +628,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, NULL);
-+        IDirect3DSurface9_Release(surface);
-+    }
-+
-+    return hr;
-+}
-+
- static const uint8_t bmp_file_signature[] =       { 'B', 'M' };
- static const uint8_t jpg_file_signature[] =       { 0xff, 0xd8 };
- static const uint8_t png_file_signature[] =       { 0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a };
-diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index 719a2787445..3f76ec209f9 100644
---- a/dlls/d3dx9_36/texture.c
-+++ b/dlls/d3dx9_36/texture.c
-@@ -1866,10 +1866,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.47.2
-

patches/d3dx9_36-DDS/definition

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

patches/d3dx9_animation_TrackDesc/0001-d3dx9-Implement-ID3DXAnimationController-RegisterAni.patch

@@ -0,0 +1,93 @@
+From 78fcd523dff585ce007405bd75d459aa2c4fb13a Mon Sep 17 00:00:00 2001
+From: Connor McAdams <cmcadams@codeweavers.com>
+Date: Wed, 3 Sep 2025 13:04:51 -0400
+Subject: [PATCH] d3dx9: Implement
+ ID3DXAnimationController::RegisterAnimationSet().
+
+Signed-off-by: Connor McAdams <cmcadams@codeweavers.com>
+---
+ dlls/d3dx9_36/animation.c | 34 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c
+index 8a38c05ed0c..1bb775bc44a 100644
+--- a/dlls/d3dx9_36/animation.c
++++ b/dlls/d3dx9_36/animation.c
+@@ -29,8 +29,13 @@ struct d3dx9_animation_controller
+     LONG ref;
+ 
+     UINT max_outputs;
++
++    ID3DXAnimationSet **animation_sets;
++    UINT num_sets;
+     UINT max_sets;
++
+     UINT max_tracks;
++
+     UINT max_events;
+ };
+ 
+@@ -75,6 +80,14 @@ static ULONG WINAPI d3dx9_animation_controller_Release(ID3DXAnimationController
+ 
+     if (!refcount)
+     {
++        unsigned int i;
++
++        for (i = 0; i < animation->max_sets; i++)
++        {
++            if (animation->animation_sets[i])
++                animation->animation_sets[i]->lpVtbl->Release(animation->animation_sets[i]);
++        }
++        free(animation->animation_sets);
+         free(animation);
+     }
+ 
+@@ -129,9 +142,17 @@ static HRESULT WINAPI d3dx9_animation_controller_RegisterAnimationOutput(ID3DXAn
+ static HRESULT WINAPI d3dx9_animation_controller_RegisterAnimationSet(ID3DXAnimationController *iface,
+         ID3DXAnimationSet *anim_set)
+ {
++    struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
++
+     FIXME("iface %p, anim_set %p stub.\n", iface, anim_set);
+ 
+-    return E_NOTIMPL;
++    if (!anim_set || animation->num_sets >= animation->max_sets)
++        return D3DERR_INVALIDCALL;
++
++    animation->animation_sets[animation->num_sets++] = anim_set;
++    anim_set->lpVtbl->AddRef(anim_set);
++
++    return D3D_OK;
+ }
+ 
+ static HRESULT WINAPI d3dx9_animation_controller_UnregisterAnimationSet(ID3DXAnimationController *iface,
+@@ -144,9 +165,11 @@ static HRESULT WINAPI d3dx9_animation_controller_UnregisterAnimationSet(ID3DXAni
+ 
+ static UINT WINAPI d3dx9_animation_controller_GetNumAnimationSets(ID3DXAnimationController *iface)
+ {
++    struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
++
+     FIXME("iface %p stub.\n", iface);
+ 
+-    return 0;
++    return animation->num_sets;
+ }
+ 
+ static HRESULT WINAPI d3dx9_animation_controller_GetAnimationSet(ID3DXAnimationController *iface,
+@@ -459,6 +482,13 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets,
+     object->ID3DXAnimationController_iface.lpVtbl = &d3dx9_animation_controller_vtbl;
+     object->ref = 1;
+     object->max_outputs = max_outputs;
++
++    object->animation_sets = calloc(max_sets, sizeof(*object->animation_sets));
++    if (!object->animation_sets)
++    {
++        free(object);
++        return E_OUTOFMEMORY;
++    }
+     object->max_sets    = max_sets;
+     object->max_tracks  = max_tracks;
+     object->max_events  = max_events;
+-- 
+2.50.1
+

patches/d3dx9_animation_TrackDesc/0002-d3dx9-Implement-ID3DXAnimationController-Get-Set-Tra.patch

@@ -0,0 +1,85 @@
+From ee45504fb838a5e7bfeec350c6a7c5a318400c68 Mon Sep 17 00:00:00 2001
+From: Connor McAdams <cmcadams@codeweavers.com>
+Date: Wed, 3 Sep 2025 13:31:04 -0400
+Subject: [PATCH] d3dx9: Implement
+ ID3DXAnimationController::{Get,Set}TrackDesc().
+
+Signed-off-by: Connor McAdams <cmcadams@codeweavers.com>
+---
+ dlls/d3dx9_36/animation.c | 30 ++++++++++++++++++++++++++++--
+ 1 file changed, 28 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c
+index 1bb775bc44a..6ded652930a 100644
+--- a/dlls/d3dx9_36/animation.c
++++ b/dlls/d3dx9_36/animation.c
+@@ -23,6 +23,11 @@
+ 
+ WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
+ 
++struct d3dx9_track
++{
++    D3DXTRACK_DESC desc;
++};
++
+ struct d3dx9_animation_controller
+ {
+     ID3DXAnimationController ID3DXAnimationController_iface;
+@@ -34,6 +39,7 @@ struct d3dx9_animation_controller
+     UINT num_sets;
+     UINT max_sets;
+ 
++    struct d3dx9_track *tracks;
+     UINT max_tracks;
+ 
+     UINT max_events;
+@@ -269,17 +275,29 @@ static HRESULT WINAPI d3dx9_animation_controller_SetTrackEnable(ID3DXAnimationCo
+ static HRESULT WINAPI d3dx9_animation_controller_SetTrackDesc(ID3DXAnimationController *iface,
+         UINT track, D3DXTRACK_DESC *desc)
+ {
++    struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
++
+     FIXME("iface %p, track %u, desc %p stub.\n", iface, track, desc);
+ 
+-    return E_NOTIMPL;
++    if (track > animation->max_tracks || !desc)
++        return D3DERR_INVALIDCALL;
++
++    animation->tracks[track].desc = *desc;
++    return D3D_OK;
+ }
+ 
+ static HRESULT WINAPI d3dx9_animation_controller_GetTrackDesc(ID3DXAnimationController *iface,
+         UINT track, D3DXTRACK_DESC *desc)
+ {
++    struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
++
+     FIXME("iface %p, track %u, desc %p stub.\n", iface, track, desc);
+ 
+-    return E_NOTIMPL;
++    if (track > animation->max_tracks || !desc)
++        return D3DERR_INVALIDCALL;
++
++    *desc = animation->tracks[track].desc;
++    return D3D_OK;
+ }
+ 
+ static HRESULT WINAPI d3dx9_animation_controller_SetPriorityBlend(ID3DXAnimationController *iface,
+@@ -490,6 +508,14 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets,
+         return E_OUTOFMEMORY;
+     }
+     object->max_sets    = max_sets;
++
++    object->tracks = calloc(max_tracks, sizeof(*object->tracks));
++    if (!object->tracks)
++    {
++        free(object->animation_sets);
++        free(object);
++        return E_OUTOFMEMORY;
++    }
+     object->max_tracks  = max_tracks;
+     object->max_events  = max_events;
+ 
+-- 
+2.50.1
+

patches/d3dx9_animation_TrackDesc/0003-d3dx9-Implement-ID3DXAnimationController-Get-Set-Tra.patch

@@ -0,0 +1,93 @@
+From fa933a9493c8b4a2e9626c1815bb5ef4309627b4 Mon Sep 17 00:00:00 2001
+From: Connor McAdams <cmcadams@codeweavers.com>
+Date: Wed, 3 Sep 2025 13:33:16 -0400
+Subject: [PATCH] d3dx9: Implement
+ ID3DXAnimationController::{Get,Set}TrackAnimationSet().
+
+Signed-off-by: Connor McAdams <cmcadams@codeweavers.com>
+---
+ dlls/d3dx9_36/animation.c | 38 ++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 36 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c
+index 6ded652930a..ccd16778c3e 100644
+--- a/dlls/d3dx9_36/animation.c
++++ b/dlls/d3dx9_36/animation.c
+@@ -26,6 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
+ struct d3dx9_track
+ {
+     D3DXTRACK_DESC desc;
++    int set_idx;
+ };
+ 
+ struct d3dx9_animation_controller
+@@ -219,17 +220,47 @@ static double WINAPI d3dx9_animation_controller_GetTime(ID3DXAnimationController
+ static HRESULT WINAPI d3dx9_animation_controller_SetTrackAnimationSet(ID3DXAnimationController *iface,
+         UINT track, ID3DXAnimationSet *anim_set)
+ {
++    struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
++    unsigned int i;
++    int idx;
++
+     FIXME("iface %p, track %u, anim_set %p stub.\n", iface, track, anim_set);
+ 
+-    return E_NOTIMPL;
++    if (track > animation->max_tracks || !anim_set || (animation->tracks[track].set_idx >= 0))
++        return D3DERR_INVALIDCALL;
++
++    idx = -1;
++    for (i = 0; i < animation->num_sets; i++)
++    {
++        if (animation->animation_sets[i] == anim_set)
++        {
++            idx = i;
++            break;
++        }
++    }
++
++    animation->tracks[track].set_idx = idx;
++
++    return idx >= 0 ? D3D_OK : D3DERR_INVALIDCALL;
+ }
+ 
+ static HRESULT WINAPI d3dx9_animation_controller_GetTrackAnimationSet(ID3DXAnimationController *iface,
+         UINT track, ID3DXAnimationSet **anim_set)
+ {
++    struct d3dx9_animation_controller *animation = impl_from_ID3DXAnimationController(iface);
++    int set_idx;
++
+     FIXME("iface %p, track %u, anim_set %p stub.\n", iface, track, anim_set);
+ 
+-    return E_NOTIMPL;
++    if (track > animation->max_tracks || !anim_set)
++        return D3DERR_INVALIDCALL;
++
++    set_idx = animation->tracks[track].set_idx;
++    *anim_set = set_idx >= 0 ? animation->animation_sets[set_idx] : NULL;
++
++    if (*anim_set)
++        (*anim_set)->lpVtbl->AddRef(*anim_set);
++    return D3D_OK;
+ }
+ 
+ static HRESULT WINAPI d3dx9_animation_controller_SetTrackPriority(ID3DXAnimationController *iface,
+@@ -486,6 +517,7 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets,
+         UINT max_tracks, UINT max_events, ID3DXAnimationController **controller)
+ {
+     struct d3dx9_animation_controller *object;
++    unsigned int i;
+ 
+     TRACE("max_outputs %u, max_sets %u, max_tracks %u, max_events %u, controller %p.\n",
+             max_outputs, max_sets, max_tracks, max_events, controller);
+@@ -516,6 +548,8 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets,
+         free(object);
+         return E_OUTOFMEMORY;
+     }
++    for (i = 0; i < max_tracks; ++i)
++        object->tracks[i].set_idx = -1;
+     object->max_tracks  = max_tracks;
+     object->max_events  = max_events;
+ 
+-- 
+2.50.1
+