Jacek Caban : urlmon: Skip tests on IEs older than 6 by checking for CompareSecurityIds.

Alexandre Julliard julliard at winehq.org
Thu Sep 30 11:23:37 CDT 2010


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Sep 30 13:02:44 2010 +0200

urlmon: Skip tests on IEs older than 6 by checking for CompareSecurityIds.

---

 dlls/urlmon/tests/misc.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 558fc42..0dacd12 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -74,6 +74,7 @@ static HRESULT (WINAPI *pFindMimeFromData)(LPBC, LPCWSTR, LPVOID, DWORD, LPCWSTR
 static HRESULT (WINAPI *pObtainUserAgentString)(DWORD, LPSTR, DWORD*);
 static HRESULT (WINAPI *pReleaseBindInfo)(BINDINFO*);
 static HRESULT (WINAPI *pUrlMkGetSessionOption)(DWORD, LPVOID, DWORD, DWORD *, DWORD);
+static HRESULT (WINAPI *pCompareSecurityIds)(BYTE*,DWORD,BYTE*,DWORD,DWORD);
 
 
 static void test_CreateFormatEnum(void)
@@ -1472,10 +1473,11 @@ START_TEST(misc)
     pObtainUserAgentString = (void*) GetProcAddress(hurlmon, "ObtainUserAgentString");
     pReleaseBindInfo = (void*) GetProcAddress(hurlmon, "ReleaseBindInfo");
     pUrlMkGetSessionOption = (void*) GetProcAddress(hurlmon, "UrlMkGetSessionOption");
+    pCompareSecurityIds = (void*) GetProcAddress(hurlmon, "CompareSecurityIds");
 
     if (!pCoInternetCompareUrl || !pCoInternetGetSecurityUrl ||
-        !pCoInternetGetSession || !pCoInternetParseUrl) {
-        win_skip("Various needed functions not present in IE 4.0\n");
+        !pCoInternetGetSession || !pCoInternetParseUrl || !pCompareSecurityIds) {
+        win_skip("Various needed functions not present, too old IE\n");
         return;
     }
 




More information about the wine-cvs mailing list