Rebase against 87733a69f7448d25539cbc4fc37d2e93466f38de.

This commit is contained in:
Alistair Leslie-Hughes
2020-05-27 10:10:56 +10:00
parent 8be56c21f9
commit f3298432f0
11 changed files with 109 additions and 227 deletions

View File

@@ -1,4 +1,4 @@
From c2299b57da38098badb711e54f9baf9d8e1c1241 Mon Sep 17 00:00:00 2001
From e31513df269b2ba58f0dc11cc5494b9db1e05cd4 Mon Sep 17 00:00:00 2001
From: "Olivier F. R. Dierick" <o.dierick@piezo-forte.be>
Date: Tue, 19 Apr 2016 07:33:32 +0200
Subject: [PATCH] kernel32: Implement GetSystemDEPPolicy().
@@ -8,18 +8,18 @@ Subject: [PATCH] kernel32: Implement GetSystemDEPPolicy().
1 file changed, 68 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 185278740e4..503a9797b59 100644
index cf97affd6faf..78f80c5210f0 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -58,6 +58,7 @@
@@ -51,6 +51,7 @@
#include "winbase.h"
#include "wincon.h"
#include "kernel_private.h"
+#include "winreg.h"
#include "psapi.h"
#include "wine/exception.h"
#include "wine/library.h"
@@ -4399,8 +4400,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
#include "wine/server.h"
@@ -671,8 +672,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
*/
DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
{
@@ -96,5 +96,5 @@ index 185278740e4..503a9797b59 100644
/**********************************************************************
--
2.17.1
2.26.2