Added patch to silence repeated winhttp "no support on this platform" message.

This commit is contained in:
Sebastian Lackner 2015-07-09 06:23:37 +02:00
parent 04f83c2765
commit d7500bccd1
3 changed files with 45 additions and 1 deletions

2
debian/changelog vendored
View File

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

View File

@ -55,7 +55,7 @@ version()
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
echo " commit 71e5fdf478dbfb1821d4c39a55c3555cc8188741"
echo " commit 47a11ec626dc8888442ab0f5eb943e1d33048114"
echo ""
}
@ -269,6 +269,7 @@ patch_enable_all ()
enable_winex11_Window_Style="$1"
enable_winex11_XEMBED="$1"
enable_winex11_wglShareLists="$1"
enable_winhttp_System_Proxy_Autoconfig="$1"
enable_wininet_Cleanup="$1"
enable_wininet_ParseX509EncodedCertificateForListBoxEntry="$1"
enable_winmm_Delay_Import_Depends="$1"
@ -879,6 +880,9 @@ patch_enable ()
winex11-wglShareLists)
enable_winex11_wglShareLists="$2"
;;
winhttp-System_Proxy_Autoconfig)
enable_winhttp_System_Proxy_Autoconfig="$2"
;;
wininet-Cleanup)
enable_wininet_Cleanup="$2"
;;
@ -5539,6 +5543,18 @@ if test "$enable_winex11_wglShareLists" -eq 1; then
) >> "$patchlist"
fi
# Patchset winhttp-System_Proxy_Autoconfig
# |
# | Modified files:
# | * dlls/winhttp/session.c
# |
if test "$enable_winhttp_System_Proxy_Autoconfig" -eq 1; then
patch_apply winhttp-System_Proxy_Autoconfig/0001-winhttp-Silence-repeated-no-support-on-this-platform.patch
(
echo '+ { "Jarkko Korpi", "winhttp: Silence repeated \"no support on this platform\" message.", 1 },';
) >> "$patchlist"
fi
# Patchset wininet-Cleanup
# |
# | This patchset fixes the following Wine bugs:

View File

@ -0,0 +1,26 @@
From e449ba207a501ae85ae23a1b0c84e91eea90caf6 Mon Sep 17 00:00:00 2001
From: Jarkko Korpi <jarkko_korpi@hotmail.com>
Date: Mon, 6 Jul 2015 21:07:26 +0300
Subject: winhttp: Silence repeated "no support on this platform" message.
---
dlls/winhttp/session.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index 1b54288..c84c69a 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -1339,7 +1339,8 @@ static BOOL get_system_proxy_autoconfig_url( char *buf, DWORD buflen )
CFRelease( settings );
return ret;
#else
- FIXME( "no support on this platform\n" );
+ static int once;
+ if (!once++) FIXME( "no support on this platform\n" );
return FALSE;
#endif
}
--
2.4.5