wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Nikolay Sivov : comctl32/datetime: Always store a recalculated day of week instead of a value passed in ( DTM_SETSYSTEMTIME).
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 9557376138f3b2508d4b523314182d7dafd4fa85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9557376138f3b2508d4b52331… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 03:11:00 2009 +0400 comctl32/datetime: Always store a recalculated day of week instead of a value passed in (DTM_SETSYSTEMTIME). --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/datetime.c | 11 ++++++++--- dlls/comctl32/monthcal.c | 2 +- dlls/comctl32/tests/datetime.c | 6 +++--- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index fd07110..e0d1970 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -231,6 +231,7 @@ extern void UPDOWN_Unregister(void); int MONTHCAL_MonthLength(int month, int year); +int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year); extern void THEMING_Initialize(void); extern void THEMING_Uninitialize(void); diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 224519a..8f7f5dd 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -88,6 +88,7 @@ typedef struct /* in monthcal.c */ extern int MONTHCAL_MonthLength(int month, int year); +extern int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year); /* this list of defines is closely related to `allowedformatchars' defined * in datetime.c; the high nibble indicates the `base type' of the format @@ -164,17 +165,21 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy if (flag == GDT_VALID) { if (systime->wYear < 1601 || systime->wYear > 30827 || systime->wMonth < 1 || systime->wMonth > 12 || - systime->wDayOfWeek > 6 || systime->wDay < 1 || systime->wDay > 31 || systime->wHour > 23 || systime->wMinute > 59 || systime->wSecond > 59 || systime->wMilliseconds > 999 ) - return 0; + return FALSE; infoPtr->dateValid = TRUE; infoPtr->date = *systime; + /* always store a valid day of week */ + infoPtr->date.wDayOfWeek = + MONTHCAL_CalculateDayOfWeek(infoPtr->date.wDay, infoPtr->date.wMonth, + infoPtr->date.wYear); + SendMessageW (infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date)); SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_CHECKED, 0); } else if ((infoPtr->dwStyle & DTS_SHOWNONE) && (flag == GDT_NONE)) { @@ -182,7 +187,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_UNCHECKED, 0); } else - return 0; + return FALSE; InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return TRUE; diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index fcfc7eb..71e477e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -199,7 +199,7 @@ static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) /* returns the day in the week(0 == sunday, 6 == saturday) */ /* day(1 == 1st, 2 == 2nd... etc), year is the year value */ -static int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) +int MONTHCAL_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year) { year-=(month < 3); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 26d7ea1..c449e45 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -616,7 +616,7 @@ static void test_dtm_set_and_get_system_time(void) st = ref; st.wDayOfWeek = 10; r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); - todo_wine expect(1, r); + expect(1, r); r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); expect(GDT_VALID, r); expect_systime(&ref, &getSt); @@ -661,9 +661,9 @@ static void test_dtm_set_and_get_system_time(void) r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); expect(GDT_VALID, r); /* 01.10.2009 is Thursday */ - todo_wine expect(4, (LRESULT)getSt.wDayOfWeek); + expect(4, (LRESULT)getSt.wDayOfWeek); st.wDayOfWeek = 4; - todo_wine expect_systime(&st, &getSt); + expect_systime(&st, &getSt); DestroyWindow(hWnd); }

1 0

Nikolay Sivov : comctl32/datetime: Some DTM_SETSYSTEMTIME tests.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 99ded940e142d0f688500eb782697655fe4f244b URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ded940e142d0f688500eb78… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 03:00:26 2009 +0400 comctl32/datetime: Some DTM_SETSYSTEMTIME tests. --- dlls/comctl32/tests/datetime.c | 88 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 87 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 986fc8e..26d7ea1 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -524,7 +524,7 @@ static void test_dtm_set_range_swap_min_max(void) static void test_dtm_set_and_get_system_time(void) { LRESULT r; - SYSTEMTIME st, getSt; + SYSTEMTIME st, getSt, ref; HWND hWnd, hWndDateTime_test_gdt_none; hWndDateTime_test_gdt_none = create_datetime_control(0, 0); @@ -579,6 +579,92 @@ static void test_dtm_set_and_get_system_time(void) expect_unsuccess(0, r); ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_system_time_seq, "test_dtm_set_and_get_system_time", FALSE); + + /* set to some valid value */ + GetSystemTime(&ref); + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&ref); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + + /* year invalid */ + st = ref; + st.wYear = 0; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + todo_wine expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* month invalid */ + st = ref; + st.wMonth = 13; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* day invalid */ + st = ref; + st.wDay = 32; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* day of week isn't validated */ + st = ref; + st.wDayOfWeek = 10; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + todo_wine expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* hour invalid */ + st = ref; + st.wHour = 25; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* minute invalid */ + st = ref; + st.wMinute = 60; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* sec invalid */ + st = ref; + st.wSecond = 60; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + /* msec invalid */ + st = ref; + st.wMilliseconds = 1000; + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(0, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + expect_systime(&ref, &getSt); + + /* day of week should be calculated automatically, + actual day of week for this date is 4 */ + fill_systime_struct(&st, 2009, 10, 1, 1, 0, 0, 10, 200); + r = SendMessage(hWnd, DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM)&st); + expect(1, r); + r = SendMessage(hWnd, DTM_GETSYSTEMTIME, 0, (LPARAM)&getSt); + expect(GDT_VALID, r); + /* 01.10.2009 is Thursday */ + todo_wine expect(4, (LRESULT)getSt.wDayOfWeek); + st.wDayOfWeek = 4; + todo_wine expect_systime(&st, &getSt); + DestroyWindow(hWnd); }

1 0

Nikolay Sivov : comctl32/datetime: Separate tests from each other.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: aae85b4d68bb28d02b2581527653464552c5052b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aae85b4d68bb28d02b2581527… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 02:35:16 2009 +0400 comctl32/datetime: Separate tests from each other. --- dlls/comctl32/tests/datetime.c | 327 ++++++++++++++++++++-------------------- 1 files changed, 167 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aae85b4d68bb28d02b258…

1 0

Michael Stefaniuc : server: A signed 1-bit bitfield doesn't make much sense ; use unsigned.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 0eed4405de418405b43c2b56c92689cd2e2763a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eed4405de418405b43c2b56c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Oct 1 00:22:55 2009 +0200 server: A signed 1-bit bitfield doesn't make much sense; use unsigned. --- server/fd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/fd.c b/server/fd.c index d2da624..72ebcfe 100644 --- a/server/fd.c +++ b/server/fd.c @@ -192,8 +192,8 @@ struct fd unsigned int sharing; /* file sharing mode */ int unix_fd; /* unix file descriptor */ unsigned int no_fd_status;/* status to return when unix_fd is -1 */ - int signaled :1; /* is the fd signaled? */ - int fs_locks :1; /* can we use filesystem locks for this fd? */ + unsigned int signaled :1; /* is the fd signaled? */ + unsigned int fs_locks :1; /* can we use filesystem locks for this fd? */ int poll_index; /* index of fd in poll array */ struct async_queue *read_q; /* async readers of this fd */ struct async_queue *write_q; /* async writers of this fd */

1 0

Jacek Caban : mshtml: Added QueryCustomPolicy implementation.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 81079eb221782dbfb16d21453cc0e892f2b1ea3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=81079eb221782dbfb16d21453… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:01:17 2009 +0200 mshtml: Added QueryCustomPolicy implementation. --- dlls/mshtml/secmgr.c | 82 +++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/script.c | 93 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 171 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index c9b1e46..be56e5d 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -27,6 +27,8 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "objsafe.h" +#include "activscp.h" #include "wine/debug.h" @@ -36,6 +38,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; +/* 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}}; + #define HOSTSECMGR_THIS(iface) DEFINE_THIS(HTMLDocumentNode, IInternetHostSecurityManager, iface) static HRESULT WINAPI InternetHostSecurityManager_QueryInterface(IInternetHostSecurityManager *iface, REFIID riid, void **ppv) @@ -78,12 +84,84 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost pContext, cbContext, dwFlags, dwReserved); } +static DWORD confirm_safety(HTMLDocumentNode *This, const WCHAR *url, IUnknown *obj) +{ + DWORD policy, enabled_opts, supported_opts; + IObjectSafety *obj_safety; + HRESULT hres; + + /* FIXME: Check URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY */ + + hres = IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, URLACTION_SCRIPT_SAFE_ACTIVEX, + (BYTE*)&policy, sizeof(policy), NULL, 0, 0, 0); + if(FAILED(hres) || policy != URLPOLICY_ALLOW) + return URLPOLICY_DISALLOW; + + hres = IUnknown_QueryInterface(obj, &IID_IObjectSafety, (void**)&obj_safety); + if(FAILED(hres)) + return URLPOLICY_DISALLOW; + + hres = IObjectSafety_GetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, &supported_opts, &enabled_opts); + if(SUCCEEDED(hres)) { + enabled_opts = INTERFACESAFE_FOR_UNTRUSTED_CALLER; + if(supported_opts & INTERFACE_USES_SECURITY_MANAGER) + enabled_opts |= INTERFACE_USES_SECURITY_MANAGER; + hres = IObjectSafety_SetInterfaceSafetyOptions(obj_safety, &IID_IDispatchEx, enabled_opts, enabled_opts); + } + IObjectSafety_Release(obj_safety); + if(FAILED(hres)) + return URLPOLICY_DISALLOW; + + return URLPOLICY_ALLOW; +} + static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHostSecurityManager *iface, REFGUID guidKey, BYTE **ppPolicy, DWORD *pcbPolicy, BYTE *pContext, DWORD cbContext, DWORD dwReserved) { HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); - FIXME("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); - return E_NOTIMPL; + const WCHAR *url; + HRESULT hres; + + TRACE("(%p)->(%s %p %p %p %d %x)\n", This, debugstr_guid(guidKey), ppPolicy, pcbPolicy, pContext, cbContext, dwReserved); + + url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW; + + hres = IInternetSecurityManager_QueryCustomPolicy(This->secmgr, url, guidKey, ppPolicy, pcbPolicy, + pContext, cbContext, dwReserved); + if(hres != HRESULT_FROM_WIN32(ERROR_NOT_FOUND)) + return hres; + + if(IsEqualGUID(&GUID_CUSTOM_CONFIRMOBJECTSAFETY, guidKey)) { + IActiveScript *active_script; + struct CONFIRMSAFETY *cs; + DWORD policy; + + if(cbContext != sizeof(struct CONFIRMSAFETY)) { + FIXME("wrong context size\n"); + return E_FAIL; + } + + cs = (struct CONFIRMSAFETY*)pContext; + hres = IUnknown_QueryInterface(cs->pUnk, &IID_IActiveScript, (void**)&active_script); + if(SUCCEEDED(hres)) { + FIXME("Got IAciveScript iface\n"); + IActiveScript_Release(active_script); + return E_FAIL; + } + + policy = confirm_safety(This, url, cs->pUnk); + + *ppPolicy = CoTaskMemAlloc(sizeof(policy)); + if(!*ppPolicy) + return E_OUTOFMEMORY; + + *(DWORD*)*ppPolicy = policy; + *pcbPolicy = sizeof(policy); + return S_OK; + } + + FIXME("Unknown guidKey %s\n", debugstr_guid(guidKey)); + return hres; } #undef HOSTSECMGR_THIS diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 89b076c..5f59ea4 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -37,6 +37,10 @@ DEFINE_GUID(CLSID_IdentityUnmarshal,0x0000001b,0x0000,0x0000,0xc0,0x00,0x00,0x00,0x00,0x00,0x00,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}}; + #ifdef _WIN64 #define CTXARG_T DWORDLONG @@ -110,6 +114,10 @@ DEFINE_EXPECT(GetScriptDispatch); DEFINE_EXPECT(funcDisp); DEFINE_EXPECT(script_testprop_d); DEFINE_EXPECT(script_testprop_i); +DEFINE_EXPECT(AXQueryInterface_IActiveScript); +DEFINE_EXPECT(AXQueryInterface_IObjectSafety); +DEFINE_EXPECT(AXGetInterfaceSafetyOptions); +DEFINE_EXPECT(AXSetInterfaceSafetyOptions); #define TESTSCRIPT_CLSID "{178fc163-f585-4e24-9c13-4bb7faf80746}" @@ -519,7 +527,7 @@ static SCRIPTSTATE state; static HRESULT WINAPI ObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) { *ppv = NULL; - ok(0, "unexpected call\n"); + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -573,11 +581,72 @@ static const IObjectSafetyVtbl ObjectSafetyVtbl = { static IObjectSafety ObjectSafety = { &ObjectSafetyVtbl }; +static HRESULT WINAPI AXObjectSafety_QueryInterface(IObjectSafety *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IActiveScript, riid)) { + CHECK_EXPECT(AXQueryInterface_IActiveScript); + return E_NOINTERFACE; + } + + if(IsEqualGUID(&IID_IObjectSafety, riid)) { + CHECK_EXPECT(AXQueryInterface_IObjectSafety); + *ppv = iface; + return S_OK; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI AXObjectSafety_GetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD *pdwSupportedOptions, DWORD *pdwEnabledOptions) +{ + CHECK_EXPECT(AXGetInterfaceSafetyOptions); + + ok(IsEqualGUID(&IID_IDispatchEx, riid), "unexpected riid %s\n", debugstr_guid(riid)); + ok(pdwSupportedOptions != NULL, "pdwSupportedOptions == NULL\n"); + ok(pdwEnabledOptions != NULL, "pdwEnabledOptions == NULL\n"); + + *pdwSupportedOptions = INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER; + *pdwEnabledOptions = INTERFACE_USES_DISPEX; + + return S_OK; +} + +static HRESULT WINAPI AXObjectSafety_SetInterfaceSafetyOptions(IObjectSafety *iface, REFIID riid, + DWORD dwOptionSetMask, DWORD dwEnabledOptions) +{ + CHECK_EXPECT(AXSetInterfaceSafetyOptions); + + ok(IsEqualGUID(&IID_IDispatchEx, riid), "unexpected riid %s\n", debugstr_guid(riid)); + + ok(dwOptionSetMask == (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACE_USES_SECURITY_MANAGER), + "dwOptionSetMask=%x\n", dwOptionSetMask); + ok(dwEnabledOptions == (INTERFACESAFE_FOR_UNTRUSTED_CALLER|INTERFACE_USES_SECURITY_MANAGER), + "dwEnabledOptions=%x\n", dwOptionSetMask); + + return S_OK; +} + +static const IObjectSafetyVtbl AXObjectSafetyVtbl = { + AXObjectSafety_QueryInterface, + ObjectSafety_AddRef, + ObjectSafety_Release, + AXObjectSafety_GetInterfaceSafetyOptions, + AXObjectSafety_SetInterfaceSafetyOptions +}; + +static IObjectSafety AXObjectSafety = { &AXObjectSafetyVtbl }; + static void test_security(void) { IInternetHostSecurityManager *sec_mgr; IServiceProvider *sp; - DWORD policy; + DWORD policy, policy_size; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); @@ -593,6 +662,26 @@ static void test_security(void) ok(hres == S_OK, "ProcessUrlAction failed: %08x\n", hres); ok(policy == URLPOLICY_ALLOW, "policy = %x\n", policy); + cs.clsid = CLSID_TestActiveX; + cs.pUnk = (IUnknown*)&AXObjectSafety; + cs.dwFlags = 0; + + SET_EXPECT(AXQueryInterface_IActiveScript); + SET_EXPECT(AXQueryInterface_IObjectSafety); + SET_EXPECT(AXGetInterfaceSafetyOptions); + SET_EXPECT(AXSetInterfaceSafetyOptions); + hres = IInternetHostSecurityManager_QueryCustomPolicy(sec_mgr, &GUID_CUSTOM_CONFIRMOBJECTSAFETY, + &ppolicy, &policy_size, (BYTE*)&cs, sizeof(cs), 0); + CHECK_CALLED(AXQueryInterface_IActiveScript); + CHECK_CALLED(AXQueryInterface_IObjectSafety); + CHECK_CALLED(AXGetInterfaceSafetyOptions); + CHECK_CALLED(AXSetInterfaceSafetyOptions); + + ok(hres == S_OK, "QueryCusromPolicy failed: %08x\n", hres); + ok(policy_size == sizeof(DWORD), "policy_size = %d\n", policy_size); + ok(*(DWORD*)ppolicy == URLPOLICY_ALLOW, "policy = %x\n", *(DWORD*)ppolicy); + CoTaskMemFree(ppolicy); + IInternetHostSecurityManager_Release(sec_mgr); }

1 0

Jacek Caban : urlmon: Added support for URLACTION_ACTIVEX_OVERRIDE_SCRIPT_SAFETY.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 3b92a3f3a3f1b87e786565c00d0c5722925ba6e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b92a3f3a3f1b87e786565c00… Author: Jacek Caban <jacek(a)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);

1 0

Jacek Caban : urlmon: Improve QueryCustomPolicy stub.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: e41d6eb94d4d4737a7d7b04258c5357352881da7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e41d6eb94d4d4737a7d7b0425… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:00:33 2009 +0200 urlmon: Improve QueryCustomPolicy stub. --- dlls/urlmon/sec_mgr.c | 4 ++-- dlls/urlmon/tests/sec_mgr.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 173fad7..b3d468d 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -590,8 +590,8 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager return hres; } - FIXME("Default action is not implemented\n"); - return E_NOTIMPL; + WARN("Unknown guidKey %s\n", debugstr_guid(guidKey)); + return HRESULT_FROM_WIN32(ERROR_NOT_FOUND); } static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface, diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 80a4552..8820811 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -71,6 +71,10 @@ static const BYTE secid10_2[] = static const GUID CLSID_TestActiveX = {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 { LPCWSTR url; DWORD zone; @@ -297,7 +301,9 @@ static void test_special_url_action(IInternetSecurityManager *secmgr, IInternetZ static void test_activex(IInternetSecurityManager *secmgr) { - DWORD policy; + DWORD policy, policy_size; + struct CONFIRMSAFETY cs; + BYTE *ppolicy; HRESULT hres; policy = 0xdeadbeef; @@ -305,6 +311,13 @@ static void test_activex(IInternetSecurityManager *secmgr) 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); + + 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)

1 0

Jacek Caban : mshtml: Added IInternetHostSecurity:: ProcessUrlAction implementation.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: a5923a6eea5a5c672544c41d0d0be92f72fe9946 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5923a6eea5a5c672544c41d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 1 00:05:36 2009 +0200 mshtml: Added IInternetHostSecurity::ProcessUrlAction implementation. --- dlls/mshtml/htmldoc.c | 10 ++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/secmgr.c | 12 ++++++++++-- dlls/mshtml/tests/script.c | 8 ++++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bfde79d..d6baa8e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1772,6 +1772,9 @@ void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = HTMLDOCNODE_NODE_THIS(iface); + if(This->secmgr) + IInternetSecurityManager_Release(This->secmgr); + detach_selection(This); detach_ranges(This); release_nodes(This); @@ -1805,6 +1808,7 @@ static dispex_static_data_t HTMLDocumentNode_dispex = { HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_obj, HTMLWindow *window, HTMLDocumentNode **ret) { HTMLDocumentNode *doc; + HRESULT hres; doc = heap_alloc_zero(sizeof(HTMLDocumentNode)); if(!doc) @@ -1829,6 +1833,12 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob HTMLDOMNode_Init(doc, &doc->node, (nsIDOMNode*)nsdoc); doc->node.vtbl = &HTMLDocumentNodeImplVtbl; + hres = CoInternetCreateSecurityManager(NULL, &doc->secmgr, 0); + if(FAILED(hres)) { + htmldoc_release(&doc->basedoc); + return hres; + } + *ret = doc; return S_OK; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 17fa971..82e1c60 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -471,6 +471,8 @@ struct HTMLDocumentNode { HTMLDOMNode *nodes; + IInternetSecurityManager *secmgr; + struct list selection_list; struct list range_list; }; diff --git a/dlls/mshtml/secmgr.c b/dlls/mshtml/secmgr.c index 617cb23..c9b1e46 100644 --- a/dlls/mshtml/secmgr.c +++ b/dlls/mshtml/secmgr.c @@ -34,6 +34,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); +static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0}; + #define HOSTSECMGR_THIS(iface) DEFINE_THIS(HTMLDocumentNode, IInternetHostSecurityManager, iface) static HRESULT WINAPI InternetHostSecurityManager_QueryInterface(IInternetHostSecurityManager *iface, REFIID riid, void **ppv) @@ -66,8 +68,14 @@ static HRESULT WINAPI InternetHostSecurityManager_ProcessUrlAction(IInternetHost BYTE *pPolicy, DWORD cbPolicy, BYTE *pContext, DWORD cbContext, DWORD dwFlags, DWORD dwReserved) { HTMLDocumentNode *This = HOSTSECMGR_THIS(iface); - FIXME("%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); - return E_NOTIMPL; + const WCHAR *url; + + TRACE("%p)->(%d %p %d %p %d %x %x)\n", This, dwAction, pPolicy, cbPolicy, pContext, cbContext, dwFlags, dwReserved); + + url = This->basedoc.doc_obj->url ? This->basedoc.doc_obj->url : about_blankW; + + return IInternetSecurityManager_ProcessUrlAction(This->secmgr, url, dwAction, pPolicy, cbPolicy, + pContext, cbContext, dwFlags, dwReserved); } static HRESULT WINAPI InternetHostSecurityManager_QueryCustomPolicy(IInternetHostSecurityManager *iface, REFGUID guidKey, diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 92897a6..89b076c 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -117,6 +117,8 @@ DEFINE_EXPECT(script_testprop_i); static const GUID CLSID_TestScript = {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x07,0x46}}; +static const GUID CLSID_TestActiveX = + {0x178fc163,0xf585,0x4e24,{0x9c,0x13,0x4b,0xb7,0xfa,0xf8,0x06,0x46}}; static IHTMLDocument2 *notif_doc; static IDispatchEx *window_dispex; @@ -575,6 +577,7 @@ static void test_security(void) { IInternetHostSecurityManager *sec_mgr; IServiceProvider *sp; + DWORD policy; HRESULT hres; hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); @@ -585,6 +588,11 @@ static void test_security(void) IServiceProvider_Release(sp); ok(hres == S_OK, "QueryService failed: %08x\n", hres); + hres = IInternetHostSecurityManager_ProcessUrlAction(sec_mgr, URLACTION_ACTIVEX_RUN, (BYTE*)&policy, sizeof(policy), + (BYTE*)&CLSID_TestActiveX, sizeof(CLSID), 0, 0); + ok(hres == S_OK, "ProcessUrlAction failed: %08x\n", hres); + ok(policy == URLPOLICY_ALLOW, "policy = %x\n", policy); + IInternetHostSecurityManager_Release(sec_mgr); }

1 0

Jacek Caban : urlmon: Correctly handle pPolicy and pContext arguments in ProcessUrlAction.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: 7f11de868245e10b0b57411d3d1926af4d57baed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f11de868245e10b0b57411d3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 23:59:47 2009 +0200 urlmon: Correctly handle pPolicy and pContext arguments in ProcessUrlAction. --- dlls/urlmon/sec_mgr.c | 4 ++- dlls/urlmon/tests/sec_mgr.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 9d0e799..173fad7 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -536,7 +536,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * return hres; } - if(pContext || cbContext || dwFlags || dwReserved) + if(dwFlags || dwReserved) FIXME("Unsupported arguments\n"); if(!pwszUrl) @@ -551,6 +551,8 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * return hres; TRACE("policy %x\n", policy); + if(cbPolicy >= sizeof(DWORD)) + *(DWORD*)pPolicy = policy; switch(GetUrlPolicyPermissions(policy)) { case URLPOLICY_ALLOW: diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2df702c..80a4552 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -68,6 +68,9 @@ static const BYTE secid10[] = static const BYTE secid10_2[] = {'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 { LPCWSTR url; DWORD zone; @@ -242,6 +245,33 @@ static void test_url_action(IInternetSecurityManager *secmgr, IInternetZoneManag 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, + 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 { 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); } +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) { IInternetZoneManager *zonemgr = NULL; @@ -277,12 +319,15 @@ static void test_polices(void) ok(hres == S_OK, "CoInternetCreateZoneManager failed: %08x\n", hres); 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_CHANNEL_SOFTDIST_PERMISSIONS); test_url_action(secmgr, zonemgr, 0xdeadbeef); test_special_url_action(secmgr, zonemgr, URLACTION_SCRIPT_OVERRIDE_SAFETY); + test_activex(secmgr); + IInternetSecurityManager_Release(secmgr); IInternetZoneManager_Release(zonemgr); }

1 0

Jacek Caban : mshtml: Return HTMLDocumentNode object in ScriptHost:: QueryService for SID_SInternetHostSecurityManager.
by Alexandre Julliard 01 Oct '09

01 Oct '09

Module: wine Branch: master Commit: b6dff3f733120c33095b03cda68251987fb4abf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6dff3f733120c33095b03cda… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 30 23:59:28 2009 +0200 mshtml: Return HTMLDocumentNode object in ScriptHost::QueryService for SID_SInternetHostSecurityManager. --- dlls/mshtml/script.c | 10 ++++++++++ dlls/mshtml/tests/script.c | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index c242242..5c83e1e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -557,6 +557,16 @@ static HRESULT WINAPI ASServiceProvider_QueryService(IServiceProvider *iface, RE REFIID riid, void **ppv) { ScriptHost *This = SERVPROV_THIS(iface); + + if(IsEqualGUID(&SID_SInternetHostSecurityManager, guidService)) { + TRACE("(%p)->(SID_SInternetHostSecurityManager)\n", This); + + if(!This->window || !This->window->doc) + return E_NOINTERFACE; + + return IInternetHostSecurityManager_QueryInterface(HOSTSECMGR(This->window->doc), riid, ppv); + } + FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); return E_NOINTERFACE; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 6c6504b..92897a6 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -571,6 +571,23 @@ static const IObjectSafetyVtbl ObjectSafetyVtbl = { static IObjectSafety ObjectSafety = { &ObjectSafetyVtbl }; +static void test_security(void) +{ + IInternetHostSecurityManager *sec_mgr; + IServiceProvider *sp; + HRESULT hres; + + hres = IActiveScriptSite_QueryInterface(site, &IID_IServiceProvider, (void**)&sp); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(sp, &SID_SInternetHostSecurityManager, + &IID_IInternetHostSecurityManager, (void**)&sec_mgr); + IServiceProvider_Release(sp); + ok(hres == S_OK, "QueryService failed: %08x\n", hres); + + IInternetHostSecurityManager_Release(sec_mgr); +} + static HRESULT WINAPI ActiveScriptProperty_QueryInterface(IActiveScriptProperty *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -960,6 +977,8 @@ static HRESULT WINAPI ActiveScriptParse_ParseScriptText(IActiveScriptParse *ifac CHECK_CALLED(GetScriptDispatch); CHECK_CALLED(script_testprop_i); + test_security(); + return S_OK; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2009