From 5eb920dd8366d360e56513317ea4e42478aae99a Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 3 Dec 2020 10:02:16 +1100
Subject: [PATCH] Rebase against e4fbae832c868e9fcf5a91c58255fe3f4ea1cb30.

---
 ...-kernel32-Implement-SetProcessDEPPolicy.patch | 16 ++++++++--------
 patches/patchinstall.sh                          |  2 +-
 staging/upstream-commit                          |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch b/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch
index c67fc012..463aaafe 100644
--- a/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch
+++ b/patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch
@@ -1,4 +1,4 @@
-From 9a269d58ea099e115857ffe72700fdb7d5948ad5 Mon Sep 17 00:00:00 2001
+From 2543348eb9a6d0ab4cdac725d240b16e0648dce7 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, 32 insertions(+), 4 deletions(-)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index ff4e79ff2b7..5c25920ba5b 100644
+index ec37b66621f..cb15823c864 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -68,6 +68,8 @@ typedef struct
+@@ -49,6 +49,8 @@ typedef struct
      DWORD dwReserved;
  } LOADPARMS32;
  
 +static BOOL is_wow64;
 +
- HMODULE kernel32_handle = 0;
  SYSTEM_BASIC_INFORMATION system_info = { 0 };
  
-@@ -83,6 +85,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s',
+ /* Process flags */
+@@ -59,6 +61,7 @@ SYSTEM_BASIC_INFORMATION system_info = { 0 };
  #define PDB32_FILE_APIS_OEM 0x0040  /* File APIs are OEM */
  #define PDB32_WIN32S_PROC   0x8000  /* Win32s process */
  
@@ -28,7 +28,7 @@ index ff4e79ff2b7..5c25920ba5b 100644
  
  /***********************************************************************
   *           wait_input_idle
-@@ -201,7 +204,6 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
+@@ -177,7 +180,6 @@ DWORD WINAPI LoadModule( LPCSTR name, LPVOID paramBlock )
      return ret;
  }
  
@@ -36,7 +36,7 @@ index ff4e79ff2b7..5c25920ba5b 100644
  /***********************************************************************
   *           ExitProcess   (KERNEL32.@)
   *
-@@ -586,9 +588,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
+@@ -562,9 +564,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
   */
  BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
  {
@@ -76,5 +76,5 @@ index ff4e79ff2b7..5c25920ba5b 100644
  
  /**********************************************************************
 -- 
-2.28.0
+2.29.2
 
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 669874c7..72a70a45 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "447924a6d68f7919bd451661314a52aa99cab709"
+	echo "e4fbae832c868e9fcf5a91c58255fe3f4ea1cb30"
 }
 
 # Show version information
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 9b08b440..20e7e7fe 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-447924a6d68f7919bd451661314a52aa99cab709
+e4fbae832c868e9fcf5a91c58255fe3f4ea1cb30