From 01a9cda4615ac08a2877c940c0700c3f01247fb6 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 20 Jun 2018 21:52:32 -0500 Subject: [PATCH] Revert "winebuild-Fake_Dlls: Reorder some lines to avoid collision with ntdll-User_Shared_Data." This reverts commit b27ebc675ac29095aebae56d967ab1b1dcc930a9. --- ...ebuild-Add-syscall-thunks-for-64-bit.patch | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch b/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch index e6f37835..9bbe53dc 100644 --- a/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch +++ b/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch @@ -1,4 +1,4 @@ -From b8b9396c2aa6701b4c42564abfdb7d3b9241e16b Mon Sep 17 00:00:00 2001 +From 57bc2f7968034641df20e843a9b26014153202f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 7 Sep 2017 00:38:09 +0200 Subject: tools/winebuild: Add syscall thunks for 64 bit. @@ -61,27 +61,27 @@ index 0d25360..bb344bb 100644 return status; } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index cc61659..0fbf25b 100644 +index 59d64e1..84e9e45 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c -@@ -63,6 +63,8 @@ static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s' - PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; - void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; +@@ -55,6 +55,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); + struct _KUSER_SHARED_DATA *user_shared_data = NULL; + static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; +extern void DECLSPEC_NORETURN __wine_syscall_dispatcher( void ); + - /* info passed to a starting thread */ - struct startup_info - { -@@ -558,6 +560,8 @@ HANDLE thread_init(void) + PUNHANDLED_EXCEPTION_FILTER unhandled_exception_filter = NULL; + void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; - NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); +@@ -401,6 +403,8 @@ HANDLE thread_init(void) + user_shared_data->TickCountLowDeprecated = user_shared_data->u.TickCount.LowPart; + user_shared_data->TickCountMultiplier = 1 << 24; + *((void **)&user_shared_data->SystemCall) = __wine_syscall_dispatcher; + - return exe_file; - } + fill_cpu_info(); + NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 0a64ea4..e2ae56d 100644 --- a/libs/wine/loader.c