Rebase against 3dbd46716299883761be9c4c4173a5f0402b2f7c.

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

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: