February 2017 - Wine-commits

Jacek Caban : mshtml: Return event target as EventTarget in NodeImplVtbl.get_event_target.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: e1d54def73187d2302c9c8c789062fc6637a3a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d54def73187d2302c9c8c78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:51 2017 +0100 mshtml: Return event target as EventTarget in NodeImplVtbl.get_event_target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlbody.c | 8 ++++---- dlls/mshtml/htmlelem.c | 4 ++-- dlls/mshtml/mshtml_private.h | 7 ++++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fbd04aa..e1e886f 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -825,13 +825,13 @@ static void HTMLBodyElement_unlink(HTMLDOMNode *iface) } } -static event_target_t **HTMLBodyElement_get_event_target_ptr(HTMLDOMNode *iface) +static EventTarget *HTMLBodyElement_get_event_target(HTMLDOMNode *iface) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); return This->textcont.element.node.doc && This->textcont.element.node.doc->window - ? &This->textcont.element.node.doc->window->event_target.ptr - : &This->textcont.element.node.event_target.ptr; + ? &This->textcont.element.node.doc->window->event_target + : &This->textcont.element.node.event_target; } static BOOL HTMLBodyElement_is_text_edit(HTMLDOMNode *iface) @@ -863,7 +863,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, - HTMLBodyElement_get_event_target_ptr, + HTMLBodyElement_get_event_target, NULL, NULL, NULL, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d191a35..3a6197d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5077,8 +5077,8 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex); - return This->node.vtbl->get_event_target_ptr - ? This->node.vtbl->get_event_target_ptr(&This->node) + return This->node.vtbl->get_event_target + ? &This->node.vtbl->get_event_target(&This->node)->ptr : &This->node.event_target.ptr; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8bc0599..68362f7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -73,6 +73,7 @@ typedef struct HTMLDOMNode HTMLDOMNode; typedef struct ConnectionPoint ConnectionPoint; typedef struct BSCallback BSCallback; typedef struct event_target_t event_target_t; +typedef struct EventTarget EventTarget; #define TID_LIST \ XIID(NULL) \ @@ -363,10 +364,10 @@ typedef struct { DISPID id; } global_prop_t; -typedef struct { +struct EventTarget { DispatchEx dispex; event_target_t *ptr; -} EventTarget; +}; typedef struct { DispatchEx dispex; @@ -695,7 +696,7 @@ typedef struct { HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**); HRESULT (*handle_event)(HTMLDOMNode*,DWORD,nsIDOMEvent*,BOOL*); HRESULT (*get_attr_col)(HTMLDOMNode*,HTMLAttributeCollection**); - event_target_t **(*get_event_target_ptr)(HTMLDOMNode*); + EventTarget *(*get_event_target)(HTMLDOMNode*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*);

1 0

Jacek Caban : mshtml: Return event target as EventTarget from DispatchEx vtbl.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: c12b4b4846a06f53736c54a8dcc932599c4368cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c12b4b4846a06f53736c54a8d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:10:58 2017 +0100 mshtml: Return event target as EventTarget from DispatchEx vtbl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 8 ++++---- dlls/mshtml/htmlevent.c | 12 +++++------- dlls/mshtml/htmlwindow.c | 6 +++--- dlls/mshtml/mshtml_private.h | 2 +- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 3a6197d..3d156d8 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5074,12 +5074,12 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) return S_OK; } -static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) +static EventTarget *HTMLElement_get_event_target(DispatchEx *dispex) { HTMLElement *This = impl_from_DispatchEx(dispex); return This->node.vtbl->get_event_target - ? &This->node.vtbl->get_event_target(&This->node)->ptr - : &This->node.event_target.ptr; + ? This->node.vtbl->get_event_target(&This->node) + : &This->node.event_target; } static void HTMLElement_bind_event(DispatchEx *dispex, int eid) @@ -5113,7 +5113,7 @@ static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { HTMLElement_get_dispid, HTMLElement_invoke, HTMLElement_populate_props, - HTMLElement_get_event_target_ptr, + HTMLElement_get_event_target, HTMLElement_bind_event }; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fc5277b..4a28bb8 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -902,15 +902,13 @@ HRESULT create_event_obj(IHTMLEventObj **ret) static inline event_target_t *get_event_target_data(EventTarget *event_target, BOOL alloc) { const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); - event_target_t **ptr; - ptr = vtbl && vtbl->get_event_target_ptr - ? vtbl->get_event_target_ptr(&event_target->dispex) - : &event_target->ptr; - if(*ptr || !alloc) - return *ptr; + if(vtbl && vtbl->get_event_target) + event_target = vtbl->get_event_target(&event_target->dispex); + if(event_target->ptr || !alloc) + return event_target->ptr; - return *ptr = heap_alloc_zero(sizeof(event_target_t)); + return event_target->ptr = heap_alloc_zero(sizeof(event_target_t)); } static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b1efc0d..aa64fb4 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2942,10 +2942,10 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return hres; } -static event_target_t **HTMLWindow_get_event_target_ptr(DispatchEx *dispex) +static EventTarget *HTMLWindow_get_event_target(DispatchEx *dispex) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - return &This->event_target.ptr; + return &This->event_target; } static void HTMLWindow_bind_event(DispatchEx *dispex, int eid) @@ -2964,7 +2964,7 @@ static const dispex_static_data_vtbl_t HTMLWindow_dispex_vtbl = { NULL, HTMLWindow_invoke, NULL, - HTMLWindow_get_event_target_ptr, + HTMLWindow_get_event_target, HTMLWindow_bind_event }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 68362f7..457e32b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -259,7 +259,7 @@ typedef struct { HRESULT (*invoke)(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*populate_props)(DispatchEx*); /* We abuse this vtbl for EventTarget functions to avoid separated vtbl. */ - event_target_t **(*get_event_target_ptr)(DispatchEx*); + EventTarget *(*get_event_target)(DispatchEx*); void (*bind_event)(DispatchEx*,int); } dispex_static_data_vtbl_t;

1 0

Jacek Caban : mshtml: Don' t reallocate handler_vector_t when handlers are added.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 72ee409e7f4729f1b22ea1fc0d092c83ceffe2e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ee409e7f4729f1b22ea1fc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:07 2017 +0100 mshtml: Don't reallocate handler_vector_t when handlers are added. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 4a28bb8..96885b0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { IDispatch *handler_prop; DWORD handler_cnt; - IDispatch *handlers[0]; + IDispatch **handlers; } handler_vector_t; struct event_target_t { @@ -1315,25 +1315,13 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return S_OK; } -static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid, int cnt) +static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid) { - handler_vector_t *new_vector, *handler_vector = event_target->event_table[eid]; + if(event_target->event_table[eid]) + return TRUE; - if(handler_vector) { - if(cnt <= handler_vector->handler_cnt) - return TRUE; - - new_vector = heap_realloc_zero(handler_vector, sizeof(handler_vector_t) + sizeof(IDispatch*)*cnt); - }else { - new_vector = heap_alloc_zero(sizeof(handler_vector_t) + sizeof(IDispatch*)*cnt); - } - - if(!new_vector) - return FALSE; - - new_vector->handler_cnt = cnt; - event_target->event_table[eid] = new_vector; - return TRUE; + event_target->event_table[eid] = heap_alloc_zero(sizeof(*event_target->event_table[eid])); + return event_target->event_table[eid] != NULL; } HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) @@ -1433,7 +1421,7 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, return E_OUTOFMEMORY; if(!data->event_table[eid]) { - if(!alloc_handler_vector(data, eid, 0)) + if(!alloc_handler_vector(data, eid)) return E_OUTOFMEMORY; bind_event(event_target, eid); @@ -1536,13 +1524,21 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI if(data->event_table[eid]) { while(i < data->event_table[eid]->handler_cnt && data->event_table[eid]->handlers[i]) i++; - if(i == data->event_table[eid]->handler_cnt && !alloc_handler_vector(data, eid, i+1)) - return E_OUTOFMEMORY; - }else if(alloc_handler_vector(data, eid, i+1)) { + }else if(alloc_handler_vector(data, eid)) { bind_event(event_target, eid); }else { return E_OUTOFMEMORY; } + if(i == data->event_table[eid]->handler_cnt) { + if(i) + data->event_table[eid]->handlers = heap_realloc_zero(data->event_table[eid]->handlers, + (i + 1) * sizeof(*data->event_table[eid]->handlers)); + else + data->event_table[eid]->handlers = heap_alloc_zero(sizeof(*data->event_table[eid]->handlers)); + if(!data->event_table[eid]->handlers) + return E_OUTOFMEMORY; + data->event_table[eid]->handler_cnt++; + } IDispatch_AddRef(disp); data->event_table[eid]->handlers[i] = disp;

1 0

Jacek Caban : mshtml: Added new get_handler_vector helper for creating handle_vector_t.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: db67232ce25b0c197afb8e2506b9e6335bd0d536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db67232ce25b0c197afb8e250… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:15 2017 +0100 mshtml: Added new get_handler_vector helper for creating handle_vector_t. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 88 ++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 49 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 96885b0..44a5df0 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -911,6 +911,27 @@ static inline event_target_t *get_event_target_data(EventTarget *event_target, B return event_target->ptr = heap_alloc_zero(sizeof(event_target_t)); } +static handler_vector_t *get_handler_vector(EventTarget *event_target, eventid_t eid, BOOL alloc) +{ + event_target_t *data; + + data = get_event_target_data(event_target, alloc); + if(!data) + return NULL; + + if(alloc && !data->event_table[eid]) { + data->event_table[eid] = heap_alloc_zero(sizeof(*data->event_table[eid])); + if(data->event_table[eid]) { + const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); + if(vtbl->bind_event) + vtbl->bind_event(&event_target->dispex, eid); + else + FIXME("Unsupported event binding on target %p\n", event_target); + } + } + return data->event_table[eid]; +} + static HRESULT call_disp_func(IDispatch *disp, DISPPARAMS *dp, VARIANT *retv) { IDispatchEx *dispex; @@ -1315,15 +1336,6 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return S_OK; } -static BOOL alloc_handler_vector(event_target_t *event_target, eventid_t eid) -{ - if(event_target->event_table[eid]) - return TRUE; - - event_target->event_table[eid] = heap_alloc_zero(sizeof(*event_target->event_table[eid])); - return event_target->event_table[eid] != NULL; -} - HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) { nsIDOMNode *nsnode = NULL; @@ -1378,16 +1390,6 @@ void detach_events(HTMLDocumentNode *doc) release_nsevents(doc); } -/* Caller should ensure that it's called only once for given event in the target. */ -static void bind_event(EventTarget *event_target, eventid_t eid) -{ - const dispex_static_data_vtbl_t *vtbl = dispex_get_vtbl(&event_target->dispex); - if(vtbl->bind_event) - vtbl->bind_event(&event_target->dispex, eid); - else - FIXME("Unsupported event binding on target %p\n", event_target); -} - static void remove_event_handler(EventTarget *event_target, eventid_t eid) { event_target_t *data; @@ -1407,7 +1409,7 @@ static void remove_event_handler(EventTarget *event_target, eventid_t eid) static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, IDispatch *disp) { - event_target_t *data; + handler_vector_t *handler_vector; if(event_info[eid].flags & EVENT_FIXME) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); @@ -1416,20 +1418,14 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, if(!disp) return S_OK; - data = get_event_target_data(event_target, TRUE); - if(!data) + handler_vector = get_handler_vector(event_target, eid, TRUE); + if(!handler_vector) return E_OUTOFMEMORY; - if(!data->event_table[eid]) { - if(!alloc_handler_vector(data, eid)) - return E_OUTOFMEMORY; + if(handler_vector->handler_prop) + IDispatch_Release(handler_vector->handler_prop); - bind_event(event_target, eid); - }else if(data->event_table[eid]->handler_prop) { - IDispatch_Release(data->event_table[eid]->handler_prop); - } - - data->event_table[eid]->handler_prop = disp; + handler_vector->handler_prop = disp; IDispatch_AddRef(disp); return S_OK; } @@ -1503,7 +1499,7 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARIANT_BOOL *res) { - event_target_t *data; + handler_vector_t *handler_vector; eventid_t eid; DWORD i = 0; @@ -1517,31 +1513,25 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI if(event_info[eid].flags & EVENT_FIXME) FIXME("unimplemented event %s\n", debugstr_w(event_info[eid].name)); - data = get_event_target_data(event_target, TRUE); - if(!data) + handler_vector = get_handler_vector(event_target, eid, TRUE); + if(!handler_vector) return E_OUTOFMEMORY; - if(data->event_table[eid]) { - while(i < data->event_table[eid]->handler_cnt && data->event_table[eid]->handlers[i]) - i++; - }else if(alloc_handler_vector(data, eid)) { - bind_event(event_target, eid); - }else { - return E_OUTOFMEMORY; - } - if(i == data->event_table[eid]->handler_cnt) { + while(i < handler_vector->handler_cnt && handler_vector->handlers[i]) + i++; + if(i == handler_vector->handler_cnt) { if(i) - data->event_table[eid]->handlers = heap_realloc_zero(data->event_table[eid]->handlers, - (i + 1) * sizeof(*data->event_table[eid]->handlers)); + handler_vector->handlers = heap_realloc_zero(handler_vector->handlers, + (i + 1) * sizeof(*handler_vector->handlers)); else - data->event_table[eid]->handlers = heap_alloc_zero(sizeof(*data->event_table[eid]->handlers)); - if(!data->event_table[eid]->handlers) + handler_vector->handlers = heap_alloc_zero(sizeof(*handler_vector->handlers)); + if(!handler_vector->handlers) return E_OUTOFMEMORY; - data->event_table[eid]->handler_cnt++; + handler_vector->handler_cnt++; } IDispatch_AddRef(disp); - data->event_table[eid]->handlers[i] = disp; + handler_vector->handlers[i] = disp; *res = VARIANT_TRUE; return S_OK;

1 0

Jacek Caban : mshtml: Use get_handler_vector in remove_event_handler.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 6da77419b5f7240cad402bd83f45828344489fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da77419b5f7240cad402bd83… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:25 2017 +0100 mshtml: Use get_handler_vector in remove_event_handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 44a5df0..0f835e2 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1392,7 +1392,7 @@ void detach_events(HTMLDocumentNode *doc) static void remove_event_handler(EventTarget *event_target, eventid_t eid) { - event_target_t *data; + handler_vector_t *handler_vector; VARIANT *store; HRESULT hres; @@ -1400,10 +1400,10 @@ static void remove_event_handler(EventTarget *event_target, eventid_t eid) if(SUCCEEDED(hres)) VariantClear(store); - data = get_event_target_data(event_target, FALSE); - if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { - IDispatch_Release(data->event_table[eid]->handler_prop); - data->event_table[eid]->handler_prop = NULL; + handler_vector = get_handler_vector(event_target, eid, FALSE); + if(handler_vector && handler_vector->handler_prop) { + IDispatch_Release(handler_vector->handler_prop); + handler_vector->handler_prop = NULL; } }

1 0

Jacek Caban : mshtml: Use get_handler_vector in call_event_handlers.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 02f0483d378538b30e4a5981218dee0e6de3322b URL: http://source.winehq.org/git/wine.git/?a=commit;h=02f0483d378538b30e4a59812… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:21 2017 +0100 mshtml: Use get_handler_vector in call_event_handlers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 0f835e2..c8438a7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1004,12 +1004,12 @@ static BOOL is_cp_event(cp_static_data_t *data, DISPID dispid) void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTarget *event_target, ConnectionPointContainer *cp_container, eventid_t eid, IDispatch *this_obj) { - event_target_t *data = get_event_target_data(event_target, FALSE); + handler_vector_t *handler_vector = get_handler_vector(event_target, eid, FALSE); const BOOL cancelable = event_info[eid].flags & EVENT_CANCELABLE; VARIANT v; HRESULT hres; - if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { + if(handler_vector && handler_vector->handler_prop) { DISPID named_arg = DISPID_THIS; VARIANTARG arg; DISPPARAMS dp = {&arg, &named_arg, 1, 1}; @@ -1019,7 +1019,7 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa V_VT(&v) = VT_EMPTY; TRACE("%s >>>\n", debugstr_w(event_info[eid].name)); - hres = call_disp_func(data->event_table[eid]->handler_prop, &dp, &v); + hres = call_disp_func(handler_vector->handler_prop, &dp, &v); if(hres == S_OK) { TRACE("%s <<< %s\n", debugstr_w(event_info[eid].name), debugstr_variant(&v)); @@ -1037,7 +1037,7 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa } } - if(data && data->event_table[eid] && data->event_table[eid]->handler_cnt) { + if(handler_vector && handler_vector->handler_cnt) { VARIANTARG arg; DISPPARAMS dp = {&arg, NULL, 1, 0}; int i; @@ -1045,13 +1045,13 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa V_VT(&arg) = VT_DISPATCH; V_DISPATCH(&arg) = (IDispatch*)&event_obj->dispex.IDispatchEx_iface; - i = data->event_table[eid]->handler_cnt; + i = handler_vector->handler_cnt; while(i--) { - if(data->event_table[eid]->handlers[i]) { + if(handler_vector->handlers[i]) { V_VT(&v) = VT_EMPTY; TRACE("%s [%d] >>>\n", debugstr_w(event_info[eid].name), i); - hres = call_disp_func(data->event_table[eid]->handlers[i], &dp, &v); + hres = call_disp_func(handler_vector->handlers[i], &dp, &v); if(hres == S_OK) { TRACE("%s [%d] <<<\n", debugstr_w(event_info[eid].name), i);

1 0

Jacek Caban : mshtml: Use get_handler_vector in get_event_handler.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 3fcb5a0aed232acb0f860aa8c94fbc5cfece2191 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fcb5a0aed232acb0f860aa8c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:32 2017 +0100 mshtml: Use get_handler_vector in get_event_handler. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c8438a7..d144eeb 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1446,7 +1446,7 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var /* * Setting event handler to string is a rare case and we don't want to - * complicate nor increase memory of event_target_t for that. Instead, + * complicate nor increase memory of handler_vector_t for that. Instead, * we store the value in DispatchEx, which can already handle custom * properties. */ @@ -1475,7 +1475,7 @@ HRESULT set_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var) { - event_target_t *data; + handler_vector_t *handler_vector; VARIANT *v; HRESULT hres; @@ -1485,10 +1485,10 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var return VariantCopy(var, v); } - data = get_event_target_data(event_target, FALSE); - if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { + handler_vector = get_handler_vector(event_target, eid, FALSE); + if(handler_vector && handler_vector->handler_prop) { V_VT(var) = VT_DISPATCH; - V_DISPATCH(var) = data->event_table[eid]->handler_prop; + V_DISPATCH(var) = handler_vector->handler_prop; IDispatch_AddRef(V_DISPATCH(var)); }else { V_VT(var) = VT_NULL;

1 0

Jacek Caban : mshtml: Use get_handler_vector in detach_event.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 57239e7822ac7d3bc41a3734ed2201bc801ab208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57239e7822ac7d3bc41a3734e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:38 2017 +0100 mshtml: Use get_handler_vector in detach_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d144eeb..e844728 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1539,9 +1539,9 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) { - event_target_t *data; + handler_vector_t *handler_vector; eventid_t eid; - DWORD i = 0; + unsigned i; eid = attr_to_eid(name); if(eid == EVENTID_LAST) { @@ -1549,19 +1549,15 @@ HRESULT detach_event(EventTarget *event_target, BSTR name, IDispatch *disp) return S_OK; } - data = get_event_target_data(event_target, FALSE); - if(!data) - return S_OK; - - if(!data->event_table[eid]) + handler_vector = get_handler_vector(event_target, eid, FALSE); + if(!handler_vector) return S_OK; - while(i < data->event_table[eid]->handler_cnt) { - if(data->event_table[eid]->handlers[i] == disp) { - IDispatch_Release(data->event_table[eid]->handlers[i]); - data->event_table[eid]->handlers[i] = NULL; + for(i = 0; i < handler_vector->handler_cnt; i++) { + if(handler_vector->handlers[i] == disp) { + IDispatch_Release(handler_vector->handlers[i]); + handler_vector->handlers[i] = NULL; } - i++; } return S_OK;

1 0

Jacek Caban : mshtml: Pass event target as EventTarget to release_event_target.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: bc02ba80b922f0e62e00cb366e0f592115b4a63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc02ba80b922f0e62e00cb366… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:50 2017 +0100 mshtml: Pass event target as EventTarget to release_event_target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 21 +++++++++++++-------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlnode.c | 3 +-- dlls/mshtml/htmlwindow.c | 3 +-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index e844728..7d11747 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1642,20 +1642,25 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) return S_OK; } -void release_event_target(event_target_t *event_target) +void release_event_target(EventTarget *event_target) { int i; unsigned int j; + if(!event_target->ptr) + return; + for(i=0; i < EVENTID_LAST; i++) { - if(event_target->event_table[i]) { - if(event_target->event_table[i]->handler_prop) - IDispatch_Release(event_target->event_table[i]->handler_prop); - for(j=0; j < event_target->event_table[i]->handler_cnt; j++) - if(event_target->event_table[i]->handlers[j]) - IDispatch_Release(event_target->event_table[i]->handlers[j]); + if(event_target->ptr->event_table[i]) { + if(event_target->ptr->event_table[i]->handler_prop) + IDispatch_Release(event_target->ptr->event_table[i]->handler_prop); + for(j=0; j < event_target->ptr->event_table[i]->handler_cnt; j++) + if(event_target->ptr->event_table[i]->handlers[j]) + IDispatch_Release(event_target->ptr->event_table[i]->handlers[j]); + heap_free(event_target->ptr->event_table[i]->handlers); + heap_free(event_target->ptr->event_table[i]); } } - heap_free(event_target); + heap_free(event_target->ptr); } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index cc16fd8..d66f359 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -55,7 +55,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; -void release_event_target(event_target_t*) 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; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 1ba477e..ab47323 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1185,12 +1185,11 @@ HRESULT HTMLDOMNode_QI(HTMLDOMNode *This, REFIID riid, void **ppv) void HTMLDOMNode_destructor(HTMLDOMNode *This) { + release_event_target(&This->event_target); if(This->nsnode) nsIDOMNode_Release(This->nsnode); if(This->doc && &This->doc->node != This) htmldoc_release(&This->doc->basedoc); - if(This->event_target.ptr) - release_event_target(This->event_target.ptr); } static HRESULT HTMLDOMNode_clone(HTMLDOMNode *This, nsIDOMNode *nsnode, HTMLDOMNode **ret) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index aa64fb4..e3f22cf 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -253,8 +253,7 @@ static void release_inner_window(HTMLInnerWindow *This) htmldoc_release(&This->doc->basedoc); } - if(This->event_target.ptr) - release_event_target(This->event_target.ptr); + release_event_target(&This->event_target); release_dispex(&This->event_target.dispex); for(i=0; i < This->global_prop_cnt; i++)

1 0

Jacek Caban : mshtml: Release event target in XMLHttpRequest destructor.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 68d2f9c6a65e9d71feae92191123ef578e0e5ab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68d2f9c6a65e9d71feae92191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 13 21:11:57 2017 +0100 mshtml: Release event target in XMLHttpRequest destructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index efbb79f..51e2445 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -252,6 +252,7 @@ static ULONG WINAPI HTMLXMLHttpRequest_Release(IHTMLXMLHttpRequest *iface) if(!ref) { if(This->event_listener) detach_xhr_event_listener(This->event_listener); + release_event_target(&This->event_target); release_dispex(&This->event_target.dispex); nsIXMLHttpRequest_Release(This->nsxhr); heap_free(This);

1 0