[PATCH 3/8] urlmon/tests: CoInternetGetSecurityUrl not present on W95B

Detlef Riekenberg wine.dev at web.de
Thu Apr 15 17:20:24 CDT 2010


I forgot to commit the changes in misc.c when i created the patch
for this topic some days ago
---
 dlls/urlmon/tests/misc.c |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 259c5a0..f9fe2f5 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -64,6 +64,7 @@ DEFINE_EXPECT(CreateInstance);
 DEFINE_EXPECT(unk_Release);
 
 static HRESULT (WINAPI *pCoInternetCompareUrl)(LPCWSTR, LPCWSTR, DWORD);
+static HRESULT (WINAPI *pCoInternetGetSecurityUrl)(LPCWSTR, LPWSTR*, PSUACTION, DWORD);
 
 static void test_CreateFormatEnum(void)
 {
@@ -979,17 +980,19 @@ static void test_NameSpace(void)
     SET_EXPECT(QI_IInternetProtocolInfo);
     SET_EXPECT(ParseUrl);
 
-    hres = CoInternetGetSecurityUrl(url8, &sec_url, PSU_SECURITY_URL_ONLY, 0);
-    ok(hres == S_OK, "CoInternetGetSecurityUrl failed: %08x\n", hres);
-    if(hres == S_OK) {
-        ok(lstrlenW(sec_url)>sizeof(wszFile)/sizeof(WCHAR) &&
-                !memcmp(sec_url, wszFile, sizeof(wszFile)-sizeof(WCHAR)),
-                "Encoded url = %s\n", wine_dbgstr_w(sec_url));
-        CoTaskMemFree(sec_url);
-    }
+    if (pCoInternetGetSecurityUrl) {
+        hres = pCoInternetGetSecurityUrl(url8, &sec_url, PSU_SECURITY_URL_ONLY, 0);
+        ok(hres == S_OK, "CoInternetGetSecurityUrl failed: %08x\n", hres);
+        if(hres == S_OK) {
+            ok(lstrlenW(sec_url)>sizeof(wszFile)/sizeof(WCHAR) &&
+                    !memcmp(sec_url, wszFile, sizeof(wszFile)-sizeof(WCHAR)),
+                    "Encoded url = %s\n", wine_dbgstr_w(sec_url));
+            CoTaskMemFree(sec_url);
+        }
 
-    CHECK_CALLED(QI_IInternetProtocolInfo);
-    CHECK_CALLED(ParseUrl);
+        CHECK_CALLED(QI_IInternetProtocolInfo);
+        CHECK_CALLED(ParseUrl);
+    }
 
     hres = IInternetSession_UnregisterNameSpace(session, &test_protocol_cf, wszTest);
     ok(hres == S_OK, "UnregisterNameSpace failed: %08x\n", hres);
@@ -1417,6 +1420,7 @@ START_TEST(misc)
 
     hurlmon = GetModuleHandle("urlmon.dll");
     pCoInternetCompareUrl = (void *) GetProcAddress(hurlmon, "CoInternetCompareUrl");
+    pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl");
 
     test_CreateFormatEnum();
     test_RegisterFormatEnumerator();
-- 
1.7.0.4




More information about the wine-patches mailing list