From 806bbc0198cd272a6668ec5b58c070713bdb3993 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 25 Feb 2021 21:40:19 -0600 Subject: [PATCH] wow64cpu-Wow64Transition: Fix rebase. --- ...a-stub-implementation-of-Wow64Transition.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch b/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch index 89c3a3bf..9af92159 100644 --- a/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch +++ b/patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch @@ -1,15 +1,15 @@ -From d80c6ce49b338776bf1359c78f19b175477ea85c Mon Sep 17 00:00:00 2001 +From b692b26c6e1907d8e72c19a30463b258f18c5f30 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Wed, 8 Aug 2018 20:00:15 -0500 Subject: [PATCH] ntdll: Add a stub implementation of Wow64Transition. --- - dlls/ntdll/loader.c | 10 +++++++++- + dlls/ntdll/loader.c | 11 ++++++++++- dlls/ntdll/ntdll.spec | 1 + - 2 files changed, 10 insertions(+), 1 deletion(-) + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 8dbbb14f05d..7b404783064 100644 +index 8dbbb14f05d..1fc49fa580f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3935,6 +3935,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) @@ -20,7 +20,7 @@ index 8dbbb14f05d..7b404783064 100644 /*********************************************************************** * restart_winevdm -@@ -3965,7 +3966,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params ) +@@ -3965,9 +3966,10 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params ) static NTSTATUS process_init(void) { RTL_USER_PROCESS_PARAMETERS *params; @@ -28,8 +28,11 @@ index 8dbbb14f05d..7b404783064 100644 + WINE_MODREF *wm, *wow64cpu_wm; NTSTATUS status; ANSI_STRING func_name; ++ UNICODE_STRING nt_name; INITIAL_TEB stack; -@@ -4074,6 +4075,13 @@ static NTSTATUS process_init(void) + TEB *teb = NtCurrentTeb(); + PEB *peb = teb->Peb; +@@ -4074,6 +4076,13 @@ static NTSTATUS process_init(void) MESSAGE( "wine: could not load kernel32.dll, status %x\n", status ); NtTerminateProcess( GetCurrentProcess(), status ); }