Rebase against 825d5c86415d9e76c92a9d533c00790efe847ae7.

patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch

@@ -1,4 +1,4 @@
-From 959bc50b0ad246420e4f697e28371a3bb99f69f2 Mon Sep 17 00:00:00 2001
+From 634abe5fdb4fcd20f1675324f0adbe9d302c1d56 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 15 Jan 2016 13:01:15 +0100
 Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
@@ -10,7 +10,7 @@ Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
  3 files changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
-index e8f77c73f3..1485512d0e 100644
+index e8f77c73f36..1485512d0ef 100644
 --- a/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
 +++ b/dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
 @@ -1,6 +1,6 @@
@@ -22,7 +22,7 @@ index e8f77c73f3..1485512d0e 100644
  @ stdcall QuirkIsEnabled3(ptr ptr) kernelbase.QuirkIsEnabled3
  @ stub QuirkIsEnabledForPackage
 diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 67003da332..9fba5803b2 100644
+index 75916a4851c..2f04a0a46f9 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -1223,7 +1223,7 @@
@@ -35,7 +35,7 @@ index 67003da332..9fba5803b2 100644
  @ stdcall QuirkIsEnabled3(ptr ptr)
  # @ stub QuirkIsEnabledForPackage
 diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
-index 30cba3f6ca..6673f9b63e 100644
+index ff1b2f67623..f4d7cde8b7d 100644
 --- a/dlls/kernelbase/main.c
 +++ b/dlls/kernelbase/main.c
 @@ -1,4 +1,5 @@
@@ -44,10 +44,11 @@ index 30cba3f6ca..6673f9b63e 100644
   * Copyright 2017 Andrey Gusev
   *
   * This library is free software; you can redistribute it and/or
-@@ -21,6 +22,15 @@
- WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
+@@ -49,6 +50,15 @@ LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadIn
+     return ERROR_SUCCESS;
+ }
  
- /***********************************************************************
++/***********************************************************************
 + *           QuirkIsEnabled   (KERNELBASE.@)
 + */
 +BOOL WINAPI QuirkIsEnabled(void *arg)
@@ -56,10 +57,9 @@ index 30cba3f6ca..6673f9b63e 100644
 +    return FALSE;
 +}
 +
-+/***********************************************************************
+ /***********************************************************************
   *          QuirkIsEnabled3 (KERNELBASE.@)
   */
- BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
 -- 
-2.11.0
+2.14.1
 

patches/kernelbase-PathCchCombineEx/0001-kernelbase-Add-semi-stub-for-PathCchCombineEx.patch

@@ -1,4 +1,4 @@
-From 8cd69f6811475c6ba3ecf28588193bfd9fb91e34 Mon Sep 17 00:00:00 2001
+From 02f531e6fb014016869e1d7ba191b77551c349e7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Wed, 16 Aug 2017 02:45:23 +0200
 Subject: kernelbase: Add semi-stub for PathCchCombineEx.
@@ -19,10 +19,10 @@ Subject: kernelbase: Add semi-stub for PathCchCombineEx.
  create mode 100644 include/pathcch.h
 
 diff --git a/configure.ac b/configure.ac
-index 5979934047d..fd05212057f 100644
+index 44c7eed86f8..5c0bf350739 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3323,7 +3323,8 @@ WINE_CONFIG_DLL(jsproxy,,[implib])
+@@ -3215,7 +3215,8 @@ WINE_CONFIG_DLL(jsproxy,,[implib])
  WINE_CONFIG_TEST(dlls/jsproxy/tests)
  WINE_CONFIG_DLL(kernel32,,[clean,implib])
  WINE_CONFIG_TEST(dlls/kernel32/tests)
@@ -58,7 +58,7 @@ index 74df98ce2d5..247c6bf392a 100644
  C_SRCS = \
  	main.c
 diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
-index 4523c6a0b6f..05cafa377bd 100644
+index 85b23237bbc..1ec67e37b0b 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -1037,7 +1037,7 @@
@@ -71,12 +71,12 @@ index 4523c6a0b6f..05cafa377bd 100644
  # @ stub PathCchIsRoot
  # @ stub PathCchRemoveBackslash
 diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
-index 6673f9b63e0..00dacfe28c1 100644
+index ff1b2f67623..02d538e76b0 100644
 --- a/dlls/kernelbase/main.c
 +++ b/dlls/kernelbase/main.c
-@@ -17,7 +17,11 @@
-  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-  */
+@@ -19,7 +19,11 @@
+ #include "windows.h"
+ #include "appmodel.h"
  
 +#include "shlwapi.h"
 +#include "strsafe.h"
@@ -86,7 +86,7 @@ index 6673f9b63e0..00dacfe28c1 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
  
-@@ -38,3 +42,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
+@@ -57,3 +61,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
      FIXME("(%p, %p) stub!\n", unk1, unk2);
      return FALSE;
  }
@@ -246,10 +246,10 @@ index 00000000000..c848640a030
 +    test_PathCchCombineEx();
 +}
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 982a087d531..15f42c4ff3c 100644
+index 025fe774552..8192e03536a 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -559,6 +559,7 @@ HEADER_SRCS = \
+@@ -564,6 +564,7 @@ HEADER_SRCS = \
  	oledberr.h \
  	oledlg.h \
  	patchapi.h \
@@ -290,5 +290,5 @@ index 00000000000..8831c5238d2
 +
 +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);
 -- 
-2.13.1
+2.14.1
 

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

@@ -1,4 +1,4 @@
-From b97e38f96a743c0aa44572ae8dbc477375e0d64e Mon Sep 17 00:00:00 2001
+From 93accf8fa8225b99efed51f2b44433c1776b8403 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: ntdll: Add dummy apiset to PEB.
@@ -12,10 +12,10 @@ Subject: ntdll: Add dummy apiset to PEB.
  create mode 100644 include/apiset.h
 
 diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
-index 08318ebeeb4..88d315f1e9c 100644
+index 85ceb2bbeac..95511673fab 100644
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -69,6 +69,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH];
+@@ -68,6 +68,7 @@ static WCHAR current_dir[MAX_NT_PATH_LENGTH];
  static RTL_BITMAP tls_bitmap;
  static RTL_BITMAP tls_expansion_bitmap;
  static RTL_BITMAP fls_bitmap;
@@ -23,7 +23,7 @@ index 08318ebeeb4..88d315f1e9c 100644
  static int nb_threads = 1;
  
  static RTL_CRITICAL_SECTION peb_lock;
-@@ -388,6 +389,7 @@ HANDLE thread_init(void)
+@@ -304,6 +305,7 @@ HANDLE thread_init(void)
  
      peb->FastPebLock        = &peb_lock;
      peb->ProcessParameters  = &params;
@@ -32,17 +32,17 @@ index 08318ebeeb4..88d315f1e9c 100644
      peb->TlsExpansionBitmap = &tls_expansion_bitmap;
      peb->FlsBitmap          = &fls_bitmap;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index fcdd8b323ce..7e005f6bb1e 100644
+index 025fe774552..07e0d54dd81 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -208,6 +208,7 @@ HEADER_SRCS = \
+@@ -223,6 +223,7 @@ HEADER_SRCS = \
  	advpub.h \
  	af_irda.h \
  	amaudio.h \
 +	apiset.h \
  	appcompatapi.h \
  	appmgmt.h \
- 	atlbase.h \
+ 	appmodel.h \
 diff --git a/include/apiset.h b/include/apiset.h
 new file mode 100644
 index 00000000000..5f911717eea
@@ -83,7 +83,7 @@ index 00000000000..5f911717eea
 +    API_SET_NAMESPACE_ENTRY Array[1];
 +} API_SET_NAMESPACE_ARRAY, *PAPI_SET_NAMESPACE_ARRAY;
 diff --git a/include/winternl.h b/include/winternl.h
-index df20da58c3c..f3f9b047e50 100644
+index ec8b3874714..2c35bbb3942 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
 @@ -23,6 +23,7 @@

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "9a53298eed493080fb132d0cd57fffa95b00b1ec"
+	echo "825d5c86415d9e76c92a9d533c00790efe847ae7"
 }
 
 # Show version information