Module: wine Branch: master Commit: 5c57c838b283ff0759dd5912defe529ea56eed81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c57c838b283ff0759dd5912de...
Author: Jacek Caban jacek@codeweavers.com Date: Sun Oct 7 17:50:02 2007 +0200
urlmon: Fixed test on IE7.
---
dlls/urlmon/sec_mgr.c | 4 +++- dlls/urlmon/tests/misc.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 609ca4f..52e29b6 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -251,8 +251,10 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac return hres; }
- if(!pwszUrl) + if(!pwszUrl) { + *pdwZone = -1; return E_INVALIDARG; + }
if(dwFlags) FIXME("not supported flags: %08x\n", dwFlags); diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index c93d6c2..b6f6421 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -691,7 +691,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); + ok(zone == 100 || zone == -1, "zone=%d\n", zone);
size = sizeof(buf); hres = IInternetSecurityManager_GetSecurityId(secmgr, NULL, buf, &size, 0);