Thomas Mullaly : urlmon: Added custom security manager support to MapUrlToZoneEx2.
Alexandre Julliard
julliard at winehq.org
Mon Oct 10 10:25:35 CDT 2011
Module: wine
Branch: master
Commit: 8fc8823d5c651e82acc5342aff19d8aeb6e04a26
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc8823d5c651e82acc5342aff19d8aeb6e04a26
Author: Thomas Mullaly <thomas.mullaly at gmail.com>
Date: Thu Sep 8 17:59:59 2011 -0400
urlmon: Added custom security manager support to MapUrlToZoneEx2.
---
dlls/urlmon/sec_mgr.c | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index 314605e..0c7170c 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -1070,6 +1070,30 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZoneEx2(IInternetSecurityManagerEx2
TRACE("(%p)->(%p %p %08x %p %p)\n", This, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags);
+ if(This->custom_manager) {
+ HRESULT hres;
+ IInternetSecurityManagerEx2 *sec_mgr2;
+
+ hres = IInternetSecurityManager_QueryInterface(This->custom_manager, &IID_IInternetSecurityManagerEx2,
+ (void**)&sec_mgr2);
+ if(SUCCEEDED(hres)) {
+ hres = IInternetSecurityManagerEx2_MapUrlToZoneEx2(sec_mgr2, pUri, pdwZone, dwFlags, ppwszMappedUrl, pdwOutFlags);
+ IInternetSecurityManagerEx2_Release(sec_mgr2);
+ } else {
+ BSTR url;
+
+ hres = IUri_GetDisplayUri(pUri, &url);
+ if(FAILED(hres))
+ return hres;
+
+ hres = IInternetSecurityManager_MapUrlToZone(This->custom_manager, url, pdwZone, dwFlags);
+ SysFreeString(url);
+ }
+
+ if(hres != INET_E_DEFAULT_ACTION)
+ return hres;
+ }
+
if(!pdwZone)
return E_INVALIDARG;
More information about the wine-cvs
mailing list