[PATCH 2/8] urlmon/tests: CoInternetCreateZoneManager not present on W95B

[Detlef Riekenberg]

---
 dlls/urlmon/tests/sec_mgr.c |   29 +++++++++++++++++++++--------
 1 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index 27e3c26..cce26a7 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -35,7 +35,9 @@
 
 #include "initguid.h"
 
+
 static HRESULT (WINAPI *pCoInternetCreateSecurityManager)(IServiceProvider *, IInternetSecurityManager**, DWORD);
+static HRESULT (WINAPI *pCoInternetCreateZoneManager)(IServiceProvider *, IInternetZoneManager**, 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',
@@ -348,14 +350,14 @@ static void test_polices(void)
     IInternetSecurityManager *secmgr = NULL;
     HRESULT hres;
 
-    if(!pCoInternetCreateSecurityManager) {
-        win_skip("CoInternetCreateSecurityManager not found\n");
+    if(!pCoInternetCreateSecurityManager || !pCoInternetCreateZoneManager) {
+        win_skip("CoInternetCreateSecurityManager or CoInternetCreateZoneManager not found\n");
         return;
     }
 
     hres = pCoInternetCreateSecurityManager(NULL, &secmgr, 0);
     ok(hres == S_OK, "CoInternetCreateSecurityManager failed: %08x\n", hres);
-    hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
+    hres = pCoInternetCreateZoneManager(NULL, &zonemgr, 0);
     ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres);
 
     test_url_action(secmgr, zonemgr, URLACTION_SCRIPT_RUN);
@@ -379,7 +381,12 @@ static void test_CoInternetCreateZoneManager(void)
     IUnknown *punk = NULL;
     HRESULT hr;
 
-    hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
+    if(!pCoInternetCreateZoneManager) {
+        win_skip("CoInternetCreateZoneManager not found\n");
+        return;
+    }
+
+    hr = pCoInternetCreateZoneManager(NULL, &zonemgr, 0);
     ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
     if (FAILED(hr))
         return;
@@ -423,7 +430,12 @@ static void test_CreateZoneEnumerator(void)
     DWORD dwCount;
     DWORD dwCount2;
 
-    hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
+    if (!pCoInternetCreateZoneManager) {
+        win_skip("CoInternetCreateZoneManager not found\n");
+        return;
+    }
+
+    hr = pCoInternetCreateZoneManager(NULL, &zonemgr, 0);
     ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
     if (FAILED(hr))
         return;
@@ -489,7 +501,7 @@ static void test_GetZoneActionPolicy(void)
     HRESULT hres;
     DWORD action = URLACTION_CREDENTIALS_USE; /* Implemented on all IE versions */
 
-    hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
+    hres = pCoInternetCreateZoneManager(NULL, &zonemgr, 0);
     ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres);
     if(FAILED(hres))
         return;
@@ -532,7 +544,7 @@ static void test_GetZoneAt(void)
     DWORD dwZone;
     DWORD i;
 
-    hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
+    hr = pCoInternetCreateZoneManager(NULL, &zonemgr, 0);
     ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
     if (FAILED(hr))
         return;
@@ -580,7 +592,7 @@ static void test_GetZoneAttributes(void)
     HRESULT hr;
     DWORD i;
 
-    hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
+    hr = pCoInternetCreateZoneManager(NULL, &zonemgr, 0);
     ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
     if (FAILED(hr))
         return;
@@ -706,6 +718,7 @@ START_TEST(sec_mgr)
 
     hurlmon = GetModuleHandle("urlmon.dll");
     pCoInternetCreateSecurityManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateSecurityManager");
+    pCoInternetCreateZoneManager = (void*) GetProcAddress(hurlmon, "CoInternetCreateZoneManager");
     pCoInternetGetSecurityUrl = (void*) GetProcAddress(hurlmon, "CoInternetGetSecurityUrl");
 
     test_InternetGetSecurityUrl();
-- 
1.7.0.4