Release v9.20

This was "fixed" upstream. Though the current implementation is causing
multiple regressions with Rounded Rects.

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

@@ -1,15 +1,15 @@
-From 6a4be6a3089d37ff825853d2644d826d80d59e4f 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 bad1492e138..6f80e7b3a28 100644
+index 5f84ca7e23b..fabf394fbe5 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -43,6 +43,7 @@ WINE_DECLARE_DEBUG_CHANNEL(relay);
@@ -20,7 +20,7 @@ index bad1492e138..6f80e7b3a28 100644
  
  #ifdef _WIN64
  #define DEFAULT_SECURITY_COOKIE_64  (((ULONGLONG)0x00002b99 << 32) | 0x2ddfa232)
-@@ -3823,6 +3824,7 @@ void WINAPI LdrShutdownProcess(void)
+@@ -3828,6 +3829,7 @@ void WINAPI LdrShutdownProcess(void)
      process_detach();
  }
  
@@ -28,7 +28,7 @@ index bad1492e138..6f80e7b3a28 100644
  
  /******************************************************************
   *		RtlExitUserProcess (NTDLL.@)
-@@ -4317,6 +4319,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 bad1492e138..6f80e7b3a28 100644
      static int attach_done;
      NTSTATUS status;
      ULONG_PTR cookie, port = 0;
-@@ -4397,6 +4402,16 @@ void loader_init( CONTEXT *context, void **entry )
+@@ -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 bad1492e138..6f80e7b3a28 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 0173ca4b3352506b76801619ae5a05f338d6ff6e 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 ce48b16d7ec..2d20ee299fa 100644
---- a/programs/cmd/wcmdmain.c
-+++ b/programs/cmd/wcmdmain.c
-@@ -1541,8 +1541,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));
-       }
-     }
- 
-@@ -1572,6 +1574,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;
-           }
-@@ -1595,6 +1598,7 @@ void WCMD_run_program (WCHAR *command, BOOL called)
-         RETURN_CODE return_code;
-         BOOL oldinteractive = interactive;
- 
-+        WINE_TRACE("Calling batch program\n");
-         interactive = FALSE;
-         return_code = WCMD_batch(thisDir, command, NULL, INVALID_HANDLE_VALUE);
-         interactive = oldinteractive;
-@@ -1605,48 +1609,109 @@ void WCMD_run_program (WCHAR *command, BOOL called)
-         if (return_code != RETURN_CODE_ABORTED && return_code != RETURN_CODE_OLD_CHAINING)
-             errorlevel = return_code;
-         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.45.2
-

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 5d1a7ff33160080ad2aca22f689c5b4b446837d8 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 1e92e88d191..9b8cfd389b9 100644
---- a/programs/cmd/builtins.c
-+++ b/programs/cmd/builtins.c
-@@ -442,7 +442,7 @@ RETURN_CODE 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 errorlevel;
-         }
-diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
-index 6c76070338c..d750aca5572 100644
---- a/programs/cmd/wcmd.h
-+++ b/programs/cmd/wcmd.h
-@@ -336,7 +336,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 2df0d7c53d3..095be784f2c 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,2 +0,0 @@
-Fixes: [18154] cmd: Support for launching programs based on file association
-Disabled: True

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/dinput-regression-fix/0001-dinput-Use-the-correct-array-index-in-keyboard_creat.patch

@@ -1,29 +0,0 @@
-From 434df65f9023ec64c175825e5b38cd9daf744565 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Aida=20Jonikien=C4=97?= <aidas957@gmail.com>
-Date: Sat, 10 Aug 2024 22:20:30 +0300
-Subject: [PATCH] dinput: Use the correct array index in
- keyboard_create_device().
-
-This fixes a segfault when launching NFS Underground.
-
-Fixes: f434ea12b83 ("dinput: Implement DIPROP_SCANCODE.")
----
- dlls/dinput/keyboard.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c
-index a83f825e97d..aee1d996dde 100644
---- a/dlls/dinput/keyboard.c
-+++ b/dlls/dinput/keyboard.c
-@@ -211,7 +211,7 @@ HRESULT keyboard_create_device( struct dinput *dinput, const GUID *guid, IDirect
- 
-     if (FAILED(hr = dinput_device_init_device_format( &impl->base.IDirectInputDevice8W_iface ))) goto failed;
- 
--    for (i = 0, index = 0; i < 512; ++i)
-+    for (i = 0, index = 0; i < impl->base.device_format.dwNumObjs; ++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;
--- 
-2.43.0
-

patches/dinput-regression-fix/definition

@@ -1,5 +0,0 @@
-Fixes: Fix crash in NFS Underground
-#Depends: dinput-joy-mappings
-Depends: dinput-scancode
-
-# PR 6249

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/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/0011-server-Add-an-object-operation-to-grab-the-esync-fil.patch

@@ -1,4 +1,4 @@
-From e222dd363cf419eecb0d5c97390b60de15f37951 Mon Sep 17 00:00:00 2001
+From 0c97689e30108869e0ffc5fb7a13edcb42de7450 Mon Sep 17 00:00:00 2001
 From: Zebediah Figura <z.figura12@gmail.com>
 Date: Fri, 8 Jun 2018 18:51:40 -0500
 Subject: [PATCH] server: Add an object operation to grab the esync file
@@ -25,6 +25,7 @@ Split off to decrease patch size.
  server/mapping.c    | 3 +++
  server/mutex.c      | 1 +
  server/named_pipe.c | 5 +++++
+ server/object.c     | 2 ++
  server/object.h     | 2 ++
  server/process.c    | 3 +++
  server/queue.c      | 2 ++
@@ -40,13 +41,13 @@ Split off to decrease patch size.
  server/token.c      | 1 +
  server/window.c     | 1 +
  server/winstation.c | 2 ++
- 34 files changed, 68 insertions(+)
+ 35 files changed, 70 insertions(+)
 
 diff --git a/server/async.c b/server/async.c
-index 9cb251df5ce..337bba8631b 100644
+index 749c547af4f..2377c737e98 100644
 --- a/server/async.c
 +++ b/server/async.c
-@@ -77,6 +77,7 @@ static const struct object_ops async_ops =
+@@ -78,6 +78,7 @@ static const struct object_ops async_ops =
      add_queue,                 /* add_queue */
      remove_queue,              /* remove_queue */
      async_signaled,            /* signaled */
@@ -54,7 +55,7 @@ index 9cb251df5ce..337bba8631b 100644
      async_satisfied,           /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -676,6 +677,7 @@ static const struct object_ops iosb_ops =
+@@ -698,6 +699,7 @@ static const struct object_ops iosb_ops =
      no_add_queue,             /* add_queue */
      NULL,                     /* remove_queue */
      NULL,                     /* signaled */
@@ -75,7 +76,7 @@ index ff0799f5880..d9824de8eac 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/change.c b/server/change.c
-index 7a806abc017..e080511bb23 100644
+index f42ce066340..d0a90a99261 100644
 --- a/server/change.c
 +++ b/server/change.c
 @@ -112,6 +112,7 @@ static const struct object_ops dir_ops =
@@ -87,7 +88,7 @@ index 7a806abc017..e080511bb23 100644
      no_signal,                /* signal */
      dir_get_fd,               /* get_fd */
 diff --git a/server/clipboard.c b/server/clipboard.c
-index 8118a467dd8..8b265f2dcea 100644
+index 91f159bc7c9..0df7fd2f18e 100644
 --- a/server/clipboard.c
 +++ b/server/clipboard.c
 @@ -76,6 +76,7 @@ static const struct object_ops clipboard_ops =
@@ -171,7 +172,7 @@ index b64283baf4a..1cc9eea6a50 100644
      no_signal,                        /* signal */
      console_connection_get_fd,        /* get_fd */
 diff --git a/server/debugger.c b/server/debugger.c
-index 48adb244b09..d85a2000684 100644
+index c59a0abea77..ca04d4c71ce 100644
 --- a/server/debugger.c
 +++ b/server/debugger.c
 @@ -86,6 +86,7 @@ static const struct object_ops debug_event_ops =
@@ -227,7 +228,7 @@ index 436dac6bfe9..f730fa81afa 100644
      no_signal,                        /* signal */
      device_file_get_fd,               /* get_fd */
 diff --git a/server/directory.c b/server/directory.c
-index 23d7eb0a2b7..bc161b9ab7e 100644
+index b37ec969a9e..a6c0e292071 100644
 --- a/server/directory.c
 +++ b/server/directory.c
 @@ -69,6 +69,7 @@ static const struct object_ops object_type_ops =
@@ -279,7 +280,7 @@ index f1b79b1b35e..c727bfdd1ba 100644
      no_signal,                   /* signal */
      no_get_fd,                   /* get_fd */
 diff --git a/server/fd.c b/server/fd.c
-index 74ad95fd4d1..4ce498ec0ef 100644
+index 16328063df6..4ce78db5b33 100644
 --- a/server/fd.c
 +++ b/server/fd.c
 @@ -172,6 +172,7 @@ static const struct object_ops fd_ops =
@@ -315,7 +316,7 @@ index 74ad95fd4d1..4ce498ec0ef 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/file.c b/server/file.c
-index b4f99ddc93b..1b4efb04bc5 100644
+index 2a839968c25..cbef0c63383 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -94,6 +94,7 @@ static const struct object_ops file_ops =
@@ -327,7 +328,7 @@ index b4f99ddc93b..1b4efb04bc5 100644
      no_signal,                    /* signal */
      file_get_fd,                  /* get_fd */
 diff --git a/server/handle.c b/server/handle.c
-index 0595fdb403b..d41c7e86454 100644
+index e65831b3b22..e6c5707556f 100644
 --- a/server/handle.c
 +++ b/server/handle.c
 @@ -126,6 +126,7 @@ static const struct object_ops handle_table_ops =
@@ -339,10 +340,10 @@ index 0595fdb403b..d41c7e86454 100644
      no_signal,                       /* signal */
      no_get_fd,                       /* get_fd */
 diff --git a/server/hook.c b/server/hook.c
-index 5abdf39ad37..da351d6791f 100644
+index c2d2823cd61..ab4d0e9dd31 100644
 --- a/server/hook.c
 +++ b/server/hook.c
-@@ -80,6 +80,7 @@ static const struct object_ops hook_table_ops =
+@@ -81,6 +81,7 @@ static const struct object_ops hook_table_ops =
      no_add_queue,                 /* add_queue */
      NULL,                         /* remove_queue */
      NULL,                         /* signaled */
@@ -351,10 +352,10 @@ index 5abdf39ad37..da351d6791f 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/mailslot.c b/server/mailslot.c
-index 2d8697ec9bd..4cf9b73f784 100644
+index 61eceec94e2..92fe938d3b9 100644
 --- a/server/mailslot.c
 +++ b/server/mailslot.c
-@@ -74,6 +74,7 @@ static const struct object_ops mailslot_ops =
+@@ -81,6 +81,7 @@ static const struct object_ops mailslot_ops =
      add_queue,                 /* add_queue */
      remove_queue,              /* remove_queue */
      default_fd_signaled,       /* signaled */
@@ -362,7 +363,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      no_satisfied,              /* satisfied */
      no_signal,                 /* signal */
      mailslot_get_fd,           /* get_fd */
-@@ -133,6 +134,7 @@ static const struct object_ops mail_writer_ops =
+@@ -142,6 +143,7 @@ static const struct object_ops mail_writer_ops =
      no_add_queue,               /* add_queue */
      NULL,                       /* remove_queue */
      NULL,                       /* signaled */
@@ -370,7 +371,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      NULL,                       /* satisfied */
      no_signal,                  /* signal */
      mail_writer_get_fd,         /* get_fd */
-@@ -196,6 +198,7 @@ static const struct object_ops mailslot_device_ops =
+@@ -207,6 +209,7 @@ static const struct object_ops mailslot_device_ops =
      no_add_queue,                   /* add_queue */
      NULL,                           /* remove_queue */
      NULL,                           /* signaled */
@@ -378,7 +379,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      no_satisfied,                   /* satisfied */
      no_signal,                      /* signal */
      no_get_fd,                      /* get_fd */
-@@ -226,6 +229,7 @@ static const struct object_ops mailslot_device_file_ops =
+@@ -237,6 +240,7 @@ static const struct object_ops mailslot_device_file_ops =
      add_queue,                              /* add_queue */
      remove_queue,                           /* remove_queue */
      default_fd_signaled,                    /* signaled */
@@ -387,7 +388,7 @@ index 2d8697ec9bd..4cf9b73f784 100644
      no_signal,                              /* signal */
      mailslot_device_file_get_fd,            /* get_fd */
 diff --git a/server/mapping.c b/server/mapping.c
-index 2d0a0b783e2..1acfb032bfd 100644
+index 2bf45780375..b84bb08a77b 100644
 --- a/server/mapping.c
 +++ b/server/mapping.c
 @@ -67,6 +67,7 @@ static const struct object_ops ranges_ops =
@@ -427,7 +428,7 @@ index af0efe72132..4785a830e92 100644
      mutex_signal,              /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/named_pipe.c b/server/named_pipe.c
-index f3404a33c3b..f28cb14cb45 100644
+index dd8c14b30a9..5880b601d3a 100644
 --- a/server/named_pipe.c
 +++ b/server/named_pipe.c
 @@ -119,6 +119,7 @@ static const struct object_ops named_pipe_ops =
@@ -470,8 +471,28 @@ index f3404a33c3b..f28cb14cb45 100644
      no_satisfied,                            /* satisfied */
      no_signal,                               /* signal */
      named_pipe_device_file_get_fd,           /* get_fd */
+diff --git a/server/object.c b/server/object.c
+index b1665fb5372..0a4d1bede06 100644
+--- a/server/object.c
++++ b/server/object.c
+@@ -108,6 +108,7 @@ static const struct object_ops apc_reserve_ops =
+     no_add_queue,               /* add_queue */
+     NULL,                       /* remove_queue */
+     NULL,                       /* signaled */
++    NULL,                       /* get_esync_fd */
+     no_satisfied,               /* satisfied */
+     no_signal,                  /* signal */
+     no_get_fd,                  /* get_fd */
+@@ -132,6 +133,7 @@ static const struct object_ops completion_reserve_ops =
+     no_add_queue,              /* add_queue */
+     NULL,                      /* remove_queue */
+     NULL,                      /* signaled */
++    NULL,                      /* get_esync_fd */
+     no_satisfied,              /* satisfied */
+     no_signal,                 /* signal */
+     no_get_fd,                 /* get_fd */
 diff --git a/server/object.h b/server/object.h
-index dfdd691601f..711af54b579 100644
+index 6222e3352ed..0a65d0e3892 100644
 --- a/server/object.h
 +++ b/server/object.h
 @@ -78,6 +78,8 @@ struct object_ops
@@ -484,7 +505,7 @@ index dfdd691601f..711af54b579 100644
      void (*satisfied)(struct object *,struct wait_queue_entry *);
      /* signal an object */
 diff --git a/server/process.c b/server/process.c
-index a0d5ea64d97..777bf7c2fe2 100644
+index 49f5c75005f..dc83a089655 100644
 --- a/server/process.c
 +++ b/server/process.c
 @@ -105,6 +105,7 @@ static const struct object_ops process_ops =
@@ -512,10 +533,10 @@ index a0d5ea64d97..777bf7c2fe2 100644
      no_signal,                     /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/queue.c b/server/queue.c
-index 348fdac3214..2cd8949a252 100644
+index 984d466b66e..8a95055db40 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -174,6 +174,7 @@ static const struct object_ops msg_queue_ops =
+@@ -165,6 +165,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 */
@@ -523,7 +544,7 @@ index 348fdac3214..2cd8949a252 100644
      msg_queue_satisfied,       /* satisfied */
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
-@@ -211,6 +212,7 @@ static const struct object_ops thread_input_ops =
+@@ -202,6 +203,7 @@ static const struct object_ops thread_input_ops =
      no_add_queue,                 /* add_queue */
      NULL,                         /* remove_queue */
      NULL,                         /* signaled */
@@ -532,7 +553,7 @@ index 348fdac3214..2cd8949a252 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/registry.c b/server/registry.c
-index 629d67c832f..d6b39b99b22 100644
+index cc9a33fff1d..c19e92c9750 100644
 --- a/server/registry.c
 +++ b/server/registry.c
 @@ -180,6 +180,7 @@ static const struct object_ops key_ops =
@@ -544,7 +565,7 @@ index 629d67c832f..d6b39b99b22 100644
      no_signal,               /* signal */
      no_get_fd,               /* get_fd */
 diff --git a/server/request.c b/server/request.c
-index 7021741c765..ca83fdbd2af 100644
+index dabcea68309..832a33917b4 100644
 --- a/server/request.c
 +++ b/server/request.c
 @@ -90,6 +90,7 @@ static const struct object_ops master_socket_ops =
@@ -568,10 +589,10 @@ index 53b42a886df..e3889f24601 100644
      semaphore_signal,              /* signal */
      no_get_fd,                     /* get_fd */
 diff --git a/server/serial.c b/server/serial.c
-index d665eb7fa35..11e204e4419 100644
+index 209f2e9174e..0d49a996c2a 100644
 --- a/server/serial.c
 +++ b/server/serial.c
-@@ -85,6 +85,7 @@ static const struct object_ops serial_ops =
+@@ -91,6 +91,7 @@ static const struct object_ops serial_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -592,10 +613,10 @@ index 19b76d44c16..55cd6aa037e 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/sock.c b/server/sock.c
-index 52175b08987..77b41716cd1 100644
+index d2ec882554f..44a4e3b7b15 100644
 --- a/server/sock.c
 +++ b/server/sock.c
-@@ -451,6 +451,7 @@ static const struct object_ops sock_ops =
+@@ -471,6 +471,7 @@ static const struct object_ops sock_ops =
      add_queue,                    /* add_queue */
      remove_queue,                 /* remove_queue */
      default_fd_signaled,          /* signaled */
@@ -603,7 +624,7 @@ index 52175b08987..77b41716cd1 100644
      no_satisfied,                 /* satisfied */
      no_signal,                    /* signal */
      sock_get_fd,                  /* get_fd */
-@@ -3481,6 +3482,7 @@ static const struct object_ops ifchange_ops =
+@@ -3599,6 +3600,7 @@ static const struct object_ops ifchange_ops =
      no_add_queue,            /* add_queue */
      NULL,                    /* remove_queue */
      NULL,                    /* signaled */
@@ -611,7 +632,7 @@ index 52175b08987..77b41716cd1 100644
      no_satisfied,            /* satisfied */
      no_signal,               /* signal */
      ifchange_get_fd,         /* get_fd */
-@@ -3702,6 +3704,7 @@ static const struct object_ops socket_device_ops =
+@@ -3820,6 +3822,7 @@ static const struct object_ops socket_device_ops =
      no_add_queue,               /* add_queue */
      NULL,                       /* remove_queue */
      NULL,                       /* signaled */
@@ -620,7 +641,7 @@ index 52175b08987..77b41716cd1 100644
      no_signal,                  /* signal */
      no_get_fd,                  /* get_fd */
 diff --git a/server/symlink.c b/server/symlink.c
-index 27d48e2f994..8cb24b4ff6e 100644
+index dd28efd3a75..c7f34412317 100644
 --- a/server/symlink.c
 +++ b/server/symlink.c
 @@ -71,6 +71,7 @@ static const struct object_ops symlink_ops =
@@ -632,7 +653,7 @@ index 27d48e2f994..8cb24b4ff6e 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 diff --git a/server/thread.c b/server/thread.c
-index 0d5bdcf21d9..9dc38d4cce9 100644
+index cf69b3b53c3..4b537586e31 100644
 --- a/server/thread.c
 +++ b/server/thread.c
 @@ -96,6 +96,7 @@ static const struct object_ops thread_apc_ops =
@@ -672,10 +693,10 @@ index 96dc9d00ca1..f59902d5607 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/token.c b/server/token.c
-index 4df8d2e0c6e..8b4d2f0c1b1 100644
+index 48ee1eca8fe..479596bdbfa 100644
 --- a/server/token.c
 +++ b/server/token.c
-@@ -143,6 +143,7 @@ static const struct object_ops token_ops =
+@@ -145,6 +145,7 @@ static const struct object_ops token_ops =
      no_add_queue,              /* add_queue */
      NULL,                      /* remove_queue */
      NULL,                      /* signaled */
@@ -684,7 +705,7 @@ index 4df8d2e0c6e..8b4d2f0c1b1 100644
      no_signal,                 /* signal */
      no_get_fd,                 /* get_fd */
 diff --git a/server/window.c b/server/window.c
-index 242e93f303a..3aa7ad4ad79 100644
+index 412592fbc71..94a70ce890f 100644
 --- a/server/window.c
 +++ b/server/window.c
 @@ -107,6 +107,7 @@ static const struct object_ops window_ops =
@@ -696,7 +717,7 @@ index 242e93f303a..3aa7ad4ad79 100644
      no_signal,                /* signal */
      no_get_fd,                /* get_fd */
 diff --git a/server/winstation.c b/server/winstation.c
-index 5903497d61e..7692fbe3ed2 100644
+index e5f4bfec357..50fe34aa9ce 100644
 --- a/server/winstation.c
 +++ b/server/winstation.c
 @@ -76,6 +76,7 @@ static const struct object_ops winstation_ops =
@@ -716,5 +737,5 @@ index 5903497d61e..7692fbe3ed2 100644
      no_signal,                    /* signal */
      no_get_fd,                    /* get_fd */
 -- 
-2.42.0
+2.45.2
 

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/0001-gdi32-fix-for-rotated-Arc-ArcTo-Chord-and-Pie-drawin.patch

@@ -1,119 +0,0 @@
-From dc2aaa6a25ebccc30c7903fa68235d5971f8d6b8 Mon Sep 17 00:00:00 2001
-From: Daniel Wendt <daniel.wendt@linux.com>
-Date: Fri, 15 Nov 2013 12:52:37 +0100
-Subject: [PATCH] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing
- problem
-
-Wine-Bug: http://bugs.winehq.org/show_bug.cgi?id=34579
----
- dlls/win32u/dibdrv/graphics.c | 80 +++++++++++++++++++++++++++++++++++
- 1 file changed, 80 insertions(+)
-
-diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
-index 410f29e8f19..3a6f8184009 100644
---- a/dlls/win32u/dibdrv/graphics.c
-+++ b/dlls/win32u/dibdrv/graphics.c
-@@ -310,6 +310,60 @@ static int get_arc_points( int arc_dir, const RECT *rect, POINT start, POINT end
-     return pos - count;
- }
- 
-+/*
-+ Check if matrix has uniform scale and shear and contains a rotation.
-+*/
-+static BOOL xform_has_rotate_and_uniform_scale_and_shear( const XFORM *xform )
-+{
-+    return xform->eM21 != 0 && xform->eM11 == xform->eM22 && -xform->eM21 == xform->eM12;
-+}
-+
-+/*
-+ Decompose rotation and translation from matrix xform.
-+
-+ If parameter rotation_and_translation is != NULL, save rotation and translation into it.
-+
-+ Note: The current implementation only works on matrixes with uniform scale and shear,
-+       which has to be checked by a call to xform_has_rotate_and_uniform_scale_and_shear().
-+       Hints how to get unique values for non-uniform matrixes are welcome.
-+*/
-+static BOOL xform_decompose_rotation_and_translation( XFORM *xform, XFORM *rotation_and_translation )
-+{
-+    XFORM inverse_matrix_scale;
-+    XFORM origin_matrix = *xform;
-+    double determinant = 0;
-+
-+    /* xform = xfrom-transposed * xform */
-+    xform->eM11 = sqrt( xform->eM11 * xform->eM11 + xform->eM21 * xform->eM21 );
-+    xform->eM22 = sqrt( xform->eM12 * xform->eM12 + xform->eM22 * xform->eM22 );
-+    xform->eM12 = 0;
-+    xform->eM21 = 0;
-+    xform->eDx = 0;
-+    xform->eDy = 0;
-+
-+    if ( rotation_and_translation == NULL )
-+        return TRUE;
-+
-+    if ( xform->eM11 == 0 || xform->eM22 == 0 )
-+        return FALSE;
-+
-+    determinant = xform->eM11 * xform->eM22;
-+
-+    inverse_matrix_scale.eM11 = xform->eM22 / determinant;
-+    inverse_matrix_scale.eM12 = 0;
-+    inverse_matrix_scale.eM21 = 0;
-+    inverse_matrix_scale.eM22 = xform->eM11 / determinant;
-+
-+    /* calculate the rotation matrix */
-+    rotation_and_translation->eM11 = inverse_matrix_scale.eM11 * origin_matrix.eM11;
-+    rotation_and_translation->eM12 = inverse_matrix_scale.eM11 * origin_matrix.eM12;
-+    rotation_and_translation->eM21 = inverse_matrix_scale.eM22 * origin_matrix.eM12 * -1;
-+    rotation_and_translation->eM22 = inverse_matrix_scale.eM22 * origin_matrix.eM22;
-+    rotation_and_translation->eDx = origin_matrix.eDx;
-+    rotation_and_translation->eDy = origin_matrix.eDy;
-+    return TRUE;
-+}
-+
- /* backend for arc functions; extra_lines is -1 for ArcTo, 0 for Arc, 1 for Chord, 2 for Pie */
- static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-                       INT start_x, INT start_y, INT end_x, INT end_y, INT extra_lines )
-@@ -322,6 +376,22 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-     BOOL ret = TRUE;
-     HRGN outline = 0, interior = 0;
- 
-+    BOOL exclude_rotation = FALSE;
-+    XFORM old;
-+    XFORM rotation_and_translation;
-+    if (dc->attr->graphics_mode == GM_ADVANCED)
-+    {
-+        XFORM xf;
-+        NtGdiGetTransform( pdev->dev.hdc, 0x203, &old );
-+        xf = old;
-+        if (xform_has_rotate_and_uniform_scale_and_shear( &xf ) &&
-+            xform_decompose_rotation_and_translation( &xf, &rotation_and_translation ))
-+        {
-+            NtGdiModifyWorldTransform( pdev->dev.hdc, &xf, MWT_SET );
-+            exclude_rotation = TRUE;
-+        }
-+    }
-+
-     if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
- 
-     width = rect.right - rect.left;
-@@ -355,6 +425,16 @@ static BOOL draw_arc( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-         points[count].y = rect.top + height / 2;
-         count++;
-     }
-+
-+    if (exclude_rotation == TRUE)
-+    {
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &rotation_and_translation, MWT_SET );
-+        /* apply rotation and translation to calculated points */
-+        NtGdiTransformPoints( dev->hdc, points, points, count, NtGdiLPtoDP );
-+        /* restore origin matrix */
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &old, MWT_SET );
-+    }
-+
-     if (count < 2)
-     {
-         free( points );
--- 
-2.33.0
-

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

@@ -1,110 +0,0 @@
-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 | 63 ++++++++++++++++++++++++-----------
- 1 file changed, 44 insertions(+), 19 deletions(-)
-
-diff --git a/dlls/win32u/dibdrv/graphics.c b/dlls/win32u/dibdrv/graphics.c
-index 21d2eabbc9e..1eeea1d68ea 100644
---- a/dlls/win32u/dibdrv/graphics.c
-+++ b/dlls/win32u/dibdrv/graphics.c
-@@ -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;
- 
-+    BOOL exclude_rotation_translation = FALSE;
-+    XFORM old;
-+    XFORM rotation_and_translation;
-+
-+    if (dc->attr->graphics_mode == GM_ADVANCED)
-+    {
-+        XFORM xf;
-+        NtGdiGetTransform( pdev->dev.hdc, 0x203, &old );
-+        xf = old;
-+        if (xform_has_rotate_and_uniform_scale_and_shear( &xf ) &&
-+            xform_decompose_rotation_and_translation( &xf, &rotation_and_translation ))
-+        {
-+            NtGdiModifyWorldTransform( pdev->dev.hdc, &xf, MWT_SET );
-+            exclude_rotation_translation = TRUE;
-+        }
-+    }
-+
-     if (!get_pen_device_rect( dc, pdev, &rect, left, top, right, bottom )) return TRUE;
- 
-     pt[0].x = pt[0].y = 0;
-@@ -1555,23 +1573,6 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-         return FALSE;
-     }
- 
--    if (pdev->brush.style != BS_NULL &&
--        !(interior = NtGdiCreateRoundRectRgn( rect.left, rect.top, rect.right + 1, rect.bottom + 1,
--                                              ellipse_width, ellipse_height )))
--    {
--        free( points );
--        if (outline) NtGdiDeleteObjectApp( outline );
--        return FALSE;
--    }
--
--    /* if not using a region, paint the interior first so the outline can overlap it */
--    if (interior && !outline)
--    {
--        ret = brush_region( pdev, interior );
--        NtGdiDeleteObjectApp( interior );
--        interior = 0;
--    }
--
-     count = ellipse_first_quadrant( ellipse_width, ellipse_height, points );
- 
-     if (dc->attr->arc_direction == AD_CLOCKWISE)
-@@ -1615,13 +1616,37 @@ BOOL dibdrv_RoundRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom,
-     }
-     count = end + 1;
- 
-+    if (exclude_rotation_translation == TRUE)
-+    {
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &rotation_and_translation, MWT_SET );
-+        /* apply rotation and translation to calculated points */
-+        NtGdiTransformPoints( dev->hdc, points, points, count, NtGdiLPtoDP );
-+        /* restore origin matrix */
-+        NtGdiModifyWorldTransform( pdev->dev.hdc, &old, MWT_SET );
-+    }
-+
-+    if (pdev->brush.style != BS_NULL &&
-+        !(interior = ULongToHandle(NtGdiPolyPolyDraw( ULongToHandle(ALTERNATE), points, &count, 1, NtGdiPolyPolygonRgn ))))
-+    {
-+        free( points );
-+        if (outline) NtGdiDeleteObjectApp( outline );
-+            return FALSE;
-+    }
-+
-+    /* if not using a region, paint the interior first so the outline can overlap it */
-+    if (interior && !outline)
-+    {
-+        ret = brush_region( pdev, interior );
-+        NtGdiDeleteObjectApp( interior );
-+        interior = 0;
-+    }
-+
-     reset_dash_origin( pdev );
-     pdev->pen_lines( pdev, count, points, TRUE, outline );
-     add_pen_lines_bounds( pdev, count, points, outline );
- 
-     if (interior)
-     {
--        NtGdiCombineRgn( interior, interior, outline, RGN_DIFF );
-         ret = brush_region( pdev, interior );
-         NtGdiDeleteObjectApp( interior );
-     }
--- 
-2.43.0
-

patches/gdi32-rotation/definition

@@ -1,2 +0,0 @@
-Fixes: [34579] gdi32: fix for rotated Arc, ArcTo, Chord and Pie drawing problem
-Fixes: [35331] gdi32: fix for rotated ellipse

patches/kernel32-Debugger/0001-kernel32-Always-start-debugger-on-WinSta0.patch

@@ -1,24 +1,24 @@
-From b617701d440a9b5210762503cf441e9fcb3132e1 Mon Sep 17 00:00:00 2001
+From 4dfa7d8a06e20d9888398298e03c20fac89a9fdf Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Fri, 13 Jan 2017 01:59:13 +0100
-Subject: kernel32: Always start debugger on WinSta0.
+Subject: [PATCH] kernel32: Always start debugger on WinSta0.
 
 ---
  dlls/kernelbase/debug.c | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
-index 016c21109..0681f726b 100644
+index cbefc0c8733..b37faaa0003 100644
 --- a/dlls/kernelbase/debug.c
 +++ b/dlls/kernelbase/debug.c
-@@ -640,6 +640,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event )
+@@ -625,6 +625,7 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event )
      TRACE( "Starting debugger %s\n", debugstr_w(cmdline) );
      memset( &startup, 0, sizeof(startup) );
      startup.cb = sizeof(startup);
 +    startup.lpDesktop = (WCHAR*)L"WinSta0";
      startup.dwFlags = STARTF_USESHOWWINDOW;
      startup.wShowWindow = SW_SHOWNORMAL;
-     ret = CreateProcessW( NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info );
+     ret = CreateProcessW( NULL, cmdline, NULL, NULL, TRUE, CREATE_UNICODE_ENVIRONMENT, env, NULL, &startup, &info );
 -- 
-2.23.0
+2.45.2
 

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