diff --git a/patches/kernel32-SetProcessDEPPolicy/0002-kernel32-Implement-GetSystemDEPPolicy.patch b/patches/kernel32-SetProcessDEPPolicy/0002-kernel32-Implement-GetSystemDEPPolicy.patch index 70a580d6..9531f18c 100644 --- a/patches/kernel32-SetProcessDEPPolicy/0002-kernel32-Implement-GetSystemDEPPolicy.patch +++ b/patches/kernel32-SetProcessDEPPolicy/0002-kernel32-Implement-GetSystemDEPPolicy.patch @@ -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" 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) { diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 2386e115..ae0852b2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "90a1e5d943724f8cb5e51fe806cb38ce6c98c4c1" + echo "95be042be3f116db38eb4a255c2667a6b46fcc1e" } # Show version information