Rebase against 65989f2ace1b06617638e31cb7ba56deb38fe690

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

@@ -1,7 +1,7 @@
-From 76daaa88f6a1ec55668fdb5a1abcc4ac31149976 Mon Sep 17 00:00:00 2001
+From 54abbae392fbf72e9abc241d7c1a36df27e0c9a0 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.
+Subject: [PATCH] kernelbase: Add semi-stub for PathCchCombineEx.
 
 ---
  configure.ac                                       |   3 +-
@@ -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 04091fc0ec9..4bd6bb35c8a 100644
+index 7bb9c49..fc79b7a 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3235,7 +3235,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
+@@ -3329,7 +3329,8 @@ WINE_CONFIG_TEST(dlls/jsproxy/tests)
  WINE_CONFIG_DLL(kerberos)
  WINE_CONFIG_DLL(kernel32,,[clean,implib])
  WINE_CONFIG_TEST(dlls/kernel32/tests)
@@ -33,7 +33,7 @@ index 04091fc0ec9..4bd6bb35c8a 100644
  WINE_CONFIG_DLL(krnl386.exe16,enable_win16,[implib],[kernel])
  WINE_CONFIG_DLL(ksuser)
 diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec
-index cb10d89773c..4df147e6611 100644
+index cb10d89..4df147e 100644
 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec
 +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec
 @@ -8,7 +8,7 @@
@@ -46,7 +46,7 @@ index cb10d89773c..4df147e6611 100644
  @ stub PathCchIsRoot
  @ stub PathCchRemoveBackslash
 diff --git a/dlls/kernelbase/Makefile.in b/dlls/kernelbase/Makefile.in
-index 74df98ce2d5..247c6bf392a 100644
+index 74df98c..247c6bf 100644
 --- a/dlls/kernelbase/Makefile.in
 +++ b/dlls/kernelbase/Makefile.in
 @@ -1,4 +1,6 @@
@@ -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 395b65839b8..f1745e00c89 100644
+index 6c61c51..55737f9 100644
 --- a/dlls/kernelbase/kernelbase.spec
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -1037,7 +1037,7 @@
@@ -71,10 +71,10 @@ index 395b65839b8..f1745e00c89 100644
  # @ stub PathCchIsRoot
  # @ stub PathCchRemoveBackslash
 diff --git a/dlls/kernelbase/main.c b/dlls/kernelbase/main.c
-index b0a34786e2e..0410f38a122 100644
+index 920fd12..eadb130 100644
 --- a/dlls/kernelbase/main.c
 +++ b/dlls/kernelbase/main.c
-@@ -19,7 +19,11 @@
+@@ -20,7 +20,11 @@
  #include "windows.h"
  #include "appmodel.h"
  
@@ -86,8 +86,8 @@ index b0a34786e2e..0410f38a122 100644
  
  WINE_DEFAULT_DEBUG_CHANNEL(kernelbase);
  
-@@ -83,3 +87,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
-     FIXME("(%p, %p) stub!\n", unk1, unk2);
+@@ -97,3 +101,28 @@ BOOL WINAPI QuirkIsEnabled3(void *unk1, void *unk2)
+ 
      return FALSE;
  }
 +
@@ -117,7 +117,7 @@ index b0a34786e2e..0410f38a122 100644
 +}
 diff --git a/dlls/kernelbase/tests/Makefile.in b/dlls/kernelbase/tests/Makefile.in
 new file mode 100644
-index 00000000000..92f5ca57131
+index 0000000..92f5ca5
 --- /dev/null
 +++ b/dlls/kernelbase/tests/Makefile.in
 @@ -0,0 +1,5 @@
@@ -128,7 +128,7 @@ index 00000000000..92f5ca57131
 +	path.c
 diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c
 new file mode 100644
-index 00000000000..c848640a030
+index 0000000..c848640
 --- /dev/null
 +++ b/dlls/kernelbase/tests/path.c
 @@ -0,0 +1,113 @@
@@ -246,20 +246,20 @@ index 00000000000..c848640a030
 +    test_PathCchCombineEx();
 +}
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 025fe774552..8192e03536a 100644
+index f064e96..6e7ffc1 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
-@@ -564,6 +564,7 @@ HEADER_SRCS = \
+@@ -572,6 +572,7 @@ HEADER_SRCS = \
  	oledberr.h \
  	oledlg.h \
  	patchapi.h \
 +	pathcch.h \
  	pdh.h \
  	pdhmsg.h \
- 	physicalmonitorenumerationapi.h \
+ 	perflib.h \
 diff --git a/include/pathcch.h b/include/pathcch.h
 new file mode 100644
-index 00000000000..8831c5238d2
+index 0000000..8831c52
 --- /dev/null
 +++ b/include/pathcch.h
 @@ -0,0 +1,26 @@
@@ -290,5 +290,5 @@ index 00000000000..8831c5238d2
 +
 +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);
 -- 
-2.14.2
+1.9.1