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

urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY.

This commit is contained in:
Jacek Caban 2009-10-01 00:00:53 +02:00 committed by Alexandre Julliard
parent e41d6eb94d
commit 3b92a3f3a3
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/urlmon/sec_mgr.c
View File

@ -238,6 +238,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s
switch(action) { switch(action) {
case URLACTION_SCRIPT_OVERRIDE_SAFETY: case URLACTION_SCRIPT_OVERRIDE_SAFETY:
case URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY:
*(DWORD*)policy = URLPOLICY_DISALLOW; *(DWORD*)policy = URLPOLICY_DISALLOW;
return S_OK; return S_OK;
} }

7
dlls/urlmon/tests/sec_mgr.c
View File

@ -297,6 +297,12 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ
hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy, hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, action, (BYTE*)&policy,
sizeof(WCHAR), NULL, 0, 0, 0); sizeof(WCHAR), NULL, 0, 0, 0);
ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres); 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) static void test_activex(IInternetSecurityManager *secmgr)
@ -338,6 +344,7 @@ static void test_polices(void)
test_url_action(secmgr, zonemgr, 0xdeadbeef); test_url_action(secmgr, zonemgr, 0xdeadbeef);
test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY); test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY);
test_special_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY);
test_activex(secmgr); test_activex(secmgr);