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 626162f7db979360d231698ab1288cda97940bb9

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-12-11 09:43:03 +11:00
parent b011002d55
commit dc9fa12a14
6 changed files with 47 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,18 +1,18 @@
From 47b34421517920aee7eecd87cc32c4d9a7457cfc Mon Sep 17 00:00:00 2001
From b291e0c2c119d24b4a5119604d84bd62023a5c71 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 | 11 ++++++++++-
dlls/ntdll/loader.c | 12 +++++++++++-
dlls/ntdll/ntdll.spec | 1 +
2 files changed, 11 insertions(+), 1 deletion(-)
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index c2810d50b..1da6b2934 100644
index 5e4ef0f2b8d..13a9b6b8707 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -4249,18 +4249,20 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
@@ -4441,18 +4441,20 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
return TRUE;
}
@@ -34,7 +34,7 @@ index c2810d50b..1da6b2934 100644
NTSTATUS status;
ANSI_STRING func_name;
UNICODE_STRING nt_name;
@@ -4299,6 +4301,13 @@ void __wine_process_init(void)
@@ -4498,7 +4500,15 @@ void __wine_process_init(void)
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
exit(1);
}
@@ -45,14 +45,16 @@ index c2810d50b..1da6b2934 100644
+ else
+ WARN( "could not load wow64cpu.dll, status %#x\n", status );
+
RtlInitAnsiString( &func_name, "__wine_kernel_init" );
RtlInitAnsiString( &func_name, "__wine_start_process" );
+
if ((status = LdrGetProcedureAddress( wm->ldr.BaseAddress, &func_name,
0, (void **)&init_func )) != STATUS_SUCCESS)
0, (void **)&kernel32_start_process )) != STATUS_SUCCESS)
{
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 5057e2b07..b7a502c62 100644
index bb634af5e46..44bbdcefb2a 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1085,6 +1085,7 @@
@@ -1090,6 +1090,7 @@
@ stdcall WinSqmIsOptedIn()
@ stdcall WinSqmSetDWORD(ptr long long)
@ stdcall WinSqmStartSession(ptr long long)
@@ -61,5 +63,5 @@ index 5057e2b07..b7a502c62 100644
@ 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.23.0
2.17.1