Rebase against 67d1321c2b8eb5d54aa8fbe0807d9052ae56c1ed

patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch

@@ -1,4 +1,4 @@
-From 8ba5167f0ade2bd789e0a1b97263cfe5daad98d7 Mon Sep 17 00:00:00 2001
+From 63db3d2aef606a1c197dac103510479391044f84 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,10 +8,10 @@ Subject: [PATCH] kernel32: Implement SetProcessDEPPolicy().
  1 file changed, 33 insertions(+), 3 deletions(-)
 
 diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
-index f68193c93..ae894c29d 100644
+index 4ec6ebc415b..70c5b33f14c 100644
 --- a/dlls/kernel32/process.c
 +++ b/dlls/kernel32/process.c
-@@ -70,6 +70,8 @@ typedef struct
+@@ -71,6 +71,8 @@ typedef struct
      DWORD dwReserved;
  } LOADPARMS32;
  
@@ -20,23 +20,23 @@ index f68193c93..ae894c29d 100644
  HMODULE kernel32_handle = 0;
  SYSTEM_BASIC_INFORMATION system_info = { 0 };
  
-@@ -85,6 +87,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s',
+@@ -86,6 +88,7 @@ const WCHAR DIR_System[] = {'C',':','\\','w','i','n','d','o','w','s',
  #define PDB32_FILE_APIS_OEM 0x0040  /* File APIs are OEM */
  #define PDB32_WIN32S_PROC   0x8000  /* Win32s process */
  
 +static DEP_SYSTEM_POLICY_TYPE system_DEP_policy = OptIn;
  
- /***********************************************************************
-  *              set_library_argv
-@@ -211,6 +214,7 @@ void * CDECL __wine_kernel_init(void)
-     setbuf(stdout,NULL);
-     setbuf(stderr,NULL);
+ #ifdef __i386__
+ extern DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry );
+@@ -188,6 +191,7 @@ void * CDECL __wine_kernel_init(void)
+     static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2',0};
+ 
      kernel32_handle = GetModuleHandleW(kernel32W);
 +    IsWow64Process( GetCurrentProcess(), &is_wow64 );
      RtlSetUnhandledExceptionFilter( UnhandledExceptionFilter );
  
      LOCALE_Init();
-@@ -917,9 +921,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
+@@ -890,9 +894,35 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
   */
  BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP)
  {
@@ -76,5 +76,5 @@ index f68193c93..ae894c29d 100644
  
  /**********************************************************************
 -- 
-2.23.0
+2.17.1
 

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "5cf64084fb6f277c3453099a65a78817d5c9f1db"
+	echo "67d1321c2b8eb5d54aa8fbe0807d9052ae56c1ed"
 }
 
 # Show version information