Rebase against 3dbd46716299883761be9c4c4173a5f0402b2f7c.

[wbemdisp-ASSOCIATORS]
Removed patch with initial tests for ASSOCIATORS query (accepted upstream).

patches/d3dx9_36-Dummy_Skininfo/0001-d3dx9_36-Return-dummy-skininfo-interface-in-D3DXLoad.patch

@@ -1,4 +1,4 @@
-From 7aca17433be04df15990308c3a081feb2f3a97f6 Mon Sep 17 00:00:00 2001
+From 8dfdd1054d4db1718707cc765fcd2d05d64c6c96 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Tue, 28 Jul 2015 17:26:09 +0200
 Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof
@@ -11,12 +11,12 @@ Subject: d3dx9_36: Return dummy skininfo interface in D3DXLoadSkinMeshFromXof
  3 files changed, 30 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h
-index 5ba93ac..f4cdabc 100644
+index 556d213..bc40531 100644
 --- a/dlls/d3dx9_36/d3dx9_private.h
 +++ b/dlls/d3dx9_36/d3dx9_private.h
-@@ -144,4 +144,6 @@ HRESULT d3dx_create_param_eval(struct d3dx9_base_effect *base_effect, void *byte
-         unsigned int byte_code_size, D3DXPARAMETER_TYPE type, struct d3dx_param_eval **peval) DECLSPEC_HIDDEN;
- void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN;
+@@ -196,4 +196,6 @@ void d3dx_free_param_eval(struct d3dx_param_eval *peval) DECLSPEC_HIDDEN;
+ HRESULT d3dx_evaluate_parameter(struct d3dx_param_eval *peval,
+         const struct d3dx_parameter *param, void *param_value) DECLSPEC_HIDDEN;
  
 +HRESULT create_dummy_skin(ID3DXSkinInfo **iface) DECLSPEC_HIDDEN;
 +

patches/patchinstall.sh

@@ -51,13 +51,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "f0429adbffce1f67b88b8c0a3e3a5badb6d6526e"
+	echo "3dbd46716299883761be9c4c4173a5f0402b2f7c"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 1.9.8"
+	echo "Wine Staging 1.9.9 (unreleased)"
 	echo "Copyright (C) 2014-2016 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
@@ -344,7 +344,6 @@ patch_enable_all ()
 	enable_version_VerFindFileA="$1"
 	enable_version_VerQueryValue="$1"
 	enable_vulkan_Vulkan_Implementation="$1"
-	enable_wbemdisp_ASSOCIATORS="$1"
 	enable_wbemdisp_ISWbemSecurity="$1"
 	enable_widl_SLTG_Typelib_Support="$1"
 	enable_windowscodecs_32bppGrayFloat="$1"
@@ -1211,9 +1210,6 @@ patch_enable ()
 		vulkan-Vulkan_Implementation)
 			enable_vulkan_Vulkan_Implementation="$2"
 			;;
-		wbemdisp-ASSOCIATORS)
-			enable_wbemdisp_ASSOCIATORS="$2"
-			;;
 		wbemdisp-ISWbemSecurity)
 			enable_wbemdisp_ISWbemSecurity="$2"
 			;;
@@ -7034,18 +7030,6 @@ if test "$enable_vulkan_Vulkan_Implementation" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset wbemdisp-ASSOCIATORS
-# |
-# | Modified files:
-# |   *	dlls/wbemprox/tests/query.c
-# |
-if test "$enable_wbemdisp_ASSOCIATORS" -eq 1; then
-	patch_apply wbemdisp-ASSOCIATORS/0001-wbemprox-tests-Add-tests-for-ASSOCIATORS-queries.patch
-	(
-		echo '+    { "Michael Müller", "wbemprox/tests: Add tests for ASSOCIATORS queries.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset wbemdisp-ISWbemSecurity
 # |
 # | Modified files:

patches/wbemdisp-ASSOCIATORS/0001-wbemprox-tests-Add-tests-for-ASSOCIATORS-queries.patch

@@ -1,54 +0,0 @@
-From 9c724e10c256e98f208c0e8ea535963912f23168 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
-Date: Sat, 16 Apr 2016 21:29:15 +0200
-Subject: wbemprox/tests: Add tests for ASSOCIATORS queries.
-
----
- dlls/wbemprox/tests/query.c | 24 ++++++++++++++++++++++++
- 1 file changed, 24 insertions(+)
-
-diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c
-index 9dc0db4..dd29df1 100644
---- a/dlls/wbemprox/tests/query.c
-+++ b/dlls/wbemprox/tests/query.c
-@@ -147,6 +147,29 @@ static void test_select( IWbemServices *services )
-     SysFreeString( query );
- }
- 
-+static void test_associators( IWbemServices *services )
-+{
-+    static const WCHAR query1[] =
-+        {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_',
-+        'v','L','o','g','i','c','a','l','D','i','s','k','.', 'D','e','v','i','c','e','I','D','=','"','C',':','"','}',0};
-+    static const WCHAR query2[] =
-+        {'A','S','S','O','C','I','A','T','O','R','S',' ','O','F',' ','{','W','i','n','3','2','_',
-+         'v','L','o','g','i','c','a','l','D','i','s','k','.','D','e','v','i','c','e','I','D','=','"','C',':','"','}',' ',
-+         'W','H','E','R','E',' ','A','s','s','o','c','C','l','a','s','s',' ','=',' ','W','i','n','3','2','_',
-+         'L','o','g','i','c','a','l','D','i','s','k','T','o','P','a','r','t','i','t','i','o','n',0};
-+    static const WCHAR *test[] = { query1, query2 };
-+    HRESULT hr;
-+    IEnumWbemClassObject *result;
-+    UINT i;
-+
-+    for (i = 0; i < sizeof(test)/sizeof(test[0]); i++)
-+    {
-+        hr = exec_query( services, test[i], &result );
-+        todo_wine ok( hr == S_OK, "query %u failed: %08x\n", i, hr );
-+        if (result) IEnumWbemClassObject_Release( result );
-+    }
-+}
-+
- static void test_Win32_Service( IWbemServices *services )
- {
-     static const WCHAR returnvalueW[] = {'R','e','t','u','r','n','V','a','l','u','e',0};
-@@ -1054,6 +1077,7 @@ START_TEST(query)
-     ok( hr == S_OK, "failed to set proxy blanket %08x\n", hr );
- 
-     test_select( services );
-+    test_associators( services );
-     test_Win32_Bios( services );
-     test_Win32_Process( services );
-     test_Win32_Service( services );
--- 
-2.7.1
-

staging/VERSION

@@ -1 +1 @@
-Wine Staging 1.9.8
+Wine Staging 1.9.9 (unreleased)