Added patch to silence repeated wbemprox "timeout not supported" fixme.

This commit is contained in:
Sebastian Lackner 2015-07-09 06:35:48 +02:00
parent d7500bccd1
commit e3bece1c76
5 changed files with 55 additions and 0 deletions

View File

@ -39,6 +39,11 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [1]:**
* Silence repeated wbemprox "timeout not supported" fixme ([Wine Bug #37618](https://bugs.winehq.org/show_bug.cgi?id=37618))
**Bug fixes and features in Wine Staging 1.7.46 [236]:**
*Note: The following list only contains features and bug fixes which are not

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
wine-staging (1.7.47) UNRELEASED; urgency=low
* Added patch to silence repeated winhttp "no support on this platform"
message.
* Added patch to silence repeated wbemprox "timeout not supported" fixme.
* Removed patch to implement kernel32.GetNumaProcessorNode (accepted
upstream).
* Removed patch to initialize *end with NULL on failure in msvcrt.strtod

View File

@ -237,6 +237,7 @@ patch_enable_all ()
enable_vcomp_Stub_Functions="$1"
enable_version_VerQueryValue="$1"
enable_wbemdisp_ISWbemSecurity="$1"
enable_wbemdisp_Timeout="$1"
enable_wiaservc_IEnumWIA_DEV_INFO="$1"
enable_windowscodecs_GIF_Decoder="$1"
enable_windowscodecs_TIFF_Decoder="$1"
@ -784,6 +785,9 @@ patch_enable ()
wbemdisp-ISWbemSecurity)
enable_wbemdisp_ISWbemSecurity="$2"
;;
wbemdisp-Timeout)
enable_wbemdisp_Timeout="$2"
;;
wiaservc-IEnumWIA_DEV_INFO)
enable_wiaservc_IEnumWIA_DEV_INFO="$2"
;;
@ -4660,6 +4664,21 @@ if test "$enable_wbemdisp_ISWbemSecurity" -eq 1; then
) >> "$patchlist"
fi
# Patchset wbemdisp-Timeout
# |
# | This patchset fixes the following Wine bugs:
# | * [#37618] Silence repeated wbemprox "timeout not supported" fixme
# |
# | Modified files:
# | * dlls/wbemprox/class.c
# |
if test "$enable_wbemdisp_Timeout" -eq 1; then
patch_apply wbemdisp-Timeout/0001-wbemprox-Silence-repeated-timeout-not-supported-fixm.patch
(
echo '+ { "Jarkko Korpi", "wbemprox: Silence repeated \"timeout not supported\" fixme.", 1 },';
) >> "$patchlist"
fi
# Patchset wiaservc-IEnumWIA_DEV_INFO
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,29 @@
From de11056b08110b83c3ce9e2f90c16280d6c74193 Mon Sep 17 00:00:00 2001
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
Date: Mon, 6 Jul 2015 23:47:07 +0300
Subject: wbemprox: Silence repeated "timeout not supported" fixme.
---
dlls/wbemprox/class.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c
index afb9f8c..5ce0381 100644
--- a/dlls/wbemprox/class.c
+++ b/dlls/wbemprox/class.c
@@ -120,7 +120,11 @@ static HRESULT WINAPI enum_class_object_Next(
if (!uCount) return WBEM_S_FALSE;
if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER;
- if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n");
+ if (lTimeout != WBEM_INFINITE)
+ {
+ static int once;
+ if (!once++) FIXME("timeout not supported\n");
+ }
*puReturned = 0;
if (ec->index >= view->count) return WBEM_S_FALSE;
--
2.4.5

View File

@ -0,0 +1 @@
Fixes: [37618] Silence repeated wbemprox "timeout not supported" fixme