Jacek Caban : urlmon: Fix zone tests.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Tue Feb  6 20:48:19 2007 +0100

urlmon: Fix zone tests.

---

dlls/urlmon/sec_mgr.c    |    2 ++
 dlls/urlmon/tests/misc.c |   10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index ad423de..609ca4f 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -68,6 +68,8 @@ static HRESULT map_url_to_zone(LPCWSTR u
                     'P','r','o','t','o','c','o','l','D','e','f','a','u','l','t','s',0};
     static const WCHAR wszFile[] = {'f','i','l','e',0};

+    *zone = -1;
+
     hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0);
     if(FAILED(hres))
         return hres;
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index fedd15d..8774410 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -539,7 +539,7 @@ static void test_FindMimeFromData(void)
             ok(!lstrcmpW(mime, mime_tests[i].mime), "[%d] wrong mime\n", i);
             CoTaskMemFree(mime);
         }else {
-            ok(hres == E_FAIL, "FindMimeFromData failed: %08x, expected E_FAIL\n", hres);
+            ok(hres == E_FAIL, "[%d] FindMimeFromData failed: %08x, expected E_FAIL\n", i, hres);
             ok(mime == (LPWSTR)0xf0f0f0f0, "[%d] mime != 0xf0f0f0f0\n", i);
         }

@@ -664,8 +664,11 @@ static void test_SecurityManager(void)
         ok(hres == secmgr_tests[i].zone_hres,
            "[%d] MapUrlToZone failed: %08x, expected %08x\n",
                 i, hres, secmgr_tests[i].zone_hres);
-        ok(zone == secmgr_tests[i].zone, "[%d] zone=%d, expected %d\n", i, zone,
-                secmgr_tests[i].zone);
+        if(SUCCEEDED(hres))
+            ok(zone == secmgr_tests[i].zone, "[%d] zone=%d, expected %d\n", i, zone,
+               secmgr_tests[i].zone);
+        else
+            ok(zone == secmgr_tests[i].zone || zone == -1, "[%d] zone=%d\n", i, zone);

size = sizeof(buf);
         memset(buf, 0xf0, sizeof(buf));
@@ -684,6 +687,7 @@ static void test_SecurityManager(void)
     zone = 100;
     hres = IInternetSecurityManager_MapUrlToZone(secmgr, NULL, &zone, 0);
     ok(hres == E_INVALIDARG, "MapUrlToZone failed: %08x, expected E_INVALIDARG\n", hres);
+    ok(zone == 100, "zone=%d\n", zone);

size = sizeof(buf);
     hres = IInternetSecurityManager_GetSecurityId(secmgr, NULL, buf, &size, 0);