Patch application has failed

[nokia8801]

==> Starting prepare()...
  -> Changing wine HEAD to the wine-staging base commit...
  -> Using upstream-commit file
HEAD is now at b448a8ba7b6 vccorlib140: Implement {Get, Resolve}WeakReference.
==> WARNING: Hotfix: Fix for Riot Client updates
==> WARNING: Hotfix: Remove a TRACE in the DXGIGetDebugInterface1 stub causing segfaults.
==> WARNING: Hotfix: Fix NosTale mouse bug
==> WARNING: Hotfix: Fix for CL/opencl.h header recognition
  -> cherry picking...
  -> Hotfixing...
  -> Applying CSMT-toggle.patch
  -> Applying wine-staging patches using staging/patchinstall.py... 
     Staging overrides used, if any: 
  -> Applying enable_dynamic_wow64_def.patch
  -> Applying LAA-unix-staging-wow64.patch
  -> Applying ge-wayland.patch
==> WARNING: NTsync was already implemented in Wine 10.16. Don't applying fastsync patches
  -> Applying proton-win10-default.patch
  -> Applying proton_battleye.patch
  -> Applying Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch
==> ERROR: Patch application has failed. The error was logged to /tmp/wine-tkg-git/wine-tkg-git/prepare.log for your convenience.
==> ERROR: A failure occurred in prepare().
    Aborting...
  -> Removed BIG_UGLY_FROGMINER - Ribbit
  -> Removed Proton-tkg token - Valve Ribbit
  -> exit cleanup done
==> Removing installed dependencies...

last_build_config.log
prepare.log

[zefkerr]

last_build_config.log
prepare.log

[asdfzdfj]

for that piece of patch in specific, it looks like some new syscall entries got added to the patched file (probably this one) and it cause change in syscall entry numbers which then make the patch failed to apply

there's probably a better way to update that patch but I did try to edit the syscall number in the patch by hand and it seemed to apply successfully, but I can't verify that it still works because I then ran into the same problem as #1672/#1673

hand edited word diff of the patch

diff --git a/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch b/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch
index 552e5816..9f77e714 100644
--- a/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch
+++ b/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch
@@ -30,22 +30,22 @@ index 3aa13741a72..e1afe28423e 100644
--- a/dlls/ntdll/ntsyscalls.h
+++ b/dlls/ntdll/ntsyscalls.h
@@ -248,7 +248,8 @@
     SYSCALL_ENTRY( [-0x0103,-]{+0x0104,+} NtWow64IsProcessorFeaturePresent, 4 ) \
     SYSCALL_ENTRY( [-0x0104,-]{+0x0105,+} NtWow64QueryInformationProcess64, 20 ) \
     SYSCALL_ENTRY( [-0x0105,-]{+0x0106,+} NtWow64ReadVirtualMemory64, 28 ) \
-    SYSCALL_ENTRY( [-0x0106,-]{+0x0107,+} NtWow64WriteVirtualMemory64, 28 )
+    SYSCALL_ENTRY( [-0x0106,-]{+0x0107,+} NtWow64WriteVirtualMemory64, 28 ) \
+    SYSCALL_ENTRY( [-0x0107,-]{+0x0108,+} wine_nt_to_unix_file_name, 16 )
 #ifdef _WIN64
 #define ALL_SYSCALLS \
     SYSCALL_ENTRY( 0x0000, NtAccessCheck, 64 ) \
@@ -492,7 +493,8 @@
     SYSCALL_ENTRY( [-0x00fd,-]{+0x00fe,+} NtUnmapViewOfSectionEx, 24 ) \
     SYSCALL_ENTRY( [-0x00fe,-]{+0x00ff,+} NtWaitForAlertByThreadId, 16 ) \
     SYSCALL_ENTRY( [-0x00ff,-]{+0x0100,+} NtWaitForDebugEvent, 32 ) \
-    SYSCALL_ENTRY( [-0x0100,-]{+0x0101,+} NtWaitForKeyedEvent, 32 )
+    SYSCALL_ENTRY( [-0x0100,-]{+0x0101,+} NtWaitForKeyedEvent, 32 ) \
+    SYSCALL_ENTRY( [-0x0101,-]{+0x0102,+} wine_nt_to_unix_file_name, 32 )
 #else
 #define ALL_SYSCALLS ALL_SYSCALLS32
 #endif

---

sidenote: seems like the current patchset (as of 2b032b4) applies and builds fine against wine v10.18

# customization.cfg
_plain_version="v10.18"
_staging_version="v10.18"

[LinLo]

Hi,

I successfully built on my side after updating a little some patches. Maybe it will not be enough depending on your customizations options.

• wine-tkg-git/wine-tkg-patches/misc/winewayland/ge-wayland.patch
• wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch

Here are the modifications of the 2 patch files working for me but I don't know if there will be regressions related to those changes.

diff -ru wine-tkg-git-orig/wine-tkg-git/wine-tkg-patches/misc/winewayland/ge-wayland.patch wine-tkg-git/wine-tkg-git/wine-tkg-patches/misc/winewayland/ge-wayland.patch
--- wine-tkg-git-orig/wine-tkg-git/wine-tkg-patches/misc/winewayland/ge-wayland.patch   2025-11-15 13:28:11.463636271 +0100
+++ wine-tkg-git/wine-tkg-git/wine-tkg-patches/misc/winewayland/ge-wayland.patch        2025-11-15 12:45:02.675877578 +0100
@@ -1238,7 +1238,7 @@
 index 00000000000..754e22f914f
 --- /dev/null
 +++ b/dlls/amdxc64/main.c
-@@ -0,0 +1,317 @@
+@@ -0,0 +1,316 @@
 +/*
 + * amdxc implementation
 + *
@@ -1268,7 +1268,6 @@
 +#include "winbase.h"
 +#include "winternl.h"
 +#include "wine/debug.h"
-+#include "wine/heap.h"
 +
 +#include "wine/vulkan.h"
 +#include "wine/asm.h"
diff -ru wine-tkg-git-orig/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch wine-tkg-git/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch
--- wine-tkg-git-orig/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch       2025-11-15 13:28:11.504913458 +0100
+++ wine-tkg-git/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton_eac/Revert-ntdll-Get-rid-of-the-wine_nt_to_unix_file_nam.patch   2025-11-15 13:15:42.298282956 +0100
@@ -29,23 +29,23 @@
 index 3aa13741a72..e1afe28423e 100644
 --- a/dlls/ntdll/ntsyscalls.h
 +++ b/dlls/ntdll/ntsyscalls.h
-@@ -248,7 +248,8 @@
-     SYSCALL_ENTRY( 0x0103, NtWow64IsProcessorFeaturePresent, 4 ) \
-     SYSCALL_ENTRY( 0x0104, NtWow64QueryInformationProcess64, 20 ) \
-     SYSCALL_ENTRY( 0x0105, NtWow64ReadVirtualMemory64, 28 ) \
--    SYSCALL_ENTRY( 0x0106, NtWow64WriteVirtualMemory64, 28 )
-+    SYSCALL_ENTRY( 0x0106, NtWow64WriteVirtualMemory64, 28 ) \
-+    SYSCALL_ENTRY( 0x0107, wine_nt_to_unix_file_name, 16 )
+@@ -264,7 +264,8 @@
+     SYSCALL_ENTRY( 0x0104, NtWow64IsProcessorFeaturePresent, 4 ) \
+     SYSCALL_ENTRY( 0x0105, NtWow64QueryInformationProcess64, 20 ) \
+     SYSCALL_ENTRY( 0x0106, NtWow64ReadVirtualMemory64, 28 ) \
+-    SYSCALL_ENTRY( 0x0107, NtWow64WriteVirtualMemory64, 28 )
++    SYSCALL_ENTRY( 0x0107, NtWow64WriteVirtualMemory64, 28 ) \
++    SYSCALL_ENTRY( 0x0108, wine_nt_to_unix_file_name, 16 )
  #ifdef _WIN64
  #define ALL_SYSCALLS \
      SYSCALL_ENTRY( 0x0000, NtAccessCheck, 64 ) \
 @@ -492,7 +493,8 @@
-     SYSCALL_ENTRY( 0x00fd, NtUnmapViewOfSectionEx, 24 ) \
-     SYSCALL_ENTRY( 0x00fe, NtWaitForAlertByThreadId, 16 ) \
-     SYSCALL_ENTRY( 0x00ff, NtWaitForDebugEvent, 32 ) \
--    SYSCALL_ENTRY( 0x0100, NtWaitForKeyedEvent, 32 )
-+    SYSCALL_ENTRY( 0x0100, NtWaitForKeyedEvent, 32 ) \
-+    SYSCALL_ENTRY( 0x0101, wine_nt_to_unix_file_name, 32 )
+     SYSCALL_ENTRY( 0x00fe, NtUnmapViewOfSectionEx, 24 ) \
+     SYSCALL_ENTRY( 0x00ff, NtWaitForAlertByThreadId, 16 ) \
+     SYSCALL_ENTRY( 0x0100, NtWaitForDebugEvent, 32 ) \
+-    SYSCALL_ENTRY( 0x0101, NtWaitForKeyedEvent, 32 )
++    SYSCALL_ENTRY( 0x0101, NtWaitForKeyedEvent, 32 ) \
++    SYSCALL_ENTRY( 0x0102, wine_nt_to_unix_file_name, 32 )
  #else
  #define ALL_SYSCALLS ALL_SYSCALLS32
  #endif
@@ -86,7 +86,7 @@
 +    UNICODE_STRING nt_name;
 +    OBJECT_ATTRIBUTES new_attr = *attr;
 +
-+    status = get_nt_and_unix_names( &new_attr, &nt_name, &buffer, disposition );
++    status = get_nt_and_unix_names( &new_attr, &nt_name, &buffer, disposition, FALSE );
 +    if (!status || status == STATUS_NO_SUCH_FILE)
 +    {
 +        struct stat st1, st2;

[shaumux]

@LinLo Maybe create a pull request?