Dmitry Timoshkov : winhttp/tests: Accept Windows7 return value for WinHttpQueryOption( WINHTTP_OPTION_CONNECTION_INFO).
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Dec 4 08:19:27 CST 2015
Module: wine
Branch: master
Commit: 42d42daa2e9699869fe553643d8811192fcdb940
URL: http://source.winehq.org/git/wine.git/?a=commit;h=42d42daa2e9699869fe553643d8811192fcdb940
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Fri Dec 4 17:14:05 2015 +0800
winhttp/tests: Accept Windows7 return value for WinHttpQueryOption(WINHTTP_OPTION_CONNECTION_INFO).
Windows7 doesn't include the size of info.cbSize field in the returned
'size' value.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winhttp/tests/winhttp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c
index bd6b47f..d6b4649 100644
--- a/dlls/winhttp/tests/winhttp.c
+++ b/dlls/winhttp/tests/winhttp.c
@@ -2903,7 +2903,7 @@ static void test_connection_info( int port )
memset( &info, 0, sizeof(info) );
ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size );
ok( ret, "failed to retrieve connection info %u\n", GetLastError() );
- ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize );
+ ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize );
ret = WinHttpReceiveResponse( req, NULL );
ok( ret, "failed to receive response %u\n", GetLastError() );
@@ -2912,7 +2912,7 @@ static void test_connection_info( int port )
memset( &info, 0, sizeof(info) );
ret = WinHttpQueryOption( req, WINHTTP_OPTION_CONNECTION_INFO, &info, &size );
ok( ret, "failed to retrieve connection info %u\n", GetLastError() );
- ok( info.cbSize == sizeof(info), "wrong size %u\n", info.cbSize );
+ ok( info.cbSize == sizeof(info) || info.cbSize == sizeof(info) - sizeof(info.cbSize) /* Win7 */, "wrong size %u\n", info.cbSize );
WinHttpCloseHandle( req );
WinHttpCloseHandle( con );
More information about the wine-cvs
mailing list