Rebase against dfa4c07941322dbcad54507cd0acf271a6c719ab.

patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch

@@ -1,4 +1,4 @@
-From ce7b43fafe87ec364bb98415dac1283fe611ead0 Mon Sep 17 00:00:00 2001
+From 658a24832ee3e9a04a311600fd00b91b6d5cfb5f Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 01:06:26 +0200
 Subject: [PATCH] ntdll: Add dummy apiset to PEB.
@@ -12,7 +12,7 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
  create mode 100644 include/apiset.h
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index a6cfbb675eb..1354997f2e3 100644
+index c7da728964c..addc5e0adfc 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
 @@ -169,6 +169,7 @@ static RTL_CRITICAL_SECTION peb_lock = { &peb_critsect_debug, -1, 0, 0, 0, 0 };
@@ -23,7 +23,7 @@ index a6cfbb675eb..1354997f2e3 100644
  
  static WINE_MODREF *cached_modref;
  static WINE_MODREF *current_modref;
-@@ -4019,6 +4020,7 @@ static NTSTATUS process_init(void)
+@@ -4025,6 +4026,7 @@ static NTSTATUS process_init(void)
  
      peb->LdrData            = &ldr;
      peb->FastPebLock        = &peb_lock;
@@ -32,7 +32,7 @@ index a6cfbb675eb..1354997f2e3 100644
      peb->TlsExpansionBitmap = &tls_expansion_bitmap;
      peb->LoaderLock         = &loader_section;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 9ea8416211d..d52c0adf309 100644
+index 87cc175739b..ff9f0f692d9 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
 @@ -15,6 +15,7 @@ SOURCES = \
@@ -87,7 +87,7 @@ index 00000000000..6801cd5f509
 +
 +#endif
 diff --git a/include/winternl.h b/include/winternl.h
-index 89ea58c2d93..5723e0b3b7a 100644
+index cff261b6d7c..ca7a85d9578 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
 @@ -23,6 +23,7 @@
@@ -98,10 +98,10 @@ index 89ea58c2d93..5723e0b3b7a 100644
  
  #ifdef __cplusplus
  extern "C" {
-@@ -315,7 +316,7 @@ typedef struct _PEB
-     ULONG                        EnvironmentUpdateCount;            /* 028/050 */
+@@ -316,7 +317,7 @@ typedef struct _PEB
      PVOID                        KernelCallbackTable;               /* 02c/058 */
-     ULONG                        Reserved[2];                       /* 030/060 */
+     ULONG                        Reserved;                          /* 030/060 */
+     ULONG                        AtlThunkSListPtr32;                /* 034/064 */
 -    PVOID /*PPEB_FREE_BLOCK*/    FreeList;                          /* 038/068 */
 +    PAPI_SET_NAMESPACE_ARRAY     ApiSetMap;                         /* 038/068 */
      ULONG                        TlsExpansionCounter;               /* 03c/070 */

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "03eaa2cc93e5e2ea4c36495870c268797aea3ca8"
+	echo "dfa4c07941322dbcad54507cd0acf271a6c719ab"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-03eaa2cc93e5e2ea4c36495870c268797aea3ca8
+dfa4c07941322dbcad54507cd0acf271a6c719ab