Release v10.14

Squashed.

Updated to vkd3d 1.17+

.github/workflows/macOS.yml

@@ -20,7 +20,6 @@ jobs:
                         bison \
                         gphoto2 \
                         gstreamer \
-                        gcenx/wine/libinotify-kqueue \
                         mingw-w64 \
                         molten-vk \
                         sdl2
@@ -36,7 +35,7 @@ jobs:
           mkdir $GITHUB_WORKSPACE/wine
           cd wine
           git init
-          git fetch git://source.winehq.org/git/wine.git $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit) --depth=1
+          git fetch https://gitlab.winehq.org/wine/wine.git $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit) --depth=1
           git checkout $($GITHUB_WORKSPACE/staging/patchinstall.py --upstream-commit)
 
       - name: Run patchinstall.py --all
@@ -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,18 +1,18 @@
-From f48fa2ff628c3262245593301a141dee31118fd4 Mon Sep 17 00:00:00 2001
+From 3dc4a148d7c91afea8f589f47daca82c5c27b7c1 Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Thu, 2 Oct 2014 19:44:31 +0200
 Subject: [PATCH] ntdll: Print a warning message specifying the wine-staging
  branch name and version.
 
 ---
- dlls/ntdll/loader.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
+ dlls/ntdll/loader.c | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 021f7941969..68cb4b25d85 100644
+index 74eb1b7f500..95639558155 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -42,6 +42,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
+@@ -43,6 +43,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
  WINE_DECLARE_DEBUG_CHANNEL(snoop);
  WINE_DECLARE_DEBUG_CHANNEL(loaddll);
  WINE_DECLARE_DEBUG_CHANNEL(imports);
@@ -20,7 +20,7 @@ index 021f7941969..68cb4b25d85 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3822,6 +3823,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3870,6 +3871,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,7 +28,7 @@ index 021f7941969..68cb4b25d85 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -4244,6 +4246,9 @@ static void release_address_space(void)
+@@ -4366,6 +4368,9 @@ static void release_address_space(void)
   */
  void loader_init( CONTEXT *context, void **entry )
  {
@@ -38,10 +38,13 @@ index 021f7941969..68cb4b25d85 100644
      static int attach_done;
      NTSTATUS status;
      ULONG_PTR cookie, port = 0;
-@@ -4317,6 +4322,16 @@ void loader_init( CONTEXT *context, void **entry )
-     if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
+@@ -4455,6 +4460,20 @@ void loader_init( CONTEXT *context, void **entry )
+         arm64ec_thread_init();
  #endif
- 
+         wm = get_modref( NtCurrentTeb()->Peb->ImageBaseAddress );
++        /* This hunk occasionally applies in the wrong place;
++         * add a comment here to try to prevent that. */
++    }
 +    RtlInitUnicodeString( &staging_event_string, L"\\__wine_staging_warn_event" );
 +    InitializeObjectAttributes( &staging_event_attr, &staging_event_string, OBJ_OPENIF, NULL, NULL );
 +    if (NtCreateEvent( &staging_event, EVENT_ALL_ACCESS, &staging_event_attr, NotificationEvent, FALSE ) == STATUS_SUCCESS)
@@ -50,11 +53,12 @@ index 021f7941969..68cb4b25d85 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());
-+
-     RtlAcquirePebLock();
-     InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks );
-     RtlReleasePebLock();
++        NtClose( staging_event );
+     }
+ 
+     NtCurrentTeb()->FlsSlots = fls_alloc_data();
 -- 
-2.43.0
+2.47.2
 

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

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

patches/cmd-launch-association/0001-cmd-Support-for-launching-programs-based-on-file-ass.patch

@@ -1,197 +0,0 @@
-From 1e7b6a812b248a8344076a402fc97bd60da495d1 Mon Sep 17 00:00:00 2001
-From: Jason Edmeades <us@edmeades.me.uk>
-Date: Tue, 16 Jul 2019 13:49:18 +1000
-Subject: [PATCH] cmd: Support for launching programs based on file association
-
-cmd already handles exe, cmd, bat etc but if you run a file with another extension,
-then use the associations set in the registry (for example via ftype / assoc) to
-launch a program. This enables you to run test.txt and notepad to pop up, or
-fred.msi for msiexec to be launched.
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=18154
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36646
----
- programs/cmd/wcmdmain.c | 139 +++++++++++++++++++++++++++++-----------
- 1 file changed, 102 insertions(+), 37 deletions(-)
-
-diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
-index 12d3db1b012..0f222f3640b 100644
---- a/programs/cmd/wcmdmain.c
-+++ b/programs/cmd/wcmdmain.c
-@@ -1494,8 +1494,10 @@ void WCMD_run_program (WCHAR *command, BOOL called)
- 
-     /* 1. If extension supplied, see if that file exists */
-     if (extensionsupplied) {
--      if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) {
-+      DWORD attribs = GetFileAttributesW(thisDir);
-+      if (attribs != INVALID_FILE_ATTRIBUTES && !(attribs&FILE_ATTRIBUTE_DIRECTORY)) {
-         found = TRUE;
-+        WINE_TRACE("Found as file with extension as '%s'\n", wine_dbgstr_w(thisDir));
-       }
-     }
- 
-@@ -1525,6 +1527,7 @@ void WCMD_run_program (WCHAR *command, BOOL called)
-           }
- 
-           if (GetFileAttributesW(thisDir) != INVALID_FILE_ATTRIBUTES) {
-+            WINE_TRACE("Found via search and pathext as '%s'\n", wine_dbgstr_w(thisDir));
-             found = TRUE;
-             thisExt = NULL;
-           }
-@@ -1546,6 +1549,7 @@ void WCMD_run_program (WCHAR *command, BOOL called)
-       /* Special case BAT and CMD */
-       if (ext && (!wcsicmp(ext, L".bat") || !wcsicmp(ext, L".cmd"))) {
-         BOOL oldinteractive = interactive;
-+        WINE_TRACE("Calling batch program\n");
-         interactive = FALSE;
-         WCMD_batch(thisDir, command, NULL, INVALID_HANDLE_VALUE);
-         interactive = oldinteractive;
-@@ -1554,48 +1558,109 @@ void WCMD_run_program (WCHAR *command, BOOL called)
-           context->skip_rest = TRUE;
-         }
-         return;
--      } else {
--        DWORD exit_code;
--        /* thisDir contains the file to be launched, but with what?
--           eg. a.exe will require a.exe to be launched, a.html may be iexplore */
--        hinst = FindExecutableW (thisDir, NULL, temp);
--        if ((INT_PTR)hinst < 32)
--          console = 0;
--        else
--          console = SHGetFileInfoW(temp, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE);
--
--        ZeroMemory (&st, sizeof(STARTUPINFOW));
--        st.cb = sizeof(STARTUPINFOW);
--        init_msvcrt_io_block(&st);
--
--        /* Launch the process and if a CUI wait on it to complete
--           Note: Launching internal wine processes cannot specify a full path to exe */
--        status = CreateProcessW(thisDir,
--                                command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe);
--        free(st.lpReserved2);
--        if ((opt_c || opt_k) && !opt_s && !status
--            && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
--          /* strip first and last quote WCHARacters and try again */
--          WCMD_strip_quotes(command);
--          opt_s = TRUE;
--          WCMD_run_program(command, called);
-+      }
-+
-+      /* Calculate what program will be launched, and whether it is a
-+         console application or not. Note the program may be different
-+         from the parameter (eg running a .txt file will launch notepad.exe) */
-+      hinst = FindExecutableW (thisDir, NULL, temp);
-+      if ((INT_PTR)hinst < 32)
-+        console = 0;   /* Assume not console app by default */
-+      else
-+        console = SHGetFileInfoW(temp, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE);
-+
-+
-+      /* If it is not a .com or .exe, try to launch through ShellExecuteExW
-+         which takes into account the association for the extension.        */
-+      if (ext && (wcsicmp(ext, L".exe") && wcsicmp(ext, L".com"))) {
-+
-+        SHELLEXECUTEINFOW shexw;
-+        BOOL              rc;
-+        WCHAR            *rawarg;
-+
-+        WCMD_parameter(command, 1, &rawarg, FALSE, TRUE);
-+        WINE_TRACE("Launching via ShellExecuteEx\n");
-+        memset(&shexw, 0x00, sizeof(shexw));
-+        shexw.cbSize   = sizeof(SHELLEXECUTEINFOW);
-+        shexw.fMask    = SEE_MASK_NO_CONSOLE |      /* Run in same console as currently using       */
-+                         SEE_MASK_NOCLOSEPROCESS;   /* We need a process handle to possibly wait on */
-+        shexw.lpFile   = thisDir;
-+        shexw.lpParameters = rawarg;
-+        shexw.nShow    = SW_SHOWNORMAL;
-+
-+        /* Try to launch the binary or its associated program */
-+        rc = ShellExecuteExW(&shexw);
-+
-+        if (rc && (INT_PTR)shexw.hInstApp >= 32) {
-+
-+          WINE_TRACE("Successfully launched\n");
-+
-+          /* It worked... Always wait when non-interactive (cmd /c or in
-+             batch program), or for console applications                  */
-+          if (!interactive || (console && !HIWORD(console))) {
-+            WINE_TRACE("Waiting for process to end\n");
-+            WaitForSingleObject (shexw.hProcess, INFINITE);
-+          }
-+
-+          GetExitCodeProcess (shexw.hProcess, &errorlevel);
-+          if (errorlevel == STILL_ACTIVE) {
-+            WINE_TRACE("Process still running, but returning anyway\n");
-+            errorlevel = 0;
-+          } else {
-+            WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel);
-+          }
-+
-+          CloseHandle(pe.hProcess);
-           return;
-+
-         }
-+      }
- 
--        if (!status)
--          break;
-+      /* If its a .exe or .com or the shellexecute failed due to no association,
-+         CreateProcess directly                                                  */
-+      ZeroMemory (&st, sizeof(STARTUPINFOW));
-+      st.cb = sizeof(STARTUPINFOW);
-+      init_msvcrt_io_block(&st);
-+
-+      /* Launch the process and if a CUI wait on it to complete
-+         Note: Launching internal wine processes cannot specify a full path to exe */
-+      WINE_TRACE("Launching via CreateProcess\n");
-+      status = CreateProcessW(thisDir,
-+                              command, NULL, NULL, TRUE, 0, NULL, NULL, &st, &pe);
-+      free(st.lpReserved2);
-+      if ((opt_c || opt_k) && !opt_s && !status
-+          && GetLastError()==ERROR_FILE_NOT_FOUND && command[0]=='\"') {
-+        /* strip first and last quote WCHARacters and try again */
-+        WCMD_strip_quotes(command);
-+        opt_s = TRUE;
-+        WCMD_run_program(command, called);
-+        return;
-+      }
- 
--        /* Always wait when non-interactive (cmd /c or in batch program),
--           or for console applications                                    */
--        if (!interactive || (console && !HIWORD(console)))
--            WaitForSingleObject (pe.hProcess, INFINITE);
--        GetExitCodeProcess (pe.hProcess, &exit_code);
--        errorlevel = (exit_code == STILL_ACTIVE) ? NO_ERROR : exit_code;
-+      if (!status) {
-+        WINE_TRACE("Failed to launch via CreateProcess, rc %d (%ld)\n",
-+                   status, GetLastError());
-+        break;
-+      }
- 
--        CloseHandle(pe.hProcess);
--        CloseHandle(pe.hThread);
--        return;
-+      /* Always wait when non-interactive (cmd /c or in batch program),
-+         or for console applications                                    */
-+      if (!interactive || (console && !HIWORD(console))) {
-+          WINE_TRACE("Waiting for process to end\n");
-+          WaitForSingleObject (pe.hProcess, INFINITE);
-       }
-+
-+      GetExitCodeProcess (pe.hProcess, &errorlevel);
-+      if (errorlevel == STILL_ACTIVE) {
-+        WINE_TRACE("Process still running, but returning anyway\n");
-+        errorlevel = 0;
-+      } else {
-+        WINE_TRACE("Process ended, errorlevel %ld\n", errorlevel);
-+      }
-+
-+      CloseHandle(pe.hProcess);
-+      CloseHandle(pe.hThread);
-+      return;
-     }
-   }
- 
--- 
-2.43.0
-

patches/cmd-launch-association/0002-cmd-ftype-failed-to-clear-file-associations.patch

@@ -1,79 +0,0 @@
-From 2f9fa2d492521d297eb87e4b6709d8349818b9c6 Mon Sep 17 00:00:00 2001
-From: Jason Edmeades <us@edmeades.me.uk>
-Date: Tue, 16 Jul 2019 13:51:58 +1000
-Subject: [PATCH] cmd: ftype failed to clear file associations
-
-If a file association was set (e.g. ftype fred=xxx), ftype fred= needs to clear it,
-but previously it failed to do so.
----
- programs/cmd/builtins.c                  | 6 +++---
- programs/cmd/tests/test_builtins.cmd     | 9 +++++++++
- programs/cmd/tests/test_builtins.cmd.exp | 5 ++++-
- 3 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
-index 1c39c35ca78..f23f9ef2046 100644
---- a/programs/cmd/builtins.c
-+++ b/programs/cmd/builtins.c
-@@ -4101,11 +4101,11 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) {
-         /* If nothing after '=' then clear value - only valid for ASSOC */
-         if (*newValue == 0x00) {
- 
--          if (assoc) rc = RegDeleteKeyW(key, args);
--          if (assoc && rc == ERROR_SUCCESS) {
-+          rc = RegDeleteTreeW(key, args);
-+          if (rc == ERROR_SUCCESS) {
-             WINE_TRACE("HKCR Key '%s' deleted\n", wine_dbgstr_w(args));
- 
--          } else if (assoc && rc != ERROR_FILE_NOT_FOUND) {
-+          } else if (rc != ERROR_FILE_NOT_FOUND) {
-             WCMD_print_error();
-             errorlevel = ERROR_FILE_NOT_FOUND;
- 
-diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd
-index d5397560bc6..14666c85cac 100644
---- a/programs/cmd/tests/test_builtins.cmd
-+++ b/programs/cmd/tests/test_builtins.cmd
-@@ -2670,6 +2670,12 @@ echo echo +++>> tmp.cmd
- echo ftype footype>> tmp.cmd
- cmd /c tmp.cmd
- 
-+echo --- testing association
-+ftype footype=cmd.exe /c "echo '%%1'"
-+echo dummy>test.foo
-+test.foo
-+del test.foo
-+
- echo --- resetting association
- assoc .foo=
- 
-@@ -2701,6 +2707,9 @@ echo .foo=footype
- echo footype=foo_opencmd
- echo +++
- echo footype=foo_opencmd
-+echo --- testing association
-+echo footype=cmd.exe /c "echo '%%1'"
-+echo Skipped as not enough permissions
- echo --- resetting association
- echo original value
- 
-diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp
-index 0102c3bcbc5..a6d97bc8248 100644
---- a/programs/cmd/tests/test_builtins.cmd.exp
-+++ b/programs/cmd/tests/test_builtins.cmd.exp
-@@ -1549,8 +1549,11 @@ footype=foo_opencmd
- footype=foo_opencmd
- +++
- footype=foo_opencmd
-+--- testing association
-+footype=cmd.exe /c "echo '%1'"
-+'@drive@@path@foobar\test.foo'@or_broken@Skipped as not enough permissions
- --- resetting association
--@todo_wine@original value@or_broken@buggyXP@or_broken@!WINE_FOO!
-+original value@or_broken@buggyXP@or_broken@!WINE_FOO!
- ------------ Testing CALL ------------
- --- external script
- foo@space@
--- 
-2.43.0
-

patches/cmd-launch-association/0003-cmd-Changed-errorlevel-type-to-DWORD.patch

@@ -1,55 +0,0 @@
-From bbd077ad0ba63001b1a785c2b3c740b5b01d3469 Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Tue, 18 Jun 2024 09:14:56 +1000
-Subject: [PATCH] cmd: Changed errorlevel type to DWORD
-
-This stop the invalid type being passed to GetExitCodeProcess which is being reported
-as an error with clang/mingw in the latest version.
----
- programs/cmd/builtins.c | 2 +-
- programs/cmd/wcmd.h     | 2 +-
- programs/cmd/wcmdmain.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
-index f98ac902eba..147f94ac4bb 100644
---- a/programs/cmd/builtins.c
-+++ b/programs/cmd/builtins.c
-@@ -440,7 +440,7 @@ void WCMD_choice (const WCHAR * args) {
-                 SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode);
- 
-             errorlevel = (ptr - opt_c) + 1;
--            TRACE("answer: %d\n", errorlevel);
-+            TRACE("answer: %ld\n", errorlevel);
-             free(my_command);
-             return;
-         }
-diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
-index dde5d1e12ec..f202e6ef9e4 100644
---- a/programs/cmd/wcmd.h
-+++ b/programs/cmd/wcmd.h
-@@ -306,7 +306,7 @@ void WCMD_set_for_loop_variable(int var_idx, const WCHAR *value);
-  * variables and batch parameters substitution already done.
-  */
- extern WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING];
--extern int errorlevel;
-+extern DWORD errorlevel;
- extern BATCH_CONTEXT *context;
- extern FOR_CONTEXT *forloopcontext;
- extern BOOL delayedsubst;
-diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
-index 702c3657a2b..0f8bdd3df14 100644
---- a/programs/cmd/wcmdmain.c
-+++ b/programs/cmd/wcmdmain.c
-@@ -36,7 +36,7 @@ extern const WCHAR inbuilt[][10];
- extern struct env_stack *pushd_directories;
- 
- BATCH_CONTEXT *context = NULL;
--int errorlevel;
-+DWORD errorlevel;
- WCHAR quals[MAXSTRING], param1[MAXSTRING], param2[MAXSTRING];
- BOOL  interactive;
- FOR_CONTEXT *forloopcontext; /* The 'for' loop context */
--- 
-2.43.0
-

patches/cmd-launch-association/definition

@@ -1 +0,0 @@
-Fixes: [18154] cmd: Support for launching programs based on file association

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/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/d3dx9_36-BumpLuminance/0002-d3dx9_36-Add-format-description-for-X8L8V8U8-for-for.patch

@@ -1,24 +0,0 @@
-From 170a6d9df910f617585791df31aa72b79622ed0b Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Mon, 16 May 2016 13:20:39 +0200
-Subject: d3dx9_36: Add format description for X8L8V8U8 for format conversions.
-
----
- dlls/d3dx9_36/util.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c
-index d8cd43a..12b9c2c 100644
---- a/dlls/d3dx9_36/util.c
-+++ b/dlls/d3dx9_36/util.c
-@@ -90,6 +90,7 @@ static const struct pixel_format_desc formats[] =
-     {D3DFMT_G32R32F,       { 0, 32, 32,  0}, { 0,  0, 32,  0},  8, 1, 1,  8, FORMAT_ARGBF,   NULL,         NULL      },
-     {D3DFMT_A32B32G32R32F, {32, 32, 32, 32}, {96,  0, 32, 64}, 16, 1, 1, 16, FORMAT_ARGBF,   NULL,         NULL      },
-     {D3DFMT_P8,            { 8,  8,  8,  8}, { 0,  0,  0,  0},  1, 1, 1,  1, FORMAT_INDEX,   NULL,         index_to_rgba},
-+    {D3DFMT_X8L8V8U8,      { 0,  8,  8,  8}, { 0,  0,  8, 16},  4, 1, 1,  4, FORMAT_ARGB,    NULL,         NULL      },
-     /* marks last element */
-     {D3DFMT_UNKNOWN,       { 0,  0,  0,  0}, { 0,  0,  0,  0},  0, 1, 1,  0, FORMAT_UNKNOWN, NULL,         NULL      },
- };
--- 
-2.8.0
-

patches/d3dx9_36-BumpLuminance/definition

@@ -1 +0,0 @@
-Fixes: Recognize bump luminance X8L8V8U8 when loading dds file

patches/d3dx9_36-D3DXOptimizeVertices/0002-d3dx9_36-Add-semi-stub-for-D3DXOptimizeVertices.patch

@@ -1,371 +0,0 @@
-From 3eb7b781849135fefeece9ca257ca9673b1545fd Mon Sep 17 00:00:00 2001
-From: Christian Costa <titan.costa@gmail.com>
-Date: Sun, 16 Jul 2017 18:13:31 +0200
-Subject: d3dx9_36: Add semi-stub for D3DXOptimizeVertices.
-
----
- dlls/d3dx9_24/d3dx9_24.spec |  2 +-
- dlls/d3dx9_25/d3dx9_25.spec |  2 +-
- dlls/d3dx9_26/d3dx9_26.spec |  2 +-
- dlls/d3dx9_27/d3dx9_27.spec |  2 +-
- dlls/d3dx9_28/d3dx9_28.spec |  2 +-
- dlls/d3dx9_29/d3dx9_29.spec |  2 +-
- dlls/d3dx9_30/d3dx9_30.spec |  2 +-
- dlls/d3dx9_31/d3dx9_31.spec |  2 +-
- dlls/d3dx9_32/d3dx9_32.spec |  2 +-
- dlls/d3dx9_33/d3dx9_33.spec |  2 +-
- dlls/d3dx9_34/d3dx9_34.spec |  2 +-
- dlls/d3dx9_35/d3dx9_35.spec |  2 +-
- dlls/d3dx9_36/d3dx9_36.spec |  2 +-
- dlls/d3dx9_36/mesh.c        | 27 +++++++++++++++++++++++++++
- dlls/d3dx9_36/tests/mesh.c  | 22 ++++++++++++++++++++++
- dlls/d3dx9_37/d3dx9_37.spec |  2 +-
- dlls/d3dx9_38/d3dx9_38.spec |  2 +-
- dlls/d3dx9_39/d3dx9_39.spec |  2 +-
- dlls/d3dx9_40/d3dx9_40.spec |  2 +-
- dlls/d3dx9_41/d3dx9_41.spec |  2 +-
- dlls/d3dx9_42/d3dx9_42.spec |  2 +-
- dlls/d3dx9_43/d3dx9_43.spec |  2 +-
- 22 files changed, 69 insertions(+), 20 deletions(-)
-
-diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec
-index 0ca8777efe6..9b52c2bf307 100644
---- a/dlls/d3dx9_24/d3dx9_24.spec
-+++ b/dlls/d3dx9_24/d3dx9_24.spec
-@@ -226,7 +226,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec
-index a5449810a43..fc75dfd9c04 100644
---- a/dlls/d3dx9_25/d3dx9_25.spec
-+++ b/dlls/d3dx9_25/d3dx9_25.spec
-@@ -226,7 +226,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec
-index 9e1200442f4..85d9fc5332e 100644
---- a/dlls/d3dx9_26/d3dx9_26.spec
-+++ b/dlls/d3dx9_26/d3dx9_26.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec
-index 9e1200442f4..85d9fc5332e 100644
---- a/dlls/d3dx9_27/d3dx9_27.spec
-+++ b/dlls/d3dx9_27/d3dx9_27.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec
-index b316a23baf1..62673ccd7af 100644
---- a/dlls/d3dx9_28/d3dx9_28.spec
-+++ b/dlls/d3dx9_28/d3dx9_28.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec
-index b316a23baf1..62673ccd7af 100644
---- a/dlls/d3dx9_29/d3dx9_29.spec
-+++ b/dlls/d3dx9_29/d3dx9_29.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec
-index e00fa547862..2c7575d88fc 100644
---- a/dlls/d3dx9_30/d3dx9_30.spec
-+++ b/dlls/d3dx9_30/d3dx9_30.spec
-@@ -230,7 +230,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec
-index d308939ef67..a41eb3e9af2 100644
---- a/dlls/d3dx9_31/d3dx9_31.spec
-+++ b/dlls/d3dx9_31/d3dx9_31.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_32/d3dx9_32.spec
-+++ b/dlls/d3dx9_32/d3dx9_32.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_33/d3dx9_33.spec
-+++ b/dlls/d3dx9_33/d3dx9_33.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_34/d3dx9_34.spec
-+++ b/dlls/d3dx9_34/d3dx9_34.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec
-index c2292dff396..eab56b3c9ee 100644
---- a/dlls/d3dx9_35/d3dx9_35.spec
-+++ b/dlls/d3dx9_35/d3dx9_35.spec
-@@ -227,7 +227,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_36/d3dx9_36.spec
-+++ b/dlls/d3dx9_36/d3dx9_36.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
-index 6294ce624fe..12cb7eb7258 100644
---- a/dlls/d3dx9_36/mesh.c
-+++ b/dlls/d3dx9_36/mesh.c
-@@ -7184,6 +7184,33 @@ cleanup:
-     return hr;
- }
- 
-+
-+/*************************************************************************
-+ * D3DXOptimizeVertices    (D3DX9_36.@)
-+ */
-+HRESULT WINAPI D3DXOptimizeVertices(const void *indices, UINT num_faces,
-+        UINT num_vertices, BOOL indices_are_32bit, DWORD *vertex_remap)
-+{
-+    UINT i;
-+
-+    FIXME("indices %p, num_faces %u, num_vertices %u, indices_are_32bit %#x, vertex_remap %p semi-stub.\n",
-+            indices, num_faces, num_vertices, indices_are_32bit, vertex_remap);
-+
-+    if (!vertex_remap)
-+    {
-+        WARN("vertex remap pointer is NULL.\n");
-+        return D3DERR_INVALIDCALL;
-+    }
-+
-+    for (i = 0; i < num_vertices; i++)
-+    {
-+        vertex_remap[i] = i;
-+    }
-+
-+    return D3D_OK;
-+}
-+
-+
- /*************************************************************************
-  * D3DXOptimizeFaces    (D3DX9_36.@)
-  *
-diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c
-index f437a83cbd8..c5faae520c9 100644
---- a/dlls/d3dx9_36/tests/mesh.c
-+++ b/dlls/d3dx9_36/tests/mesh.c
-@@ -10403,6 +10403,27 @@ cleanup:
-     free_test_context(test_context);
- }
- 
-+static void test_optimize_vertices(void)
-+{
-+    HRESULT hr;
-+    DWORD vertex_remap[3];
-+    const DWORD indices[] = {0, 1, 2};
-+    const UINT num_faces = 1;
-+    const UINT num_vertices = 3;
-+
-+    hr = D3DXOptimizeVertices(indices, num_faces,
-+                              num_vertices, FALSE,
-+                              vertex_remap);
-+    ok(hr == D3D_OK, "D3DXOptimizeVertices failed. Got %lx, expected D3D_OK.\n", hr);
-+
-+    /* vertex_remap must not be NULL */
-+    hr = D3DXOptimizeVertices(indices, num_faces,
-+                              num_vertices, FALSE,
-+                              NULL);
-+    ok(hr == D3DERR_INVALIDCALL, "D3DXOptimizeVertices passed NULL vertex_remap "
-+            "pointer. Got %lx, expected D3DERR_INVALIDCALL.\n", hr);
-+}
-+
- static void test_optimize_faces(void)
- {
-     HRESULT hr;
-@@ -11291,6 +11312,7 @@ START_TEST(mesh)
-     test_weld_vertices();
-     test_clone_mesh();
-     test_valid_mesh();
-+    test_optimize_vertices();
-     test_optimize_faces();
-     test_compute_normals();
-     test_D3DXFrameFind();
-diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_37/d3dx9_37.spec
-+++ b/dlls/d3dx9_37/d3dx9_37.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_38/d3dx9_38.spec
-+++ b/dlls/d3dx9_38/d3dx9_38.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_39/d3dx9_39.spec
-+++ b/dlls/d3dx9_39/d3dx9_39.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_40/d3dx9_40.spec
-+++ b/dlls/d3dx9_40/d3dx9_40.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec
-index 0fdf4e135e1..6201657d4a5 100644
---- a/dlls/d3dx9_41/d3dx9_41.spec
-+++ b/dlls/d3dx9_41/d3dx9_41.spec
-@@ -229,7 +229,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec
-index 2f2ac5fd619..7cfc439f84b 100644
---- a/dlls/d3dx9_42/d3dx9_42.spec
-+++ b/dlls/d3dx9_42/d3dx9_42.spec
-@@ -222,7 +222,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
-diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec
-index 2f2ac5fd619..7cfc439f84b 100644
---- a/dlls/d3dx9_43/d3dx9_43.spec
-+++ b/dlls/d3dx9_43/d3dx9_43.spec
-@@ -222,7 +222,7 @@
- @ stdcall D3DXMatrixTranslation(ptr float float float)
- @ stdcall D3DXMatrixTranspose(ptr ptr)
- @ stdcall D3DXOptimizeFaces(ptr long long long ptr)
--@ stub D3DXOptimizeVertices(ptr long long long ptr)
-+@ stdcall D3DXOptimizeVertices(ptr long long long ptr)
- @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr)
- @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr)
- @ stdcall D3DXPlaneIntersectLine(ptr ptr ptr ptr)
--- 
-2.14.2
-