Rebase against 5e8ded1646579a597c029531f2612930b17c7627.

This commit is contained in:
Zebediah Figura
2019-08-09 19:54:43 -05:00
parent f901156486
commit 49b441e0df
5 changed files with 44 additions and 29 deletions

View File

@@ -1,14 +1,14 @@
From 71cb9b2d7c41098881516a2b8f5db2f17f84dca6 Mon Sep 17 00:00:00 2001
From d14d9f0265a8adb9bbcb6eb3b0e76b6c88655218 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 1/3] kernel32: Implement SetProcessDEPPolicy().
Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
---
dlls/kernel32/process.c | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 0d0de93eee..7a89207388 100644
index 992437047..e10bfd95a 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -114,6 +114,8 @@ static WCHAR winevdm[] = {'C',':','\\','w','i','n','d','o','w','s',
@@ -19,8 +19,8 @@ index 0d0de93eee..7a89207388 100644
+
static void exec_process( LPCWSTR name );
extern void SHELL_LoadRegistry(void);
@@ -4376,9 +4378,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
/* return values for get_binary_info */
@@ -3919,9 +3921,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
*/
BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
{
@@ -60,5 +60,5 @@ index 0d0de93eee..7a89207388 100644
/**********************************************************************
--
2.17.1
2.22.0