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

urlmon: Improve QueryCustomPolicy stub.

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

4
dlls/urlmon/sec_mgr.c
View File

@ -590,8 +590,8 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager
return hres; return hres;
} }
FIXME("Default action is not implemented\n"); WARN("Unknown guidKey %s\n", debugstr_guid(guidKey));
return E_NOTIMPL; return HRESULT_FROM_WIN32(ERROR_NOT_FOUND);
} }
static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface, static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface,

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

@ -71,6 +71,10 @@ static const BYTE secid10_2[] =
static const GUID CLSID_TestActiveX = static const GUID CLSID_TestActiveX =
{0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}};
/* Defined as extern in urlmon.idl, but not exported by uuid.lib */
const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY =
{0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}};
static struct secmgr_test { static struct secmgr_test {
LPCWSTR url; LPCWSTR url;
DWORD zone; DWORD zone;
@ -297,7 +301,9 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ
static void test_activex(IInternetSecurityManager *secmgr) static void test_activex(IInternetSecurityManager *secmgr)
{ {
DWORD policy; DWORD policy, policy_size;
struct CONFIRMSAFETY cs;
BYTE *ppolicy;
HRESULT hres; HRESULT hres;
policy = 0xdeadbeef; policy = 0xdeadbeef;
@ -305,6 +311,13 @@ static void test_activex(IInternetSecurityManager *secmgr)
sizeof(DWORD), (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0); sizeof(DWORD), (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0);
ok(hres == S_OK, "ProcessUrlAction(URLACTION_ACTIVEX_RUN) failed: %08x\n", hres); ok(hres == S_OK, "ProcessUrlAction(URLACTION_ACTIVEX_RUN) failed: %08x\n", hres);
ok(policy == URLPOLICY_ALLOW || policy == URLPOLICY_DISALLOW, "policy = %x\n", policy); ok(policy == URLPOLICY_ALLOW || policy == URLPOLICY_DISALLOW, "policy = %x\n", policy);
cs.clsid = CLSID_TestActiveX;
cs.pUnk = (IUnknown*)0xdeadbeef;
cs.dwFlags = 0;
hres = IInternetSecurityManager_QueryCustomPolicy(secmgr, url1, &GUID_CUSTOM_CONFIRMOBJECTSAFETY,
&ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0);
ok(hres == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), "QueryCusromPolicy failed: %08x\n", hres);
} }
static void test_polices(void) static void test_polices(void)