[PATCH 1/8] urlmon/tests: CoInternetCreateSecurityManager not present on W95B

Detlef Riekenberg wine.dev at web.de
Thu Apr 15 17:19:56 CDT 2010


That IE is really old
---
 dlls/urlmon/tests/sec_mgr.c |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index 239da6c..27e3c26 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -35,6 +35,7 @@
 
 #include "initguid.h"
 
+static HRESULT (WINAPI *pCoInternetCreateSecurityManager)(IServiceProvider *, IInternetSecurityManager**, DWORD);
 static HRESULT (WINAPI *pCoInternetGetSecurityUrl)(LPCWSTR, LPWSTR*, PSUACTION, DWORD);
 
 static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l',
@@ -109,7 +110,12 @@ static void test_SecurityManager(void)
     DWORD zone, size, policy;
     HRESULT hres;
 
-    hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0);
+    if(!pCoInternetCreateSecurityManager) {
+        win_skip("CoInternetCreateSecurityManager not found\n");
+        return;
+    }
+
+    hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0);
     ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres);
     if(FAILED(hres))
         return;
@@ -342,7 +348,12 @@ static void test_polices(void)
     IInternetSecurityManager *secmgr = NULL;
     HRESULT hres;
 
-    hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0);
+    if(!pCoInternetCreateSecurityManager) {
+        win_skip("CoInternetCreateSecurityManager not found\n");
+        return;
+    }
+
+    hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0);
     ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres);
     hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
     ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres);
@@ -622,7 +633,13 @@ static void test_InternetSecurityMarshalling(void)
     IStream *stream;
     HRESULT hres;
 
-    hres = CoInternetCreateSecurityManager(NULL, &secmgr, 0);
+    if(!pCoInternetCreateSecurityManager) {
+        win_skip("CoInternetCreateSecurityManager not found\n");
+        return;
+    }
+
+    hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0);
+    ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres);
     if(FAILED(hres))
         return;
 
@@ -688,6 +705,7 @@ START_TEST(sec_mgr)
     OleInitialize(NULL);
 
     hurlmon = GetModuleHandle("urlmon.dll");
+    pCoInternetCreateSecurityManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateSecurityManager");
     pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl");
 
     test_InternetGetSecurityUrl();
-- 
1.7.0.4




More information about the wine-patches mailing list