wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 842b38e29166a429d59331be40761335807c85d2.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-12-05 10:25:39 +11:00
parent e002d94a8b
commit 7be9c41c35
10 changed files with 40 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 85c9586902b2f1d197e0d6dcbde53a36b7803092 Mon Sep 17 00:00:00 2001
From cacb65b29f688766745372653bd406116e87ee87 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 0eac7fdb939..36c1a467562 100644
index 4ededa838b4..b0c4853ca48 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -4181,6 +4181,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
@@ -4109,6 +4109,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
return TRUE;
}
@@ -20,16 +20,16 @@ index 0eac7fdb939..36c1a467562 100644
/***********************************************************************
* restart_winevdm
@@ -4217,7 +4218,7 @@ static NTSTATUS process_init(void)
's','y','s','t','e','m','3','2','\\',
'k','e','r','n','e','l','3','2','.','d','l','l',0};
@@ -4139,7 +4140,7 @@ static void restart_winevdm( RTL_USER_PROCESS_PARAMETERS *params )
static NTSTATUS process_init(void)
{
RTL_USER_PROCESS_PARAMETERS *params;
- WINE_MODREF *wm;
+ WINE_MODREF *wm, *wow64cpu_wm;
NTSTATUS status;
ANSI_STRING func_name;
UNICODE_STRING nt_name;
@@ -4282,6 +4283,13 @@ static NTSTATUS process_init(void)
@@ -4201,6 +4202,13 @@ static NTSTATUS process_init(void)
MESSAGE( "wine: could not load kernel32.dll, status %x\n", status );
NtTerminateProcess( GetCurrentProcess(), status );
}
@@ -44,10 +44,10 @@ index 0eac7fdb939..36c1a467562 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 c0e9c681e1d..e343e66f4af 100644
index aa34fdf04d9..34cdeaa1479 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1124,6 +1124,7 @@
@@ -1130,6 +1130,7 @@
@ stdcall WinSqmIsOptedIn()
@ stdcall WinSqmSetDWORD(ptr long long)
@ stdcall WinSqmStartSession(ptr long long)
@@ -56,5 +56,5 @@ index c0e9c681e1d..e343e66f4af 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.28.0
2.29.2