Rebase against 4e9cc305bb1a758eb70419318c7c41c2918fc180.

patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch

@@ -1,4 +1,4 @@
-From fa095669c3bad1091523c6133c6a12541555dfbd Mon Sep 17 00:00:00 2001
+From e79975433e5173ffc592f77bc65a16ec18ee5ce8 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:37:26 +0100
 Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll.
@@ -13,17 +13,17 @@ Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll.
  create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
 
 diff --git a/configure.ac b/configure.ac
-index 1ebf17a..2d2108b 100644
+index 33a6e21..703b29b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2623,6 +2623,7 @@ WINE_CONFIG_DLL(advpack,,[implib])
+@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib])
  WINE_CONFIG_TEST(dlls/advpack/tests)
  WINE_CONFIG_DLL(amstream,,[clean])
  WINE_CONFIG_TEST(dlls/amstream/tests)
 +WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1)
+ WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0)
 diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
 new file mode 100644
 index 0000000..289d96f
@@ -74,17 +74,17 @@ index 0000000..2e5fbf1
 +@ stub VerifyPackageId
 +@ stub VerifyPackageRelativeApplicationId
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 05010cc..d2158d8 100755
+index eb07239..dc8b9fe 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -161,6 +161,7 @@ my @dll_groups =
+@@ -125,6 +125,7 @@ my @dll_groups =
   ],
   [
    "kernel32",
 +  "api-ms-win-appmodel-runtime-l1-1-1",
    "api-ms-win-downlevel-normaliz-l1-1-0",
    "api-ms-win-core-processthreads-l1-1-0",
-   "api-ms-win-core-debug-l1-1-0",
+   "api-ms-win-core-atoms-l1-1-0",
 -- 
-2.6.4
+2.9.0
 

patches/api-ms-win-Stub_DLLs/0004-api-ms-win-core-apiquery-l1-1-0-Add-dll.patch

@@ -1,4 +1,4 @@
-From 60ecb8d166d2b940052160dcb250cc458ba2f728 Mon Sep 17 00:00:00 2001
+From 385c915d6c0b7408d6d3514f5aa8cde2ec10bcc3 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:45:05 +0100
 Subject: api-ms-win-core-apiquery-l1-1-0: Add dll.
@@ -13,17 +13,17 @@ Subject: api-ms-win-core-apiquery-l1-1-0: Add dll.
  create mode 100644 dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
 
 diff --git a/configure.ac b/configure.ac
-index 6ab0640..ce22c64 100644
+index 703b29b..d3a6c249 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2626,6 +2626,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests)
+@@ -2651,6 +2651,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests)
  WINE_CONFIG_DLL(amstream,,[clean])
  WINE_CONFIG_TEST(dlls/amstream/tests)
  WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1)
 +WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0)
+ WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1)
- WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0)
 diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in b/dlls/api-ms-win-core-apiquery-l1-1-0/Makefile.in
 new file mode 100644
 index 0000000..492a265
@@ -39,10 +39,10 @@ index 0000000..1d99dd7
 @@ -0,0 +1 @@
 +@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 13a5674..cd0d761 100755
+index dc8b9fe..8a0307e 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -264,6 +264,7 @@ my @dll_groups =
+@@ -254,6 +254,7 @@ my @dll_groups =
    "msvcrt",
    "ntdll",
    "ntoskrnl.exe",
@@ -51,5 +51,5 @@ index 13a5674..cd0d761 100755
    "api-ms-win-core-rtlsupport-l1-2-0",
   ],
 -- 
-2.6.4
+2.9.0
 

patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch

@@ -1,4 +1,4 @@
-From 57f3079d00eb226013528e2171e19f9aa7e31282 Mon Sep 17 00:00:00 2001
+From 4dfeafbe2c75253ecca37810fa7351e326e9e310 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
 Date: Tue, 15 Sep 2015 17:44:33 -0600
 Subject: msidb: Add stub tool for manipulating MSI databases.
@@ -13,17 +13,17 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
  create mode 100644 programs/msidb/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 9e0dcd9..7989ec6 100644
+index ac75845..71a245d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3474,6 +3474,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
+@@ -3522,6 +3522,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
  WINE_CONFIG_PROGRAM(lodctr,,[install])
  WINE_CONFIG_PROGRAM(mofcomp,,[install])
  WINE_CONFIG_PROGRAM(mshta,,[install])
 +WINE_CONFIG_PROGRAM(msidb,,[install,installbin])
  WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage])
+ WINE_CONFIG_PROGRAM(msinfo32,,[install])
  WINE_CONFIG_PROGRAM(net,,[clean,install])
- WINE_CONFIG_PROGRAM(netsh,,[install])
 diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
 new file mode 100644
 index 0000000..dae699c
@@ -198,5 +198,5 @@ index 0000000..43cc519
 +    return 0;
 +}
 -- 
-2.7.1
+2.9.0
 

patches/patchinstall.sh

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