wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

ntdll-Syscall_Wrappers: Only enable syscall wrappers on Linux, MacOS needs special linker flags.

Browse Source
This commit is contained in:
Sebastian Lackner 2015-10-19 05:30:18 +02:00
parent 6494429c2f
commit d8cf46384c
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/ntdll-Syscall_Wrappers/0001-ntdll-Use-wrapper-functions-for-syscalls.patch
View File

@ -1,4 +1,4 @@
From 0668a4f55e62578d3c3b9ebd84599b6c0fd0baf0 Mon Sep 17 00:00:00 2001
From 127b83239a2d762d974fcbf6b14a6298c659b7cc Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 16 Oct 2015 02:32:58 +0200
Subject: ntdll: Use wrapper functions for syscalls.
@ -11,7 +11,7 @@ Subject: ntdll: Use wrapper functions for syscalls.
dlls/ntdll/file.c | 75 +++++++++++++++++---------
dlls/ntdll/loader.c | 6 ++-
dlls/ntdll/nt.c | 93 +++++++++++++++++++++-----------
dlls/ntdll/ntdll_misc.h | 15 +++++-
dlls/ntdll/ntdll_misc.h | 17 ++++++
dlls/ntdll/om.c | 39 +++++++++-----
dlls/ntdll/process.c | 15 ++++--
dlls/ntdll/reg.c | 57 +++++++++++++-------
@ -26,7 +26,7 @@ Subject: ntdll: Use wrapper functions for syscalls.
dlls/ntdll/thread.c | 36 ++++++++-----
dlls/ntdll/time.c | 12 +++--
dlls/ntdll/virtual.c | 48 +++++++++++------
22 files changed, 407 insertions(+), 192 deletions(-)
22 files changed, 410 insertions(+), 191 deletions(-)
diff --git a/dlls/ntdll/atom.c b/dlls/ntdll/atom.c
index 304b7f6..222fde9 100644
@ -733,14 +733,14 @@ index 2acaa83..e48e6d4 100644
{
FIXME("(%d, %p, %d, %p, %d, %p), stub\n", command, inbuffer, inbuflength, outbuffer, outbuflength, retlength);
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index cbd19db..a33b1ea 100644
index cbd19db..0f9534a 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -260,7 +260,20 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN;
".byte 0x6a," #args "\n\t" /* pushl $args */ \
"call " __ASM_NAME("__wine_call_from_regs") "\n\t" \
@@ -262,6 +262,23 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN;
"ret $(4*" #args ")" ) /* fake ret to make copy protections happy */
-#endif
#endif
+#if defined(__i386__) && defined(__linux__)
+
+#define SYSCALL( name ) __syscall_ ## name
+#define DEFINE_SYSCALL_ENTRYPOINT( name, args ) \
@ -749,15 +749,17 @@ index cbd19db..a33b1ea 100644
+ "movl $" __ASM_NAME("call_syscall_func") ",%edx\n\t" \
+ "call *%edx\n\t" \
+ "ret $(4*" #args ")" )
+#else /* __i386__ */
+
+#else /* defined(__i386__) && defined(__linux__) */
+
+#define SYSCALL( name ) name
+#define DEFINE_SYSCALL_ENTRYPOINT( name, args ) /* nothing */
+
+#endif /* __i386__ */
+#endif /* defined(__i386__) && defined(__linux__) */
+
#define HASH_STRING_ALGORITHM_DEFAULT 0
#define HASH_STRING_ALGORITHM_X65599 1
#define HASH_STRING_ALGORITHM_INVALID 0xffffffff
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
index 3fadba7..4fd0656 100644
--- a/dlls/ntdll/om.c

15
patches/ntdll-Syscall_Wrappers/0002-ntdll-APCs-should-call-the-implementation-instead-of.patch
View File

@ -1,23 +1,22 @@
From bf52a59d8a964fd0e79c684b61513c0ec5c78ccb Mon Sep 17 00:00:00 2001
From 34347e0af48ce1fb1343b5d975d7fd9faf6ba1ab Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 16 Oct 2015 05:17:26 +0200
Subject: ntdll: APCs should call the implementation instead of the syscall
thunk.
---
dlls/ntdll/ntdll_misc.h | 14 ++++++++++++++
dlls/ntdll/ntdll_misc.h | 13 +++++++++++++
dlls/ntdll/server.c | 18 +++++++++---------
2 files changed, 23 insertions(+), 9 deletions(-)
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index a33b1ea..b63005e 100644
index 0f9534a..620cae8 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -268,6 +268,20 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN;
"movl $" __ASM_NAME("call_syscall_func") ",%edx\n\t" \
@@ -272,6 +272,19 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN;
"call *%edx\n\t" \
"ret $(4*" #args ")" )
+
+#define DECLARE_SYSCALL_ENTRYPOINT( name ) \
+ extern typeof( name ) __syscall_ ## name
+
@ -31,7 +30,7 @@ index a33b1ea..b63005e 100644
+DECLARE_SYSCALL_ENTRYPOINT( NtUnlockVirtualMemory );
+DECLARE_SYSCALL_ENTRYPOINT( NtUnmapViewOfSection );
+
#else /* __i386__ */
#else /* defined(__i386__) && defined(__linux__) */
#define SYSCALL( name ) name
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c