Rebase against 71bbd8da87109161448c7c6d7f6fcfa721b6c746.

wine-compholio · Dec 3, 2015 · ebf9db3 · ebf9db3
1 parent 2d713a9
commit ebf9db3
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 223 deletions.
diff --git a/README.md b/README.md
@@ -260,7 +260,7 @@ for more details.*
 * Set NamedPipeState to FILE_PIPE_CLOSING_STATE on broken pipe in NtQueryInformationFile
 * Share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL forwards ([Wine Bug #21817](https://bugs.winehq.org/show_bug.cgi?id=21817))
 * Show unmounted devices in winecfg and allow changing the unix path
-* Show windows version when collecting system info in winedbg
+* ~~Show windows version when collecting system info in winedbg~~
 * Silence repeated FIXME message in surface_cpu_blt
 * Silence repeated LocaleNameToLCID/LCIDToLocaleName unsupported flags FIXMEs ([Wine Bug #30076](https://bugs.winehq.org/show_bug.cgi?id=30076))
 * ~~Skip invalid entries in GetPrivateProfileString16~~ ([Wine Bug #9919](https://bugs.winehq.org/show_bug.cgi?id=9919))

diff --git a/...2-Pass-a-HREFTYPE-to-get_iface_guid.patch → ...2-Pass-a-HREFTYPE-to-get_iface_guid.patch b/...2-Pass-a-HREFTYPE-to-get_iface_guid.patch → ...2-Pass-a-HREFTYPE-to-get_iface_guid.patch
diff --git a/...es/oleaut32-TKIND_COCLASS/0001-oleaut32-tests-Add-test-for-calling-method-with-cocl.patch b/...es/oleaut32-TKIND_COCLASS/0001-oleaut32-tests-Add-test-for-calling-method-with-cocl.patch
diff --git a/...t-ITypeInfo_fnInvoke-for-TKIND_COCL.patch → ...t-ITypeInfo_fnInvoke-for-TKIND_COCL.patch b/...t-ITypeInfo_fnInvoke-for-TKIND_COCL.patch → ...t-ITypeInfo_fnInvoke-for-TKIND_COCL.patch
diff --git a/...KIND_COCLASS-in-proxy-stub-marshall.patch → ...KIND_COCLASS-in-proxy-stub-marshall.patch b/...KIND_COCLASS-in-proxy-stub-marshall.patch → ...KIND_COCLASS-in-proxy-stub-marshall.patch
diff --git a/...d-a-test-for-TKIND_COCLASS-in-proxy.patch → ...d-a-test-for-TKIND_COCLASS-in-proxy.patch b/...d-a-test-for-TKIND_COCLASS-in-proxy.patch → ...d-a-test-for-TKIND_COCLASS-in-proxy.patch
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "e69d9ec3c4e8829c5c18cea7d8348171d51dcd76"
+	echo "71bbd8da87109161448c7c6d7f6fcfa721b6c746"
 }
 
 # Show version information
@@ -313,7 +313,6 @@ patch_enable_all ()
 	enable_wined3d_resource_check_usage="$1"
 	enable_wined3d_surface_cpu_blt="$1"
 	enable_wined3d_wined3d_swapchain_present="$1"
-	enable_winedbg_Windows_Version="$1"
 	enable_winedevice_Fix_Relocation="$1"
 	enable_winemenubuilder_Desktop_Icon_Path="$1"
 	enable_winepulse_PulseAudio_Support="$1"
@@ -1050,9 +1049,6 @@ patch_enable ()
 		wined3d-wined3d_swapchain_present)
 			enable_wined3d_wined3d_swapchain_present="$2"
 			;;
-		winedbg-Windows_Version)
-			enable_winedbg_Windows_Version="$2"
-			;;
 		winedevice-Fix_Relocation)
 			enable_winedevice_Fix_Relocation="$2"
 			;;
@@ -4659,17 +4655,14 @@ fi
 # |   *	[#19016] Implement marshalling for TKIND_COCLASS
 # |
 # | Modified files:
-# |   *	dlls/oleaut32/tests/tmarshal.c, dlls/oleaut32/tests/tmarshal.idl, dlls/oleaut32/tests/tmarshal_dispids.h,
-# | 	dlls/oleaut32/tmarshal.c, dlls/oleaut32/typelib.c
+# |   *	dlls/oleaut32/tests/tmarshal.c, dlls/oleaut32/tmarshal.c, dlls/oleaut32/typelib.c
 # |
 if test "$enable_oleaut32_TKIND_COCLASS" -eq 1; then
-	patch_apply oleaut32-TKIND_COCLASS/0001-oleaut32-tests-Add-test-for-calling-method-with-cocl.patch
-	patch_apply oleaut32-TKIND_COCLASS/0002-oleaut32-Pass-a-HREFTYPE-to-get_iface_guid.patch
-	patch_apply oleaut32-TKIND_COCLASS/0003-oleaut32-Implement-ITypeInfo_fnInvoke-for-TKIND_COCL.patch
-	patch_apply oleaut32-TKIND_COCLASS/0004-oleaut32-Handle-TKIND_COCLASS-in-proxy-stub-marshall.patch
-	patch_apply oleaut32-TKIND_COCLASS/0005-oleaut32-tests-Add-a-test-for-TKIND_COCLASS-in-proxy.patch
+	patch_apply oleaut32-TKIND_COCLASS/0001-oleaut32-Pass-a-HREFTYPE-to-get_iface_guid.patch
+	patch_apply oleaut32-TKIND_COCLASS/0002-oleaut32-Implement-ITypeInfo_fnInvoke-for-TKIND_COCL.patch
+	patch_apply oleaut32-TKIND_COCLASS/0003-oleaut32-Handle-TKIND_COCLASS-in-proxy-stub-marshall.patch
+	patch_apply oleaut32-TKIND_COCLASS/0004-oleaut32-tests-Add-a-test-for-TKIND_COCLASS-in-proxy.patch
 	(
-		echo '+    { "Sebastian Lackner", "oleaut32/tests: Add test for calling method with coclass argument.", 1 },';
 		echo '+    { "Sebastian Lackner", "oleaut32: Pass a HREFTYPE to get_iface_guid.", 1 },';
 		echo '+    { "Sebastian Lackner", "oleaut32: Implement ITypeInfo_fnInvoke for TKIND_COCLASS in arguments.", 1 },';
 		echo '+    { "Sebastian Lackner", "oleaut32: Handle TKIND_COCLASS in proxy/stub marshalling.", 1 },';
@@ -6298,18 +6291,6 @@ if test "$enable_wined3d_CSMT_Main" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset winedbg-Windows_Version
-# |
-# | Modified files:
-# |   *	programs/winedbg/tgt_active.c
-# |
-if test "$enable_winedbg_Windows_Version" -eq 1; then
-	patch_apply winedbg-Windows_Version/0001-winedbg-Print-windows-version-in-system-info.patch
-	(
-		echo '+    { "Michael Müller", "winedbg: Print windows version in system info.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset winedevice-Fix_Relocation
 # |
 # | This patchset fixes the following Wine bugs:

diff --git a/patches/winedbg-Windows_Version/0001-winedbg-Print-windows-version-in-system-info.patch b/patches/winedbg-Windows_Version/0001-winedbg-Print-windows-version-in-system-info.patch
diff --git a/patches/winedbg-Windows_Version/definition b/patches/winedbg-Windows_Version/definition
diff --git a/staging/changelog b/staging/changelog
@@ -6,6 +6,8 @@ wine-staging (1.8~rc3) UNRELEASED; urgency=low
     (accepted upstream).
   * Removed patch to skip invalid entries in GetPrivateProfileString16 (accepted
     upstream).
+  * Removed patch to show windows version when collecting system info in winedbg
+    (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Tue, 01 Dec 2015 02:35:10 +0100
 
 wine-staging (1.8~rc2) unstable; urgency=low