Jacek Caban : wininet: Skip security flags tests on too old wininet versions.

Alexandre Julliard julliard at winehq.org
Fri Jun 8 13:36:14 CDT 2012


Module: wine
Branch: master
Commit: e3dfbe33f6b1e77b2f3689849ff0454a15be853f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e3dfbe33f6b1e77b2f3689849ff0454a15be853f

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Jun  8 15:02:51 2012 +0200

wininet: Skip security flags tests on too old wininet versions.

---

 dlls/wininet/tests/http.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c
index 1d82537..e7be839 100644
--- a/dlls/wininet/tests/http.c
+++ b/dlls/wininet/tests/http.c
@@ -2933,8 +2933,8 @@ static void _test_secflags_option(unsigned line, HINTERNET req, DWORD ex_flags)
     flags = 0xdeadbeef;
     size = sizeof(flags);
     res = InternetQueryOptionW(req, 98, &flags, &size);
-    ok_(__FILE__,line)(res, "InternetQueryOptionW(INTERNET_OPTION_SECURITY_FLAGS) failed: %u\n", GetLastError());
-    ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS flags = %x, expected %x\n", flags, ex_flags);
+    ok_(__FILE__,line)(res, "InternetQueryOptionW(98) failed: %u\n", GetLastError());
+    ok_(__FILE__,line)(flags == ex_flags, "INTERNET_OPTION_SECURITY_FLAGS(98) flags = %x, expected %x\n", flags, ex_flags);
 }
 
 #define set_secflags(a,b,c) _set_secflags(__LINE__,a,b,c)
@@ -2975,6 +2975,17 @@ static void test_security_flags(void)
     ok(req != NULL, "HttpOpenRequest failed\n");
     CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED);
 
+    flags = 0xdeadbeef;
+    size = sizeof(flags);
+    res = InternetQueryOptionW(req, 98, &flags, &size);
+    if(!res && GetLastError() == ERROR_INVALID_PARAMETER) {
+        win_skip("Incomplete security flags support, skipping\n");
+
+        close_async_handle(ses, hCompleteEvent, 2);
+        CloseHandle(hCompleteEvent);
+        return;
+    }
+
     test_secflags_option(req, 0);
 
     set_secflags(req, TRUE, SECURITY_FLAG_IGNORE_REVOCATION);




More information about the wine-cvs mailing list