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

urlmon: Correctly handle pPolicy and pContext arguments in ProcessUrlAction.

This commit is contained in:
Jacek Caban 2009-09-30 23:59:47 +02:00 committed by Alexandre Julliard
parent b6dff3f733
commit 7f11de8682
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/urlmon/sec_mgr.c
View File

@ -536,7 +536,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager *
return hres; return hres;
} }
if(pContext || cbContext || dwFlags || dwReserved) if(dwFlags || dwReserved)
FIXME("Unsupported arguments\n"); FIXME("Unsupported arguments\n");
if(!pwszUrl) if(!pwszUrl)
@ -551,6 +551,8 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager *
return hres; return hres;
TRACE("policy %x\n", policy); TRACE("policy %x\n", policy);
if(cbPolicy >= sizeof(DWORD))
*(DWORD*)pPolicy = policy;
switch(GetUrlPolicyPermissions(policy)) { switch(GetUrlPolicyPermissions(policy)) {
case URLPOLICY_ALLOW: case URLPOLICY_ALLOW:

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

@ -68,6 +68,9 @@ static const BYTE secid10[] =
static const BYTE secid10_2[] = static const BYTE secid10_2[] =
{'f','i','l','e',':','s','o','m','e',' ','f','i','l','e','.','j','p','g',3,0,0,0}; {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e','.','j','p','g',3,0,0,0};
static const GUID CLSID_TestActiveX =
{0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}};
static struct secmgr_test { static struct secmgr_test {
LPCWSTR url; LPCWSTR url;
DWORD zone; DWORD zone;
@ -242,6 +245,33 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag
else else
ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres); ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres);
ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy); ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy);
policy = 0xdeadbeef;
hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy,
2, NULL, 0, 0, 0);
if(reg_policy == URLPOLICY_DISALLOW)
ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres);
else
ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres);
ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy);
policy = 0xdeadbeef;
hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy,
sizeof(DWORD), NULL, 0, 0, 0);
if(reg_policy == URLPOLICY_DISALLOW)
ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres);
else
ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres);
ok(policy == reg_policy, "(%x) policy=%x\n", action, policy);
policy = 0xdeadbeef;
hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url9, action, (BYTE*)&policy,
sizeof(WCHAR), (BYTE*)0xdeadbeef, 16, 0, 0);
if(reg_policy == URLPOLICY_DISALLOW)
ok(hres == S_FALSE, "ProcessUrlAction(%x) failed: %08x, expected S_FALSE\n", action, hres);
else
ok(hres == S_OK, "ProcessUrlAction(%x) failed: %08x\n", action, hres);
ok(policy == 0xdeadbeef, "(%x) policy=%x\n", action, policy);
}else { }else {
skip("IE running in Enhanced Security Configuration\n"); skip("IE running in Enhanced Security Configuration\n");
} }
@ -265,6 +295,18 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ
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);
} }
static void test_activex(IInternetSecurityManager *secmgr)
{
DWORD policy;
HRESULT hres;
policy = 0xdeadbeef;
hres = IInternetSecurityManager_ProcessUrlAction(secmgr, url1, URLACTION_ACTIVEX_RUN, (BYTE*)&policy,
sizeof(DWORD), (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0);
ok(hres == S_OK, "ProcessUrlAction(URLACTION_ACTIVEX_RUN) failed: %08x\n", hres);
ok(policy == URLPOLICY_ALLOW || policy == URLPOLICY_DISALLOW, "policy = %x\n", policy);
}
static void test_polices(void) static void test_polices(void)
{ {
IInternetZoneManager *zonemgr = NULL; IInternetZoneManager *zonemgr = NULL;
@ -277,12 +319,15 @@ static void test_polices(void)
ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres); ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres);
test_url_action(secmgr, zonemgr, URLACTION_SCRIPT_RUN); test_url_action(secmgr, zonemgr, URLACTION_SCRIPT_RUN);
test_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_RUN);
test_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_OBJECT_SAFETY); test_url_action(secmgr, zonemgr, URLACTION_ACTIVEX_OVERRIDE_OBJECT_SAFETY);
test_url_action(secmgr, zonemgr, URLACTION_CHANNEL_SOFTDIST_PERMISSIONS); test_url_action(secmgr, zonemgr, URLACTION_CHANNEL_SOFTDIST_PERMISSIONS);
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_activex(secmgr);
IInternetSecurityManager_Release(secmgr); IInternetSecurityManager_Release(secmgr);
IInternetZoneManager_Release(zonemgr); IInternetZoneManager_Release(zonemgr);
} }