October 2017 - Wine-commits

Jacek Caban : mshtml: Use separated struct for event target vtbl.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: e5c0759c0cad6739a485f439fe77f972844cb34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5c0759c0cad6739a485f439f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:38:51 2017 +0200 mshtml: Use separated struct for event target vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 2 +- dlls/mshtml/htmldoc.c | 18 ++++++++++-------- dlls/mshtml/htmlelem.c | 22 ++++++++++++---------- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 6 ++++++ dlls/mshtml/htmlwindow.c | 20 +++++++++++--------- dlls/mshtml/mshtml_private.h | 4 +--- dlls/mshtml/xmlhttprequest.c | 12 ++++-------- 8 files changed, 46 insertions(+), 40 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index de478f3..f434545 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1767,7 +1767,7 @@ void dispex_unlink(DispatchEx *This) } } -const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx *dispex) +const void *dispex_get_vtbl(DispatchEx *dispex) { return dispex->info->desc->vtbl; } diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index c6bc7ac..fc2d676 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5024,18 +5024,20 @@ static compat_mode_t HTMLDocumentNode_get_compat_mode(DispatchEx *dispex) return This->document_mode; } -static void HTMLDocumentNode_bind_event(DispatchEx *dispex, int eid) +static void HTMLDocumentNode_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); ensure_doc_nsevent_handler(This, eid); } -static const dispex_static_data_vtbl_t HTMLDocumentNode_dispex_vtbl = { - NULL, - NULL, - HTMLDocumentNode_invoke, - HTMLDocumentNode_get_compat_mode, - NULL, +static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { + { + NULL, + NULL, + HTMLDocumentNode_invoke, + HTMLDocumentNode_get_compat_mode, + NULL + }, HTMLDocumentNode_bind_event }; @@ -5076,7 +5078,7 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t } static dispex_static_data_t HTMLDocumentNode_dispex = { - &HTMLDocumentNode_dispex_vtbl, + &HTMLDocumentNode_event_target_vtbl.dispex_vtbl, DispHTMLDocument_tid, HTMLDocumentNode_iface_tids, HTMLDocumentNode_init_dispex_info diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 9cf143d..3cd85e6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5332,7 +5332,7 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) return S_OK; } -static void HTMLElement_bind_event(DispatchEx *dispex, int eid) +static void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLElement *This = impl_from_DispatchEx(dispex); @@ -5343,7 +5343,7 @@ static void HTMLElement_bind_event(DispatchEx *dispex, int eid) add_nsevent_listener(This->node.doc, This->node.nsnode, loadW); return; default: - dispex_get_vtbl(&This->node.doc->node.event_target.dispex)->bind_event(&This->node.doc->node.event_target.dispex, eid); + ensure_doc_nsevent_handler(This->node.doc, eid); } } @@ -5369,17 +5369,19 @@ static const tid_t HTMLElement_iface_tids[] = { 0 }; -static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { - NULL, - HTMLElement_get_dispid, - HTMLElement_invoke, - NULL, - HTMLElement_populate_props, +static event_target_vtbl_t HTMLElement_event_target_vtbl = { + { + NULL, + HTMLElement_get_dispid, + HTMLElement_invoke, + NULL, + HTMLElement_populate_props + }, HTMLElement_bind_event }; static dispex_static_data_t HTMLElement_dispex = { - &HTMLElement_dispex_vtbl, + &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, HTMLElement_iface_tids, HTMLElement_init_dispex_info @@ -5398,7 +5400,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMHTMLElemen This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; if(dispex_data && !dispex_data->vtbl) - dispex_data->vtbl = &HTMLElement_dispex_vtbl; + dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl; if(nselem) { HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem, dispex_data ? dispex_data : &HTMLElement_dispex); diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1c27c13..1e72220 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -843,7 +843,7 @@ HRESULT create_event_obj(IHTMLEventObj **ret) static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) { - const dispex_static_data_vtbl_t *vtbl; + const event_target_vtbl_t *vtbl; handler_vector_t *handler_vector; struct wine_rb_entry *entry; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index eda6013..7da2f5b 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -79,6 +79,12 @@ void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void add_nsevent_listener(HTMLDocumentNode*,nsIDOMNode*,LPCWSTR) DECLSPEC_HIDDEN; void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; +/* We extend dispex vtbl for EventTarget functions to avoid separated vtbl. */ +typedef struct { + dispex_static_data_vtbl_t dispex_vtbl; + void (*bind_event)(DispatchEx*,eventid_t); +} event_target_vtbl_t; + static inline EventTarget *get_node_event_prop_target(HTMLDOMNode *node, eventid_t eid) { return node->vtbl->get_event_prop_target ? node->vtbl->get_event_prop_target(node, eid) : &node->event_target; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 13963da..2999ef0 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2995,10 +2995,10 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return hres; } -static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) +static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - dispex_get_vtbl(&This->doc->node.event_target.dispex)->bind_event(&This->doc->node.event_target.dispex, eid); + ensure_doc_nsevent_handler(This->doc, eid); } static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) @@ -3006,12 +3006,14 @@ static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compa dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); } -static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { - NULL, - NULL, - HTMLWindow_invoke, - NULL, - NULL, +static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { + { + NULL, + NULL, + HTMLWindow_invoke, + NULL, + NULL + }, HTMLWindow_bind_event }; @@ -3024,7 +3026,7 @@ static const tid_t HTMLWindow_iface_tids[] = { }; static dispex_static_data_t HTMLWindow_dispex = { - &HTMLWindow_dispex_vtbl, + &HTMLWindow_event_target_vtbl.dispex_vtbl, DispHTMLWindow2_tid, HTMLWindow_iface_tids, HTMLWindow_init_dispex_info diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index ae2f6cb..93d3ff7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -270,8 +270,6 @@ typedef struct { HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); compat_mode_t (*get_compat_mode)(DispatchEx*); HRESULT (*populate_props)(DispatchEx*); - /* We abuse this vtbl for EventTarget functions to avoid separated vtbl. */ - void (*bind_event)(DispatchEx*,int); } dispex_static_data_vtbl_t; typedef struct { @@ -330,7 +328,7 @@ void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_H void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; 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; +const void *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; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index f868c3a..0b02a2c 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -733,7 +733,7 @@ static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); } -static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, int eid) +static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLXMLHttpRequest *This = impl_from_DispatchEx(dispex); nsIDOMEventTarget *nstarget; @@ -768,12 +768,8 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, int eid) ERR("AddEventListener failed: %08x\n", nsres); } -static dispex_static_data_vtbl_t HTMLXMLHttpRequest_dispex_vtbl = { - NULL, - NULL, - NULL, - NULL, - NULL, +static event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { + {NULL}, HTMLXMLHttpRequest_bind_event }; @@ -782,7 +778,7 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = { 0 }; static dispex_static_data_t HTMLXMLHttpRequest_dispex = { - &HTMLXMLHttpRequest_dispex_vtbl, + &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, HTMLXMLHttpRequest_iface_tids };

1 0

Jacek Caban : mshtml: Use vtbl to get ConnectionPointContainer from event target.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 0c35bf7c8e76314c2366f2b597e4cc8a45b41c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c35bf7c8e76314c2366f2b59… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:39:22 2017 +0200 mshtml: Use vtbl to get ConnectionPointContainer from event target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 14 ++++++-- dlls/mshtml/htmlelem.c | 11 ++++-- dlls/mshtml/htmlevent.c | 82 +++++++++++++++++++++----------------------- dlls/mshtml/htmlevent.h | 3 +- dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/xmlhttprequest.c | 2 +- 6 files changed, 62 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c35bf7c8e76314c2366f…

1 0

Jacek Caban : mshtml: Always use event target as script this in call_event_handlers.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 62c7dd0576dc0c0cd8f0f667922be6d1df928b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62c7dd0576dc0c0cd8f0f6679… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:39:40 2017 +0200 mshtml: Always use event target as script this in call_event_handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 24 ++++++++++-------------- dlls/mshtml/htmlevent.h | 4 ++-- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/nsembed.c | 2 +- dlls/mshtml/nsevents.c | 10 +++++----- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/script.c | 4 ++-- dlls/mshtml/xmlhttprequest.c | 3 +-- 9 files changed, 25 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62c7dd0576dc0c0cd8f0f…

1 0

Jacek Caban : mshtml: Call default event handles through event target vtbl.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: ec5d0d44baa122b451a823f28c2b21cb34f2e462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec5d0d44baa122b451a823f28… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:40:02 2017 +0200 mshtml: Call default event handles through event target vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 1 + dlls/mshtml/htmlelem.c | 10 ++++++++++ dlls/mshtml/htmlevent.c | 5 +++-- dlls/mshtml/htmlevent.h | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 540ede0..3ce044d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5048,6 +5048,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { NULL }, HTMLDocumentNode_bind_event, + NULL, HTMLDocumentNode_get_cp_container }; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7a2c4fc..28f885f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5347,6 +5347,15 @@ static void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid) } } +static HRESULT HTMLElement_handle_event_default(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *nsevent, BOOL *prevent_default) +{ + HTMLElement *This = impl_from_DispatchEx(dispex); + + if(!This->node.vtbl->handle_event) + return S_OK; + return This->node.vtbl->handle_event(&This->node, eid, nsevent, prevent_default); +} + static ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex); @@ -5385,6 +5394,7 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_populate_props }, HTMLElement_bind_event, + HTMLElement_handle_event_default, HTMLElement_get_cp_container }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4e25bf3..dedd311 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1137,8 +1137,9 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e break; if(node) { - if(node->vtbl->handle_event) - hres = node->vtbl->handle_event(node, eid, event_obj ? event_obj->nsevent : NULL, &prevent_default); + const event_target_vtbl_t *vtbl = dispex_get_vtbl(&node->event_target.dispex); + if(vtbl && vtbl->handle_event_default) + hres = vtbl->handle_event_default(&node->event_target.dispex, eid, event_obj ? event_obj->nsevent : NULL, &prevent_default); node_release(node); if(FAILED(hres) || prevent_default || (event_obj && event_obj->cancel_bubble)) break; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index ebb8e4c..e4128f2 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -83,6 +83,7 @@ void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; typedef struct { dispex_static_data_vtbl_t dispex_vtbl; void (*bind_event)(DispatchEx*,eventid_t); + HRESULT (*handle_event_default)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*); ConnectionPointContainer *(*get_cp_container)(DispatchEx*); } event_target_vtbl_t;

1 0

Jacek Caban : mshtml: Store event target as EventTarget in HTMLEventObj.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 969583850e4b11e17b526a20f8d2ffb5e41e1779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=969583850e4b11e17b526a20f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:40:20 2017 +0200 mshtml: Store event target as EventTarget in HTMLEventObj. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index dedd311..30fdf3b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -220,7 +220,7 @@ struct HTMLEventObj { LONG ref; - HTMLDOMNode *target; + EventTarget *target; const event_info_t *type; nsIDOMEvent *nsevent; VARIANT return_value; @@ -274,7 +274,7 @@ static ULONG WINAPI HTMLEventObj_Release(IHTMLEventObj *iface) if(!ref) { if(This->target) - IHTMLDOMNode_Release(&This->target->IHTMLDOMNode_iface); + IDispatchEx_Release(&This->target->dispex.IDispatchEx_iface); if(This->nsevent) nsIDOMEvent_Release(This->nsevent); release_dispex(&This->dispex); @@ -323,7 +323,7 @@ static HRESULT WINAPI HTMLEventObj_get_srcElement(IHTMLEventObj *iface, IHTMLEle *p = NULL; if(This->target) - IHTMLDOMNode_QueryInterface(&This->target->IHTMLDOMNode_iface, &IID_IHTMLElement, (void**)p); + IDispatchEx_QueryInterface(&This->target->dispex.IDispatchEx_iface, &IID_IHTMLElement, (void**)p); return S_OK; } @@ -803,7 +803,7 @@ static HTMLEventObj *create_event(void) return ret; } -static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_t eid, nsIDOMEvent *nsevent) +static HRESULT set_event_info(HTMLEventObj *event, EventTarget *target, eventid_t eid, HTMLDocumentNode *doc, nsIDOMEvent *nsevent) { event->type = event_info+eid; event->nsevent = nsevent; @@ -815,7 +815,7 @@ static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_ nsresult nsres; nsAString_InitDepend(&type_str, event_types[event_info[eid].type]); - nsres = nsIDOMHTMLDocument_CreateEvent(target->doc->nsdoc, &type_str, &event->nsevent); + nsres = nsIDOMHTMLDocument_CreateEvent(doc->nsdoc, &type_str, &event->nsevent); nsAString_Finish(&type_str); if(NS_FAILED(nsres)) { ERR("Could not create event: %08x\n", nsres); @@ -825,7 +825,7 @@ static HRESULT set_event_info(HTMLEventObj *event, HTMLDOMNode *target, eventid_ event->target = target; if(target) - IHTMLDOMNode_AddRef(&target->IHTMLDOMNode_iface); + IDispatchEx_AddRef(&target->dispex.IDispatchEx_iface); return S_OK; } @@ -1175,7 +1175,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, HTMLDOMNod if(!event_obj) return; - hres = set_event_info(event_obj, target, eid, nsevent); + hres = set_event_info(event_obj, &target->event_target, eid, doc, nsevent); if(FAILED(hres)) { IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); return; @@ -1225,7 +1225,7 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even } if(event_obj) { - hres = set_event_info(event_obj, node, eid, NULL); + hres = set_event_info(event_obj, &node->event_target, eid, node->doc, NULL); if(SUCCEEDED(hres)) fire_event_obj(node->doc, eid, event_obj, node);

1 0

Jacek Caban : mshtml: Update event_info array.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 5a9f5470ef2f72f3336aad2bf8988a5067c0cf4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9f5470ef2f72f3336aad2bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 18 16:40:31 2017 +0200 mshtml: Update event_info array. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 159 +++++++++++++++++++++++++----------------------- 1 file changed, 84 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5a9f5470ef2f72f3336aa…

1 0

Sergio Gómez Del Real : uxtheme: Add a stub for IsCompositionActive().
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 731136d8d32b36cf088a2c7182ca08d28e0e75a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=731136d8d32b36cf088a2c718… Author: Sergio Gómez Del Real <sergio.g.delreal(a)gmail.com> Date: Wed Oct 18 08:40:10 2017 -0500 uxtheme: Add a stub for IsCompositionActive(). Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 12 ++++++++++++ dlls/uxtheme/uxtheme.spec | 1 + include/uxtheme.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 625be24..08996e1 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -562,6 +562,18 @@ BOOL WINAPI IsThemeActive(void) return bThemeActive; } +/************************************************************ +* IsCompositionActive (UXTHEME.@) +*/ +BOOL WINAPI IsCompositionActive(void) +{ + FIXME(": stub\n"); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + return FALSE; +} + /*********************************************************************** * EnableTheming (UXTHEME.@) * diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 7d2a7d7..5b68fde 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -100,6 +100,7 @@ @ stdcall GetWindowTheme(ptr) @ stdcall HitTestThemeBackground(ptr long long long long ptr long int64 ptr) @ stdcall IsAppThemed() +@ stdcall IsCompositionActive() @ stdcall IsThemeActive() @ stdcall IsThemeBackgroundPartiallyTransparent(ptr long long) @ stdcall IsThemeDialogTextureEnabled(ptr) diff --git a/include/uxtheme.h b/include/uxtheme.h index 7606306..374b530 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -209,6 +209,7 @@ HTHEME WINAPI GetWindowTheme(HWND); HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*, HRGN,POINT,WORD*); BOOL WINAPI IsAppThemed(void); +BOOL WINAPI IsCompositionActive(void); BOOL WINAPI IsThemeActive(void); BOOL WINAPI IsThemeBackgroundPartiallyTransparent(HTHEME,int,int); BOOL WINAPI IsThemeDialogTextureEnabled(HWND);

1 0

Andrey Gusev : winsta: Add WinStationUnRegisterConsoleNotification stub.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 981dec4986e7ac1982049dbede1ca2aa72f5e70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=981dec4986e7ac1982049dbed… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Oct 18 20:36:51 2017 +0300 winsta: Add WinStationUnRegisterConsoleNotification stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winsta/main.c | 7 +++++++ dlls/winsta/winsta.h | 1 + dlls/winsta/winsta.spec | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winsta/main.c b/dlls/winsta/main.c index 59efef2..7568310 100644 --- a/dlls/winsta/main.c +++ b/dlls/winsta/main.c @@ -68,6 +68,13 @@ BOOLEAN WINAPI WinStationRegisterConsoleNotification( HANDLE server, HWND hwnd, return FALSE; } +BOOLEAN WINAPI WinStationUnRegisterConsoleNotification( HANDLE server, HWND hwnd ) +{ + FIXME( "%p %p\n", server, hwnd ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + BOOLEAN WINAPI WinStationGetAllProcesses( HANDLE server, ULONG level, ULONG *process_count, PTS_ALL_PROCESSES_INFO *info ) { diff --git a/dlls/winsta/winsta.h b/dlls/winsta/winsta.h index a97f4c4..d908aa8 100644 --- a/dlls/winsta/winsta.h +++ b/dlls/winsta/winsta.h @@ -94,5 +94,6 @@ BOOLEAN WINAPI WinStationGetAllProcesses(HANDLE,ULONG,PULONG,PTS_ALL_PROCESSES_I BOOLEAN WINAPI WinStationGetProcessSid(HANDLE,ULONG,FILETIME *,PVOID,PULONG); BOOLEAN WINAPI WinStationQueryInformationW(HANDLE,ULONG,WINSTATIONINFOCLASS,PVOID,ULONG,PULONG); BOOLEAN WINAPI WinStationRegisterConsoleNotification(HANDLE,HWND,ULONG); +BOOLEAN WINAPI WinStationUnRegisterConsoleNotification(HANDLE,HWND); #endif /* _WINSTA_H */ diff --git a/dlls/winsta/winsta.spec b/dlls/winsta/winsta.spec index 20db0ca..1f38a23 100644 --- a/dlls/winsta/winsta.spec +++ b/dlls/winsta/winsta.spec @@ -69,7 +69,7 @@ @ stub WinStationShadowStop @ stub WinStationShutdownSystem @ stub WinStationTerminateProcess -@ stub WinStationUnRegisterConsoleNotification +@ stdcall WinStationUnRegisterConsoleNotification(ptr ptr) @ stdcall WinStationVirtualOpen(ptr ptr ptr) @ stub WinStationWaitSystemEvent @ stub _NWLogonQueryAdmin

1 0

Nikolay Sivov : gdiplus/metafile: Validate data size when playing back EmfPlusClear.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: b203b76190a8b68ee1cb0c64acd49e223b9a5edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b203b76190a8b68ee1cb0c64a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 15:49:11 2017 +0300 gdiplus/metafile: Validate data size when playing back EmfPlusClear. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 1fd4db2..9312a04 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -1823,6 +1823,9 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { EmfPlusClear *record = (EmfPlusClear*)header; + if (dataSize != sizeof(record->Color)) + return InvalidParameter; + return GdipGraphicsClear(metafile->playback_graphics, record->Color); } case EmfPlusRecordTypeFillRects:

1 0

Nikolay Sivov : gdiplus/metafile: Added support for EmfPlusFont objects.
by Alexandre Julliard 18 Oct '17

18 Oct '17

Module: wine Branch: master Commit: 7b99fe6f09ffc33d80e76e80c25f86c8bae6303a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b99fe6f09ffc33d80e76e80c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 17 15:49:12 2017 +0300 gdiplus/metafile: Added support for EmfPlusFont objects. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/metafile.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index dc2f0892..d4c1fd9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -396,6 +396,7 @@ struct emfplus_object { GpBrush *brush; GpPath *path; GpImage *image; + GpFont *font; GpImageAttributes *image_attributes; void *object; } u; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 9312a04..b67f565 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -377,6 +377,17 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +typedef struct EmfPlusFont +{ + DWORD Version; + float EmSize; + DWORD SizeUnit; + DWORD FontStyleFlags; + DWORD Reserved; + DWORD Length; + WCHAR FamilyName[1]; +} EmfPlusFont; + static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) { struct emfplus_object *object = &metafile->objtable[id]; @@ -394,6 +405,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypeImage: GdipDisposeImage(object->u.image); break; + case ObjectTypeFont: + GdipDeleteFont(object->u.font); + break; case ObjectTypeImageAttributes: GdipDisposeImageAttributes(object->u.image_attributes); break; @@ -1692,6 +1706,34 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypeImage: status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object); break; + case ObjectTypeFont: + { + EmfPlusFont *data = (EmfPlusFont *)record_data; + GpFontFamily *family; + WCHAR *familyname; + + if (data_size <= FIELD_OFFSET(EmfPlusFont, FamilyName)) + return InvalidParameter; + data_size -= FIELD_OFFSET(EmfPlusFont, FamilyName); + + if (data_size < data->Length * sizeof(WCHAR)) + return InvalidParameter; + + if (!(familyname = GdipAlloc((data->Length + 1) * sizeof(*familyname)))) + return OutOfMemory; + + memcpy(familyname, data->FamilyName, data->Length * sizeof(*familyname)); + familyname[data->Length] = 0; + + status = GdipCreateFontFamilyFromName(familyname, NULL, &family); + GdipFree(familyname); + if (status != Ok) + return InvalidParameter; + + status = GdipCreateFont(family, data->EmSize, data->FontStyleFlags, data->SizeUnit, (GpFont **)&object); + GdipDeleteFontFamily(family); + break; + } case ObjectTypeImageAttributes: { EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;

1 0