Rebase against 17529582402ebe27ef975fc7dcb8353f4f95e629.

This commit is contained in:
Zebediah Figura
2020-06-08 15:59:31 -05:00
parent 044cb93066
commit 9a4c8c5631
10 changed files with 156 additions and 336 deletions

View File

@@ -1,4 +1,4 @@
From 20298be5a42af52be27c56f88ad6a8a0304b55b6 Mon Sep 17 00:00:00 2001
From cd04d1910294b035bb3858b3ef1bb295aec3a732 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Mon, 30 Dec 2019 13:27:53 +0300
Subject: [PATCH] ntdll: Support x86_64 syscall emulation.
@@ -15,7 +15,7 @@ is used for trapping syscalls.
3 files changed, 119 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index e3d63ed7501..2fbec4129df 100644
index e61a98455c3..4adeb52d225 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,6 +464,7 @@ AC_CHECK_HEADERS(\
@@ -27,7 +27,7 @@ index e3d63ed7501..2fbec4129df 100644
linux/types.h \
linux/ucdrom.h \
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 0ccc7cbceb6..149ad1bf5e7 100644
index dd8b45fa907..a5612abf2b1 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -24,6 +24,7 @@
@@ -61,8 +61,8 @@ index 0ccc7cbceb6..149ad1bf5e7 100644
typedef struct _SCOPE_TABLE
{
ULONG Count;
@@ -2797,6 +2807,104 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext )
restore_context( &context, ucontext );
@@ -2480,6 +2490,104 @@ static inline DWORD is_privileged_instr( CONTEXT *context )
return 0;
}
+extern unsigned int __wine_nb_syscalls;
@@ -165,8 +165,8 @@ index 0ccc7cbceb6..149ad1bf5e7 100644
+}
/***********************************************************************
* __wine_set_signal_handler (NTDLL.@)
@@ -2842,6 +2950,9 @@ void signal_init_process(void)
* handle_interrupt
@@ -2793,6 +2901,9 @@ void signal_init_process(void)
sig_act.sa_sigaction = trap_handler;
if (sigaction( SIGTRAP, &sig_act, NULL ) == -1) goto error;
#endif