From 9937bf04635e33efa0d32e6e5af3a2bb55ad8f9c Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sat, 11 Dec 2021 17:41:22 +1100
Subject: [PATCH] Rebase against 533616d23f9832596e41f839356830c7679df930.

---
 ...dll-Support-x86_64-syscall-emulation.patch | 22 +++++++++----------
 patches/patchinstall.sh                       |  2 +-
 staging/upstream-commit                       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch b/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch
index 5469bcb5..014d6a46 100644
--- a/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch
+++ b/patches/ntdll-Syscall_Emulation/0001-ntdll-Support-x86_64-syscall-emulation.patch
@@ -1,4 +1,4 @@
-From 54b37227849cb6e4d214b4a6740d37624e4bb037 Mon Sep 17 00:00:00 2001
+From d7be25a11e01c6f223b39df2fb45cc9f531f6c83 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 14 Jul 2020 15:00:34 +0300
 Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
@@ -10,11 +10,11 @@ Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
  3 files changed, 125 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9af23da03e6..058fea5941d 100644
+index 5a5d88f10b0..7ae43b0c593 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -455,6 +455,7 @@ AC_CHECK_HEADERS(\
- 	linux/joystick.h \
+@@ -448,6 +448,7 @@ AC_CHECK_HEADERS(\
+ 	linux/ioctl.h \
  	linux/major.h \
  	linux/param.h \
 +	linux/seccomp.h \
@@ -22,7 +22,7 @@ index 9af23da03e6..058fea5941d 100644
  	linux/types.h \
  	linux/ucdrom.h \
 diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
-index 4600d079536..f028a855147 100644
+index 06d99545913..9a46b4a50b0 100644
 --- a/dlls/ntdll/unix/signal_x86_64.c
 +++ b/dlls/ntdll/unix/signal_x86_64.c
 @@ -27,11 +27,13 @@
@@ -53,7 +53,7 @@ index 4600d079536..f028a855147 100644
  #define NONAMELESSUNION
  #define NONAMELESSSTRUCT
  #include "ntstatus.h"
-@@ -2422,6 +2431,118 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
+@@ -2432,6 +2441,118 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
      return 0;
  }
  
@@ -172,7 +172,7 @@ index 4600d079536..f028a855147 100644
  
  /***********************************************************************
   *           handle_interrupt
-@@ -3000,6 +3121,7 @@ void signal_init_process(void)
+@@ -3010,6 +3131,7 @@ void signal_init_process(void)
      if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error;
      if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error;
@@ -180,7 +180,7 @@ index 4600d079536..f028a855147 100644
      return;
  
   error:
-@@ -3218,6 +3340,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
+@@ -3228,6 +3350,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher,
                     "leaq 0x28(%rsp),%rsi\n\t"      /* first argument */
                     "movq %rcx,%rsp\n\t"
                     "movq 0x00(%rcx),%rax\n\t"
@@ -189,10 +189,10 @@ index 4600d079536..f028a855147 100644
                     "movl %eax,%ebx\n\t"
                     "shrl $8,%ebx\n\t"
 diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c
-index 104397716f1..5f62210f486 100644
+index c876d51f8e6..37f1465a139 100644
 --- a/tools/winebuild/import.c
 +++ b/tools/winebuild/import.c
-@@ -1410,7 +1410,6 @@ static int cmp_link_name( const void *e1, const void *e2 )
+@@ -1366,7 +1366,6 @@ static int cmp_link_name( const void *e1, const void *e2 )
      return strcmp( odp1->link_name, odp2->link_name );
  }
  
@@ -200,7 +200,7 @@ index 104397716f1..5f62210f486 100644
  /* output the functions for system calls */
  void output_syscalls( DLLSPEC *spec )
  {
-@@ -1468,7 +1467,7 @@ void output_syscalls( DLLSPEC *spec )
+@@ -1424,7 +1423,7 @@ void output_syscalls( DLLSPEC *spec )
               * validate that instruction, we can just put a jmp there instead. */
              output( "\t.byte 0x4c,0x8b,0xd1\n" ); /* movq %rcx,%r10 */
              output( "\t.byte 0xb8\n" );           /* movl $i,%eax */
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 985637b6..e55c1bcf 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "f69d4a865f926aa5c4a9c55cfe4d2dbc10746e5c"
+	echo "533616d23f9832596e41f839356830c7679df930"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index ccdff7bc..7ff5df3f 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-f69d4a865f926aa5c4a9c55cfe4d2dbc10746e5c
+533616d23f9832596e41f839356830c7679df930