Jacek Caban : urlmon: Fixed MapUrlToZone test on IE7.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Sat Mar  8 20:15:45 2008 +0100

urlmon: Fixed MapUrlToZone test on IE7.

---

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

diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index 0b56ba4..6ed72dc 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -66,7 +66,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone)
     if(FAILED(hres))
         return hres;
     if(!*schema)
-        return 0x80041001;
+        return E_INVALIDARG;
 
     /* file protocol is a special case */
     if(!strcmpW(schema, wszFile)) {
diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c
index 50a40b1..01c5eaf 100644
--- a/dlls/urlmon/tests/misc.c
+++ b/dlls/urlmon/tests/misc.c
@@ -754,7 +754,8 @@ static void test_SecurityManager(void)
         zone = 100;
         hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url,
                                                      &zone, 0);
-        ok(hres == secmgr_tests[i].zone_hres,
+        ok(hres == secmgr_tests[i].zone_hres /* IE <=6 */
+           || (FAILED(secmgr_tests[i].zone_hres) && hres == E_INVALIDARG), /* IE7 */
            "[%d] MapUrlToZone failed: %08x, expected %08x\n",
                 i, hres, secmgr_tests[i].zone_hres);
         if(SUCCEEDED(hres))