Release v9.18

The current state even after multiple iterations, the whole
WRITECOPY implemenet needs differently.  Upstream will need to
do this.

wine-staging will currently allow Chrome based application to run.

.github/workflows/macOS.yml

@@ -36,7 +36,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

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 601da0ae0c6b22f37d20e6e0f10558093277eca9 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 | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index 021f7941969..68cb4b25d85 100644
+index 5f84ca7e23b..fabf394fbe5 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)
+@@ -3828,6 +3829,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)
+@@ -4322,6 +4324,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 );
+@@ -4407,7 +4412,18 @@ 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)
@@ -51,10 +54,9 @@ index 021f7941969..68cb4b25d85 100644
 +    }
 +    else
 +        WARN_(winediag)("wine-staging %s is a testing version containing experimental patches.\n", wine_get_version());
-+
-     RtlAcquirePebLock();
-     InsertHeadList( &tls_links, &NtCurrentTeb()->TlsLinks );
-     RtlReleasePebLock();
+ 
+     NtCurrentTeb()->FlsSlots = fls_alloc_data();
+ 
 -- 
-2.43.0
+2.45.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/d3dx9_36-DDS/0002-d3dx9_36-Improve-D3DXSaveTextureToFile-to-save-simpl.patch

@@ -1,4 +1,4 @@
-From f6d47bb4eb5747fde7059271a560268080756791 Mon Sep 17 00:00:00 2001
+From 96af775034dae1c0b133b315c45b7172090d3498 Mon Sep 17 00:00:00 2001
 From: Christian Costa <titan.costa@gmail.com>
 Date: Sun, 11 Jan 2015 16:29:30 +0100
 Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
@@ -6,15 +6,15 @@ Subject: [PATCH] d3dx9_36: Improve D3DXSaveTextureToFile to save simple
 
 ---
  dlls/d3dx9_36/d3dx9_private.h |  2 ++
- dlls/d3dx9_36/surface.c       | 62 +++++++++++++++++++++++++++++++++++
+ dlls/d3dx9_36/surface.c       | 63 +++++++++++++++++++++++++++++++++++
  dlls/d3dx9_36/texture.c       |  5 +--
- 3 files changed, 65 insertions(+), 4 deletions(-)
+ 3 files changed, 66 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 001a7f26f4f..b322765d164 100644
+index 34a9f6eec7f..878dff3fc01 100644
 --- a/dlls/d3dx9_36/d3dx9_private.h
 +++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -182,6 +182,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
+@@ -178,6 +178,8 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO
          IDirect3DSurface9 **temp_surface, BOOL write);
  HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect,
          IDirect3DSurface9 *temp_surface, BOOL update);
@@ -24,10 +24,10 @@ index 001a7f26f4f..b322765d164 100644
          const PALETTEENTRY *palette, D3DFORMAT format, uint32_t left, uint32_t top, uint32_t right, uint32_t bottom,
          uint32_t front, uint32_t back, struct d3dx_pixels *pixels);
 diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
-index fb49ca5665a..2a8bd97fe2d 100644
+index 31bce97bbab..212d452c654 100644
 --- a/dlls/d3dx9_36/surface.c
 +++ b/dlls/d3dx9_36/surface.c
-@@ -560,6 +560,68 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
+@@ -574,6 +574,69 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur
      return D3D_OK;
  }
  
@@ -93,14 +93,15 @@ index fb49ca5665a..2a8bd97fe2d 100644
 +
 +    return hr;
 +}
- HRESULT load_volume_from_dds(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,
-     const D3DBOX *dst_box, const void *src_data, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key,
-     const D3DXIMAGE_INFO *src_info)
++
+ HRESULT load_cube_texture_from_dds(IDirect3DCubeTexture9 *cube_texture, const void *src_data,
+     const PALETTEENTRY *palette, DWORD filter, DWORD color_key, const D3DXIMAGE_INFO *src_info)
+ {
 diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
-index 52cfb1e8c34..ccbe1fcef20 100644
+index b42c9db3f2d..d84bac25cfe 100644
 --- a/dlls/d3dx9_36/texture.c
 +++ b/dlls/d3dx9_36/texture.c
-@@ -1858,10 +1858,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
+@@ -1847,10 +1847,7 @@ HRESULT WINAPI D3DXSaveTextureToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE
      if (!dst_buffer || !src_texture) return D3DERR_INVALIDCALL;
  
      if (file_format == D3DXIFF_DDS)
@@ -113,5 +114,5 @@ index 52cfb1e8c34..ccbe1fcef20 100644
      type = IDirect3DBaseTexture9_GetType(src_texture);
      switch (type)
 -- 
-2.43.0
+2.45.2
 

patches/d3dx9_36-DDS/definition

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

patches/dinput-scancode/0001-dinput-Factor-keyboard-initialization-and-enumeratio.patch

@@ -0,0 +1,175 @@
+From 77a518b61884ef4e06f4fe8b94dd5c855c5e8daf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
+Date: Fri, 23 Aug 2024 08:49:13 +0200
+Subject: [PATCH] dinput: Factor keyboard initialization and enumeration loops.
+
+---
+ dlls/dinput/keyboard.c | 129 +++++++++++++++++++++++------------------
+ 1 file changed, 72 insertions(+), 57 deletions(-)
+
+diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
+index 8ec9dd47150..d1fa242574e 100644
+--- a/dlls/dinput/keyboard.c
++++ b/dlls/dinput/keyboard.c
+@@ -185,12 +185,79 @@ HRESULT keyboard_enum_device( DWORD type, DWORD flags, DIDEVICEINSTANCEW *instan
+     return DI_OK;
+ }
+ 
++static BOOL enum_object( struct keyboard *impl, const DIPROPHEADER *filter, DWORD flags, enum_object_callback callback,
++                         UINT index, DIDEVICEOBJECTINSTANCEW *instance, void *data )
++{
++    if (flags != DIDFT_ALL && !(flags & DIDFT_GETTYPE( instance->dwType ))) return DIENUM_CONTINUE;
++
++    switch (filter->dwHow)
++    {
++    case DIPH_DEVICE:
++        return callback( &impl->base, index, NULL, instance, data );
++    case DIPH_BYOFFSET:
++        if (filter->dwObj != instance->dwOfs) return DIENUM_CONTINUE;
++        return callback( &impl->base, index, NULL, instance, data );
++    case DIPH_BYID:
++        if ((filter->dwObj & 0x00ffffff) != (instance->dwType & 0x00ffffff)) return DIENUM_CONTINUE;
++        return callback( &impl->base, index, NULL, instance, data );
++    }
++
++    return DIENUM_CONTINUE;
++}
++
++static HRESULT enum_objects( struct keyboard *impl, const DIPROPHEADER *filter,
++                             DWORD flags, enum_object_callback callback, void *data )
++{
++    BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType );
++    DIDEVICEOBJECTINSTANCEW instance =
++    {
++        .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW),
++        .guidType = GUID_Key,
++        .dwOfs = DIK_ESCAPE,
++        .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
++    };
++    DWORD index, i, dik;
++    BOOL ret;
++
++    for (i = 0, index = 0; i < 512; ++i)
++    {
++        if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
++        if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue;
++        instance.dwOfs = dik;
++        instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
++        ret = enum_object( impl, filter, flags, callback, index++, &instance, data );
++        if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
++    }
++
++    return DIENUM_CONTINUE;
++}
++
++static BOOL init_object_properties( struct dinput_device *device, UINT index, struct hid_value_caps *caps,
++                                    const DIDEVICEOBJECTINSTANCEW *instance, void *data )
++{
++    struct object_properties *properties;
++    UINT dik = instance->dwOfs;
++
++    if (index == -1) return DIENUM_STOP;
++    properties = device->object_properties + index;
++
++    if (dik == DIK_NUMLOCK) properties->scan_code = 0x451de1;
++    else if (dik == DIK_PAUSE) properties->scan_code = 0x45;
++    else if (dik < 0x80) properties->scan_code = dik;
++    else properties->scan_code = (dik - 0x80) << 8 | 0x00e0;
++
++    return DIENUM_CONTINUE;
++}
++
+ HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirectInputDevice8W **out )
+ {
+-    DIDEVICEOBJECTINSTANCEW instance;
++    static const DIPROPHEADER filter =
++    {
++        .dwSize = sizeof(filter),
++        .dwHeaderSize = sizeof(filter),
++        .dwHow = DIPH_DEVICE,
++    };
+     struct keyboard *impl;
+-    DWORD i, index, dik;
+-    BYTE subtype;
+     HRESULT hr;
+ 
+     TRACE( "dinput %p, guid %s, out %p.\n", dinput, debugstr_guid( guid ), out );
+@@ -207,20 +274,9 @@ HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirect
+     impl->base.caps.dwFirmwareRevision = 100;
+     impl->base.caps.dwHardwareRevision = 100;
+     if (dinput->dwVersion >= 0x0800) impl->base.use_raw_input = TRUE;
+-    subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType );
+ 
+     if (FAILED(hr = dinput_device_init_device_format( &impl->base.IDirectInputDevice8W_iface ))) goto failed;
+-
+-    for (i = 0, index = 0; i < 512; ++i)
+-    {
+-        if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
+-        if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue;
+-
+-        if (dik == DIK_NUMLOCK) impl->base.object_properties[index++].scan_code = 0x451de1;
+-        else if (dik == DIK_PAUSE) impl->base.object_properties[index++].scan_code = 0x45;
+-        else if (dik < 0x80) impl->base.object_properties[index++].scan_code = dik;
+-        else impl->base.object_properties[index++].scan_code = (dik - 0x80) << 8 | 0x00e0;
+-    }
++    enum_objects( impl, &filter, DIDFT_BUTTON, init_object_properties, NULL );
+ 
+     *out = &impl->base.IDirectInputDevice8W_iface;
+     return DI_OK;
+@@ -248,52 +304,11 @@ static HRESULT keyboard_unacquire( IDirectInputDevice8W *iface )
+     return DI_OK;
+ }
+ 
+-static BOOL try_enum_object( struct dinput_device *impl, const DIPROPHEADER *filter, DWORD flags, enum_object_callback callback,
+-                             UINT index, DIDEVICEOBJECTINSTANCEW *instance, void *data )
+-{
+-    if (flags != DIDFT_ALL && !(flags & DIDFT_GETTYPE( instance->dwType ))) return DIENUM_CONTINUE;
+-
+-    switch (filter->dwHow)
+-    {
+-    case DIPH_DEVICE:
+-        return callback( impl, index, NULL, instance, data );
+-    case DIPH_BYOFFSET:
+-        if (filter->dwObj != instance->dwOfs) return DIENUM_CONTINUE;
+-        return callback( impl, index, NULL, instance, data );
+-    case DIPH_BYID:
+-        if ((filter->dwObj & 0x00ffffff) != (instance->dwType & 0x00ffffff)) return DIENUM_CONTINUE;
+-        return callback( impl, index, NULL, instance, data );
+-    }
+-
+-    return DIENUM_CONTINUE;
+-}
+-
+ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter,
+                                       DWORD flags, enum_object_callback callback, void *context )
+ {
+     struct keyboard *impl = impl_from_IDirectInputDevice8W( iface );
+-    BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType );
+-    DIDEVICEOBJECTINSTANCEW instance =
+-    {
+-        .dwSize = sizeof(DIDEVICEOBJECTINSTANCEW),
+-        .guidType = GUID_Key,
+-        .dwOfs = DIK_ESCAPE,
+-        .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
+-    };
+-    DWORD index, i, dik;
+-    BOOL ret;
+-
+-    for (i = 0, index = 0; i < 512; ++i)
+-    {
+-        if (!GetKeyNameTextW( i << 16, instance.tszName, ARRAY_SIZE(instance.tszName) )) continue;
+-        if (!(dik = map_dik_code( i, 0, subtype, impl->base.dinput->dwVersion ))) continue;
+-        instance.dwOfs = dik;
+-        instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
+-        ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
+-        if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
+-    }
+-
+-    return DIENUM_CONTINUE;
++    return enum_objects( impl, filter, flags, callback, context );
+ }
+ 
+ static HRESULT keyboard_get_property( IDirectInputDevice8W *iface, DWORD property,
+-- 
+2.43.0
+

patches/dinput-scancode/0002-dinput-Avoid-duplicated-objects-in-keyboard-devices.patch

@@ -1,6 +1,6 @@
-From b2764b3d21a64c3c194b29b9cb71379456e03b06 Mon Sep 17 00:00:00 2001
+From b9f850d5ba2d36ae39a2e88b31a687e2d9745c6e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
-Date: Fri, 7 Jul 2023 12:44:26 +0200
+Date: Fri, 23 Aug 2024 08:51:44 +0200
 Subject: [PATCH] dinput: Avoid duplicated objects in keyboard devices.
 
 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55205
@@ -9,10 +9,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55205
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
-index cbcbf94f0f6..3fd75bb10e6 100644
+index d1fa242574e..d9c73cd7367 100644
 --- a/dlls/dinput/keyboard.c
 +++ b/dlls/dinput/keyboard.c
-@@ -265,13 +265,15 @@ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPH
+@@ -216,13 +216,15 @@ static HRESULT enum_objects( struct keyboard *impl, const DIPROPHEADER *filter,
          .dwOfs = DIK_ESCAPE,
          .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
      };
@@ -28,7 +28,7 @@ index cbcbf94f0f6..3fd75bb10e6 100644
 +        mapped[dik] = TRUE;
          instance.dwOfs = dik;
          instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
-         ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
+         ret = enum_object( impl, filter, flags, callback, index++, &instance, data );
 -- 
-2.40.1
+2.43.0
 

patches/dinput-scancode/0003-dinput-Enumerate-lower-keyboard-scancodes-values-fir.patch

@@ -1,6 +1,6 @@
-From bdf952bf0711a7cf22fee840197234bd413ae611 Mon Sep 17 00:00:00 2001
+From c133a17f33a7cce87df6a56c7e265b1553726134 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
-Date: Fri, 7 Jul 2023 12:45:04 +0200
+Date: Fri, 23 Aug 2024 08:52:34 +0200
 Subject: [PATCH] dinput: Enumerate lower keyboard scancodes values first.
 
 Windows usually doesn't have scancodes higher than 0x7f, or extended
@@ -16,18 +16,18 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55205
  1 file changed, 14 insertions(+), 10 deletions(-)
 
 diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
-index 3fd75bb10e6..1f1db883b80 100644
+index d9c73cd7367..407634967de 100644
 --- a/dlls/dinput/keyboard.c
 +++ b/dlls/dinput/keyboard.c
-@@ -256,6 +256,7 @@ static BOOL try_enum_object( struct dinput_device *impl, const DIPROPHEADER *fil
- static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPHEADER *filter,
-                                       DWORD flags, enum_object_callback callback, void *context )
+@@ -208,6 +208,7 @@ static BOOL enum_object( struct keyboard *impl, const DIPROPHEADER *filter, DWOR
+ static HRESULT enum_objects( struct keyboard *impl, const DIPROPHEADER *filter,
+                              DWORD flags, enum_object_callback callback, void *data )
  {
 +    static const UINT vsc_base[] = {0, 0x100, 0x80, 0x180};
-     struct keyboard *impl = impl_from_IDirectInputDevice8W( iface );
      BYTE subtype = GET_DIDEVICE_SUBTYPE( impl->base.instance.dwDevType );
      DIDEVICEOBJECTINSTANCEW instance =
-@@ -266,18 +267,21 @@ static HRESULT keyboard_enum_objects( IDirectInputDevice8W *iface, const DIPROPH
+     {
+@@ -217,18 +218,21 @@ static HRESULT enum_objects( struct keyboard *impl, const DIPROPHEADER *filter,
          .dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( DIK_ESCAPE ),
      };
      BOOL ret, mapped[0x100] = {0};
@@ -43,7 +43,7 @@ index 3fd75bb10e6..1f1db883b80 100644
 -        mapped[dik] = TRUE;
 -        instance.dwOfs = dik;
 -        instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
--        ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
+-        ret = enum_object( impl, filter, flags, callback, index++, &instance, data );
 -        if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
 +        for (vsc = vsc_base[i]; vsc < vsc_base[i] + 0x80; vsc++)
 +        {
@@ -53,12 +53,12 @@ index 3fd75bb10e6..1f1db883b80 100644
 +            mapped[dik] = TRUE;
 +            instance.dwOfs = dik;
 +            instance.dwType = DIDFT_PSHBUTTON | DIDFT_MAKEINSTANCE( dik );
-+            ret = try_enum_object( &impl->base, filter, flags, callback, index++, &instance, context );
++            ret = enum_object( impl, filter, flags, callback, index++, &instance, data );
 +            if (ret != DIENUM_CONTINUE) return DIENUM_STOP;
 +        }
      }
  
      return DIENUM_CONTINUE;
 -- 
-2.40.1
+2.43.0
 

patches/dxgi_getFrameStatistics/0001-dxgi-Semi-stub-IDXGISwapChain4-GetFrameStatistics.patch

@@ -0,0 +1,125 @@
+From e31146d5dd91ef05298ae98f7db4868e73011865 Mon Sep 17 00:00:00 2001
+From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
+Date: Thu, 23 May 2024 14:25:57 +1000
+Subject: [PATCH] dxgi: Semi-stub IDXGISwapChain::GetFrameStatistics.
+
+Not completely correct but does allow improved framerates.  Mileage will vary.
+---
+ dlls/dxgi/swapchain.c | 89 +++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 85 insertions(+), 4 deletions(-)
+
+diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
+index 4797fcecd8d..4111a488407 100644
+--- a/dlls/dxgi/swapchain.c
++++ b/dlls/dxgi/swapchain.c
+@@ -587,12 +587,66 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh
+     return dxgi_get_output_from_window(swapchain->factory, window, output);
+ }
+ 
++static int get_display_frequency(void)
++{
++    DEVMODEW mode;
++    BOOL ret;
++
++    memset(&mode, 0, sizeof(mode));
++    mode.dmSize = sizeof(mode);
++    ret = EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &mode, 0);
++    if (ret && mode.dmFields & DM_DISPLAYFREQUENCY && mode.dmDisplayFrequency)
++    {
++        return mode.dmDisplayFrequency;
++    }
++    else
++    {
++        WARN("Failed to query display frequency, returning a fallback value.\n");
++        return 60;
++    }
++}
++
++static LARGE_INTEGER get_perf_req(void)
++{
++    LARGE_INTEGER performance_frequency;
++
++    QueryPerformanceFrequency(&performance_frequency);
++    return performance_frequency;
++}
++
+ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapChain4 *iface,
+         DXGI_FRAME_STATISTICS *stats)
+ {
+-    FIXME("iface %p, stats %p stub!\n", iface, stats);
++    struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain4(iface);
++    HRESULT hr = S_OK;
++    static BOOL once = 0;
++    const LARGE_INTEGER performance_frequency = get_perf_req();
++    int display_frequency = get_display_frequency();
+ 
+-    return E_NOTIMPL;
++    LARGE_INTEGER count;
++    TRACE("iface %p, stats %p Semi-stub\n", iface, stats);
++
++    if (!stats)
++        return E_INVALIDARG;
++
++    QueryPerformanceCounter(&count);
++
++    stats->PresentCount          = swapchain->present_count;
++    stats->PresentRefreshCount   = 0;
++    stats->SyncRefreshCount      = 0;
++    stats->SyncQPCTime.QuadPart  = count.QuadPart;
++    stats->SyncGPUTime.QuadPart  = 0;
++
++    stats->PresentRefreshCount =  performance_frequency.QuadPart / display_frequency;
++    stats->SyncRefreshCount = display_frequency;
++
++    if(!once)
++    {
++        once++;
++        hr = DXGI_ERROR_FRAME_STATISTICS_DISJOINT;
++    }
++
++    return hr;
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetLastPresentCount(IDXGISwapChain4 *iface,
+@@ -2704,9 +2758,36 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapCh
+ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFrameStatistics(IDXGISwapChain4 *iface,
+         DXGI_FRAME_STATISTICS *stats)
+ {
+-    FIXME("iface %p, stats %p stub!\n", iface, stats);
++    struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain4(iface);
++    HRESULT hr = S_OK;
++    static BOOL once = 0;
++    const LARGE_INTEGER performance_frequency = get_perf_req();
++    int display_frequency = get_display_frequency();
+ 
+-    return E_NOTIMPL;
++    LARGE_INTEGER count;
++    TRACE("iface %p, stats %p Semi-stub\n", iface, stats);
++
++    if (!stats)
++        return E_INVALIDARG;
++
++    QueryPerformanceCounter(&count);
++
++    stats->PresentCount          = swapchain->frame_number;
++    stats->PresentRefreshCount   = 0;
++    stats->SyncRefreshCount      = 0;
++    stats->SyncQPCTime.QuadPart  = count.QuadPart;
++    stats->SyncGPUTime.QuadPart  = 0;
++
++    stats->PresentRefreshCount =  performance_frequency.QuadPart / display_frequency;
++    stats->SyncRefreshCount = display_frequency;
++
++    if(!once)
++    {
++        once++;
++        hr = DXGI_ERROR_FRAME_STATISTICS_DISJOINT;
++    }
++
++    return hr;
+ }
+ 
+ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetLastPresentCount(IDXGISwapChain4 *iface,
+-- 
+2.43.0
+

patches/dxgi_getFrameStatistics/definition

@@ -0,0 +1 @@
+Fixes: [53696] d3d11: Semi-stub IDXGISwapChain::GetFrameStatistics.

patches/eventfd_synchronization/0001-configure-Check-for-sys-eventfd.h-ppoll-and-shm_open.patch

@@ -1,4 +1,4 @@
-From d3262875b2ce7d2a6746f2139ca00e3d0f13fb33 Mon Sep 17 00:00:00 2001
+From 6dbedd8d7aebe117b013c61f9549848f13619f0e Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Wed, 13 Jun 2018 10:44:49 -0500
 Subject: [PATCH] configure: Check for sys/eventfd.h, ppoll(), and shm_open().
@@ -7,15 +7,15 @@ We use ppoll() instead of poll() for the better time granularity.
 
 Although perhaps we shouldn't since the server doesn't do this.
 ---
- configure.ac        | 8 ++++++++
- include/config.h.in | 9 +++++++++
- 2 files changed, 17 insertions(+)
+ configure.ac        |  8 ++++++++
+ include/config.h.in | 11 ++++++++++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 3be31e40cf6..0a2cdc0dfcd 100644
+index 67775f9cd15..c03d4c3688b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -453,6 +453,7 @@ AC_CHECK_HEADERS(\
+@@ -407,6 +407,7 @@ AC_CHECK_HEADERS(\
  	sys/cdio.h \
  	sys/epoll.h \
  	sys/event.h \
@@ -23,17 +23,17 @@ index 3be31e40cf6..0a2cdc0dfcd 100644
  	sys/extattr.h \
  	sys/filio.h \
  	sys/ipc.h \
-@@ -2024,6 +2025,7 @@ AC_CHECK_FUNCS(\
+@@ -2067,6 +2068,7 @@ AC_CHECK_FUNCS(\
  	port_create \
  	posix_fadvise \
  	posix_fallocate \
 +	ppoll \
  	prctl \
- 	proc_pidinfo \
  	sched_yield \
-@@ -2049,6 +2051,12 @@ case $host_os in
-     ;;
- esac
+ 	renameat \
+@@ -2087,6 +2089,12 @@ AC_SEARCH_LIBS(clock_gettime, rt,
+                 test "$ac_res" = "none required" || AC_SUBST(RT_LIBS,"$ac_res")])
+ LIBS=$ac_save_LIBS
  
 +ac_save_LIBS=$LIBS
 +AC_SEARCH_LIBS(shm_open, rt,
@@ -45,30 +45,32 @@ index 3be31e40cf6..0a2cdc0dfcd 100644
                  AC_LINK_IFELSE([AC_LANG_PROGRAM(
  [[#include <sched.h>]], [[sched_setaffinity(0, 0, 0);]])],[wine_cv_have_sched_setaffinity=yes],[wine_cv_have_sched_setaffinity=no]))
 diff --git a/include/config.h.in b/include/config.h.in
-index fe2fc36a914..8e8c57d711c 100644
+index 1c3d4c4d62b..e9686e04a2a 100644
 --- a/include/config.h.in
 +++ b/include/config.h.in
-@@ -309,6 +309,9 @@
- /* Define to 1 if you have the `posix_fallocate' function. */
+@@ -318,6 +318,9 @@
+ /* Define to 1 if you have the 'posix_fallocate' function. */
  #undef HAVE_POSIX_FALLOCATE
  
 +/* Define to 1 if you have the `ppoll' function. */
 +#undef HAVE_PPOLL
 +
- /* Define to 1 if you have the `prctl' function. */
+ /* Define to 1 if you have the 'prctl' function. */
  #undef HAVE_PRCTL
  
-@@ -375,6 +378,9 @@
- /* Define to 1 if `interface_id' is a member of `sg_io_hdr_t'. */
+@@ -375,7 +378,10 @@
+ /* Define to 1 if 'interface_id' is a member of 'sg_io_hdr_t'. */
  #undef HAVE_SG_IO_HDR_T_INTERFACE_ID
  
+-/* Define to 1 if 'si_fd' is a member of 'siginfo_t'. */
 +/* Define to 1 if you have the `shm_open' function. */
 +#undef HAVE_SHM_OPEN
 +
- /* Define to 1 if `si_fd' is a member of `siginfo_t'. */
++/* Define to 1 if `si_fd' is a member of `siginfo_t'. */
  #undef HAVE_SIGINFO_T_SI_FD
  
-@@ -510,6 +516,9 @@
+ /* Define to 1 if you have the 'sigprocmask' function. */
+@@ -504,6 +510,9 @@
  /* Define to 1 if you have the <sys/epoll.h> header file. */
  #undef HAVE_SYS_EPOLL_H
  
@@ -79,5 +81,5 @@ index fe2fc36a914..8e8c57d711c 100644
  #undef HAVE_SYS_EVENT_H
  
 -- 
-2.39.0
+2.45.2
 

patches/eventfd_synchronization/0006-ntdll-Implement-NtWaitForMultipleObjects.patch

@@ -1,28 +1,30 @@
-From cdced5d4d89a932fa456191551899e1919a1881e Mon Sep 17 00:00:00 2001
+From 4865ed639a87ee06ffcf6a7a74b6c97ef448e7ab Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 12:34:42 -0500
 Subject: [PATCH] ntdll: Implement NtWaitForMultipleObjects().
 
 ---
- dlls/ntdll/unix/esync.c | 170 ++++++++++++++++++++++++++++++++++++++++
+ dlls/ntdll/unix/esync.c | 172 ++++++++++++++++++++++++++++++++++++++++
  dlls/ntdll/unix/esync.h |   3 +
  dlls/ntdll/unix/sync.c  |   7 ++
- 3 files changed, 180 insertions(+)
+ 3 files changed, 182 insertions(+)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
-index e031e9cb94f..75ceb95bc66 100644
+index e031e9cb94f..85db837f16b 100644
 --- a/dlls/ntdll/unix/esync.c
 +++ b/dlls/ntdll/unix/esync.c
-@@ -22,6 +22,8 @@
- #pragma makedep unix
- #endif
+@@ -24,6 +24,10 @@
  
-+#define _GNU_SOURCE
-+
  #include "config.h"
  
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++
  #include <assert.h>
-@@ -34,6 +36,12 @@
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -34,6 +38,12 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
@@ -35,7 +37,7 @@ index e031e9cb94f..75ceb95bc66 100644
  #include <sys/types.h>
  #include <unistd.h>
  
-@@ -286,6 +294,168 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
+@@ -286,6 +296,168 @@ NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
      return STATUS_SUCCESS;
  }
  
@@ -219,10 +221,10 @@ index c63491dcaad..92b609ebd27 100644
  /* We have to synchronize on the fd cache mutex so that our calls to receive_fd
   * don't race with theirs. It looks weird, I know.
 diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
-index c85f985b4f3..79141999e33 100644
+index dd938c95873..4361813e628 100644
 --- a/dlls/ntdll/unix/sync.c
 +++ b/dlls/ntdll/unix/sync.c
-@@ -1479,6 +1479,13 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO
+@@ -1588,6 +1588,13 @@ NTSTATUS WINAPI NtWaitForMultipleObjects( DWORD count, const HANDLE *handles, BO
  
      if (!count || count > MAXIMUM_WAIT_OBJECTS) return STATUS_INVALID_PARAMETER_1;
  
@@ -237,5 +239,5 @@ index c85f985b4f3..79141999e33 100644
      select_op.wait.op = wait_any ? SELECT_WAIT : SELECT_WAIT_ALL;
      for (i = 0; i < count; i++) select_op.wait.handles[i] = wine_server_obj_handle( handles[i] );
 -- 
-2.42.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From f1fcc584ff2bb975656b9f2f111d3e09b36293d0 Mon Sep 17 00:00:00 2001
+From 27e2bc1b0d098abce9168ea46589024054817e25 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:01:56 -0500
 Subject: [PATCH] server: Create eventfd file descriptors for message queues.
@@ -8,7 +8,7 @@ Subject: [PATCH] server: Create eventfd file descriptors for message queues.
  1 file changed, 29 insertions(+), 1 deletion(-)
 
 diff --git a/server/queue.c b/server/queue.c
-index 4d3f43b8d52..74a59b2ee84 100644
+index ee575724e4e..60f0c043257 100644
 --- a/server/queue.c
 +++ b/server/queue.c
 @@ -44,6 +44,7 @@
@@ -19,7 +19,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
  
  #define WM_NCMOUSEFIRST WM_NCMOUSEMOVE
  #define WM_NCMOUSELAST  (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST))
-@@ -148,6 +149,7 @@ struct msg_queue
+@@ -144,6 +145,7 @@ struct msg_queue
      int                    keystate_lock;   /* owns an input keystate lock */
      const queue_shm_t     *shared;          /* queue in session shared memory */
      unsigned int           ignore_post_msg; /* ignore post messages newer than this unique id */
@@ -27,7 +27,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
  };
  
  struct hotkey
-@@ -164,6 +166,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
+@@ -160,6 +162,7 @@ static void msg_queue_dump( struct object *obj, int verbose );
  static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *entry );
  static void msg_queue_remove_queue( struct object *obj, struct wait_queue_entry *entry );
  static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entry );
@@ -35,7 +35,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
  static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry );
  static void msg_queue_destroy( struct object *obj );
  static void msg_queue_poll_event( struct fd *fd, int event );
-@@ -179,7 +182,7 @@ static const struct object_ops msg_queue_ops =
+@@ -175,7 +178,7 @@ static const struct object_ops msg_queue_ops =
      msg_queue_add_queue,       /* add_queue */
      msg_queue_remove_queue,    /* remove_queue */
      msg_queue_signaled,        /* signaled */
@@ -44,7 +44,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
      msg_queue_satisfied,       /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -321,6 +324,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+@@ -313,6 +316,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          queue->last_get_msg    = current_time;
          queue->keystate_lock   = 0;
          queue->ignore_post_msg = 0;
@@ -52,7 +52,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
          list_init( &queue->send_result );
          list_init( &queue->callback_result );
          list_init( &queue->pending_timers );
-@@ -339,6 +343,9 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+@@ -335,6 +339,9 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          }
          SHARED_WRITE_END;
  
@@ -62,7 +62,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
          thread->queue = queue;
  
          if ((desktop = get_thread_desktop( thread, 0 )))
-@@ -672,6 +679,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
+@@ -685,6 +692,9 @@ static inline void clear_queue_bits( struct msg_queue *queue, unsigned int bits
          if (queue->keystate_lock) unlock_input_keystate( queue->input );
          queue->keystate_lock = 0;
      }
@@ -72,7 +72,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
  }
  
  /* check if message is matched by the filter */
-@@ -1213,6 +1223,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
+@@ -1227,6 +1237,13 @@ static int msg_queue_signaled( struct object *obj, struct wait_queue_entry *entr
      return ret || is_signaled( queue );
  }
  
@@ -86,7 +86,7 @@ index 4d3f43b8d52..74a59b2ee84 100644
  static void msg_queue_satisfied( struct object *obj, struct wait_queue_entry *entry )
  {
      struct msg_queue *queue = (struct msg_queue *)obj;
-@@ -1258,6 +1275,7 @@ static void msg_queue_destroy( struct object *obj )
+@@ -1278,6 +1295,7 @@ static void msg_queue_destroy( struct object *obj )
      if (queue->hooks) release_object( queue->hooks );
      if (queue->fd) release_object( queue->fd );
      if (queue->shared) free_shared_object( queue->shared );
@@ -94,8 +94,8 @@ index 4d3f43b8d52..74a59b2ee84 100644
  }
  
  static void msg_queue_poll_event( struct fd *fd, int event )
-@@ -2962,6 +2980,9 @@ DECL_HANDLER(set_queue_mask)
-             if (req->skip_wait) queue->wake_mask = queue->changed_mask = 0;
+@@ -3000,6 +3018,9 @@ DECL_HANDLER(set_queue_mask)
+             }
              else wake_up( &queue->obj, 0 );
          }
 +
@@ -104,19 +104,19 @@ index 4d3f43b8d52..74a59b2ee84 100644
      }
  }
  
-@@ -2975,6 +2996,9 @@ DECL_HANDLER(get_queue_status)
-         reply->wake_bits    = queue->wake_bits;
-         reply->changed_bits = queue->changed_bits;
-         queue->changed_bits &= ~req->clear_bits;
+@@ -3020,6 +3041,9 @@ DECL_HANDLER(get_queue_status)
+             shared->changed_bits &= ~req->clear_bits;
+         }
+         SHARED_WRITE_END;
 +
 +        if (do_esync() && !is_signaled( queue ))
 +            esync_clear( queue->esync_fd );
      }
      else reply->wake_bits = reply->changed_bits = 0;
  }
-@@ -3229,6 +3253,10 @@ DECL_HANDLER(get_message)
-     queue->wake_mask = req->wake_mask;
-     queue->changed_mask = req->changed_mask;
+@@ -3286,6 +3310,10 @@ DECL_HANDLER(get_message)
+     SHARED_WRITE_END;
+ 
      set_error( STATUS_PENDING );  /* FIXME */
 +
 +    if (do_esync() && !is_signaled( queue ))

patches/eventfd_synchronization/0021-server-ntdll-Implement-message-waits.patch

@@ -1,4 +1,4 @@
-From 57703c0423cf2b138b93dfaf4bd993d50235e55a Mon Sep 17 00:00:00 2001
+From 7522f4cf4bb29413bce97be5e61ebaefb5276c77 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <zfigura@codeweavers.com>
 Date: Mon, 6 Jul 2020 16:11:23 -0500
 Subject: [PATCH] server, ntdll: Implement message waits.
@@ -6,8 +6,8 @@ Subject: [PATCH] server, ntdll: Implement message waits.
 ---
  dlls/ntdll/unix/esync.c | 51 +++++++++++++++++++++++++++++++++++++++--
  server/protocol.def     |  4 ++++
- server/queue.c          | 22 ++++++++++++++++++
- 3 files changed, 75 insertions(+), 2 deletions(-)
+ server/queue.c          | 24 +++++++++++++++++++
+ 3 files changed, 77 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
 index 399930c444b..06d7d8babc6 100644
@@ -105,10 +105,10 @@ index 399930c444b..06d7d8babc6 100644
  {
      struct stat st;
 diff --git a/server/protocol.def b/server/protocol.def
-index d4a7173776f..4a081973ca5 100644
+index 56f2d263100..46cdbbed9b7 100644
 --- a/server/protocol.def
 +++ b/server/protocol.def
-@@ -3964,6 +3964,10 @@ enum esync_type
+@@ -3968,6 +3968,10 @@ enum esync_type
      unsigned int shm_idx;
  @END
  
@@ -120,10 +120,10 @@ index d4a7173776f..4a081973ca5 100644
  @REQ(set_keyboard_repeat)
      int enable;                /* whether to enable auto-repeat */
 diff --git a/server/queue.c b/server/queue.c
-index 6183c2fa686..260fb753799 100644
+index 60f0c043257..d6b6f2f20aa 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -150,6 +150,7 @@ struct msg_queue
+@@ -146,6 +146,7 @@ struct msg_queue
      const queue_shm_t     *shared;          /* queue in session shared memory */
      unsigned int           ignore_post_msg; /* ignore post messages newer than this unique id */
      int                    esync_fd;        /* esync file descriptor (signalled on message) */
@@ -131,7 +131,7 @@ index 6183c2fa686..260fb753799 100644
  };
  
  struct hotkey
-@@ -325,6 +326,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+@@ -317,6 +318,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          queue->keystate_lock   = 0;
          queue->ignore_post_msg = 0;
          queue->esync_fd        = -1;
@@ -139,7 +139,7 @@ index 6183c2fa686..260fb753799 100644
          list_init( &queue->send_result );
          list_init( &queue->callback_result );
          list_init( &queue->pending_timers );
-@@ -1170,6 +1172,10 @@ static int is_queue_hung( struct msg_queue *queue )
+@@ -1183,6 +1185,10 @@ static int is_queue_hung( struct msg_queue *queue )
          if (get_wait_queue_thread(entry)->queue == queue)
              return 0;  /* thread is waiting on queue -> not hung */
      }
@@ -150,18 +150,20 @@ index 6183c2fa686..260fb753799 100644
      return 1;
  }
  
-@@ -4025,6 +4031,21 @@ DECL_HANDLER(update_rawinput_devices)
+@@ -4079,6 +4085,23 @@ DECL_HANDLER(update_rawinput_devices)
      }
  }
  
 +DECL_HANDLER(esync_msgwait)
 +{
 +    struct msg_queue *queue = get_current_queue();
++    const queue_shm_t *queue_shm;
 +
 +    if (!queue) return;
++    queue_shm = queue->shared;
 +    queue->esync_in_msgwait = req->in_msgwait;
 +
-+    if (current->process->idle_event && !(queue->wake_mask & QS_SMRESULT))
++    if (current->process->idle_event && !(queue_shm->wake_mask & QS_SMRESULT))
 +        set_event( current->process->idle_event );
 +
 +    /* and start/stop waiting on the driver */
@@ -172,7 +174,7 @@ index 6183c2fa686..260fb753799 100644
  DECL_HANDLER(set_keyboard_repeat)
  {
      struct desktop *desktop;
-@@ -4043,3 +4064,4 @@ DECL_HANDLER(set_keyboard_repeat)
+@@ -4097,3 +4120,4 @@ DECL_HANDLER(set_keyboard_repeat)
  
      release_object( desktop );
  }

patches/eventfd_synchronization/0057-ntdll-Compile-warning-fixes-for-esync.patch

@@ -0,0 +1,126 @@
+From fed04f8ef69b829fa2cf3c7051160a6f822912dd Mon Sep 17 00:00:00 2001
+From: Elizabeth Figura <zfigura@codeweavers.com>
+Date: Mon, 12 Aug 2024 16:54:44 -0500
+Subject: [PATCH] ntdll: Compile warning fixes for esync.
+
+---
+ dlls/ntdll/unix/esync.c | 26 +++++++++++++-------------
+ dlls/ntdll/unix/esync.h |  4 ++--
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/dlls/ntdll/unix/esync.c b/dlls/ntdll/unix/esync.c
+index f4748e405ef..86809b610c7 100644
+--- a/dlls/ntdll/unix/esync.c
++++ b/dlls/ntdll/unix/esync.c
+@@ -73,29 +73,29 @@ int do_esync(void)
+ 
+ struct esync
+ {
+-    enum esync_type type;
++    LONG type;
+     int fd;
+     void *shm;
+ };
+ 
+ struct semaphore
+ {
+-    int max;
+-    int count;
++    LONG max;
++    LONG count;
+ };
+ C_ASSERT(sizeof(struct semaphore) == 8);
+ 
+ struct mutex
+ {
+-    DWORD tid;
+-    int count;    /* recursion count */
++    LONG tid;
++    LONG count;    /* recursion count */
+ };
+ C_ASSERT(sizeof(struct mutex) == 8);
+ 
+ struct event
+ {
+-    int signaled;
+-    int locked;
++    LONG signaled;
++    LONG locked;
+ };
+ C_ASSERT(sizeof(struct event) == 8);
+ 
+@@ -182,7 +182,7 @@ static struct esync *add_to_list( HANDLE handle, enum esync_type type, int fd, v
+         }
+     }
+ 
+-    if (!InterlockedCompareExchange( (int *)&esync_list[entry][idx].type, type, 0 ))
++    if (!InterlockedCompareExchange( &esync_list[entry][idx].type, type, 0 ))
+     {
+         esync_list[entry][idx].fd = fd;
+         esync_list[entry][idx].shm = shm;
+@@ -206,7 +206,7 @@ static struct esync *get_cached_object( HANDLE handle )
+  * message queue, etc.) */
+ static NTSTATUS get_object( HANDLE handle, struct esync **obj )
+ {
+-    NTSTATUS ret = STATUS_SUCCESS;
++    int ret = STATUS_SUCCESS;
+     enum esync_type type = 0;
+     unsigned int shm_idx = 0;
+     obj_handle_t fd_handle;
+@@ -274,7 +274,7 @@ NTSTATUS esync_close( HANDLE handle )
+ 
+     if (entry < ESYNC_LIST_ENTRIES && esync_list[entry])
+     {
+-        if (InterlockedExchange((int *)&esync_list[entry][idx].type, 0))
++        if (InterlockedExchange(&esync_list[entry][idx].type, 0))
+         {
+             close( esync_list[entry][idx].fd );
+             return STATUS_SUCCESS;
+@@ -370,7 +370,7 @@ static NTSTATUS open_esync( enum esync_type type, HANDLE *handle,
+ }
+ 
+ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
+-    const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max)
++    const OBJECT_ATTRIBUTES *attr, int initial, int max)
+ {
+     TRACE("name %s, initial %d, max %d.\n",
+         attr ? debugstr_us(attr->ObjectName) : "<no name>", initial, max);
+@@ -386,7 +386,7 @@ NTSTATUS esync_open_semaphore( HANDLE *handle, ACCESS_MASK access,
+     return open_esync( ESYNC_SEMAPHORE, handle, access, attr );
+ }
+ 
+-NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev )
++NTSTATUS esync_release_semaphore( HANDLE handle, unsigned int count, ULONG *prev )
+ {
+     struct esync *obj;
+     struct semaphore *semaphore;
+@@ -800,7 +800,7 @@ static BOOL update_grabbed_object( struct esync *obj )
+ 
+ /* A value of STATUS_NOT_IMPLEMENTED returned from this function means that we
+  * need to delegate to server_select(). */
+-static NTSTATUS __esync_wait_objects( DWORD count, const HANDLE *handles, BOOLEAN wait_any,
++static NTSTATUS __esync_wait_objects( unsigned int count, const HANDLE *handles, BOOLEAN wait_any,
+                              BOOLEAN alertable, const LARGE_INTEGER *timeout )
+ {
+     static const LARGE_INTEGER zero;
+diff --git a/dlls/ntdll/unix/esync.h b/dlls/ntdll/unix/esync.h
+index 59f8809fc1a..9102cf911aa 100644
+--- a/dlls/ntdll/unix/esync.h
++++ b/dlls/ntdll/unix/esync.h
+@@ -23,11 +23,11 @@ extern void esync_init(void);
+ extern NTSTATUS esync_close( HANDLE handle );
+ 
+ extern NTSTATUS esync_create_semaphore(HANDLE *handle, ACCESS_MASK access,
+-    const OBJECT_ATTRIBUTES *attr, LONG initial, LONG max);
++    const OBJECT_ATTRIBUTES *attr, int initial, int max);
+ extern NTSTATUS esync_open_semaphore( HANDLE *handle, ACCESS_MASK access,
+     const OBJECT_ATTRIBUTES *attr );
+ extern NTSTATUS esync_query_semaphore( HANDLE handle, void *info, ULONG *ret_len );
+-extern NTSTATUS esync_release_semaphore( HANDLE handle, ULONG count, ULONG *prev );
++extern NTSTATUS esync_release_semaphore( HANDLE handle, unsigned int count, ULONG *prev );
+ 
+ extern NTSTATUS esync_create_event( HANDLE *handle, ACCESS_MASK access,
+     const OBJECT_ATTRIBUTES *attr, EVENT_TYPE type, BOOLEAN initial );
+-- 
+2.45.2
+

patches/gdi32-rotation/0002-gdi32-fix-for-rotated-ellipse.patch

@@ -1,18 +1,24 @@
-From 5dcb80fe0d35101804bb978e507e6db361a949af Mon Sep 17 00:00:00 2001
+From fdc9d34400af31765d20ca7b070e53d7eec710e4 Mon Sep 17 00:00:00 2001
 From: Daniel Wendt <daniel.wendt@linux.com>
 Date: Tue, 10 Dec 2013 14:55:32 +0100
 Subject: [PATCH] gdi32: fix for rotated ellipse
 
 Bug: http://bugs.winehq.org/show_bug.cgi?id=35331
 ---
- dlls/win32u/dibdrv/graphics.c | 60 ++++++++++++++++++++++++-----------
- 1 file changed, 42 insertions(+), 18 deletions(-)
+ dlls/win32u/dibdrv/graphics.c | 63 ++++++++++++++++++++++++-----------
+ 1 file changed, 44 insertions(+), 19 deletions(-)
 
 diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
-index 3a6f8184009..b5231636261 100644
+index 21d2eabbc9e..1eeea1d68ea 100644
 --- a/dlls/win32u/dibdrv/graphics.c
 +++ b/dlls/win32u/dibdrv/graphics.c
-@@ -1535,6 +1535,23 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
+@@ -1531,10 +1531,28 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
+     DC *dc = get_physdev_dc( dev );
+     RECT rect;
+     POINT pt[2], *points;
+-    int i, end, count;
++    int i, end;
++    ULONG count;
      BOOL ret = TRUE;
      HRGN outline = 0, interior = 0;
  
@@ -36,7 +42,7 @@ index 3a6f8184009..b5231636261 100644
      if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
  
      pt[0].x = pt[0].y = 0;
-@@ -1555,23 +1572,6 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
+@@ -1555,23 +1573,6 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
          return FALSE;
      }
  
@@ -60,7 +66,7 @@ index 3a6f8184009..b5231636261 100644
      count = ellipse_first_quadrant( ellipse_width, ellipse_height, points );
  
      if (dc->attr->arc_direction == AD_CLOCKWISE)
-@@ -1615,13 +1615,37 @@ BOOL CDECL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bott
+@@ -1615,13 +1616,37 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
      }
      count = end + 1;
  
@@ -74,7 +80,7 @@ index 3a6f8184009..b5231636261 100644
 +    }
 +
 +    if (pdev->brush.style != BS_NULL &&
-+        !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, (const UINT *)&count, 1, NtGdiPolyPolygonRgn ))))
++        !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, &count, 1, NtGdiPolyPolygonRgn ))))
 +    {
 +        free( points );
 +        if (outline) NtGdiDeleteObjectApp( outline );
@@ -100,5 +106,5 @@ index 3a6f8184009..b5231636261 100644
          NtGdiDeleteObjectApp( interior );
      }
 -- 
-2.33.0
+2.43.0
 

patches/ntdll-ForceBottomUpAlloc/0003-ntdll-Force-virtual-memory-allocation-order.patch

@@ -1,4 +1,4 @@
-From 8f9e309dc4b3e9c7328c86cc4993b9359f0e6839 Mon Sep 17 00:00:00 2001
+From 4c246e61f0de05a8b80e7a5d5ff2edcd21036fec Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Mon, 25 Nov 2019 12:19:20 +0300
 Subject: [PATCH] ntdll: Force virtual memory allocation order.
@@ -16,10 +16,10 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46568
  1 file changed, 164 insertions(+), 246 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index cd1655d41b2..c0537375ab8 100644
+index 1a3d527f186..ec72d692c3a 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
-@@ -1241,43 +1241,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
+@@ -1269,43 +1269,15 @@ static struct file_view *find_view_range( const void *addr, size_t size )
  }
  
  
@@ -71,7 +71,7 @@ index cd1655d41b2..c0537375ab8 100644
  
  /***********************************************************************
   *           try_map_free_area
-@@ -1312,112 +1284,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
+@@ -1338,112 +1310,6 @@ static void* try_map_free_area( void *base, void *end, ptrdiff_t step,
  }
  
  
@@ -184,7 +184,7 @@ index cd1655d41b2..c0537375ab8 100644
  /***********************************************************************
   *           remove_reserved_area
   *
-@@ -1527,8 +1393,7 @@ static void free_view( struct file_view *view )
+@@ -1553,8 +1419,7 @@ static void free_view( struct file_view *view )
   */
  static void unregister_view( struct file_view *view )
  {
@@ -194,7 +194,7 @@ index cd1655d41b2..c0537375ab8 100644
      wine_rb_remove( &views_tree, &view->entry );
  }
  
-@@ -1556,8 +1421,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
+@@ -1582,8 +1447,7 @@ static void delete_view( struct file_view *view ) /* [in] View */
  static void register_view( struct file_view *view )
  {
      wine_rb_put( &views_tree, view->base, &view->entry );
@@ -204,7 +204,7 @@ index cd1655d41b2..c0537375ab8 100644
  }
  
  
-@@ -1830,89 +1694,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
+@@ -1855,89 +1719,176 @@ static inline void *unmap_extra_space( void *ptr, size_t total_size, size_t want
      return ptr;
  }
  
@@ -343,7 +343,7 @@ index cd1655d41b2..c0537375ab8 100644
 +static void *alloc_free_area( char *limit_low, char *limit_high, size_t size, BOOL top_down, int unix_prot, UINT_PTR align_mask )
  {
 -    void *ptr = NULL;
--    struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry );
+-    struct reserved_area *area;
 +    struct range_entry *range, *ranges_start, *ranges_end;
 +    char *reserve_start, *reserve_end;
 +    struct alloc_area area;
@@ -442,7 +442,7 @@ index cd1655d41b2..c0537375ab8 100644
  }
  
  /***********************************************************************
-@@ -2016,48 +1967,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
+@@ -2041,48 +1992,13 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size,
      }
      else
      {
@@ -495,7 +495,7 @@ index cd1655d41b2..c0537375ab8 100644
      status = create_view( view_ret, ptr, size, vprot );
      if (status != STATUS_SUCCESS) unmap_area( ptr, size );
      return status;
-@@ -3236,6 +3152,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
+@@ -3275,6 +3191,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P
  done:
      server_leave_uninterrupted_section( &virtual_mutex, &sigset );
      if (needs_close) close( unix_handle );
@@ -503,7 +503,7 @@ index cd1655d41b2..c0537375ab8 100644
      return res;
  }
  
-@@ -6143,6 +6060,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
+@@ -6394,6 +6311,7 @@ NTSTATUS WINAPI NtWow64AllocateVirtualMemory64( HANDLE process, ULONG64 *ret, UL
          *ret = (ULONG_PTR)base;
          *size_ptr = size;
      }
@@ -512,5 +512,5 @@ index cd1655d41b2..c0537375ab8 100644
  }
  
 -- 
-2.43.0
+2.45.2