Rebase against 95be042be3f116db38eb4a255c2667a6b46fcc1e

This commit is contained in:
Alistair Leslie-Hughes 2019-07-02 08:32:28 +10:00
parent 53dad92c83
commit c08046e1cc
2 changed files with 8 additions and 8 deletions

View File

@ -1,25 +1,25 @@
From 9e92b5b796193d5de1c342576df7ecc07bc09c7d Mon Sep 17 00:00:00 2001
From c2299b57da38098badb711e54f9baf9d8e1c1241 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 2/3] kernel32: Implement GetSystemDEPPolicy().
Subject: [PATCH] kernel32: Implement GetSystemDEPPolicy().
---
dlls/kernel32/process.c | 70 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 68 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 7a89207388..6bf31516ca 100644
index 185278740e4..503a9797b59 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -56,6 +56,7 @@
#define WIN32_NO_STATUS
#include "winternl.h"
@@ -58,6 +58,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"
@@ -4369,8 +4370,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
@@ -4399,8 +4400,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
*/
DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
{

View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1"
echo "95be042be3f116db38eb4a255c2667a6b46fcc1e"
}
# Show version information