Rebase against 4bfefc5c7132023ee40d70572b677ae0e441df38.

patches/api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 2f51e46724cd93eedfa9024dc3f88bfdd2eb3172 Mon Sep 17 00:00:00 2001
+From 37ae55184352a775722f464a37e83246207f38d9 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:07:09 +0100
 Subject: api-ms-win-core-quirks-l1-1-0: Add dll.
@@ -13,17 +13,17 @@ Subject: api-ms-win-core-quirks-l1-1-0: Add dll.
  create mode 100644 dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-quirks-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 7374b74..1cf8036 100644
+index 8007469..074974e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2729,6 +2729,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1)
+@@ -2706,6 +2706,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1)
  WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-2)
  WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-psapi-l1-1-0)
 +WINE_CONFIG_DLL(api-ms-win-core-quirks-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-core-registryuserspecific-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0)
 diff --git a/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in b/dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..9486e8b
@@ -46,10 +46,10 @@ index 0000000..54ce373
 +@ stub QuirkIsEnabledForPackage2
 +@ stub QuirkIsEnabledForProcess
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 572c0b8..e62c2cd 100755
+index e533ec8..564eae5 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -225,6 +225,10 @@ my @dll_groups =
+@@ -210,6 +210,10 @@ my @dll_groups =
    "kernelbase",
   ],
   [
@@ -61,5 +61,5 @@ index 572c0b8..e62c2cd 100755
    "api-ms-win-downlevel-ole32-l1-1-0",
    "api-ms-win-core-com-l1-1-0",
 -- 
-2.6.4
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0013-api-ms-win-core-shlwapi-obsolete-l1-2-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From bffce1c0eba38dd768d56ddd83db0cbb0b0e78b2 Mon Sep 17 00:00:00 2001
+From 8f69de845627cae36a5831e684db1a649b94ebdd Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 21 Jan 2016 00:52:33 +0100
 Subject: api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.
@@ -13,10 +13,10 @@ Subject: api-ms-win-core-shlwapi-obsolete-l1-2-0: Add dll.
  create mode 100644 dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index efedd21..07cefa5 100644
+index fcffde7..a038474 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2699,6 +2699,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0)
+@@ -2716,6 +2716,7 @@ WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-2-0)
  WINE_CONFIG_DLL(api-ms-win-core-shlwapi-legacy-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-1-0)
@@ -97,11 +97,11 @@ index 0000000..8b8b520
 +@ stdcall StrTrimA(str str) shlwapi.StrTrimA
 +@ stdcall StrTrimW(wstr wstr) shlwapi.StrTrimW
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index b969291..5aa8946 100755
+index 3a5b0b4..60ee2d3 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -231,6 +231,7 @@ my @dll_groups =
-   "api-ms-win-downlevel-shlwapi-l2-1-0",
+@@ -234,6 +234,7 @@ my @dll_groups =
+   "api-ms-win-core-registryuserspecific-l1-1-0",
    "api-ms-win-core-shlwapi-legacy-l1-1-0",
    "api-ms-win-core-shlwapi-obsolete-l1-1-0",
 +  "api-ms-win-core-shlwapi-obsolete-l1-2-0",

patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch

@@ -1,4 +1,4 @@
-From f01429e9c1944abbd2930a3c9567d5a702f47853 Mon Sep 17 00:00:00 2001
+From d37699c2b0eb6e5e74b9b040ee6a5791f4c9112c Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Tue, 19 Aug 2014 22:10:49 -0600
 Subject: ntdll: Implement retrieving DOS attributes in NtQueryInformationFile.
@@ -13,12 +13,12 @@ Subject: ntdll: Implement retrieving DOS attributes in NtQueryInformationFile.
  create mode 100644 libs/port/xattr.c
 
 diff --git a/configure.ac b/configure.ac
-index 6f1516a..b2fcee3 100644
+index 8007469..2d6bd77 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -77,6 +77,7 @@ AC_ARG_WITH(sane,      AS_HELP_STRING([--without-sane],[do not use SANE (scanner
  AC_ARG_WITH(tiff,      AS_HELP_STRING([--without-tiff],[do not use TIFF]))
- AC_ARG_WITH(udev,      AS_HELP_STRING([--without-udev],[do not use udev (play and play support)]))
+ AC_ARG_WITH(udev,      AS_HELP_STRING([--without-udev],[do not use udev (plug and play support)]))
  AC_ARG_WITH(v4l,       AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
 +AC_ARG_WITH(xattr,     AS_HELP_STRING([--without-xattr],[do not use xattr (security attributes support)]))
  AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]),

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "01581bfc48161c3c55027334b1ecb9e909873a6b"
+	echo "4bfefc5c7132023ee40d70572b677ae0e441df38"
 }
 
 # Show version information