mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
70 lines
2.8 KiB
Diff
70 lines
2.8 KiB
Diff
From 503f898967ffdf8e3b7eff12faf2adf4f2fc4a25 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.
|
|
|
|
---
|
|
dlls/ntdll/loader.c | 12 +++++++++++-
|
|
dlls/ntdll/ntdll.spec | 1 +
|
|
2 files changed, 12 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
|
|
index 3586bd44d96..1f74b029cac 100644
|
|
--- a/dlls/ntdll/loader.c
|
|
+++ b/dlls/ntdll/loader.c
|
|
@@ -4418,12 +4418,14 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
|
|
return TRUE;
|
|
}
|
|
|
|
+void *Wow64Transition;
|
|
|
|
/***********************************************************************
|
|
* __wine_process_init
|
|
*/
|
|
void __wine_process_init(void)
|
|
{
|
|
+ static const WCHAR wow64cpuW[] = {'w','o','w','6','4','c','p','u','.','d','l','l',0};
|
|
static const WCHAR ntdllW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\',
|
|
's','y','s','t','e','m','3','2','\\',
|
|
'n','t','d','l','l','.','d','l','l',0};
|
|
@@ -4432,7 +4434,7 @@ void __wine_process_init(void)
|
|
'k','e','r','n','e','l','3','2','.','d','l','l',0};
|
|
RTL_USER_PROCESS_PARAMETERS *params;
|
|
ACTIVATION_CONTEXT_RUN_LEVEL_INFORMATION runlevel;
|
|
- WINE_MODREF *wm;
|
|
+ WINE_MODREF *wm, *wow64cpu_wm;
|
|
NTSTATUS status;
|
|
ANSI_STRING func_name;
|
|
UNICODE_STRING nt_name;
|
|
@@ -4480,7 +4482,15 @@ void __wine_process_init(void)
|
|
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
|
|
exit(1);
|
|
}
|
|
+
|
|
+ RtlInitUnicodeString( &nt_name, wow64cpuW );
|
|
+ if ((status = load_builtin_dll( NULL, &nt_name, 0, 0, &wow64cpu_wm )) == STATUS_SUCCESS)
|
|
+ Wow64Transition = wow64cpu_wm->ldr.BaseAddress;
|
|
+ else
|
|
+ WARN( "could not load wow64cpu.dll, status %#x\n", status );
|
|
+
|
|
RtlInitAnsiString( &func_name, "__wine_start_process" );
|
|
+
|
|
if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name,
|
|
0, (void **)&kernel32_start_process )) != STATUS_SUCCESS)
|
|
{
|
|
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
|
index 39a2407e5bd..dc70320653b 100644
|
|
--- a/dlls/ntdll/ntdll.spec
|
|
+++ b/dlls/ntdll/ntdll.spec
|
|
@@ -1100,6 +1100,7 @@
|
|
@ stdcall WinSqmIsOptedIn()
|
|
@ stdcall WinSqmSetDWORD(ptr long long)
|
|
@ stdcall WinSqmStartSession(ptr long long)
|
|
+@ extern Wow64Transition
|
|
@ stdcall -private ZwAcceptConnectPort(ptr long ptr long ptr ptr) NtAcceptConnectPort
|
|
@ stdcall -private ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck
|
|
@ stdcall -private ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm
|
|
--
|
|
2.25.1
|
|
|