[PATCH] urlmon/tests: CoInternetCreateZoneManager not present on W95B
Detlef Riekenberg
wine.dev at web.de
Tue Apr 13 17:00:38 CDT 2010
---
dlls/urlmon/tests/sec_mgr.c | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index 8e39301..ff6b1b8 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -346,8 +346,11 @@ static void test_polices(void)
&IID_IInternetSecurityManager, (void **)&secmgr);
ok(hres == S_OK, "CoCreateInstance for IInternetSecurityManager failed: %08x\n", hres);
- hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
- ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres);
+
+ hres = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IInternetZoneManager, (void **)&zonemgr);
+
+ ok(hres == S_OK, "CoCreateInstance for IInternetZoneManager failed: %08x\n", hres);
test_url_action(secmgr, zonemgr, URLACTION_SCRIPT_RUN);
test_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_RUN);
@@ -364,14 +367,16 @@ static void test_polices(void)
IInternetZoneManager_Release(zonemgr);
}
-static void test_CoInternetCreateZoneManager(void)
+static void test_InternetZoneManager(void)
{
IInternetZoneManager *zonemgr = NULL;
IUnknown *punk = NULL;
HRESULT hr;
- hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
- ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
+ hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IInternetZoneManager, (void **)&zonemgr);
+
+ ok(hr == S_OK, "CoCreateInstance for IInternetZoneManager failed: %08x\n", hr);
if (FAILED(hr))
return;
@@ -414,8 +419,10 @@ static void test_CreateZoneEnumerator(void)
DWORD dwCount;
DWORD dwCount2;
- hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
- ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
+ hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IInternetZoneManager, (void **)&zonemgr);
+
+ ok(hr == S_OK, "CoCreateInstance for IInternetZoneManager failed: %08x\n", hr);
if (FAILED(hr))
return;
@@ -480,8 +487,10 @@ static void test_GetZoneActionPolicy(void)
HRESULT hres;
DWORD action = URLACTION_CREDENTIALS_USE; /* Implemented on all IE versions */
- hres = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
- ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres);
+ hres = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IInternetZoneManager, (void **)&zonemgr);
+
+ ok(hres == S_OK, "CoCreateInstance for IInternetZoneManager failed: %08x\n", hres);
if(FAILED(hres))
return;
@@ -523,8 +532,10 @@ static void test_GetZoneAt(void)
DWORD dwZone;
DWORD i;
- hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
- ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
+ hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IInternetZoneManager, (void **)&zonemgr);
+
+ ok(hr == S_OK, "CoCreateInstance for IInternetZoneManager failed: %08x\n", hr);
if (FAILED(hr))
return;
@@ -571,8 +582,10 @@ static void test_GetZoneAttributes(void)
HRESULT hr;
DWORD i;
- hr = CoInternetCreateZoneManager(NULL, &zonemgr, 0);
- ok(hr == S_OK, "CoInternetCreateZoneManager result: 0x%x\n", hr);
+ hr = CoCreateInstance(&CLSID_InternetZoneManager, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IInternetZoneManager, (void **)&zonemgr);
+
+ ok(hr == S_OK, "CoCreateInstance for IInternetZoneManager failed: %08x\n", hr);
if (FAILED(hr))
return;
@@ -688,7 +701,7 @@ START_TEST(sec_mgr)
test_InternetGetSecurityUrl();
test_SecurityManager();
test_polices();
- test_CoInternetCreateZoneManager();
+ test_InternetZoneManager();
test_CreateZoneEnumerator();
test_GetZoneActionPolicy();
test_GetZoneAt();
--
1.7.0.4
More information about the wine-patches
mailing list