Rebase against f53c320f04114253955b509da294ef454864679d.

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

@@ -1,4 +1,4 @@
-From 3a6430e77123ca8e40593877cea943ac2baff144 Mon Sep 17 00:00:00 2001
+From bffce1c0eba38dd768d56ddd83db0cbb0b0e78b2 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,13 +13,13 @@ 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 09ca59b..fa754f9 100644
+index efedd21..07cefa5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2698,6 +2698,7 @@ WINE_CONFIG_DLL(api-ms-win-core-registry-l1-1-0)
- WINE_CONFIG_DLL(api-ms-win-core-rtlsupport-l1-1-0)
+@@ -2699,6 +2699,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)
 +WINE_CONFIG_DLL(api-ms-win-core-shlwapi-obsolete-l1-2-0)
  WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0)
  WINE_CONFIG_DLL(api-ms-win-core-string-l2-1-0)
@@ -97,13 +97,13 @@ 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 44304e4..9084162 100755
+index b969291..5aa8946 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -230,6 +230,7 @@ my @dll_groups =
-   "api-ms-win-downlevel-shlwapi-l1-1-0",
+@@ -231,6 +231,7 @@ my @dll_groups =
    "api-ms-win-downlevel-shlwapi-l2-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",
    "api-ms-win-core-url-l1-1-0",
   ],

patches/patchinstall.sh

@@ -52,13 +52,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "7baaab5b53011c3a593e1ff32538c9ca706db212"
+	echo "f53c320f04114253955b509da294ef454864679d"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 1.9.18"
+	echo "Wine Staging 1.9.19 (unreleased)"
 	echo "Copyright (C) 2014-2016 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"

patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch

@@ -1,4 +1,4 @@
-From 77b33ddf4f55a309c42a137f4a27c3f8726e7442 Mon Sep 17 00:00:00 2001
+From 075a73bb6277b9d3968cdb451cb5ae72573c052d Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 14 Dec 2014 20:49:28 +0100
 Subject: wined3d: Add second dll with STAGING_CSMT definition set.
@@ -12,11 +12,11 @@ Subject: wined3d: Add second dll with STAGING_CSMT definition set.
  create mode 100644 dlls/wined3d-csmt/version.rc
 
 diff --git a/configure.ac b/configure.ac
-index e5fb209..7394424 100644
+index cc98f4f..5fc75a7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3318,6 +3318,7 @@ WINE_CONFIG_TEST(dlls/windowscodecsext/tests)
- WINE_CONFIG_DLL(winealsa.drv)
+@@ -3375,6 +3375,7 @@ WINE_CONFIG_DLL(winealsa.drv)
+ WINE_CONFIG_DLL(winebus.sys)
  WINE_CONFIG_DLL(winecoreaudio.drv)
  WINE_CONFIG_LIB(winecrt0)
 +WINE_CONFIG_DLL(wined3d-csmt)

patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch

@@ -1,4 +1,4 @@
-From 7e5702413a132b28a02abaf8c22f2c25b9ca1edf Mon Sep 17 00:00:00 2001
+From 4aef2c13b8f93320c112fb3646b7cc37d0be2dc4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 11 Mar 2016 21:44:53 +0100
 Subject: wuauserv: Add dummy service.
@@ -13,10 +13,10 @@ Subject: wuauserv: Add dummy service.
  create mode 100644 programs/wuauserv/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 09e0f53..bffb944 100644
+index 8d5116c..3bfb84c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3520,6 +3520,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[clean,install])
+@@ -3564,6 +3564,7 @@ WINE_CONFIG_PROGRAM(wordpad,,[clean,install])
  WINE_CONFIG_PROGRAM(write,,[clean,install])
  WINE_CONFIG_PROGRAM(wscript,,[clean,install])
  WINE_CONFIG_TEST(programs/wscript/tests)
@@ -25,34 +25,34 @@ index 09e0f53..bffb944 100644
  WINE_CONFIG_PROGRAM(xcopy,,[clean,install])
  WINE_CONFIG_TEST(programs/xcopy/tests)
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index d22b29b..fe7459e 100644
+index 4e29026..04f60ff 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -129,6 +129,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
- AddService=LanmanServer,0,LanmanServerService
+@@ -131,6 +131,7 @@ AddService=LanmanServer,0,LanmanServerService
  AddService=FontCache,0,FontCacheService
  AddService=Schedule,0,TaskSchedulerService
+ AddService=WineBus,0,WineBusService
 +AddService=wuauserv,0,wuauService
  
  [DefaultInstall.NT.Services]
  AddService=BITS,0,BITSService
-@@ -142,6 +143,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
- AddService=LanmanServer,0,LanmanServerService
+@@ -146,6 +147,7 @@ AddService=LanmanServer,0,LanmanServerService
  AddService=FontCache,0,FontCacheService
  AddService=Schedule,0,TaskSchedulerService
+ AddService=WineBus,0,WineBusService
 +AddService=wuauserv,0,wuauService
  
  [DefaultInstall.ntamd64.Services]
  AddService=BITS,0,BITSService
-@@ -155,6 +157,7 @@ AddService=FontCache3.0.0.0,0,WPFFontCacheService
- AddService=LanmanServer,0,LanmanServerService
+@@ -161,6 +163,7 @@ AddService=LanmanServer,0,LanmanServerService
  AddService=FontCache,0,FontCacheService
  AddService=Schedule,0,TaskSchedulerService
+ AddService=WineBus,0,WineBusService
 +AddService=wuauserv,0,wuauService
  
  [Strings]
  MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"
-@@ -3253,6 +3256,14 @@ ErrorControl=1
+@@ -3279,6 +3282,14 @@ ErrorControl=1
  HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll"
  HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule"
  
@@ -190,5 +190,5 @@ index 0000000..31df299
 +    return 0;
 +}
 -- 
-2.7.1
+2.9.0
 

staging/VERSION

@@ -1 +1 @@
-Wine Staging 1.9.18
+Wine Staging 1.9.19 (unreleased)