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

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

@@ -1,17 +1,17 @@
From 2399eb182bc12b6643953d9182c1c89ba42fcce3 Mon Sep 17 00:00:00 2001
From 9d11c18b9b5a40114d28445a01347950de0d7df2 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().
---
dlls/kernel32/process.c | 36 +++++++++++++++++++++++++++++++++---
1 file changed, 33 insertions(+), 3 deletions(-)
dlls/kernel32/process.c | 36 ++++++++++++++++++++++++++++++++----
1 file changed, 32 insertions(+), 4 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index e5e51a93d..e582c6d5b 100644
index 71d6800f547..5423adced3c 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -70,6 +70,8 @@ typedef struct
@@ -71,6 +71,8 @@ typedef struct
DWORD dwReserved;
} LOADPARMS32;
@@ -20,7 +20,7 @@ index e5e51a93d..e582c6d5b 100644
HMODULE kernel32_handle = 0;
SYSTEM_BASIC_INFORMATION system_info = { 0 };
@@ -85,6 +87,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s',
@@ -86,6 +88,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 e5e51a93d..e582c6d5b 100644
#ifdef __i386__
extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry );
@@ -171,6 +174,7 @@ void * CDECL __wine_kernel_init(void)
static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0};
@@ -177,7 +180,6 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
abort(); /* should not be reached */
}
kernel32_handle = GetModuleHandleW(kernel32W);
+ IsWow64Process( GetCurrentProcess(), &is_wow64 );
RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter );
return start_process_wrapper;
@@ -871,9 +875,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
-
/***********************************************************************
* wait_input_idle
*
@@ -872,9 +874,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
*/
BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
{
@@ -76,5 +76,5 @@ index e5e51a93d..e582c6d5b 100644
/**********************************************************************
--
2.24.0
2.17.1