ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

urlmon: Fixed MapUrlToZone test on IE7.

This commit is contained in:
Jacek Caban 2008-03-08 20:15:45 +01:00 committed by Alexandre Julliard
parent 75fe97dc0b
commit bbfae3deff
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/urlmon/sec_mgr.c
View File

@ -66,7 +66,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone)
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
if(!*schema) if(!*schema)
return 0x80041001; return E_INVALIDARG;
/* file protocol is a special case */ /* file protocol is a special case */
if(!strcmpW(schema, wszFile)) { if(!strcmpW(schema, wszFile)) {

3
dlls/urlmon/tests/misc.c
View File

@ -754,7 +754,8 @@ static void test_SecurityManager(void)
zone = 100; zone = 100;
hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url, hres = IInternetSecurityManager_MapUrlToZone(secmgr, secmgr_tests[i].url,
&zone, 0); &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", "[%d] MapUrlToZone failed: %08x, expected %08x\n",
i, hres, secmgr_tests[i].zone_hres); i, hres, secmgr_tests[i].zone_hres);
if(SUCCEEDED(hres)) if(SUCCEEDED(hres))