wine-commits May 2015

wine-commits@winehq.org

2 participants
428 discussions

Jacek Caban : mshtml: Pass EventTarget to update_cp_events.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: 760f9de85126d891b3f50f99b99d487295825792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=760f9de85126d891b3f50f99b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:25:56 2015 +0200 mshtml: Pass EventTarget to update_cp_events. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlevent.c | 10 +++++----- dlls/mshtml/htmlevent.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b293367..1b72a32 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -3962,7 +3962,7 @@ static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); if(This->window) - update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target.ptr, cp); + update_cp_events(This->window->base.inner_window, &This->doc_node->node.event_target, cp); } static inline HTMLDocument *impl_from_ISupportErrorInfo(ISupportErrorInfo *iface) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 18bca41..3713389 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1563,18 +1563,18 @@ void bind_target_event(HTMLDocumentNode *doc, EventTarget *event_target, const W set_event_handler_disp(event_target, doc, eid, disp); } -void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp) +void update_cp_events(HTMLInnerWindow *window, EventTarget *event_target, cp_static_data_t *cp) { - event_target_t *event_target; + event_target_t *data; int i; - event_target = get_event_target(event_target_ptr); - if(!event_target) + data = get_event_target_data(event_target, FALSE); + if(!data) return; /* FIXME */ for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_nsevent_handler(window->doc, event_target, i); + ensure_nsevent_handler(window->doc, data, i); } } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 8c3163e..85f056c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -60,7 +60,7 @@ HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) D HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; -void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLSPEC_HIDDEN; +void update_cp_events(HTMLInnerWindow*,EventTarget*,cp_static_data_t*) DECLSPEC_HIDDEN; HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml: Pass EventTarget to detach_event.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: 21151f3ec69513e695743f239a707d10345054f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21151f3ec69513e695743f239… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:25:47 2015 +0200 mshtml: Pass EventTarget to detach_event. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 20 +++++++++++--------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 2b30c67..b293367 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2042,7 +2042,7 @@ static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR even TRACE("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); - return detach_event(This->doc_node->node.event_target.ptr, This, event, pDisp); + return detach_event(&This->doc_node->node.event_target, This, event, pDisp); } static HRESULT WINAPI HTMLDocument3_put_onrowsdelete(IHTMLDocument3 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 8777e45..d2ae0be 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2575,7 +2575,7 @@ static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, TRACE("(%p)->(%s %p)\n", This, debugstr_w(event), pDisp); - return detach_event(*get_node_event_target(&This->node), &This->node.doc->basedoc, event, pDisp); + return detach_event(&This->node.event_target, &This->node.doc->basedoc, event, pDisp); } static HRESULT WINAPI HTMLElement2_get_readyState(IHTMLElement2 *iface, VARIANT *p) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 527bed2..18bca41 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1518,27 +1518,29 @@ HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, return ensure_nsevent_handler(doc->doc_node, data, eid); } -HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) +HRESULT detach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) { + event_target_t *data; eventid_t eid; DWORD i = 0; - if(!event_target) - return S_OK; - eid = attr_to_eid(name); if(eid == EVENTID_LAST) { WARN("Unknown event\n"); return S_OK; } - if(!event_target->event_table[eid]) + data = get_event_target_data(event_target, FALSE); + if(!data) + return S_OK; + + if(!data->event_table[eid]) return S_OK; - while(i < event_target->event_table[eid]->handler_cnt) { - if(event_target->event_table[eid]->handlers[i] == disp) { - IDispatch_Release(event_target->event_table[eid]->handlers[i]); - event_target->event_table[eid]->handlers[i] = NULL; + 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; } i++; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e3a4e7f..8c3163e 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -57,7 +57,7 @@ void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispa HRESULT set_event_handler(EventTarget*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; -HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; +HRESULT detach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b98d618..01ce10e 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1669,7 +1669,7 @@ static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, I return E_FAIL; } - return detach_event(window->doc->body_event_target, &window->doc->basedoc, event, pDisp); + return detach_event(&window->event_target, &window->doc->basedoc, event, pDisp); } static HRESULT window_set_timer(HTMLInnerWindow *This, VARIANT *expr, LONG msec, VARIANT *language,

1 0

Jacek Caban : mshtml: Pass EventTarget to attach_event.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: 513c77d9e42902b154fd277f57589fe9dbe9d11a URL: http://source.winehq.org/git/wine.git/?a=commit;h=513c77d9e42902b154fd277f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:25:31 2015 +0200 mshtml: Pass EventTarget to attach_event. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 20 ++++++++++---------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0316be2..2b30c67 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2032,7 +2032,7 @@ static HRESULT WINAPI HTMLDocument3_attachEvent(IHTMLDocument3 *iface, BSTR even TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(&This->doc_node->node.event_target.ptr, This, event, pDisp, pfResult); + return attach_event(&This->doc_node->node.event_target, This, event, pDisp, pfResult); } static HRESULT WINAPI HTMLDocument3_detachEvent(IHTMLDocument3 *iface, BSTR event, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 77ccc52..8777e45 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2566,7 +2566,7 @@ static HRESULT WINAPI HTMLElement2_attachEvent(IHTMLElement2 *iface, BSTR event, TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(event), pDisp, pfResult); - return attach_event(get_node_event_target(&This->node), &This->node.doc->basedoc, event, pDisp, pfResult); + return attach_event(&This->node.event_target, &This->node.doc->basedoc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLElement2_detachEvent(IHTMLElement2 *iface, BSTR event, IDispatch *pDisp) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index fe22b36..527bed2 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1484,10 +1484,10 @@ HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var return S_OK; } -HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR name, +HRESULT attach_event(EventTarget *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp, VARIANT_BOOL *res) { - event_target_t *event_target; + event_target_t *data; eventid_t eid; DWORD i = 0; @@ -1498,24 +1498,24 @@ HRESULT attach_event(event_target_t **event_target_ptr, HTMLDocument *doc, BSTR return S_OK; } - event_target = get_event_target(event_target_ptr); - if(!event_target) + data = get_event_target_data(event_target, TRUE); + if(!data) return E_OUTOFMEMORY; - if(event_target->event_table[eid]) { - while(i < event_target->event_table[eid]->handler_cnt && event_target->event_table[eid]->handlers[i]) + if(data->event_table[eid]) { + while(i < data->event_table[eid]->handler_cnt && data->event_table[eid]->handlers[i]) i++; - if(i == event_target->event_table[eid]->handler_cnt && !alloc_handler_vector(event_target, eid, i+1)) + if(i == data->event_table[eid]->handler_cnt && !alloc_handler_vector(data, eid, i+1)) return E_OUTOFMEMORY; - }else if(!alloc_handler_vector(event_target, eid, i+1)) { + }else if(!alloc_handler_vector(data, eid, i+1)) { return E_OUTOFMEMORY; } IDispatch_AddRef(disp); - event_target->event_table[eid]->handlers[i] = disp; + data->event_table[eid]->handlers[i] = disp; *res = VARIANT_TRUE; - return ensure_nsevent_handler(doc->doc_node, event_target, eid); + return ensure_nsevent_handler(doc->doc_node, data, eid); } HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, IDispatch *disp) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 1ca1cf7..e3a4e7f 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -56,7 +56,7 @@ void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; -HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; +HRESULT attach_event(EventTarget*,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT call_fire_event(HTMLDOMNode*,eventid_t) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f31fb83..b98d618 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1654,7 +1654,7 @@ static HRESULT WINAPI HTMLWindow3_attachEvent(IHTMLWindow3 *iface, BSTR event, I return E_FAIL; } - return attach_event(&window->doc->body_event_target, &window->doc->basedoc, event, pDisp, pfResult); + return attach_event(&window->event_target, &window->doc->basedoc, event, pDisp, pfResult); } static HRESULT WINAPI HTMLWindow3_detachEvent(IHTMLWindow3 *iface, BSTR event, IDispatch *pDisp)

1 0

Jacek Caban : mshtml: Pass EventTarget to get_event_handler.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: f2fa7e662eeeea4482f6a58ee8f959cdb6621547 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2fa7e662eeeea4482f6a58ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:25:34 2015 +0200 mshtml: Pass EventTarget to get_event_handler. --- dlls/mshtml/htmlevent.c | 10 ++++++---- dlls/mshtml/htmlevent.h | 4 ++-- dlls/mshtml/htmlwindow.c | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f962fc5..fe22b36 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1462,18 +1462,20 @@ HRESULT set_event_handler(EventTarget *event_target, HTMLDocumentNode *doc, even return S_OK; } -HRESULT get_event_handler(DispatchEx *dispex, event_target_t **event_target, eventid_t eid, VARIANT *var) +HRESULT get_event_handler(EventTarget *event_target, eventid_t eid, VARIANT *var) { + event_target_t *data; VARIANT *v; HRESULT hres; - hres = dispex_get_dprop_ref(dispex, event_info[eid].attr_name, FALSE, &v); + hres = dispex_get_dprop_ref(&event_target->dispex, event_info[eid].attr_name, FALSE, &v); if(SUCCEEDED(hres) && V_VT(v) != VT_EMPTY) return VariantCopy(var, v); - if(*event_target && (*event_target)->event_table[eid] && (*event_target)->event_table[eid]->handler_prop) { + data = get_event_target_data(event_target, FALSE); + if(data && data->event_table[eid] && data->event_table[eid]->handler_prop) { V_VT(var) = VT_DISPATCH; - V_DISPATCH(var) = (*event_target)->event_table[eid]->handler_prop; + V_DISPATCH(var) = data->event_table[eid]->handler_prop; IDispatch_AddRef(V_DISPATCH(var)); }else { V_VT(var) = VT_NULL; diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index eeb8aab..1ca1cf7 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -55,7 +55,7 @@ void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,HTMLDocumentNode*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; -HRESULT get_event_handler(DispatchEx*,event_target_t**,eventid_t,VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(event_target_t**,HTMLDocument*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT detach_event(event_target_t*,HTMLDocument*,BSTR,IDispatch*) DECLSPEC_HIDDEN; HRESULT dispatch_event(HTMLDOMNode*,const WCHAR*,VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; @@ -85,7 +85,7 @@ static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT * static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) { - return get_event_handler(&node->event_target.dispex, get_node_event_target(node), eid, var); + return get_event_handler(&node->event_target, eid, var); } static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 7220c0c..f31fb83 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -105,7 +105,7 @@ static inline HRESULT get_window_event(HTMLWindow *window, eventid_t eid, VARIAN return E_FAIL; } - return get_event_handler(&window->inner_window->event_target.dispex, &window->inner_window->doc->body_event_target, eid, var); + return get_event_handler(&window->inner_window->event_target, eid, var); } static void detach_inner_window(HTMLInnerWindow *window)

1 0

Jacek Caban : mshtml: Pass EventTarget to set_event_handler.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: f26597753a0dd803b88e0e6321dd4a11eb6ad353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f26597753a0dd803b88e0e632… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:25:09 2015 +0200 mshtml: Pass EventTarget to set_event_handler. --- dlls/mshtml/htmlevent.c | 59 +++++++++++++++++++++++++++++------------------- dlls/mshtml/htmlevent.h | 6 ++--- dlls/mshtml/htmlwindow.c | 3 +-- dlls/mshtml/script.c | 44 +++++++++++++----------------------- 4 files changed, 56 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f26597753a0dd803b88e0…

1 0

Jacek Caban : mshtml: Make HTMLInnerWindow inherit from EventTarget.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: 2f4e85abb8a15a7227a9e7e0091b31c21b0bf48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4e85abb8a15a7227a9e7e00… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:24:44 2015 +0200 mshtml: Make HTMLInnerWindow inherit from EventTarget. --- dlls/mshtml/htmlwindow.c | 48 +++++++++++++++++++++++++------------------- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/script.c | 2 +- 3 files changed, 29 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f4e85abb8a15a7227a9e…

1 0

Jacek Caban : mshtml: Moved getting event target data pointer to DispatchEx vtbl.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: a1d837c341e8c01dba774d459963812de2b423a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d837c341e8c01dba774d459… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:24:34 2015 +0200 mshtml: Moved getting event target data pointer to DispatchEx vtbl. --- dlls/mshtml/htmlbody.c | 6 +++--- dlls/mshtml/htmlelem.c | 11 ++++++++++- dlls/mshtml/htmlevent.h | 4 +++- dlls/mshtml/mshtml_private.h | 4 +++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index e91f20e..e4b7990 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -824,13 +824,13 @@ static void HTMLBodyElement_unlink(HTMLDOMNode *iface) } } -static event_target_t **HTMLBodyElement_get_event_target(HTMLDOMNode *iface) +static event_target_t **HTMLBodyElement_get_event_target_ptr(HTMLDOMNode *iface) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); return This->textcont.element.node.doc ? &This->textcont.element.node.doc->body_event_target - : &This->textcont.element.node.event_target; + : &This->textcont.element.node.event_target.ptr; } static BOOL HTMLBodyElement_is_text_edit(HTMLDOMNode *iface) @@ -852,7 +852,7 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, - HTMLBodyElement_get_event_target, + HTMLBodyElement_get_event_target_ptr, NULL, NULL, NULL, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 68be24f..77ccc52 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3988,6 +3988,14 @@ static HRESULT HTMLElement_populate_props(DispatchEx *dispex) return S_OK; } +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) + : &This->node.event_target.ptr; +} + static const tid_t HTMLElement_iface_tids[] = { HTMLELEMENT_TIDS, 0 @@ -3997,7 +4005,8 @@ static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = { NULL, HTMLElement_get_dispid, HTMLElement_invoke, - HTMLElement_populate_props + HTMLElement_populate_props, + HTMLElement_get_event_target_ptr }; static dispex_static_data_t HTMLElement_dispex = { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 6d0d9f8..0c86f86 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -73,7 +73,9 @@ void detach_nsevent(HTMLDocumentNode*,const WCHAR*) DECLSPEC_HIDDEN; static inline event_target_t **get_node_event_target(HTMLDOMNode *node) { - return node->vtbl->get_event_target ? node->vtbl->get_event_target(node) : &node->event_target.ptr; + return node->event_target.dispex.data->vtbl->get_event_target_ptr + ? node->event_target.dispex.data->vtbl->get_event_target_ptr(&node->event_target.dispex) + : &node->event_target.ptr; } static inline HRESULT set_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *var) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 92ff5cd..032ca9a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -230,6 +230,8 @@ typedef struct { HRESULT (*get_dispid)(DispatchEx*,BSTR,DWORD,DISPID*); 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*); } dispex_static_data_vtbl_t; typedef struct { @@ -642,7 +644,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)(HTMLDOMNode*); + event_target_t **(*get_event_target_ptr)(HTMLDOMNode*); HRESULT (*fire_event)(HTMLDOMNode*,DWORD,BOOL*); HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL); HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*);

1 0

Jacek Caban : mshtml: Added new EventTarget struct representing event targets.
by Alexandre Julliard 15 May '15

15 May '15

Module: wine Branch: master Commit: f908f03cd98524686cc3e3b42b233bede4538796 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f908f03cd98524686cc3e3b42… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 14 13:24:19 2015 +0200 mshtml: Added new EventTarget struct representing event targets. --- dlls/mshtml/htmlanchor.c | 8 +++--- dlls/mshtml/htmlattr.c | 6 ++--- dlls/mshtml/htmlbody.c | 8 +++--- dlls/mshtml/htmlcomment.c | 8 +++--- dlls/mshtml/htmldoc.c | 12 ++++----- dlls/mshtml/htmlelem.c | 60 ++++++++++++++++++++++---------------------- dlls/mshtml/htmlembed.c | 8 +++--- dlls/mshtml/htmlevent.c | 4 +-- dlls/mshtml/htmlevent.h | 6 ++--- dlls/mshtml/htmlform.c | 8 +++--- dlls/mshtml/htmlframe.c | 8 +++--- dlls/mshtml/htmlframebase.c | 8 +++--- dlls/mshtml/htmlgeneric.c | 8 +++--- dlls/mshtml/htmlhead.c | 16 ++++++------ dlls/mshtml/htmliframe.c | 24 +++++++++--------- dlls/mshtml/htmlimg.c | 8 +++--- dlls/mshtml/htmlinput.c | 32 +++++++++++------------ dlls/mshtml/htmllink.c | 8 +++--- dlls/mshtml/htmlmeta.c | 8 +++--- dlls/mshtml/htmlnode.c | 30 +++++++++++----------- dlls/mshtml/htmlobject.c | 16 ++++++------ dlls/mshtml/htmloption.c | 8 +++--- dlls/mshtml/htmlscript.c | 8 +++--- dlls/mshtml/htmlselect.c | 8 +++--- dlls/mshtml/htmlstyleelem.c | 8 +++--- dlls/mshtml/htmltable.c | 24 +++++++++--------- dlls/mshtml/htmltablecell.c | 8 +++--- dlls/mshtml/htmltablerow.c | 8 +++--- dlls/mshtml/htmltextarea.c | 8 +++--- dlls/mshtml/htmltextcont.c | 8 +++--- dlls/mshtml/htmltextnode.c | 18 ++++++------- dlls/mshtml/mshtml_private.h | 8 ++++-- dlls/mshtml/script.c | 8 +++--- 33 files changed, 209 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f908f03cd98524686cc3e…

1 0

Huw Davies : ntdll/tests: Wait for pending file operations to complete.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: 14c53a58632f89a4d3a6ae449f339806b4c094a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14c53a58632f89a4d3a6ae449… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 14 12:02:02 2015 +0100 ntdll/tests: Wait for pending file operations to complete. --- dlls/ntdll/tests/file.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19a886a..fb31b3a 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2699,6 +2699,8 @@ static void test_read_write(void) { ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); } else ok(bytes == 4, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal); @@ -2730,6 +2732,8 @@ static void test_read_write(void) { ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); + ret = WaitForSingleObject(hfile, 3000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret); } else ok(bytes == 14, "bytes %u\n", bytes); ok((NTSTATUS)ovl.Internal == STATUS_SUCCESS, "expected STATUS_SUCCESS, got %#lx\n", ovl.Internal);

1 0

Sebastian Lackner : dmime: Properly set primary dsound buffer in IDirectMusicPerformance8Impl_CreateStandardAudioPath.
by Alexandre Julliard 14 May '15

14 May '15

Module: wine Branch: master Commit: cd5f11e941f4561c1796b99706f80093d154f704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd5f11e941f4561c1796b9970… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu May 14 12:09:16 2015 +0200 dmime: Properly set primary dsound buffer in IDirectMusicPerformance8Impl_CreateStandardAudioPath. Fixes a regression introduced by b3d1b1f239a5b534cd1b9a50fbfef32733b1911f. --- dlls/dmime/performance.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b8c37b0..38f68db 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1081,7 +1081,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire create_dmaudiopath(&IID_IDirectMusicAudioPath, (void**)&pPath); set_audiopath_perf_pointer(pPath, iface); set_audiopath_dsound_buffer(pPath, buffer); - set_audiopath_primary_dsound_buffer(pPath, buffer); + set_audiopath_primary_dsound_buffer(pPath, primary_buffer); *ppNewPath = pPath;

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2015