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 b8719736c5a022fa9c50f64adfc3ef58b40460f2.

Browse Source
This commit is contained in:
Zebediah Figura
2021-02-18 20:16:43 -06:00
parent 811467bf6a
commit aa8a3d90cb
33 changed files with 301 additions and 3157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/wow64cpu-Wow64Transition/0002-ntdll-Add-a-stub-implementation-of-Wow64Transition.patch
View File

@@ -1,4 +1,4 @@
From cacb65b29f688766745372653bd406116e87ee87 Mon Sep 17 00:00:00 2001
From 15ea5663924cc00d76617d4691179e205b9ce323 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 4ededa838b4..b0c4853ca48 100644
index abc2c3f828c..645826a61e8 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -4109,6 +4109,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
@@ -3940,6 +3940,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
return TRUE;
}
@@ -20,7 +20,7 @@ index 4ededa838b4..b0c4853ca48 100644
/***********************************************************************
* restart_winevdm
@@ -4139,7 +4140,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params )
@@ -3970,7 +3971,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params )
static NTSTATUS process_init(void)
{
RTL_USER_PROCESS_PARAMETERS *params;
@@ -29,13 +29,13 @@ index 4ededa838b4..b0c4853ca48 100644
NTSTATUS status;
ANSI_STRING func_name;
UNICODE_STRING nt_name;
@@ -4201,6 +4202,13 @@ static NTSTATUS process_init(void)
@@ -4086,6 +4087,13 @@ static NTSTATUS process_init(void)
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
NtTerminateProcess( GetCurrentProcess(), status );
}
+
+ RtlInitUnicodeString( &nt_name, L"\\??\\C:\\windows\\system32\\wow64cpu.dll" );
+ if ((status = load_builtin_dll( NULL, &nt_name, 0, &wow64cpu_wm )) == STATUS_SUCCESS)
+ if ((status = load_builtin_dll( NULL, &nt_name, 0, &wow64cpu_wm, FALSE )) == STATUS_SUCCESS)
+ Wow64Transition = wow64cpu_wm->ldr.DllBase;
+ else
+ WARN( "could not load wow64cpu.dll, status %#x\n", status );
@@ -44,10 +44,10 @@ index 4ededa838b4..b0c4853ca48 100644
if ((status = LdrGetProcedureAddress( wm->ldr.DllBase, &func_name,
0, (void **)&pBaseThreadInitThunk )) != STATUS_SUCCESS)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index aa34fdf04d9..34cdeaa1479 100644
index 185dd6767eb..4b40e292fad 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1130,6 +1130,7 @@
@@ -1129,6 +1129,7 @@
@ stdcall WinSqmIsOptedIn()
@ stdcall WinSqmSetDWORD(ptr long long)
@ stdcall WinSqmStartSession(ptr long long)
@@ -56,5 +56,5 @@ index aa34fdf04d9..34cdeaa1479 100644
@ stdcall -private -syscall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck
@ stdcall -private -syscall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
--
2.29.2
2.20.1