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

Browse Source
This commit is contained in:
Zebediah Figura
2019-12-09 21:29:30 -06:00
parent 62c069eb9f
commit 3e6d6e3909
8 changed files with 76 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch
View File

@@ -1,4 +1,4 @@
From 63db3d2aef606a1c197dac103510479391044f84 Mon Sep 17 00:00:00 2001
From 2399eb182bc12b6643953d9182c1c89ba42fcce3 Mon Sep 17 00:00:00 2001
From: "Olivier F. R. Dierick" <o.dierick@piezo-forte.be>
Date: Tue, 19 Apr 2016 07:25:39 +0200
Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
@@ -8,10 +8,10 @@ Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
1 file changed, 33 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 4ec6ebc415b..70c5b33f14c 100644
index e5e51a93d..e582c6d5b 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -71,6 +71,8 @@ typedef struct
@@ -70,6 +70,8 @@ typedef struct
DWORD dwReserved;
} LOADPARMS32;
@@ -20,7 +20,7 @@ index 4ec6ebc415b..70c5b33f14c 100644
HMODULE kernel32_handle = 0;
SYSTEM_BASIC_INFORMATION system_info = { 0 };
@@ -86,6 +88,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s',
@@ -85,6 +87,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s',
#define PDB32_FILE_APIS_OEM 0x0040 /* File APIs are OEM */
#define PDB32_WIN32S_PROC 0x8000 /* Win32s process */
@@ -28,15 +28,15 @@ index 4ec6ebc415b..70c5b33f14c 100644
#ifdef __i386__
extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry );
@@ -188,6 +191,7 @@ void * CDECL __wine_kernel_init(void)
@@ -171,6 +174,7 @@ void * CDECL __wine_kernel_init(void)
static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0};
kernel32_handle = GetModuleHandleW(kernel32W);
+ IsWow64Process( GetCurrentProcess(), &is_wow64 );
RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter );
LOCALE_Init();
@@ -890,9 +894,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
return start_process_wrapper;
@@ -871,9 +875,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
*/
BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
{
@@ -76,5 +76,5 @@ index 4ec6ebc415b..70c5b33f14c 100644
/**********************************************************************
--
2.17.1
2.24.0