Rebase against 35e43ccf1b42e9f67d7765753f0c3ef8cf102c46.

This commit is contained in:
Zebediah Figura
2021-02-25 21:04:11 -06:00
parent 9a7b25dfd2
commit e4debaae9b
7 changed files with 45 additions and 46 deletions

View File

@@ -1,4 +1,4 @@
From 15ea5663924cc00d76617d4691179e205b9ce323 Mon Sep 17 00:00:00 2001
From d80c6ce49b338776bf1359c78f19b175477ea85c Mon Sep 17 00:00:00 2001
From: Zebediah Figura <z.figura12@gmail.com>
Date: Wed, 8 Aug 2018 20:00:15 -0500
Subject: [PATCH] ntdll: Add a stub implementation of Wow64Transition.
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Add a stub implementation of Wow64Transition.
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index abc2c3f828c..645826a61e8 100644
index 8dbbb14f05d..7b404783064 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -3940,6 +3940,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
@@ -3935,6 +3935,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
return TRUE;
}
@@ -20,7 +20,7 @@ index abc2c3f828c..645826a61e8 100644
/***********************************************************************
* restart_winevdm
@@ -3970,7 +3971,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params )
@@ -3965,7 +3966,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params )
static NTSTATUS process_init(void)
{
RTL_USER_PROCESS_PARAMETERS *params;
@@ -28,8 +28,8 @@ index abc2c3f828c..645826a61e8 100644
+ WINE_MODREF *wm, *wow64cpu_wm;
NTSTATUS status;
ANSI_STRING func_name;
UNICODE_STRING nt_name;
@@ -4086,6 +4087,13 @@ static NTSTATUS process_init(void)
INITIAL_TEB stack;
@@ -4074,6 +4075,13 @@ static NTSTATUS process_init(void)
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
NtTerminateProcess( GetCurrentProcess(), status );
}