Jacek Caban : urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY.
Alexandre Julliard
julliard at winehq.org
Thu Oct 1 09:48:18 CDT 2009
Module: wine
Branch: master
Commit: 3b92a3f3a3f1b87e786565c00d0c5722925ba6e9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b92a3f3a3f1b87e786565c00d0c5722925ba6e9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Oct 1 00:00:53 2009 +0200
urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY.
---
dlls/urlmon/sec_mgr.c | 1 +
dlls/urlmon/tests/sec_mgr.c | 7 +++++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c
index b3d468d..7a1255a 100644
--- a/dlls/urlmon/sec_mgr.c
+++ b/dlls/urlmon/sec_mgr.c
@@ -238,6 +238,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s
switch(action) {
case URLACTION_SCRIPT_OVERRIDE_SAFETY:
+ case URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY:
*(DWORD*)policy = URLPOLICY_DISALLOW;
return S_OK;
}
diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c
index 8820811..62471cf 100644
--- a/dlls/urlmon/tests/sec_mgr.c
+++ b/dlls/urlmon/tests/sec_mgr.c
@@ -297,6 +297,12 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ
hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy,
sizeof(WCHAR), NULL, 0, 0, 0);
ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres);
+
+ policy = 0xdeadbeef;
+ hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy,
+ sizeof(DWORD), NULL, 0, 0, 0);
+ ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres);
+ ok(policy == URLPOLICY_DISALLOW, "policy = %x\n", policy);
}
static void test_activex(IInternetSecurityManager *secmgr)
@@ -338,6 +344,7 @@ static void test_polices(void)
test_url_action(secmgr, zonemgr, 0xdeadbeef);
test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY);
+ test_special_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY);
test_activex(secmgr);
More information about the wine-cvs
mailing list