Rebase against 34ed1e37da1e1c1cfd641f1f16b0e00030cbb357.

This commit is contained in:
Zebediah Figura
2019-11-11 19:53:15 -06:00
parent ca018c8079
commit 8148194353
6 changed files with 37 additions and 57 deletions

View File

@@ -1,4 +1,4 @@
From d14d9f0265a8adb9bbcb6eb3b0e76b6c88655218 Mon Sep 17 00:00:00 2001
From 31df1334957af47dd6e3049ad10c63a0e2210005 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,19 +8,19 @@ Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 992437047..e10bfd95a 100644
index b9c277aac..1255732eb 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',
@@ -104,6 +104,8 @@ static WCHAR winevdm[] = {'C',':','\\','w','i','n','d','o','w','s',
static const char * const cpu_names[] = { "x86", "x86_64", "PowerPC", "ARM", "ARM64" };
+static DEP_SYSTEM_POLICY_TYPE system_DEP_policy = OptIn;
+
static void exec_process( LPCWSTR name );
/* return values for get_binary_info */
@@ -3919,9 +3921,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
enum binary_type
{
@@ -2595,9 +2597,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
*/
BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
{
@@ -60,5 +60,5 @@ index 992437047..e10bfd95a 100644
/**********************************************************************
--
2.22.0
2.23.0