wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against fdac39f697e049ead215b164bfe6953269ffa7be.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-09-20 18:29:20 +02:00
parent 8859da7cbd
commit 3b068197d3
10 changed files with 149 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch
View File

@@ -1,4 +1,4 @@
From bf996fd4928c50ce68bd266cff147cc3d52a178c Mon Sep 17 00:00:00 2001
From e6812e345ddbfdf41222de31025661cc7c66c747 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 7 Sep 2017 00:38:09 +0200
Subject: tools/winebuild: Add syscall thunks for 64 bit.
@@ -13,10 +13,10 @@ Subject: tools/winebuild: Add syscall thunks for 64 bit.
6 files changed, 224 insertions(+), 10 deletions(-)
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index 5ac99e0c1ec..20e9868ac31 100644
index 57b2b08aeca..1a47abe5a4f 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -898,7 +898,7 @@ static void test_Loader(void)
@@ -858,7 +858,7 @@ static void test_Loader(void)
static void test_FakeDLL(void)
{
@@ -25,7 +25,7 @@ index 5ac99e0c1ec..20e9868ac31 100644
NTSTATUS (WINAPI *pNtSetEvent)(HANDLE, ULONG *) = NULL;
IMAGE_EXPORT_DIRECTORY *dir;
HMODULE module = GetModuleHandleA("ntdll.dll");
@@ -940,8 +940,13 @@ static void test_FakeDLL(void)
@@ -900,8 +900,13 @@ static void test_FakeDLL(void)
dll_func = (BYTE *)GetProcAddress(module, func_name);
ok(dll_func != NULL, "%s: GetProcAddress returned NULL\n", func_name);
@@ -40,7 +40,7 @@ index 5ac99e0c1ec..20e9868ac31 100644
todo_wine ok(0, "%s: Export is a stub-function, skipping\n", func_name);
continue;
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 07dbfc71210..1c5ab158a3a 100644
index a74825c3c36..83bcd4d46f7 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -326,6 +326,8 @@ static inline struct amd64_thread_data *amd64_thread_data(void)
@@ -52,7 +52,7 @@ index 07dbfc71210..1c5ab158a3a 100644
/***********************************************************************
* Dynamic unwind table
*/
@@ -2971,6 +2973,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
@@ -2973,6 +2975,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
{
(*teb)->Tib.Self = &(*teb)->Tib;
(*teb)->Tib.ExceptionList = (void *)~0UL;
@@ -61,7 +61,7 @@ index 07dbfc71210..1c5ab158a3a 100644
return status;
}
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index fb31a351d19..d4bbae1896e 100644
index 86e5047facb..8b9df0cc7c0 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -55,6 +55,8 @@ static struct _KUSER_SHARED_DATA user_shared_data_internal;
@@ -71,8 +71,8 @@ index fb31a351d19..d4bbae1896e 100644
+extern void DECLSPEC_NORETURN __wine_syscall_dispatcher( void );
+
PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL;
LPTHREAD_START_ROUTINE kernel32_start_process = NULL;
/* info passed to a starting thread */
@@ -84,7 +86,6 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug =
};
static RTL_CRITICAL_SECTION peb_lock = { &critsect_debug, -1, 0, 0, 0, 0 };
@@ -81,7 +81,7 @@ index fb31a351d19..d4bbae1896e 100644
BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck,
LARGE_INTEGER *kernel, LARGE_INTEGER *user)
{
@@ -491,6 +492,10 @@ HANDLE thread_init(void)
@@ -490,6 +491,10 @@ HANDLE thread_init(void)
InitializeListHead( &ldr.InInitializationOrderModuleList );
*(ULONG_PTR *)peb->Reserved = get_image_addr();
@@ -93,10 +93,10 @@ index fb31a351d19..d4bbae1896e 100644
* Starting with Vista, the first user to log on has session id 1.
* Session id 0 is for processes that don't interact with the user (like services).
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 5f37dc978ba..ab1f9c548f1 100644
index 0a64ea4a73b..e2ae56df427 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -450,7 +450,11 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr )
@@ -455,7 +455,11 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr )
sec->SizeOfRawData = data_start - code_start;
sec->Misc.VirtualSize = sec->SizeOfRawData;
sec->VirtualAddress = code_start;