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@baikal.ru> Signed-off-by: Hans Leidekker <hans@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winhttp/tests: Accept Windows7 return value for WinHttpQueryOption(WINHTTP_OPTION_CONNECTION_INFO).
42d42daa · Dmitry Timoshkov · Alexandre Julliard · 3e7da62a · 42d42daa
Commit 42d42daa authored Dec 04, 2015 by Dmitry Timoshkov Committed by Alexandre Julliard Dec 04, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

winhttp.c dlls/winhttp/tests/winhttp.c +2 -2

No files found.
--- 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 );