Rebase against 0d06ebf5fb515e19cd9ec951dd9e49f6e678b35c.

[advapi32-RegCopyTree]
Removed patch to fix RegDeleteTreeW when empty string is passed (accepted
upstream).

[shutdown-Stub_DLL]
Removed patch to add shutdown.exe stub implementation (accepted upstream).

patches/advapi32-RegCopyTree/0001-advapi32-Fix-RegDeleteTreeW-when-empty-string-is-pas.patch

@@ -1,69 +0,0 @@
-From 95113550630cf847fdc52c5ded8ad1d6c84c6149 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Tue, 1 Mar 2016 13:20:07 +0100
-Subject: advapi32: Fix RegDeleteTreeW when empty string is passed.
-
----
- dlls/advapi32/registry.c       |  6 +++---
- dlls/advapi32/tests/registry.c | 14 ++++++++++++++
- 2 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c
-index 172423b..aa451b1 100644
---- a/dlls/advapi32/registry.c
-+++ b/dlls/advapi32/registry.c
-@@ -3030,7 +3030,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey )
- 
-     TRACE( "(%p, %s)\n", hkey, debugstr_w(subkey) );
- 
--    if (subkey)
-+    if (subkey && *subkey)
-     {
-         ret = RegOpenKeyExW( hkey, subkey, 0, KEY_READ, &hkey );
-         if (ret) return ret;
-@@ -3060,7 +3060,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey )
-     }
- 
-     /* Delete the key itself */
--    if (subkey)
-+    if (subkey && *subkey)
-     {
-         ret = RegDeleteKeyW( hkey, emptyW );
-         goto cleanup;
-@@ -3081,7 +3081,7 @@ LSTATUS WINAPI RegDeleteTreeW( HKEY hkey, const WCHAR *subkey )
- 
- cleanup:
-     heap_free( name_buf );
--    if (subkey)
-+    if (subkey && *subkey)
-         RegCloseKey( hkey );
-     return ret;
- }
-diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c
-index 4b3b4e9..ddda755 100644
---- a/dlls/advapi32/tests/registry.c
-+++ b/dlls/advapi32/tests/registry.c
-@@ -2246,6 +2246,20 @@ static void test_reg_delete_tree(void)
-     dwsize = MAX_PATH;
-     ok(RegQueryValueExA(subkey, "value", NULL, &type, (BYTE *)buffer, &dwsize),
-         "Value is still present\n");
-+    ret = RegCloseKey(subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    ret = RegOpenKeyA(hkey_main, "subkey", &subkey);
-+    ok(ret == ERROR_SUCCESS, "subkey was deleted\n");
-+    ret = pRegDeleteTreeA(subkey, "");
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+    ret = RegCloseKey(subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
-+
-+    ret = RegOpenKeyA(hkey_main, "subkey", &subkey);
-+    ok(ret == ERROR_SUCCESS, "subkey was deleted\n");
-+    ret = RegCloseKey(subkey);
-+    ok(ret == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", ret);
- 
-     ret = pRegDeleteTreeA(hkey_main, "not-here");
-     ok(ret == ERROR_FILE_NOT_FOUND,
--- 
-2.7.1
-

patches/api-ms-win-Stub_DLLs/definition

@@ -24,4 +24,3 @@ Depends: kernel32-GetFinalPathNameByHandle
 Depends: kernel32-FreeUserPhysicalPages
 Depends: kernel32-GetCurrentPackageFamilyName
 Depends: combase-RoApi
-Depends: advapi32-RegCopyTree

patches/shutdown-Stub_DLL/0001-programs-shutdown-Add-stub-implementation.patch

@@ -1,78 +0,0 @@
-From 6c0b9fc4b26ba0f2efaa9fca6e12fef3c27bd2ef Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Thu, 11 Feb 2016 20:13:58 +0100
-Subject: programs/shutdown: Add stub implementation.
-
----
- configure.ac                  |  1 +
- programs/shutdown/Makefile.in |  5 +++++
- programs/shutdown/main.c      | 33 +++++++++++++++++++++++++++++++++
- 3 files changed, 39 insertions(+)
- create mode 100644 programs/shutdown/Makefile.in
- create mode 100644 programs/shutdown/main.c
-
-diff --git a/configure.ac b/configure.ac
-index 9e0dcd9..d11f5e4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3502,6 +3502,7 @@ WINE_CONFIG_PROGRAM(secedit,,[install])
- WINE_CONFIG_PROGRAM(servicemodelreg,,[install])
- WINE_CONFIG_PROGRAM(services,,[clean,install])
- WINE_CONFIG_TEST(programs/services/tests)
-+WINE_CONFIG_PROGRAM(shutdown,,[install])
- WINE_CONFIG_PROGRAM(spoolsv,,[install])
- WINE_CONFIG_PROGRAM(start,,[clean,install])
- WINE_CONFIG_PROGRAM(svchost,,[install])
-diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in
-new file mode 100644
-index 0000000..0014021
---- /dev/null
-+++ b/programs/shutdown/Makefile.in
-@@ -0,0 +1,5 @@
-+MODULE    = shutdown.exe
-+APPMODE   = -mconsole -municode
-+
-+C_SRCS = \
-+	main.c
-diff --git a/programs/shutdown/main.c b/programs/shutdown/main.c
-new file mode 100644
-index 0000000..49f8d24
---- /dev/null
-+++ b/programs/shutdown/main.c
-@@ -0,0 +1,33 @@
-+/*
-+ * Copyright 2016 Michael Müller
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
-+ */
-+
-+#include "wine/debug.h"
-+
-+WINE_DEFAULT_DEBUG_CHANNEL(shutdown);
-+
-+int wmain(int argc, WCHAR *argv[])
-+{
-+    int i;
-+
-+    WINE_FIXME("stub:");
-+    for (i = 0; i < argc; i++)
-+        WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
-+    WINE_FIXME("\n");
-+
-+    return 0;
-+}
--- 
-2.7.1
-

patches/shutdown-Stub_DLL/definition

@@ -1 +0,0 @@
-Fixes: Add stub program for shutdown.exe

patches/wined3d-CSMT_Main/definition

@@ -5,6 +5,7 @@ Fixes: [11674] Support for CSMT (command stream) to increase graphic performance
 Apply-After: dlls/wined3d/*
 Depends: wined3d-CSMT_Helper
 IfDefined: STAGING_CSMT
+Disabled: true
 
 # Known issues:
 # https://bugs.wine-staging.com/buglist.cgi?component=Bugs&keywords=csmt%2C%20&keywords_type=allwords&list_id=3690&query_format=advanced&resolution=---