September 2017 - Wine-Commits

Zebediah Figura : mshtml: Don' t query for an INewWindowManager if the client site is NULL.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 02641e33a98c68435eb70a240f640bdfa2e5fd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02641e33a98c68435eb70a240… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 09:59:43 2017 -0500 mshtml: Don't query for an INewWindowManager if the client site is NULL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/navigate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 423d650..1597de9 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -2246,9 +2246,14 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam nsChannelBSC *bsc; HRESULT hres; - hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, &IID_INewWindowManager, - (void**)&new_window_mgr); - if(SUCCEEDED(hres)) { + if (window->doc_obj->client) { + hres = do_query_service((IUnknown*)window->doc_obj->client, &SID_SNewWindowManager, + &IID_INewWindowManager, (void**)&new_window_mgr); + if (FAILED(hres)) { + FIXME("No INewWindowManager\n"); + return hres; + } + hres = IUri_GetDisplayUri(window->uri_nofrag, &context_url); if(FAILED(hres)) return hres; @@ -2270,9 +2275,6 @@ HRESULT navigate_new_window(HTMLOuterWindow *window, IUri *uri, const WCHAR *nam *ret = NULL; return S_OK; } - }else { - FIXME("No INewWindowManager\n"); - return E_NOTIMPL; }

1 0

Zebediah Figura : include: Update BrowserNavConstants enum for Win10.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 52e45d8f505f393e3a347426b7b0dc3ac4dcf64a URL: http://source.winehq.org/git/wine.git/?a=commit;h=52e45d8f505f393e3a347426b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 13:55:40 2017 -0500 include: Update BrowserNavConstants enum for Win10. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/exdisp.idl | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index b665ce3..90cc266 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -64,14 +64,35 @@ interface IWebBrowser : IDispatch { typedef enum BrowserNavConstants { - navOpenInNewWindow = 0x1, - navNoHistory = 0x2, - navNoReadFromCache = 0x4, - navNoWriteToCache = 0x8, - navAllowAutosearch = 0x10, - navBrowserBar = 0x20, - navHyperlink = 0x40, - navEnforceRestricted = 0x80 + navOpenInNewWindow = 0x00000001, + navNoHistory = 0x00000002, + navNoReadFromCache = 0x00000004, + navNoWriteToCache = 0x00000008, + navAllowAutosearch = 0x00000010, + navBrowserBar = 0x00000020, + navHyperlink = 0x00000040, + navEnforceRestricted = 0x00000080, + navNewWindowsManaged = 0x00000100, + navUntrustedForDownload = 0x00000200, + navTrustedForActiveX = 0x00000400, + navOpenInNewTab = 0x00000800, + navOpenInBackgroundTab = 0x00001000, + navKeepWordWheelText = 0x00002000, + navVirtualTab = 0x00004000, + navBlockRedirectsXDomain = 0x00008000, + navOpenNewForegroundTab = 0x00010000, + navTravelLogScreenshot = 0x00020000, + navDeferUnload = 0x00040000, + navSpeculative = 0x00080000, + navSuggestNewWindow = 0x00100000, + navSuggestNewTab = 0x00200000, + navReserved1 = 0x00400000, + navHomepageNavigate = 0x00800000, + navRefresh = 0x01000000, + navHostNavigation = 0x02000000, + navReserved2 = 0x04000000, + navReserved3 = 0x08000000, + navReserved4 = 0x10000000, } BrowserNavConstants; typedef enum RefreshConstants

1 0

Alexandre Julliard : ntdll: Remove some unnecessary parameters in helper functions.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 872228da4c0000459ac1cc883fb2b3a2620ddb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=872228da4c0000459ac1cc883… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 22 09:52:29 2017 +0200 ntdll: Remove some unnecessary parameters in helper functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index a452c58..ceb4216 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -804,7 +804,7 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot, BOOL image * * Wrapper for mprotect, adds PROT_EXEC if forced by force_exec_prot */ -static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigned int view_protect ) +static inline int mprotect_exec( void *base, size_t size, int unix_prot ) { if (force_exec_prot && (unix_prot & PROT_READ) && !(unix_prot & PROT_EXEC)) { @@ -823,7 +823,7 @@ static inline int mprotect_exec( void *base, size_t size, int unix_prot, unsigne * * Call mprotect on a page range, applying the protections from the per-page byte. */ -static void mprotect_range( struct file_view *view, void *base, size_t size, BYTE set, BYTE clear ) +static void mprotect_range( void *base, size_t size, BYTE set, BYTE clear ) { size_t i, count; char *addr = base; @@ -834,12 +834,12 @@ static void mprotect_range( struct file_view *view, void *base, size_t size, BYT { next = VIRTUAL_GetUnixProt( (get_page_vprot( addr + (count << page_shift) ) & ~clear) | set ); if (next == prot) continue; - mprotect_exec( addr, count << page_shift, prot, view->protect ); + mprotect_exec( addr, count << page_shift, prot ); addr += count << page_shift; prot = next; count = 0; } - if (count) mprotect_exec( addr, count << page_shift, prot, view->protect ); + if (count) mprotect_exec( addr, count << page_shift, prot ); } @@ -863,7 +863,7 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ { /* each page may need different protections depending on write watch flag */ set_page_vprot_bits( base, size, vprot & ~VPROT_WRITEWATCH, ~vprot & ~VPROT_WRITEWATCH ); - mprotect_range( view, base, size, 0, 0 ); + mprotect_range( base, size, 0, 0 ); return TRUE; } @@ -878,7 +878,7 @@ static BOOL VIRTUAL_SetProt( struct file_view *view, /* [in] Pointer to view */ return TRUE; } - if (mprotect_exec( base, size, unix_prot, view->protect )) /* FIXME: last error */ + if (mprotect_exec( base, size, unix_prot )) /* FIXME: last error */ return FALSE; set_page_vprot( base, size, vprot ); @@ -917,10 +917,10 @@ static NTSTATUS set_protection( struct file_view *view, void *base, SIZE_T size, * * Reset write watches in a memory range. */ -static void reset_write_watches( struct file_view *view, void *base, SIZE_T size ) +static void reset_write_watches( void *base, SIZE_T size ) { set_page_vprot_bits( base, size, VPROT_WRITEWATCH, 0 ); - mprotect_range( view, base, size, 0, 0 ); + mprotect_range( base, size, 0, 0 ); } @@ -1769,7 +1769,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) if (vprot & VPROT_WRITEWATCH) { set_page_vprot_bits( page, page_size, 0, VPROT_WRITEWATCH ); - mprotect_range( view, page, page_size, 0, 0 ); + mprotect_range( page, page_size, 0, 0 ); } /* ignore fault if page is writable now */ if (VIRTUAL_GetUnixProt( get_page_vprot( page )) & PROT_WRITE) ret = STATUS_SUCCESS; @@ -1777,7 +1777,7 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack ) if (!on_signal_stack && (vprot & VPROT_GUARD)) { set_page_vprot_bits( page, page_size, 0, VPROT_GUARD ); - mprotect_range( view, page, page_size, 0, 0 ); + mprotect_range( page, page_size, 0, 0 ); ret = STATUS_GUARD_PAGE_VIOLATION; } } @@ -1972,7 +1972,7 @@ NTSTATUS virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZ if (view->protect & VPROT_WRITEWATCH) /* enable write access by clearing write watches */ { set_page_vprot_bits( addr, size, 0, VPROT_WRITEWATCH ); - mprotect_range( view, addr, size, 0, 0 ); + mprotect_range( addr, size, 0, 0 ); } memcpy( addr, buffer, size ); ret = STATUS_SUCCESS; @@ -2003,7 +2003,7 @@ void VIRTUAL_SetForceExec( BOOL enable ) /* file mappings are always accessible */ BYTE commit = is_view_valloc( view ) ? 0 : VPROT_COMMITTED; - mprotect_range( view, view->base, view->size, commit, 0 ); + mprotect_range( view->base, view->size, commit, 0 ); } } server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -3090,7 +3090,7 @@ NTSTATUS WINAPI NtGetWriteWatch( HANDLE process, ULONG flags, PVOID base, SIZE_T if (!(get_page_vprot( addr ) & VPROT_WRITEWATCH)) addresses[pos++] = addr; addr += page_size; } - if (flags & WRITE_WATCH_FLAG_RESET) reset_write_watches( view, base, addr - (char *)base ); + if (flags & WRITE_WATCH_FLAG_RESET) reset_write_watches( base, addr - (char *)base ); *count = pos; *granularity = page_size; } @@ -3121,7 +3121,7 @@ NTSTATUS WINAPI NtResetWriteWatch( HANDLE process, PVOID base, SIZE_T size ) server_enter_uninterrupted_section( &csVirtual, &sigset ); if ((view = VIRTUAL_FindView( base, size )) && (view->protect & VPROT_WRITEWATCH)) - reset_write_watches( view, base, size ); + reset_write_watches( base, size ); else status = STATUS_INVALID_PARAMETER;

1 0

Fabian Maurer : propsys: Added PropVariantToBoolean with some tests.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 58ea6bddaef5deced2c7f81c6df0668408e99656 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ea6bddaef5deced2c7f81c6… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Fri Sep 22 10:00:46 2017 +0300 propsys: Added PropVariantToBoolean with some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propvar.c | 60 ++++++++++++ dlls/propsys/tests/propsys.c | 215 +++++++++++++++++++++++++++++++++++++++++++ include/propvarutil.h | 1 + 4 files changed, 277 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58ea6bddaef5deced2c7f…

1 0

Zebediah Figura : shlwapi: URL schemes may contain hyphen, plus, or period.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 3559c261c142eff8d500c6ca443672b17ea162db URL: http://source.winehq.org/git/wine.git/?a=commit;h=3559c261c142eff8d500c6ca4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 21 14:49:46 2017 -0500 shlwapi: URL schemes may contain hyphen, plus, or period. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/tests/url.c | 1 + dlls/shlwapi/url.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index f1c0965..ac896b0 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1483,6 +1483,7 @@ static const struct parse_url_test_t { {"ab-://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN}, {" http://www.winehq.org/",URL_E_INVALID_SYNTAX}, {"HTTP://www.winehq.org/",S_OK,4,URL_SCHEME_HTTP}, + {"a+-.://www.winehq.org/",S_OK,4,URL_SCHEME_UNKNOWN}, }; static void test_ParseURL(void) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index bda4eb2..c7d717b 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -169,7 +169,7 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y) if(y->cbSize != sizeof(*y)) return E_INVALIDARG; - while(*ptr && (isalnum(*ptr) || *ptr == '-')) + while(*ptr && (isalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= x+1) { @@ -203,7 +203,7 @@ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y) if(y->cbSize != sizeof(*y)) return E_INVALIDARG; - while(*ptr && (isalnumW(*ptr) || *ptr == '-')) + while(*ptr && (isalnumW(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= x+1) {

1 0

Jacek Caban : mshtml: Added IEventTarget stub implementation.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 455d68467116dd962caceb844a74d8ee4ef8484c URL: http://source.winehq.org/git/wine.git/?a=commit;h=455d68467116dd962caceb844… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 23:25:55 2017 +0200 mshtml: Added IEventTarget stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 8 ++- dlls/mshtml/htmlevent.c | 126 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/tests/dom.c | 28 ++++++++++ 4 files changed, 162 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 95c17b8..de478f3 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1346,6 +1346,11 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) } } +compat_mode_t dispex_compat_mode(DispatchEx *dispex) +{ + return dispex->info->desc->vtbl->get_compat_mode(dispex); +} + static dispex_data_t *ensure_dispex_info(dispex_static_data_t *desc, compat_mode_t compat_mode) { if(!desc->info_cache[compat_mode]) { @@ -1362,8 +1367,7 @@ static BOOL ensure_real_info(DispatchEx *dispex) if(dispex->info != dispex->info->desc->delayed_init_info) return TRUE; - dispex->info = ensure_dispex_info(dispex->info->desc, - dispex->info->desc->vtbl->get_compat_mode(dispex)); + dispex->info = ensure_dispex_info(dispex->info->desc, dispex_compat_mode(dispex)); return dispex->info != NULL; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0061384..4372066 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1638,8 +1638,120 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } +static inline EventTarget *impl_from_IEventTarget(IEventTarget *iface) +{ + return CONTAINING_RECORD(iface, EventTarget, IEventTarget_iface); +} + +static HRESULT WINAPI EventTarget_QueryInterface(IEventTarget *iface, REFIID riid, void **ppv) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); +} + +static ULONG WINAPI EventTarget_AddRef(IEventTarget *iface) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); +} + +static ULONG WINAPI EventTarget_Release(IEventTarget *iface) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); +} + +static HRESULT WINAPI EventTarget_GetTypeInfoCount(IEventTarget *iface, UINT *pctinfo) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI EventTarget_GetTypeInfo(IEventTarget *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI EventTarget_GetIDsOfNames(IEventTarget *iface, REFIID riid, LPOLESTR *rgszNames, + UINT cNames, LCID lcid, DISPID *rgDispId) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, + rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI EventTarget_Invoke(IEventTarget *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + EventTarget *This = impl_from_IEventTarget(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, + riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI EventTarget_addEventListener(IEventTarget *iface, BSTR type, + IDispatch *listener, VARIANT_BOOL capture) +{ + EventTarget *This = impl_from_IEventTarget(iface); + FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); + return E_NOTIMPL; +} + +static HRESULT WINAPI EventTarget_removeEventListener(IEventTarget *iface, BSTR type, + IDispatch *listener, VARIANT_BOOL capture) +{ + EventTarget *This = impl_from_IEventTarget(iface); + FIXME("(%p)->(%s %p %x)\n", This, debugstr_w(type), listener, capture); + return E_NOTIMPL; +} + +static HRESULT WINAPI EventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event, VARIANT_BOOL *result) +{ + EventTarget *This = impl_from_IEventTarget(iface); + FIXME("(%p)->(%p %p)\n", This, event, result); + return E_NOTIMPL; +} + +static const IEventTargetVtbl EventTargetVtbl = { + EventTarget_QueryInterface, + EventTarget_AddRef, + EventTarget_Release, + EventTarget_GetTypeInfoCount, + EventTarget_GetTypeInfo, + EventTarget_GetIDsOfNames, + EventTarget_Invoke, + EventTarget_addEventListener, + EventTarget_removeEventListener, + EventTarget_dispatchEvent +}; + +#define DELAY_INIT_VTBL ((const IEventTargetVtbl*)1) + +static BOOL use_event_quirks(EventTarget *event_target) +{ + if(event_target->IEventTarget_iface.lpVtbl == DELAY_INIT_VTBL) { + event_target->IEventTarget_iface.lpVtbl = + dispex_compat_mode(&event_target->dispex) >= COMPAT_MODE_IE9 + ? &EventTargetVtbl : NULL; + } + return !event_target->IEventTarget_iface.lpVtbl; +} + HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) { + if(IsEqualGUID(riid, &IID_IEventTarget)) { + if(use_event_quirks(event_target)) { + WARN("IEventTarget queried, but not supported by in document mode\n"); + *ppv = NULL; + return E_NOINTERFACE; + } + IEventTarget_AddRef(&event_target->IEventTarget_iface); + *ppv = &event_target->IEventTarget_iface; + return S_OK; + } + if(dispex_query_interface(&event_target->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; @@ -1658,6 +1770,20 @@ void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_ { init_dispex_with_compat_mode(&event_target->dispex, outer, dispex_data, compat_mode); wine_rb_init(&event_target->handler_map, event_id_cmp); + + /* + * IEventTarget is supported by the object or not depending on compatibility mode. + * We use NULL vtbl for objects in compatibility mode not supporting the interface. + * For targets that don't know compatibility mode at creation time, we set vtbl + * to special DELAY_INIT_VTBL value so that vtbl will be set to proper value + * when it's needed. + */ + if(compat_mode == COMPAT_MODE_QUIRKS && dispex_data->vtbl && dispex_data->vtbl->get_compat_mode) + event_target->IEventTarget_iface.lpVtbl = DELAY_INIT_VTBL; + else if(compat_mode < COMPAT_MODE_IE9) + event_target->IEventTarget_iface.lpVtbl = NULL; + else + event_target->IEventTarget_iface.lpVtbl = &EventTargetVtbl; } void release_event_target(EventTarget *event_target) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index f509b43..1727f2c 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -333,6 +333,7 @@ void release_typelib(void) DECLSPEC_HIDDEN; HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t,const DISPID*) DECLSPEC_HIDDEN; +compat_mode_t dispex_compat_mode(DispatchEx*) DECLSPEC_HIDDEN; static inline void init_dispex(DispatchEx *dispex, IUnknown *outer, dispex_static_data_t *desc) { @@ -379,6 +380,7 @@ typedef struct { struct EventTarget { DispatchEx dispex; + IEventTarget IEventTarget_iface; struct wine_rb_tree handler_map; }; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d7cfedd..0ce4872 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -10582,7 +10582,10 @@ static float expected_document_mode; static void test_document_mode(IHTMLDocument2 *doc2) { + IEventTarget *event_target; + IHTMLDocument2 *doc_node; IHTMLDocument6 *doc; + IHTMLElement *body; VARIANT v; HRESULT hres; @@ -10605,6 +10608,31 @@ static void test_document_mode(IHTMLDocument2 *doc2) ok(V_VT(&v) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&v)); ok(V_R4(&v) == expected_document_mode, "documentMode = %f\n", V_R4(&v)); IHTMLDocument6_Release(doc); + + doc_node = get_doc_node(doc2); + + hres = IHTMLDocument2_QueryInterface(doc_node, &IID_IEventTarget, (void**)&event_target); + if(expected_document_mode >= 9) { + ok(hres == S_OK, "Could not get IEventTarget interface: %08x\n", hres); + IEventTarget_Release(event_target); + }else { + ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08x\n", hres); + } + + IHTMLDocument2_Release(doc_node); + + + body = doc_get_body(doc2); + + hres = IHTMLElement_QueryInterface(body, &IID_IEventTarget, (void**)&event_target); + if(expected_document_mode >= 9) { + ok(hres == S_OK, "Could not get IEventTarget interface: %08x\n", hres); + IEventTarget_Release(event_target); + }else { + ok(hres == E_NOINTERFACE, "QI(IEventTarget) returned %08x\n", hres); + } + + IHTMLElement_Release(body); } static void test_quirks_mode(void)

1 0

Ihsan Akmal : include: Add dxgicommon.idl.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: f5268feeacbd86fd680f88cdfb337ceca14ad03e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5268feeacbd86fd680f88cdf… Author: Ihsan Akmal <ihsanapps(a)gmail.com> Date: Thu Sep 21 22:29:35 2017 +0200 include: Add dxgicommon.idl. Signed-off-by: Ihsan Akmal <ihsanapps(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dxgicommon.idl | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 13 +---------- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index edb4c3c..9acb0bf 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -70,6 +70,7 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxgi1_3.idl \ + dxgicommon.idl \ dxgiformat.idl \ dxgitype.idl \ dxva2api.idl \ diff --git a/include/dxgicommon.idl b/include/dxgicommon.idl new file mode 100644 index 0000000..99ace03 --- /dev/null +++ b/include/dxgicommon.idl @@ -0,0 +1,61 @@ +/* + * Copyright 2017 Ihsan Akmal + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +cpp_quote("#if 0") +typedef unsigned int UINT; +cpp_quote("#endif") + +const UINT DXGI_STANDARD_MULTISAMPLE_QUALITY_PATTERN = 0xffffffff; +const UINT DXGI_CENTER_MULTISAMPLE_QUALITY_PATTERN = 0xfffffffe; + +typedef enum DXGI_COLOR_SPACE_TYPE +{ + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P709 = 0x00, + DXGI_COLOR_SPACE_RGB_FULL_G10_NONE_P709 = 0x01, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P709 = 0x02, + DXGI_COLOR_SPACE_RGB_STUDIO_G22_NONE_P2020 = 0x03, + DXGI_COLOR_SPACE_RESERVED = 0x04, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_NONE_P709_X601 = 0x05, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P601 = 0x06, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P601 = 0x07, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P709 = 0x08, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P709 = 0x09, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_LEFT_P2020 = 0x0a, + DXGI_COLOR_SPACE_YCBCR_FULL_G22_LEFT_P2020 = 0x0b, + DXGI_COLOR_SPACE_RGB_FULL_G2084_NONE_P2020 = 0x0c, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_LEFT_P2020 = 0x0d, + DXGI_COLOR_SPACE_RGB_STUDIO_G2084_NONE_P2020 = 0x0e, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G22_TOPLEFT_P2020 = 0x0f, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G2084_TOPLEFT_P2020 = 0x10, + DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020 = 0x11, + DXGI_COLOR_SPACE_YCBCR_STUDIO_GHLG_TOPLEFT_P2020 = 0x12, + DXGI_COLOR_SPACE_YCBCR_FULL_GHLG_TOPLEFT_P2020 = 0x13, + DXGI_COLOR_SPACE_CUSTOM = 0xffffffff, +} DXGI_COLOR_SPACE_TYPE; + +typedef struct DXGI_SAMPLE_DESC +{ + UINT Count; + UINT Quality; +} DXGI_SAMPLE_DESC; + +typedef struct DXGI_RATIONAL +{ + UINT Numerator; + UINT Denominator; +} DXGI_RATIONAL; diff --git a/include/dxgitype.idl b/include/dxgitype.idl index e7d2b43..a9ed571 100644 --- a/include/dxgitype.idl +++ b/include/dxgitype.idl @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +import "dxgicommon.idl"; import "dxgiformat.idl"; cpp_quote("#if 0") @@ -59,18 +60,6 @@ typedef struct _D3DCOLORVALUE cpp_quote("#endif") typedef D3DCOLORVALUE DXGI_RGBA; -typedef struct DXGI_SAMPLE_DESC -{ - UINT Count; - UINT Quality; -} DXGI_SAMPLE_DESC; - -typedef struct DXGI_RATIONAL -{ - UINT Numerator; - UINT Denominator; -} DXGI_RATIONAL; - typedef struct DXGI_MODE_DESC { UINT Width;

1 0

Henri Verbeet : include: Convert dxgiformat.h to IDL.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 00990782fdc26cf404ed18996f21d76eac2ddbf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00990782fdc26cf404ed18996… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 22:29:34 2017 +0200 include: Convert dxgiformat.h to IDL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/dcommon.idl | 2 +- include/dxgiformat.h | 147 ------------------------------------------------- include/dxgiformat.idl | 145 ++++++++++++++++++++++++++++++++++++++++++++++++ include/dxgitype.idl | 2 +- 5 files changed, 148 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00990782fdc26cf404ed1…

1 0

Henri Verbeet : include: Convert dxgitype.h to IDL.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: 3a5c33946640823387ad669b11a61dc3313121a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5c33946640823387ad669b1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 22:29:32 2017 +0200 include: Convert dxgitype.h to IDL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 2 +- include/dxgi.idl | 2 +- include/{dxgitype.h => dxgitype.idl} | 83 ++++++++++++++++++++---------------- 3 files changed, 48 insertions(+), 39 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 6bc63de..41a23d3 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -69,6 +69,7 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxgi1_3.idl \ + dxgitype.idl \ dxva2api.idl \ dyngraph.idl \ endpointvolume.idl \ @@ -369,7 +370,6 @@ HEADER_SRCS = \ dxerr9.h \ dxfile.h \ dxgiformat.h \ - dxgitype.h \ errorrep.h \ errors.h \ evcode.h \ diff --git a/include/dxgi.idl b/include/dxgi.idl index b35c891..b2e53e3 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -18,7 +18,7 @@ import "oaidl.idl"; import "ocidl.idl"; -import "dxgitype.h"; +import "dxgitype.idl"; const UINT _FACDXGI = 0x87a; diff --git a/include/dxgitype.h b/include/dxgitype.idl similarity index 58% rename from include/dxgitype.h rename to include/dxgitype.idl index 13df046..6e9ac9b 100644 --- a/include/dxgitype.h +++ b/include/dxgitype.idl @@ -16,55 +16,63 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __dxgitype_h__ -#define __dxgitype_h__ +import "dxgiformat.h"; -#include "dxgiformat.h" +cpp_quote("#if 0") +typedef unsigned int UINT; +typedef long BOOL; +cpp_quote("#endif") -#ifndef D3DCOLORVALUE_DEFINED -typedef struct _D3DCOLORVALUE { +typedef enum DXGI_MODE_ROTATION +{ + DXGI_MODE_ROTATION_UNSPECIFIED = 0x0, + DXGI_MODE_ROTATION_IDENTITY = 0x1, + DXGI_MODE_ROTATION_ROTATE90 = 0x2, + DXGI_MODE_ROTATION_ROTATE180 = 0x3, + DXGI_MODE_ROTATION_ROTATE270 = 0x4, +} DXGI_MODE_ROTATION; + +typedef enum DXGI_MODE_SCANLINE_ORDER +{ + DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0x0, + DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 0x1, + DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 0x2, + DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 0x3, +} DXGI_MODE_SCANLINE_ORDER; + +typedef enum DXGI_MODE_SCALING +{ + DXGI_MODE_SCALING_UNSPECIFIED = 0x0, + DXGI_MODE_SCALING_CENTERED = 0x1, + DXGI_MODE_SCALING_STRETCHED = 0x2, +} DXGI_MODE_SCALING; + +cpp_quote("#ifndef D3DCOLORVALUE_DEFINED") +cpp_quote("#define D3DCOLORVALUE_DEFINED") +typedef struct _D3DCOLORVALUE +{ float r; float g; float b; float a; } D3DCOLORVALUE; -#define D3DCOLORVALUE_DEFINED -#endif - +cpp_quote("#endif") typedef D3DCOLORVALUE DXGI_RGBA; -typedef struct DXGI_SAMPLE_DESC { +typedef struct DXGI_SAMPLE_DESC +{ UINT Count; UINT Quality; } DXGI_SAMPLE_DESC; -typedef enum DXGI_MODE_ROTATION { - DXGI_MODE_ROTATION_UNSPECIFIED = 0, - DXGI_MODE_ROTATION_IDENTITY = 1, - DXGI_MODE_ROTATION_ROTATE90 = 2, - DXGI_MODE_ROTATION_ROTATE180 = 3, - DXGI_MODE_ROTATION_ROTATE270 = 4, -} DXGI_MODE_ROTATION; - -typedef enum DXGI_MODE_SCANLINE_ORDER { - DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED = 0, - DXGI_MODE_SCANLINE_ORDER_PROGRESSIVE = 1, - DXGI_MODE_SCANLINE_ORDER_UPPER_FIELD_FIRST = 2, - DXGI_MODE_SCANLINE_ORDER_LOWER_FIELD_FIRST = 3, -} DXGI_MODE_SCANLINE_ORDER; - -typedef enum DXGI_MODE_SCALING { - DXGI_MODE_SCALING_UNSPECIFIED = 0, - DXGI_MODE_SCALING_CENTERED = 1, - DXGI_MODE_SCALING_STRETCHED = 2, -} DXGI_MODE_SCALING; - -typedef struct DXGI_RATIONAL { +typedef struct DXGI_RATIONAL +{ UINT Numerator; UINT Denominator; } DXGI_RATIONAL; -typedef struct DXGI_MODE_DESC { +typedef struct DXGI_MODE_DESC +{ UINT Width; UINT Height; DXGI_RATIONAL RefreshRate; @@ -73,7 +81,8 @@ typedef struct DXGI_MODE_DESC { DXGI_MODE_SCALING Scaling; } DXGI_MODE_DESC; -typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES { +typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES +{ BOOL ScaleAndOffsetSupported; float MaxConvertedValue; float MinConvertedValue; @@ -81,16 +90,16 @@ typedef struct DXGI_GAMMA_CONTROL_CAPABILITIES { float ControlPointPositions[1025]; } DXGI_GAMMA_CONTROL_CAPABILITIES; -typedef struct DXGI_RGB { +typedef struct DXGI_RGB +{ float Red; float Green; float Blue; } DXGI_RGB; -typedef struct DXGI_GAMMA_CONTROL { +typedef struct DXGI_GAMMA_CONTROL +{ DXGI_RGB Scale; DXGI_RGB Offset; DXGI_RGB GammaCurve[1025]; } DXGI_GAMMA_CONTROL; - -#endif

1 0

Jacek Caban : mshtml: Introduce EventTarget_Init.
by Alexandre Julliard Sept. 22, 2017

Sept. 22, 2017

Module: wine Branch: master Commit: d69f1f01e59385ffc04d29febccea75a7ce6e0b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d69f1f01e59385ffc04d29feb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 21 23:25:27 2017 +0200 mshtml: Introduce EventTarget_Init. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 4 +++- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlnode.c | 4 +--- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/xmlhttprequest.c | 5 ++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 40f26de..c47b71d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1643,8 +1643,10 @@ static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, handler_vector_t, entry)->event_id; } -void init_event_target(EventTarget *event_target) +void EventTarget_Init(EventTarget *event_target, IUnknown *outer, dispex_static_data_t *dispex_data, + compat_mode_t compat_mode) { + init_dispex_with_compat_mode(&event_target->dispex, outer, dispex_data, compat_mode); wine_rb_init(&event_target->handler_map, event_id_cmp); } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index b88f32f3..c47f20f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -57,7 +57,6 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; -void init_event_target(EventTarget*) DECLSPEC_HIDDEN; void release_event_target(EventTarget*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,HTMLDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index e90f4e3..730e2a8 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1450,9 +1450,7 @@ void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsno node->IHTMLDOMNode3_iface.lpVtbl = &HTMLDOMNode3Vtbl; ccref_init(&node->ccref, 1); - init_dispex_with_compat_mode(&node->event_target.dispex, (IUnknown*)&node->IHTMLDOMNode_iface, - dispex_data, doc->document_mode); - init_event_target(&node->event_target); + EventTarget_Init(&node->event_target, (IUnknown*)&node->IHTMLDOMNode_iface, dispex_data, doc->document_mode); if(&doc->node != node) htmldoc_addref(&doc->basedoc); diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index dc18f84..f61aa91 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3078,8 +3078,8 @@ static HRESULT create_inner_window(HTMLOuterWindow *outer_window, IMoniker *mon, window->base.outer_window = outer_window; window->base.inner_window = window; - init_event_target(&window->event_target); - init_dispex(&window->event_target.dispex, (IUnknown*)&window->base.IHTMLWindow2_iface, &HTMLWindow_dispex); + EventTarget_Init(&window->event_target, (IUnknown*)&window->base.IHTMLWindow2_iface, + &HTMLWindow_dispex, COMPAT_MODE_NONE); window->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 45bf98c..5d46317 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1040,6 +1040,8 @@ void HTMLElement_Init(HTMLElement*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_s void HTMLTextContainer_Init(HTMLTextContainer*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN; void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,dispex_static_data_t*) DECLSPEC_HIDDEN; +void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; + HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLDOMNode_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; void HTMLDOMNode_init_dispex_info(dispex_data_t*,compat_mode_t) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 35e91fc..e257bbc 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -901,9 +901,8 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; - init_event_target(&ret->event_target); - init_dispex(&ret->event_target.dispex, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, - &HTMLXMLHttpRequest_dispex); + EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, + &HTMLXMLHttpRequest_dispex, COMPAT_MODE_NONE); ret->ref = 1; *p = &ret->IHTMLXMLHttpRequest_iface;

1 0