You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 00a0e2cd8c4df240371ddd22516e4e3544a142ce.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 9d11c18b9b5a40114d28445a01347950de0d7df2 Mon Sep 17 00:00:00 2001
|
||||
From 9a269d58ea099e115857ffe72700fdb7d5948ad5 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, 32 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
|
||||
index 71d6800f547..5423adced3c 100644
|
||||
index ff4e79ff2b7..5c25920ba5b 100644
|
||||
--- a/dlls/kernel32/process.c
|
||||
+++ b/dlls/kernel32/process.c
|
||||
@@ -71,6 +71,8 @@ typedef struct
|
||||
@@ -68,6 +68,8 @@ typedef struct
|
||||
DWORD dwReserved;
|
||||
} LOADPARMS32;
|
||||
|
||||
@@ -20,23 +20,23 @@ index 71d6800f547..5423adced3c 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',
|
||||
@@ -83,6 +85,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 */
|
||||
|
||||
+static DEP_SYSTEM_POLICY_TYPE system_DEP_policy = OptIn;
|
||||
|
||||
#ifdef __i386__
|
||||
extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry );
|
||||
@@ -177,7 +180,6 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
|
||||
abort(); /* should not be reached */
|
||||
/***********************************************************************
|
||||
* wait_input_idle
|
||||
@@ -201,7 +204,6 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
|
||||
return ret;
|
||||
}
|
||||
|
||||
-
|
||||
/***********************************************************************
|
||||
* wait_input_idle
|
||||
* ExitProcess (KERNEL32.@)
|
||||
*
|
||||
@@ -872,9 +874,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
|
||||
@@ -586,9 +588,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
|
||||
*/
|
||||
BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
|
||||
{
|
||||
@@ -76,5 +76,5 @@ index 71d6800f547..5423adced3c 100644
|
||||
|
||||
/**********************************************************************
|
||||
--
|
||||
2.17.1
|
||||
2.28.0
|
||||
|
||||
|
Reference in New Issue
Block a user