Release v10.18

This stops the crash but doesn't show the battle at all.

Patchset shows what is needed (as a minimum), to be
implemented in order for it to work correctly.

.github/workflows/macOS.yml

@@ -20,7 +20,6 @@ jobs:
                         bison \
                         gphoto2 \
                         gstreamer \
-                        gcenx/wine/libinotify-kqueue \
                         mingw-w64 \
                         molten-vk \
                         sdl2
@@ -44,10 +43,11 @@ jobs:
           cd wine
           $GITHUB_WORKSPACE/staging/patchinstall.py DESTDIR=. --all
 
-      - name: Configure wine64
+      - name: Configure wine
         env:
-          LDFLAGS: "-Wl,-rpath,/opt/X11/lib"
-          # Avoid weird linker errors with Xcode 10 and later
+          # We need to tell the linker to add brew & Xquarts to the rpath stack.
+          LDFLAGS: "-Wl,-rpath,/usr/local/lib -Wl,-rpath,/opt/X11/lib"
+          # Use an older deployment target to avoid new dyld behaviors.
           MACOSX_DEPLOYMENT_TARGET: "10.14"
         run: |
           cd $GITHUB_WORKSPACE/wine

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 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
  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 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 5f84ca7e23b..fabf394fbe5 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3828,6 +3829,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3879,6 +3880,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)
+@@ -4388,6 +4390,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 )
-         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. */
-     }
++    }
 +    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.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,57 +0,0 @@
-From f9f5002e4ce6417dd196d53b50c51a3b224015d3 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.
-
-An application that I have here checks comctl32.dll version information
-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(-)
-
-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
---- a/dlls/comctl32/comctl32.rc
-+++ b/dlls/comctl32/comctl32.rc
-@@ -114,7 +114,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
- 
-diff --git a/include/commctrl.h b/include/commctrl.h
-index a54de13d8b2..e0b0e22d4dc 100644
---- a/include/commctrl.h
-+++ b/include/commctrl.h
-@@ -59,7 +59,7 @@ enum _LI_METRIC
- WINCOMMCTRLAPI HRESULT WINAPI LoadIconWithScaleDown(HINSTANCE, const WCHAR *, int, int, HICON *);
- WINCOMMCTRLAPI HRESULT WINAPI LoadIconMetric(HINSTANCE, const WCHAR *, int, HICON *);
- 
--#define COMCTL32_VERSION                5  /* dll version */
-+#define COMCTL32_VERSION                6  /* dll version */
- 
- #define ICC_LISTVIEW_CLASSES   0x00000001  /* listview, header */
- #define ICC_TREEVIEW_CLASSES   0x00000002  /* treeview, tooltips */
--- 
-2.40.1
-

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/d2d1_ID2D1GeometryGroup/0001-d2d1-Add-tests-for-drawing-ID2D1GeometryGroup.patch

@@ -0,0 +1,267 @@
+From e4d55d451648b67c9269241efce8eee63faf70a4 Mon Sep 17 00:00:00 2001
+From: Philipp Knechtges <philipp-dev@knechtges.com>
+Date: Fri, 13 Sep 2024 11:16:44 +0200
+Subject: [PATCH] d2d1: Add tests for drawing ID2D1GeometryGroup
+
+The functionality to draw ID2D1GeometryGroup is currently missing.
+Nothing is drawn. This causes the blank pages in the bug below.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139
+---
+ dlls/d2d1/tests/d2d1.c | 219 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 219 insertions(+)
+
+diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
+index 40bcf5079b8..41b36ef0dd5 100644
+--- a/dlls/d2d1/tests/d2d1.c
++++ b/dlls/d2d1/tests/d2d1.c
+@@ -7061,6 +7061,7 @@ static void test_gradient(BOOL d3d11)
+ static void test_draw_geometry(BOOL d3d11)
+ {
+     ID2D1TransformedGeometry *transformed_geometry[4];
++    ID2D1GeometryGroup *geometry_group;
+     ID2D1RectangleGeometry *rect_geometry[2];
+     D2D1_POINT_2F point = {0.0f, 0.0f};
+     D2D1_ROUNDED_RECT rounded_rect;
+@@ -7970,6 +7971,117 @@ static void test_draw_geometry(BOOL d3d11)
+     hr = ID2D1PathGeometry_Open(geometry, &sink);
+     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ 
++    set_point(&point, -0.402914f, 0.915514f);
++    ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
++    quadratic_to(sink, -0.310379f,  0.882571f, -0.116057f,  0.824000f);
++    quadratic_to(sink,  0.008350f,  0.693614f, -0.052343f,  0.448886f);
++    quadratic_to(sink, -0.154236f,  0.246072f, -0.279229f,  0.025343f);
++    quadratic_to(sink, -0.370064f, -0.588586f, -0.383029f, -0.924114f);
++    quadratic_to(sink, -0.295479f, -0.958764f, -0.017086f, -0.988400f);
++    quadratic_to(sink,  0.208836f, -0.954157f,  0.272200f, -0.924114f);
++    quadratic_to(sink,  0.295614f, -0.569071f,  0.230143f,  0.022886f);
++    quadratic_to(sink,  0.101664f,  0.220643f,  0.012057f,  0.451571f);
++    quadratic_to(sink, -0.028764f,  0.709014f,  0.104029f,  0.833943f);
++    quadratic_to(sink,  0.319414f,  0.913057f,  0.403229f,  0.942628f);
++    quadratic_to(sink,  0.317721f,  1.023450f, -0.017086f,  1.021771f);
++    quadratic_to(sink, -0.310843f,  1.007472f, -0.402914f,  0.915514f);
++    ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
++
++    hr = ID2D1GeometrySink_Close(sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometrySink_Release(sink);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 40.0f, 160.0f);
++    scale_matrix(&matrix, 20.0f, 80.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 160.0f, 640.0f);
++    scale_matrix(&matrix, 40.0f, 160.0f);
++    rotate_matrix(&matrix, M_PI / -5.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1PathGeometry_Release(geometry);
++
++    set_matrix_identity(&matrix);
++    scale_matrix(&matrix, 0.5f, 1.0f);
++    translate_matrix(&matrix, -80.0f, 0.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    rotate_matrix(&matrix, M_PI / 2.0f);
++    translate_matrix(&matrix, 80.0f, -320.0f);
++    scale_matrix(&matrix, 2.0f, 0.25f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_WINDING,
++            (ID2D1Geometry**) &transformed_geometry, 4, &geometry_group);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1TransformedGeometry_Release(transformed_geometry[3]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[2]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[1]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[0]);
++
++    ID2D1RenderTarget_BeginDraw(rt);
++    ID2D1RenderTarget_Clear(rt, &color);
++    ID2D1RenderTarget_DrawGeometry(rt, (ID2D1Geometry *)geometry_group, (ID2D1Brush *)brush, 10.0f, NULL);
++    hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometryGroup_Release(geometry_group);
++
++    match = compare_figure(&ctx,   0,   0, 160, 160, 0xff652e89, 256,
++            "iTANiwEagQEkeSp0LnIWAhZyFAYUchQGFHIUBhRyFAYUchQGFHIUBhRyFAYUchQGFHIUBhRyFAYU"
++            "cxQFFHMUBRRzFAUUcxQFFHMUBRRzFAUUcxQFFHMUBRRzFAUUcxQFFHQUBBR0FAQUdBQDFHUUAxR1"
++            "FAMUdRQDFHUUAxR1FQIUdhQCFHYUAhR2FAIUdhQCFHYUAhR2FAIUdhQBFHgoeCh4KHkmeiZ7JHwk"
++            "fSJ+In8ggAEfggEeggEdhAEchQEbhQEahwEZhwEYiQEXiQEWigEWigEWigEWiwEViwEViwEViwEV"
++            "igEXiQEXiQEXiQEYhwEZhgEbgwEefyR5KXQvbxgEGG4VBxhtMnAudCp6IoMBGOMu");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160,   0, 320, 160, 0xff652e89, 512,
++            "xpcBB7QCEqkCG6ACJJgCLI8CNYcCHgMc/gEeDBr4AR4UGPIBHR0W7AEdIxbmAR0pFt8BHTAV2gEd"
++            "MBrWARwuIdMBGiwi1gEYKiPZARYoJNwBFiQk4AEWHyWxAQQvFhsltgEKKBYWJrwBECBOwQEXF0rI"
++            "ARwOSM4Ba9UBYeABRf0BOIoCMZECLJYCKJoCJ5wCJp0CJJ8CIqICH6QCHagCGa4CFLoCB/yUAQAA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx,   0, 160, 160, 320, 0xff652e89, 512,
++            "yWQBnQEEmQEHlgELkwENkAEQjgETiwEVigEXhwEZhgEahQEcgwEdggEfgAEgfyF+I30jfCR8JXom"
++            "eid4KHgodxQCFHYUAhR1FAMUdBUEFHMUBRRyFQUUchQHFHEUBxRwFAgUcBQJFG4UChRuFAoUbRUL"
++            "FGwUDBRsFAwUbBQNFGwUDBRsFAwUbRQMFGwUDBRsFAwUbRQLFWwUDBRtFAsUbRQLFG0VCxRtFAsU"
++            "bRQLFG4UCxRtFAsUbhQKFG4UCxRuFAoUbhQKFG4VCRRvFAoUbhQKFG8UCRRvFAoUbxQJFG8UCRRw"
++            "FAgVbxQJFHAUCBRwFAgUcBUIFHAUCBRwFAgUcRQHFHEUBxRyFAYUchQGFHMUBRRzFAUUdBQEFHQU"
++            "BBR1FAQUdBQEFHUUAxR1FAMUdhQCFHYUAhR2FQEUdxQBFHcpeCh4KHkneSd6JnoneiZ7JXwkfSN+"
++            "In8hgAEggQEfgwEdhAEdhAEchQEbhgEahwEZiAEYGAFwGBYCcRcUBHEXEgZyFhEHchcOCXMWDAtz"
++            "FgsMdBYIDnQWBhB1FgQQdhYCEnYqdyl3KXcpeCd5J3kneSd5JnomeyR8JHwkfCN9I30ifiF/IX4h"
++            "fyF/IH8ggAEgfyCAASCAAR+AAR+BAR6CAR6BAR6CAR2CAR2DARyEARuEARuFARqGARmGARiKARSR"
++            "AQqhYwAA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160, 160, 320, 320, 0xff652e89, 1024,
++            "ytABA7gCCbICD60CFKkCF6cCGqMCHqACIZ0CJJoCJpgCKZUCFgIUkgIWBBWPAhYHFI4CFQoUjAIV"
++            "DBSKAhUNFYgCFQ8UhwIVERSFAhUTFIMCFRQVgQIUFxSAAhQZFP4BFBoV/AEUHBT7ARQeFPkBFB8V"
++            "9wEUIRT2ARQjFPQBFSMV8gEVJRTxARUnFPABFCgV7gEUKhTtARQsFOwBFCwV7AEULBTsARUsFOwB"
++            "FSsV7AEULBTtARQsFO0BFCsU7QEVKxTtARUqFe0BFSoU7gEUKxTuARQqFe4BFCoU7wEUKhTuARUp"
++            "FO8BFSkU7wEVKBXvARUoFPABFCkU8AEUKBTxARQoFPEBFCcV8QEUJxTxARUnFPEBFSYU8gEVJhTy"
++            "ARUlFfIBFSUU8wEUJRXzARQlFPQBFCUU9AEUJBT1ARQkFPUBFCMU9gEUIhT2ARUhFPcBFSAU+AEV"
++            "HxT5ARUeFPoBFR4U+gEVHRT7ARUcFPwBFRsU/QEVGhT+ARUZFP8BFBkUgAIUGBSBAhQXFIICFBcU"
++            "ggIUFhSDAhQVFIQCFBQUhQIUExSGAhQSFIcCFBIUhwIUERSIAhUPFIkCFg0UigIXCxSNAhYJFI8C"
++            "FggUkAIXBRSSAhcDFJQCFwEUlgIrlwIpmgImnAIkngIjnwIhoQIfowIepAIcpgIbpgIaqAIZqAIZ"
++            "qAIYKwP7ARgnBf0BGCMI/QEZHgz+ARgbD/8BGBcSgAIYEhaAAhoNGIICGggcgwIaBB+DAjyEAjyF"
++            "AjqGAjmIAjiIAiECFIkCFAIIBBSKAhQNFIsCFAwUjAIUCxSNAhQKFI4CFAkUjwIUBxWQAhQGFZEC"
++            "FAUVkQIUBRWRAhQFFZECFQMVkwIUAxWTAhQDFZMCFAIVlAIVARWVAiqVAimWAimWAiiYAiaZAiaZ"
++            "AiWaAiScAiKdAiGeAh+hAhyjAhmuAg3GxgEA");
++    ok(match, "Figure does not match.\n");
++
++    hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    hr = ID2D1PathGeometry_Open(geometry, &sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
+     set_point(&point, 20.0f, 80.0f);
+     ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
+     quadratic_to(sink, 20.0f, 160.0f,  60.0f, 160.0f);
+@@ -8011,6 +8123,7 @@ static void test_draw_geometry(BOOL d3d11)
+ static void test_fill_geometry(BOOL d3d11)
+ {
+     ID2D1TransformedGeometry *transformed_geometry[4];
++    ID2D1GeometryGroup *geometry_group;
+     ID2D1RectangleGeometry *rect_geometry[2];
+     D2D1_POINT_2F point = {0.0f, 0.0f};
+     D2D1_ROUNDED_RECT rounded_rect;
+@@ -8728,6 +8841,112 @@ static void test_fill_geometry(BOOL d3d11)
+     hr = ID2D1PathGeometry_Open(geometry, &sink);
+     ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
+ 
++    set_point(&point, -0.402914f, 0.915514f);
++    ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_FILLED);
++    quadratic_to(sink, -0.310379f,  0.882571f, -0.116057f,  0.824000f);
++    quadratic_to(sink,  0.008350f,  0.693614f, -0.052343f,  0.448886f);
++    quadratic_to(sink, -0.154236f,  0.246072f, -0.279229f,  0.025343f);
++    quadratic_to(sink, -0.370064f, -0.588586f, -0.383029f, -0.924114f);
++    quadratic_to(sink, -0.295479f, -0.958764f, -0.017086f, -0.988400f);
++    quadratic_to(sink,  0.208836f, -0.954157f,  0.272200f, -0.924114f);
++    quadratic_to(sink,  0.295614f, -0.569071f,  0.230143f,  0.022886f);
++    quadratic_to(sink,  0.101664f,  0.220643f,  0.012057f,  0.451571f);
++    quadratic_to(sink, -0.028764f,  0.709014f,  0.104029f,  0.833943f);
++    quadratic_to(sink,  0.319414f,  0.913057f,  0.403229f,  0.942628f);
++    quadratic_to(sink,  0.317721f,  1.023450f, -0.017086f,  1.021771f);
++    quadratic_to(sink, -0.310843f,  1.007472f, -0.402914f,  0.915514f);
++    ID2D1GeometrySink_EndFigure(sink, D2D1_FIGURE_END_CLOSED);
++
++    hr = ID2D1GeometrySink_Close(sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometrySink_Release(sink);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 40.0f, 160.0f);
++    scale_matrix(&matrix, 20.0f, 80.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[0]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    translate_matrix(&matrix, 160.0f, 640.0f);
++    scale_matrix(&matrix, 40.0f, 160.0f);
++    rotate_matrix(&matrix, M_PI / -5.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)geometry, &matrix, &transformed_geometry[1]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1PathGeometry_Release(geometry);
++
++    set_matrix_identity(&matrix);
++    scale_matrix(&matrix, 0.5f, 1.0f);
++    translate_matrix(&matrix, -80.0f, 0.0f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[1], &matrix, &transformed_geometry[2]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    set_matrix_identity(&matrix);
++    rotate_matrix(&matrix, M_PI / 2.0f);
++    translate_matrix(&matrix, 80.0f, -320.0f);
++    scale_matrix(&matrix, 2.0f, 0.25f);
++    hr = ID2D1Factory_CreateTransformedGeometry(factory,
++            (ID2D1Geometry *)transformed_geometry[2], &matrix, &transformed_geometry[3]);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
++    hr = ID2D1Factory_CreateGeometryGroup(factory, D2D1_FILL_MODE_WINDING,
++            (ID2D1Geometry**) &transformed_geometry, 4, &geometry_group);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1TransformedGeometry_Release(transformed_geometry[3]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[2]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[1]);
++    ID2D1TransformedGeometry_Release(transformed_geometry[0]);
++
++    ID2D1RenderTarget_BeginDraw(rt);
++    ID2D1RenderTarget_Clear(rt, &color);
++    ID2D1RenderTarget_FillGeometry(rt, (ID2D1Geometry *)geometry_group, (ID2D1Brush *)brush, NULL);
++    hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    ID2D1GeometryGroup_Release(geometry_group);
++
++    match = compare_figure(&ctx,   0,   0, 160, 160, 0xff652e89, 32,
++            "zzIBlwEOjQEXiAEahgEahgEahgEahgEahgEahgEahgEahgEahgEahgEahwEZhwEZhwEZhwEZhwEZ"
++            "hwEZhwEZhwEZhwEZhwEZiAEYiAEYiAEXiQEXiQEXiQEXiQEXiQEXigEWigEWigEWigEWigEWigEW"
++            "igEVjAEUjAEUjAEUjQESjgESjwEQkAEQkQEOkgENlAEMlAELlgEKlwEImAEImQEHmQEGmwEFmwEE"
++            "nQEDnQECngECngECngECnwEBnwEBnwEBnwEBngEDnQEDnQEDnQEEmwEFmgEHmQEHlwELkQERjAEX"
++            "hgEdhAEfgwEchwEWjwEMqTEA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160,   0, 320, 160, 0xff652e89, 32,
++            "h58BBrUCD6wCGKQCIJsCKZMCMIwCNoUCPf8BQ/kBSPQBTu0BTu4BTfEBSfUBRfkBQf0BPYECOYUC"
++            "NIoCMI4CK+UBAS0W/AEHIweQAgsZBpcCEAwIngIepAIZqQIWrAITsAIRswIOtQIMuAIJuwIHwAIB"
++            "ypwB");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx,   0, 160, 160, 320, 0xff652e89, 32,
++            "wW4DnAEEmwEFmgEHmAEIlwEKlQELlAEMkwEOkQEPkAEQkAERjgESjgESjQEUjAEUiwEWigEWiQEX"
++            "iQEYhwEZhwEZhgEbhQEbhAEchAEdggEeggEeggEfgAEggAEggAEhgAEggAEggQEggAEggAEggQEf"
++            "gQEggQEfgQEfggEfgQEfgQEfggEfgQEfggEeggEfggEeggEeggEegwEeggEegwEdgwEegwEdgwEd"
++            "hAEchAEdhAEchAEchAEdhAEchAEchQEbhQEbhgEahgEahwEZhwEZiAEYiAEYiQEYiAEYiQEXiQEX"
++            "igEWigEWiwEViwEVjAEUjAEUjAEUjQETjQETjgESjgETjgESjwERkAEQkgEOkwENlAEMlQELlgEK"
++            "lwEJmAEJmAEImQEHmgEGmwEFnAEEnQEEnQEDnQEDngECngEDngECngECnwECngECnwECngECngED"
++            "ngECEgGLAQMQAosBAw4EjAEDCwWNAQQJBo0BBQYIjQEHAgqNARKOARKPARCQARCQARCQAQ+RAQ6S"
++            "AQ6SAQ2TAQ2SAQ2TAQ2TAQyTAQyUAQyTAQyUAQuVAQuUAQuVAQqWAQmWAQqWAQmXAQiXAQiYAQeY"
++            "AQeZAQWbAQSDZwAA");
++    ok(match, "Figure does not match.\n");
++    match = compare_figure(&ctx, 160, 160, 320, 320, 0xff652e89, 32,
++            "g90BBLkCCLYCC7ICDrACEa0CFKoCF6cCGqQCHKMCHqECIJ8CIpwCJJsCJpkCKJcCKZYCK5QCLZIC"
++            "L5ACMI8CMo0CNIsCNYoCN4gCOYcCOYYCO4QCPYICPoECQIACQYACQIECQIACQIECQIECQIECP4IC"
++            "P4ICP4ECP4ICP4ICPoMCPoMCPoMCPYQCPYMCPYQCPYQCPYQCPIUCPIUCPIUCO4YCO4YCOoYCO4YC"
++            "OocCOocCOocCOYgCOYgCOIkCOIkCN4oCNosCNYwCNI0CM44CMo4CM44CMo8CMZACMJECL5ICLpMC"
++            "LZQCLJUCK5YCK5YCKpcCKZgCKJkCJ5oCJpsCJpsCJZwCJJ4CIqACIKICH6MCHaUCG6cCGakCF6wC"
++            "Fa0CE68CEbECD7MCDrQCDLYCCrgCCbkCB7sCBrsCBbwCBbwCBL0CBL0CBL0CBL0CA70CBL0CBL0C"
++            "BLwCBSUBlgIFIQSXAgYbCJcCBxcKmQIIEQ6ZAgoMEJoCDQUTnAIknAIjnQIingIhnwIgoAIfoQIe"
++            "ogIdowIcpAIbpQIapQIZpgIZpgIZpwIYpwIXqAIXqAIXqQIVqgIVqgIUqwITrQISrQIRrgIQsAIO"
++            "sQIMswILtQIIhs4B");
++    ok(match, "Figure does not match.\n");
++
++    hr = ID2D1Factory_CreatePathGeometry(factory, &geometry);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++    hr = ID2D1PathGeometry_Open(geometry, &sink);
++    ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr);
++
+     set_point(&point, -0.402914f, 0.915514f);
+     ID2D1GeometrySink_BeginFigure(sink, point, D2D1_FIGURE_BEGIN_HOLLOW);
+     quadratic_to(sink, -0.310379f,  0.882571f, -0.116057f,  0.824000f);
+-- 
+2.45.2
+

patches/d2d1_ID2D1GeometryGroup/0002-d2d1-Implement-drawing-for-ID2D1GeometryGroup.patch

@@ -0,0 +1,279 @@
+From be0fbef50483da8fe3fd0c4b74469d15a5c9f1ea Mon Sep 17 00:00:00 2001
+From: Philipp Knechtges <philipp-dev@knechtges.com>
+Date: Fri, 13 Sep 2024 16:37:31 +0200
+Subject: [PATCH] d2d1: Implement drawing for ID2D1GeometryGroup
+
+Drawing of ID2D1GeometryGroup was so far unimplemented and resulted in
+blank drawing buffers. This partially fixes the rendering issues mentioned
+in the bug below.
+
+Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51139
+---
+ dlls/d2d1/geometry.c | 236 ++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 235 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
+index 3da3ad2e65b..93925408077 100644
+--- a/dlls/d2d1/geometry.c
++++ b/dlls/d2d1/geometry.c
+@@ -5497,8 +5497,13 @@ static const struct ID2D1GeometryGroupVtbl d2d_geometry_group_vtbl =
+ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *factory,
+         D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, unsigned int geometry_count)
+ {
+-    unsigned int i;
++    unsigned int i, j;
++    struct d2d_geometry *other_geom;
++    D2D_MATRIX_3X2_F g, gplain;
++    size_t f_vertex_count, f_face_count, f_bezier_vertex_count, f_arc_vertex_count;
++    size_t o_vertex_count, o_face_count, o_bezier_count, o_bezier_face_count, o_arc_count, o_arc_face_count;
+ 
++    FIXME("Ignoring fill_mode=%#x!\n", fill_mode);
+     d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_geometry_group_vtbl);
+ 
+     if (!(geometry->u.group.src_geometries = calloc(geometry_count, sizeof(*geometries))))
+@@ -5507,13 +5512,242 @@ HRESULT d2d_geometry_group_init(struct d2d_geometry *geometry, ID2D1Factory *fac
+         return E_OUTOFMEMORY;
+     }
+ 
++    geometry->fill.vertex_count = 0;
++    geometry->fill.face_count = 0;
++    geometry->fill.bezier_vertex_count = 0;
++    geometry->fill.arc_vertex_count = 0;
++    geometry->outline.vertex_count = 0;
++    geometry->outline.face_count = 0;
++    geometry->outline.bezier_count = 0;
++    geometry->outline.bezier_face_count = 0;
++    geometry->outline.arc_count = 0;
++    geometry->outline.arc_face_count = 0;
+     for (i = 0; i < geometry_count; ++i)
+     {
+         ID2D1Geometry_AddRef(geometry->u.group.src_geometries[i] = geometries[i]);
++        other_geom = unsafe_impl_from_ID2D1Geometry(geometries[i]);
++        geometry->fill.vertex_count += other_geom->fill.vertex_count;
++        geometry->fill.face_count += other_geom->fill.face_count;
++        geometry->fill.bezier_vertex_count += other_geom->fill.bezier_vertex_count;
++        geometry->fill.arc_vertex_count += other_geom->fill.arc_vertex_count;
++        geometry->outline.vertex_count += other_geom->outline.vertex_count;
++        geometry->outline.face_count += other_geom->outline.face_count;
++        geometry->outline.bezier_count += other_geom->outline.bezier_count;
++        geometry->outline.bezier_face_count += other_geom->outline.bezier_face_count;
++        geometry->outline.arc_count += other_geom->outline.arc_count;
++        geometry->outline.arc_face_count += other_geom->outline.arc_face_count;
+     }
+     geometry->u.group.geometry_count = geometry_count;
+     geometry->u.group.fill_mode = fill_mode;
+ 
++    if (!(geometry->fill.vertices = calloc(geometry->fill.vertex_count, sizeof(D2D1_POINT_2F))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    if (!(geometry->fill.faces = calloc(geometry->fill.face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->fill.faces_size = geometry->fill.face_count;
++    if (!(geometry->fill.bezier_vertices = calloc(geometry->fill.bezier_vertex_count, sizeof(struct d2d_curve_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->fill.bezier_vertices_size = geometry->fill.bezier_vertex_count;
++    if (!(geometry->fill.arc_vertices = calloc(geometry->fill.arc_vertex_count, sizeof(struct d2d_curve_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->fill.arc_vertices_size = geometry->fill.arc_vertex_count;
++    if (!(geometry->outline.vertices = calloc(geometry->outline.vertex_count, sizeof(struct d2d_outline_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.vertices_size = geometry->outline.vertex_count;
++    if (!(geometry->outline.faces = calloc(geometry->outline.face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.faces_size = geometry->outline.face_count;
++    if (!(geometry->outline.beziers = calloc(geometry->outline.bezier_count, sizeof(struct d2d_curve_outline_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.beziers_size = geometry->outline.bezier_count;
++    if (!(geometry->outline.bezier_faces = calloc(geometry->outline.bezier_face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.bezier_faces_size = geometry->outline.bezier_face_count;
++    if (!(geometry->outline.arcs = calloc(geometry->outline.arc_count, sizeof(struct d2d_curve_outline_vertex))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.arcs_size = geometry->outline.arc_count;
++    if (!(geometry->outline.arc_faces = calloc(geometry->outline.arc_face_count, sizeof(struct d2d_face))))
++    {
++        for (i = 0; i < geometry->u.group.geometry_count; ++i)
++            ID2D1Geometry_Release(geometry->u.group.src_geometries[i]);
++        d2d_geometry_cleanup(geometry);
++        return E_OUTOFMEMORY;
++    }
++    geometry->outline.arc_faces_size = geometry->outline.arc_face_count;
++
++    f_vertex_count = 0;
++    f_face_count = 0;
++    f_bezier_vertex_count = 0;
++    f_arc_vertex_count = 0;
++    o_vertex_count = 0;
++    o_face_count = 0;
++    o_bezier_count = 0;
++    o_bezier_face_count = 0;
++    o_arc_count = 0;
++    o_arc_face_count = 0;
++    for (i = 0; i < geometry_count; ++i)
++    {
++        other_geom = unsafe_impl_from_ID2D1Geometry(geometries[i]);
++        g = other_geom->transform;
++        gplain = g;
++        gplain.dx = 0.0f;
++        gplain.dy = 0.0f;
++
++        for (j = 0; j < other_geom->fill.vertex_count; ++j) {
++            d2d_point_transform(&geometry->fill.vertices[j+f_vertex_count], &g,
++                    other_geom->fill.vertices[j].x, other_geom->fill.vertices[j].y);
++        }
++        for (j = 0; j < other_geom->fill.face_count; ++j) {
++            geometry->fill.faces[f_face_count+j].v[0] = other_geom->fill.faces[j].v[0]
++                + (UINT16) f_vertex_count;
++            geometry->fill.faces[f_face_count+j].v[1] = other_geom->fill.faces[j].v[1]
++                + (UINT16) f_vertex_count;
++            geometry->fill.faces[f_face_count+j].v[2] = other_geom->fill.faces[j].v[2]
++                + (UINT16) f_vertex_count;
++        }
++        f_vertex_count += other_geom->fill.vertex_count;
++        f_face_count += other_geom->fill.face_count;
++
++        for (j = 0; j < other_geom->fill.bezier_vertex_count; ++j) {
++            d2d_point_transform(&geometry->fill.bezier_vertices[j+f_bezier_vertex_count].position,
++                    &g, other_geom->fill.bezier_vertices[j].position.x,
++                    other_geom->fill.bezier_vertices[j].position.y);
++            geometry->fill.bezier_vertices[j+f_bezier_vertex_count].texcoord
++                = other_geom->fill.bezier_vertices[j].texcoord;
++        }
++        f_bezier_vertex_count += other_geom->fill.bezier_vertex_count;
++
++        for (j = 0; j < other_geom->fill.arc_vertex_count; ++j) {
++            d2d_point_transform(&geometry->fill.arc_vertices[j+f_arc_vertex_count].position,
++                    &g, other_geom->fill.arc_vertices[j].position.x,
++                    other_geom->fill.arc_vertices[j].position.y);
++            geometry->fill.arc_vertices[j+f_arc_vertex_count].texcoord
++                = other_geom->fill.arc_vertices[j].texcoord;
++
++        }
++        f_arc_vertex_count += other_geom->fill.arc_vertex_count;
++
++        for (j = 0; j < other_geom->outline.vertex_count; ++j) {
++            d2d_point_transform(&geometry->outline.vertices[j+o_vertex_count].position, &g,
++                    other_geom->outline.vertices[j].position.x, other_geom->outline.vertices[j].position.y);
++            d2d_point_transform(&geometry->outline.vertices[j+o_vertex_count].prev, &gplain,
++                    other_geom->outline.vertices[j].prev.x, other_geom->outline.vertices[j].prev.y);
++            d2d_point_normalise(&geometry->outline.vertices[j+o_vertex_count].prev);
++            d2d_point_transform(&geometry->outline.vertices[j+o_vertex_count].next, &gplain,
++                    other_geom->outline.vertices[j].next.x, other_geom->outline.vertices[j].next.y);
++            d2d_point_normalise(&geometry->outline.vertices[j+o_vertex_count].next);
++        }
++        for (j = 0; j < other_geom->outline.face_count; ++j) {
++            geometry->outline.faces[o_face_count+j].v[0] = other_geom->outline.faces[j].v[0]
++                + (UINT16) o_vertex_count;
++            geometry->outline.faces[o_face_count+j].v[1] = other_geom->outline.faces[j].v[1]
++                + (UINT16) o_vertex_count;
++            geometry->outline.faces[o_face_count+j].v[2] = other_geom->outline.faces[j].v[2]
++                + (UINT16) o_vertex_count;
++        }
++        o_vertex_count += other_geom->outline.vertex_count;
++        o_face_count += other_geom->outline.face_count;
++
++        for (j = 0; j < other_geom->outline.bezier_count; ++j) {
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].position, &g,
++                    other_geom->outline.beziers[j].position.x, other_geom->outline.beziers[j].position.y);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].prev, &gplain,
++                    other_geom->outline.beziers[j].prev.x, other_geom->outline.beziers[j].prev.y);
++            d2d_point_normalise(&geometry->outline.beziers[j+o_bezier_count].prev);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].next, &gplain,
++                    other_geom->outline.beziers[j].next.x, other_geom->outline.beziers[j].next.y);
++            d2d_point_normalise(&geometry->outline.beziers[j+o_bezier_count].next);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].p0, &g,
++                    other_geom->outline.beziers[j].p0.x, other_geom->outline.beziers[j].p0.y);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].p1, &g,
++                    other_geom->outline.beziers[j].p1.x, other_geom->outline.beziers[j].p1.y);
++            d2d_point_transform(&geometry->outline.beziers[j+o_bezier_count].p2, &g,
++                    other_geom->outline.beziers[j].p2.x, other_geom->outline.beziers[j].p2.y);
++        }
++        for (j = 0; j < other_geom->outline.bezier_face_count; ++j) {
++            geometry->outline.bezier_faces[o_bezier_face_count+j].v[0]
++                = other_geom->outline.bezier_faces[j].v[0] + (UINT16) o_bezier_count;
++            geometry->outline.bezier_faces[o_bezier_face_count+j].v[1]
++                = other_geom->outline.bezier_faces[j].v[1] + (UINT16) o_bezier_count;
++            geometry->outline.bezier_faces[o_bezier_face_count+j].v[2]
++                = other_geom->outline.bezier_faces[j].v[2] + (UINT16) o_bezier_count;
++        }
++        o_bezier_count += other_geom->outline.bezier_count;
++        o_bezier_face_count += other_geom->outline.bezier_face_count;
++
++        for (j = 0; j < other_geom->outline.arc_count; ++j) {
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].position, &g,
++                    other_geom->outline.arcs[j].position.x, other_geom->outline.arcs[j].position.y);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].prev, &gplain,
++                    other_geom->outline.arcs[j].prev.x, other_geom->outline.arcs[j].prev.y);
++            d2d_point_normalise(&geometry->outline.arcs[j+o_arc_count].prev);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].next, &gplain,
++                    other_geom->outline.arcs[j].next.x, other_geom->outline.arcs[j].next.y);
++            d2d_point_normalise(&geometry->outline.arcs[j+o_arc_count].next);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].p0, &g,
++                    other_geom->outline.arcs[j].p0.x, other_geom->outline.arcs[j].p0.y);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].p1, &g,
++                    other_geom->outline.arcs[j].p1.x, other_geom->outline.arcs[j].p1.y);
++            d2d_point_transform(&geometry->outline.arcs[j+o_arc_count].p2, &g,
++                    other_geom->outline.arcs[j].p2.x, other_geom->outline.arcs[j].p2.y);
++        }
++        for (j = 0; j < other_geom->outline.arc_face_count; ++j) {
++            geometry->outline.arc_faces[o_arc_face_count+j].v[0]
++                = other_geom->outline.arc_faces[j].v[0] + (UINT16) o_arc_count;
++            geometry->outline.arc_faces[o_arc_face_count+j].v[1]
++                = other_geom->outline.arc_faces[j].v[1] + (UINT16) o_arc_count;
++            geometry->outline.arc_faces[o_arc_face_count+j].v[2]
++                = other_geom->outline.arc_faces[j].v[2] + (UINT16) o_arc_count;
++        }
++        o_arc_count += other_geom->outline.arc_count;
++        o_arc_face_count += other_geom->outline.arc_face_count;
++    }
++
+     return S_OK;
+ }
+ 
+-- 
+2.45.2
+

patches/d2d1_ID2D1GeometryGroup/definition

@@ -0,0 +1,3 @@
+Fixes: [51139] d2d1: Implement drawing of ID2D1GeometryGroup
+
+# MR https://gitlab.winehq.org/wine/wine/-/merge_requests/6492

patches/d3drm-starwars/0001-d3drm-IDirect3DRMMeshBuilder2-Clone-stub.patch

@@ -0,0 +1,109 @@
+From 4abe3ab87631c7bb6144437ff2e1473030d033cb Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 13 May 2022 12:13:11 +1000
+Subject: [PATCH] d3drm: IDirect3DRMMeshBuilder2 Clone stub
+
+---
+ dlls/d3drm/meshbuilder.c | 85 +++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 83 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
+index 27e76c1cf25..0c765d77281 100644
+--- a/dlls/d3drm/meshbuilder.c
++++ b/dlls/d3drm/meshbuilder.c
+@@ -402,9 +402,90 @@ static ULONG WINAPI d3drm_mesh_builder2_Release(IDirect3DRMMeshBuilder2 *iface)
+ static HRESULT WINAPI d3drm_mesh_builder2_Clone(IDirect3DRMMeshBuilder2 *iface,
+         IUnknown *outer, REFIID iid, void **out)
+ {
+-    FIXME("iface %p, outer %p, iid %s, out %p stub!\n", iface, outer, debugstr_guid(iid), out);
++    struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder2(iface);
++    struct d3drm_mesh_builder *mesh2;
++    HRESULT hr;
+ 
+-    return E_NOTIMPL;
++    FIXME("iface %p, outer %p, iid %s, out %p Semi-stub\n", iface, outer, debugstr_guid(iid), out);
++
++    if (outer)
++        FIXME("outer currently ignored\n");
++
++    *out = NULL;
++
++    hr = d3drm_mesh_builder_create(&mesh2, mesh_builder->d3drm);
++    if(SUCCEEDED(hr))
++    {
++        mesh2->nb_vertices = mesh_builder->nb_vertices;
++        mesh2->vertices_size = mesh_builder->vertices_size;
++        if (mesh_builder->vertices && mesh_builder->nb_vertices)
++        {
++            if (!d3drm_array_reserve((void **)&mesh2->vertices, &mesh_builder->vertices_size, mesh_builder->nb_vertices,
++                        sizeof(*mesh_builder->vertices)))
++            {
++                IDirect3DRMMeshBuilder2_Release(&mesh2->IDirect3DRMMeshBuilder2_iface);
++                return E_OUTOFMEMORY;
++            }
++            memcpy(mesh2->vertices, mesh_builder->vertices, mesh_builder->nb_vertices * sizeof(*mesh_builder->vertices));
++        }
++
++        mesh2->nb_normals = mesh_builder->nb_normals;
++        mesh2->normals_size = mesh_builder->normals_size;
++        if (mesh_builder->normals && mesh_builder->nb_normals)
++        {
++            if (!d3drm_array_reserve((void **)&mesh2->normals, &mesh_builder->normals_size,
++                mesh_builder->nb_vertices, sizeof(*mesh_builder->normals)))
++            {
++                IDirect3DRMMeshBuilder2_Release(&mesh2->IDirect3DRMMeshBuilder2_iface);
++                return E_OUTOFMEMORY;
++            }
++            memcpy(mesh2->normals, mesh_builder->normals, mesh_builder->nb_normals * sizeof(*mesh_builder->normals));
++        }
++
++        mesh2->nb_faces = mesh_builder->nb_faces;
++        mesh2->face_data_size = mesh_builder->face_data_size;
++        if (mesh_builder->pFaceData && mesh_builder->face_data_size)
++        {
++            mesh2->pFaceData = malloc(mesh_builder->face_data_size * 2);
++            if(!mesh2->pFaceData)
++            {
++                IDirect3DRMMeshBuilder2_Release(&mesh2->IDirect3DRMMeshBuilder2_iface);
++                return E_OUTOFMEMORY;
++            }
++            memcpy(mesh2->pFaceData, mesh_builder->pFaceData, mesh_builder->face_data_size * 2);
++        }
++
++        mesh2->nb_coords2d = mesh_builder->nb_coords2d;
++        if (mesh_builder->pCoords2d && mesh_builder->nb_coords2d)
++        {
++            mesh2->pCoords2d = calloc(mesh_builder->nb_coords2d, sizeof(*mesh_builder->pCoords2d));
++            if (!mesh2->pCoords2d)
++            {
++                IDirect3DRMMeshBuilder2_Release(&mesh2->IDirect3DRMMeshBuilder2_iface);
++                return E_OUTOFMEMORY;
++            }
++            memcpy(mesh2->pCoords2d, mesh_builder->pCoords2d, mesh_builder->nb_coords2d * sizeof(*mesh_builder->pCoords2d));
++        }
++
++        mesh2->color = mesh_builder->color;
++        mesh2->material = mesh_builder->material;
++        if (mesh2->material)
++            IDirect3DRMTexture2_AddRef(mesh2->material);
++        mesh2->texture = mesh_builder->texture;
++        if (mesh2->texture)
++            IDirect3DRMTexture2_AddRef(mesh2->texture);
++        mesh2->nb_materials = mesh_builder->nb_materials;
++        if (mesh2->nb_materials > 0)
++            FIXME("materials NOT copied yet\n");
++        //struct mesh_material *materials;
++        //DWORD *material_indices;
++        mesh2->quality = mesh_builder->quality;
++
++        hr = IDirect3DRMMeshBuilder2_QueryInterface(&mesh2->IDirect3DRMMeshBuilder2_iface, iid, out);
++        IDirect3DRMMeshBuilder2_Release(&mesh2->IDirect3DRMMeshBuilder3_iface);
++    }
++
++    return hr;
+ }
+ 
+ static HRESULT WINAPI d3drm_mesh_builder2_AddDestroyCallback(IDirect3DRMMeshBuilder2 *iface,
+-- 
+2.45.2
+

patches/d3drm-starwars/0002-d3drm-IDirect3DRMMeshBuilder2-AddFaces-stub.patch

@@ -0,0 +1,27 @@
+From 689dad471ce391ed9cfcbc91a4b6c2a00c21b7d8 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 13 May 2022 12:31:55 +1000
+Subject: [PATCH] d3drm: IDirect3DRMMeshBuilder2 AddFaces stub
+
+---
+ dlls/d3drm/meshbuilder.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
+index 0c765d77281..abad81c51ae 100644
+--- a/dlls/d3drm/meshbuilder.c
++++ b/dlls/d3drm/meshbuilder.c
+@@ -679,7 +679,9 @@ static HRESULT WINAPI d3drm_mesh_builder2_AddFaces(IDirect3DRMMeshBuilder2 *ifac
+     FIXME("iface %p, vertex_count %lu, vertices %p, normal_count %lu, normals %p, face_data %p, array %p stub!\n",
+             iface, vertex_count, vertices, normal_count, normals, face_data, array);
+ 
+-    return E_NOTIMPL;
++    if (array)
++        *array = NULL;
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI d3drm_mesh_builder2_ReserveSpace(IDirect3DRMMeshBuilder2 *iface,
+-- 
+2.45.2
+

patches/d3drm-starwars/0003-d3drm-IDirect3DRMMesh-GetBox-stubs.patch

@@ -0,0 +1,61 @@
+From d1beb46198beef65617571b6d4cebf7cf8618188 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 13 May 2022 12:56:26 +1000
+Subject: [PATCH] d3drm: IDirect3DRMMesh GetBox stubs
+
+---
+ dlls/d3drm/meshbuilder.c | 4 ++--
+ dlls/d3drm/tests/d3drm.c | 8 ++++++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
+index abad81c51ae..2f0fe1df7ba 100644
+--- a/dlls/d3drm/meshbuilder.c
++++ b/dlls/d3drm/meshbuilder.c
+@@ -626,7 +626,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_GetBox(IDirect3DRMMeshBuilder2 *iface,
+ {
+     FIXME("iface %p, box %p stub!\n", iface, box);
+ 
+-    return E_NOTIMPL;
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI d3drm_mesh_builder2_GenerateNormals(IDirect3DRMMeshBuilder2 *iface)
+@@ -2594,7 +2594,7 @@ static HRESULT WINAPI d3drm_mesh_GetBox(IDirect3DRMMesh *iface, D3DRMBOX *box)
+ {
+     FIXME("iface %p, box %p stub!\n", iface, box);
+ 
+-    return E_NOTIMPL;
++    return D3DRMERR_BOXNOTSET;
+ }
+ 
+ static HRESULT WINAPI d3drm_mesh_AddGroup(IDirect3DRMMesh *iface, unsigned vertex_count,
+diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
+index 5d478f24b1a..72e07dde7a8 100644
+--- a/dlls/d3drm/tests/d3drm.c
++++ b/dlls/d3drm/tests/d3drm.c
+@@ -449,6 +449,7 @@ static void test_MeshBuilder(void)
+     DWORD size;
+     D3DCOLOR color;
+     IUnknown *unk;
++    D3DRMBOX box;
+ 
+     hr = Direct3DRMCreate(&d3drm);
+     ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface, hr %#lx\n", hr);
+@@ -694,6 +695,13 @@ static void test_MeshBuilder(void)
+         IDirect3DRMMesh_Release(mesh);
+     }
+ 
++    memset(&box, 0, sizeof(box));
++    hr = IDirect3DRMMeshBuilder_GetBox(pMeshBuilder, &box);
++    ok(hr == D3DRM_OK, "got hr %#lx.\n", hr);
++
++    expect_vector(&box.min, 1.0, 2.0f, 3.0f, 1);
++    expect_vector(&box.max, 6.9f, 8.0f, 8.9f, 1);
++
+     hr = IDirect3DRMMeshBuilder_Scale(pMeshBuilder, 2, 3 ,4);
+     ok(hr == D3DRM_OK, "Scale failed returning hr %#lx.\n", hr);
+ 
+-- 
+2.45.2
+

patches/d3drm-starwars/0004-d3drm-IDirect3DRMMeshBuilder2-Translate.patch

@@ -0,0 +1,25 @@
+From cfe0cdc509a8a69d151034aa0f709bdf556983c3 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 13 May 2022 13:01:03 +1000
+Subject: [PATCH] d3drm: IDirect3DRMMeshBuilder2 Translate
+
+---
+ dlls/d3drm/meshbuilder.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
+index 2f0fe1df7ba..8f9a3cb71a7 100644
+--- a/dlls/d3drm/meshbuilder.c
++++ b/dlls/d3drm/meshbuilder.c
+@@ -612,7 +612,7 @@ static HRESULT WINAPI d3drm_mesh_builder2_Translate(IDirect3DRMMeshBuilder2 *ifa
+ {
+     FIXME("iface %p, tx %.8e, ty %.8e, tz %.8e stub!\n", iface, tx, ty, tz);
+ 
+-    return E_NOTIMPL;
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI d3drm_mesh_builder2_SetColorSource(IDirect3DRMMeshBuilder2 *iface, D3DRMCOLORSOURCE source)
+-- 
+2.45.2
+

patches/d3drm-starwars/0005-d3drm-IDirect3DRMFrame2-SetPosition.patch

@@ -0,0 +1,81 @@
+From c210f81d3e30136dd970e9c99e6d42225743f35e Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 13 May 2022 14:19:14 +1000
+Subject: [PATCH] d3drm: IDirect3DRMFrame2 SetPosition
+
+---
+ dlls/d3drm/frame.c | 31 ++++++++++++++++++++-----------
+ 1 file changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
+index 7a5bd18cd33..80d47ce7896 100644
+--- a/dlls/d3drm/frame.c
++++ b/dlls/d3drm/frame.c
+@@ -1452,28 +1452,37 @@ static HRESULT WINAPI d3drm_frame1_GetParent(IDirect3DRMFrame *iface, IDirect3DR
+     return d3drm_frame2_GetParent(&frame->IDirect3DRMFrame2_iface, parent);
+ }
+ 
++static HRESULT frame_get_position(struct d3drm_frame *frame, struct d3drm_frame *reference, D3DVECTOR *position)
++{
++    // TODO
++    return S_OK;
++}
++
+ static HRESULT WINAPI d3drm_frame3_GetPosition(IDirect3DRMFrame3 *iface,
+         IDirect3DRMFrame3 *reference, D3DVECTOR *position)
+ {
+-    FIXME("iface %p, reference %p, position %p stub!\n", iface, reference, position);
+-
+-    return E_NOTIMPL;
++    struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface);
++    struct d3drm_frame *ref = impl_from_IDirect3DRMFrame3(reference);
++    TRACE("iface %p, reference %p, position %p\n", iface, ref, position);
++    return frame_get_position(frame, NULL, position);
+ }
+ 
+ static HRESULT WINAPI d3drm_frame2_GetPosition(IDirect3DRMFrame2 *iface,
+         IDirect3DRMFrame *reference, D3DVECTOR *position)
+ {
+-    FIXME("iface %p, reference %p, position %p stub!\n", iface, reference, position);
+-
+-    return E_NOTIMPL;
++    struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface);
++    struct d3drm_frame *ref = impl_from_IDirect3DRMFrame(reference);
++    TRACE("iface %p, reference %p, position %p\n", iface, ref, position);
++    return frame_get_position(frame, NULL, position);
+ }
+ 
+ static HRESULT WINAPI d3drm_frame1_GetPosition(IDirect3DRMFrame *iface,
+         IDirect3DRMFrame *reference, D3DVECTOR *position)
+ {
+-    FIXME("iface %p, reference %p, position %p stub!\n", iface, reference, position);
+-
+-    return E_NOTIMPL;
++    struct d3drm_frame *frame = impl_from_IDirect3DRMFrame(iface);
++    struct d3drm_frame *ref = impl_from_IDirect3DRMFrame(reference);
++    TRACE("iface %p, reference %p, position %p\n", iface, reference, position);
++    return frame_get_position(frame, ref, position);
+ }
+ 
+ 
+@@ -2449,7 +2458,7 @@ static HRESULT WINAPI d3drm_frame3_SetPosition(IDirect3DRMFrame3 *iface,
+ {
+     FIXME("iface %p, reference %p, x %.8e, y %.8e, z %.8e stub!\n", iface, reference, x, y, z);
+ 
+-    return E_NOTIMPL;
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI d3drm_frame2_SetPosition(IDirect3DRMFrame2 *iface,
+@@ -2457,7 +2466,7 @@ static HRESULT WINAPI d3drm_frame2_SetPosition(IDirect3DRMFrame2 *iface,
+ {
+     FIXME("iface %p, reference %p, x %.8e, y %.8e, z %.8e stub!\n", iface, reference, x, y, z);
+ 
+-    return E_NOTIMPL;
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI d3drm_frame1_SetPosition(IDirect3DRMFrame *iface,
+-- 
+2.45.2
+

patches/d3drm-starwars/0006-d3drm-IDirect3DRMFrame2-LookAt.patch

@@ -0,0 +1,25 @@
+From 15f7fb029e62d7027ab6f0d5546a40bef4630daa Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 13 May 2022 14:24:46 +1000
+Subject: [PATCH] d3drm: IDirect3DRMFrame2 LookAt
+
+---
+ dlls/d3drm/frame.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
+index 80d47ce7896..f908ea8dfdf 100644
+--- a/dlls/d3drm/frame.c
++++ b/dlls/d3drm/frame.c
+@@ -1800,7 +1800,7 @@ static HRESULT WINAPI d3drm_frame2_LookAt(IDirect3DRMFrame2 *iface, IDirect3DRMF
+ {
+     FIXME("iface %p, target %p, reference %p, constraint %#x stub!\n", iface, target, reference, constraint);
+ 
+-    return E_NOTIMPL;
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI d3drm_frame1_LookAt(IDirect3DRMFrame *iface, IDirect3DRMFrame *target,
+-- 
+2.45.2
+

patches/d3drm-starwars/0007-d3drm-IDirect3DRMFrame2-GetOrientation.patch

@@ -0,0 +1,25 @@
+From 92465f0808020ded4857ff303476a4d65ad90d0a Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Fri, 13 May 2022 14:56:56 +1000
+Subject: [PATCH] d3drm: IDirect3DRMFrame2 GetOrientation
+
+---
+ dlls/d3drm/frame.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
+index f908ea8dfdf..2044ba8a2cb 100644
+--- a/dlls/d3drm/frame.c
++++ b/dlls/d3drm/frame.c
+@@ -1680,7 +1680,7 @@ static HRESULT WINAPI d3drm_frame2_GetOrientation(IDirect3DRMFrame2 *iface,
+ {
+     FIXME("iface %p, reference %p, dir %p, up %p stub!\n", iface, reference, dir, up);
+ 
+-    return E_NOTIMPL;
++    return S_OK;
+ }
+ 
+ static HRESULT WINAPI d3drm_frame1_GetOrientation(IDirect3DRMFrame *iface,
+-- 
+2.45.2
+