September 2023 - Wine-Commits

Gabriel Ivăncescu : mshtml: Traverse and unlink ButtonElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: d47279b5b6d319091352e999d1e3e54189fd9bc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d47279b5b6d319091352e999d1e3e5… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:38 2023 +0300 mshtml: Traverse and unlink ButtonElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlinput.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 9169b2cca54..79af8c617a0 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1923,17 +1923,24 @@ static BOOL HTMLButtonElement_is_text_edit(HTMLDOMNode *iface) return TRUE; } -static void HTMLButtonElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLButtonElement *button_from_DispatchEx(DispatchEx *iface) { - HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLButtonElement, element.node.event_target.dispex); +} + +static void HTMLButtonElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLButtonElement *This = button_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsbutton) - note_cc_edge((nsISupports*)This->nsbutton, "This->nsbutton", cb); + note_cc_edge((nsISupports*)This->nsbutton, "nsbutton", cb); } -static void HTMLButtonElement_unlink(HTMLDOMNode *iface) +static void HTMLButtonElement_unlink(DispatchEx *dispex) { - HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + HTMLButtonElement *This = button_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsbutton); } @@ -1947,11 +1954,18 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLButtonElementImpl_put_disabled, .get_disabled = HTMLButtonElementImpl_get_disabled, - .traverse = HTMLButtonElement_traverse, - .unlink = HTMLButtonElement_unlink, .is_text_edit = HTMLButtonElement_is_text_edit }; +static const event_target_vtbl_t HTMLButtonElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLButtonElement_traverse, + .unlink = HTMLButtonElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLButtonElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLButtonElement_tid, @@ -1960,7 +1974,7 @@ static const tid_t HTMLButtonElement_iface_tids[] = { static dispex_static_data_t HTMLButtonElement_dispex = { "HTMLButtonElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLButtonElement_event_target_vtbl.dispex_vtbl, DispHTMLButtonElement_tid, HTMLButtonElement_iface_tids, HTMLElement_init_dispex_info

1 0

Hans Leidekker : winscard/tests: Skip tests when SCardListReadersA() returns an empty list.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: e85cab70eae119ae4c3ae3c3324e50cd422001bd URL: https://gitlab.winehq.org/wine/wine/-/commit/e85cab70eae119ae4c3ae3c3324e50… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 13 18:29:53 2023 +0200 winscard/tests: Skip tests when SCardListReadersA() returns an empty list. --- dlls/winscard/tests/winscard.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winscard/tests/winscard.c b/dlls/winscard/tests/winscard.c index d596f9ca400..ceb517a970e 100644 --- a/dlls/winscard/tests/winscard.c +++ b/dlls/winscard/tests/winscard.c @@ -80,6 +80,11 @@ static void test_SCardEstablishContext(void) ok( ret == SCARD_S_SUCCESS, "got %lx\n", ret ); ok( readers != NULL, "got NULL readers" ); ok( len != SCARD_AUTOALLOCATE, "got %lu", len ); + if (!*readers) + { + skip( "connect a smart card device to run more tests\n" ); + return; + } ptr = readers; while (*ptr) {

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink IFrames using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 9d10b6399e5c2df7efc3ac381752c344dee93d1f URL: https://gitlab.winehq.org/wine/wine/-/commit/9d10b6399e5c2df7efc3ac381752c3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:38 2023 +0300 mshtml: Traverse and unlink IFrames using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlframe.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index c39e11c4cd7..991e2ea8ff8 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1572,17 +1572,24 @@ static HRESULT HTMLIFrame_bind_to_tree(HTMLDOMNode *iface) return hres; } -static void HTMLIFrame_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLIFrame *iframe_from_DispatchEx(DispatchEx *iface) { - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLIFrame, framebase.element.node.event_target.dispex); +} + +static void HTMLIFrame_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLIFrame *This = iframe_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->framebase.nsiframe) - note_cc_edge((nsISupports*)This->framebase.nsiframe, "This->nsiframe", cb); + note_cc_edge((nsISupports*)This->framebase.nsiframe, "nsiframe", cb); } -static void HTMLIFrame_unlink(HTMLDOMNode *iface) +static void HTMLIFrame_unlink(DispatchEx *dispex) { - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + HTMLIFrame *This = iframe_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->framebase.nsiframe); } @@ -1600,8 +1607,15 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { .get_name = HTMLIFrame_get_name, .invoke = HTMLIFrame_invoke, .bind_to_tree = HTMLIFrame_bind_to_tree, - .traverse = HTMLIFrame_traverse, - .unlink = HTMLIFrame_unlink +}; + +static const event_target_vtbl_t HTMLIFrame_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLIFrame_traverse, + .unlink = HTMLIFrame_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLIFrame_iface_tids[] = { @@ -1616,7 +1630,7 @@ static const tid_t HTMLIFrame_iface_tids[] = { static dispex_static_data_t HTMLIFrame_dispex = { "HTMLIFrameElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLIFrame_event_target_vtbl.dispex_vtbl, DispHTMLIFrame_tid, HTMLIFrame_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink ImageElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: a9e5a233119b24cb87282df20cc15f40e9713b58 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9e5a233119b24cb87282df20cc15f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:38 2023 +0300 mshtml: Traverse and unlink ImageElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlimg.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 1a9266b2295..766d01b9eb7 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -675,17 +675,24 @@ static HRESULT HTMLImgElement_get_readystate(HTMLDOMNode *iface, BSTR *p) return IHTMLImgElement_get_readyState(&This->IHTMLImgElement_iface, p); } -static void HTMLImgElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLImg *HTMLImg_from_DispatchEx(DispatchEx *iface) { - HTMLImg *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLImg, element.node.event_target.dispex); +} + +static void HTMLImgElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLImg *This = HTMLImg_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsimg) - note_cc_edge((nsISupports*)This->nsimg, "This->nsimg", cb); + note_cc_edge((nsISupports*)This->nsimg, "nsimg", cb); } -static void HTMLImgElement_unlink(HTMLDOMNode *iface) +static void HTMLImgElement_unlink(DispatchEx *dispex) { - HTMLImg *This = impl_from_HTMLDOMNode(iface); + HTMLImg *This = HTMLImg_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsimg); } @@ -698,8 +705,15 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = { .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, .get_readystate = HTMLImgElement_get_readystate, - .traverse = HTMLImgElement_traverse, - .unlink = HTMLImgElement_unlink +}; + +static const event_target_vtbl_t HTMLImgElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLImgElement_traverse, + .unlink = HTMLImgElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLImgElement_iface_tids[] = { @@ -721,7 +735,7 @@ static void HTMLImgElement_init_dispex_info(dispex_data_t *info, compat_mode_t m static dispex_static_data_t HTMLImgElement_dispex = { "HTMLImageElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLImgElement_event_target_vtbl.dispex_vtbl, DispHTMLImg_tid, HTMLImgElement_iface_tids, HTMLImgElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink InputElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: e5afc6886a7af88be989d8754edeae772f7efa97 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5afc6886a7af88be989d8754edeae… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:38 2023 +0300 mshtml: Traverse and unlink InputElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlinput.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index a317eb2a3a4..9169b2cca54 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1393,17 +1393,24 @@ static BOOL HTMLInputElement_is_text_edit(HTMLDOMNode *iface) return ret; } -static void HTMLInputElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLInputElement *input_from_DispatchEx(DispatchEx *iface) { - HTMLInputElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLInputElement, element.node.event_target.dispex); +} + +static void HTMLInputElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLInputElement *This = input_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsinput) - note_cc_edge((nsISupports*)This->nsinput, "This->nsinput", cb); + note_cc_edge((nsISupports*)This->nsinput, "nsinput", cb); } -static void HTMLInputElement_unlink(HTMLDOMNode *iface) +static void HTMLInputElement_unlink(DispatchEx *dispex) { - HTMLInputElement *This = impl_from_HTMLDOMNode(iface); + HTMLInputElement *This = input_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsinput); } @@ -1417,11 +1424,18 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLInputElementImpl_put_disabled, .get_disabled = HTMLInputElementImpl_get_disabled, - .traverse = HTMLInputElement_traverse, - .unlink = HTMLInputElement_unlink, .is_text_edit = HTMLInputElement_is_text_edit }; +static const event_target_vtbl_t HTMLInputElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLInputElement_traverse, + .unlink = HTMLInputElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLInputElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLInputElement_tid, @@ -1430,7 +1444,7 @@ static const tid_t HTMLInputElement_iface_tids[] = { }; static dispex_static_data_t HTMLInputElement_dispex = { "HTMLInputElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLInputElement_event_target_vtbl.dispex_vtbl, DispHTMLInputElement_tid, HTMLInputElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink FormElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 35aeccf3b171474aa021798b559c229d7027dba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/35aeccf3b171474aa021798b559c22… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:37 2023 +0300 mshtml: Traverse and unlink FormElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlform.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 86c176f9eb1..39270de11ca 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -946,17 +946,24 @@ static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDO return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static void HTMLFormElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex); +} + +static void HTMLFormElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLFormElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsform) - note_cc_edge((nsISupports*)This->nsform, "This->nsform", cb); + note_cc_edge((nsISupports*)This->nsform, "nsform", cb); } -static void HTMLFormElement_unlink(HTMLDOMNode *iface) +static void HTMLFormElement_unlink(DispatchEx *dispex) { - HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + HTMLFormElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsform); } @@ -971,8 +978,15 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = { .get_dispid = HTMLFormElement_get_dispid, .get_name = HTMLFormElement_dispex_get_name, .invoke = HTMLFormElement_invoke, - .traverse = HTMLFormElement_traverse, - .unlink = HTMLFormElement_unlink +}; + +static const event_target_vtbl_t HTMLFormElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLFormElement_traverse, + .unlink = HTMLFormElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLFormElement_iface_tids[] = { @@ -983,7 +997,7 @@ static const tid_t HTMLFormElement_iface_tids[] = { static dispex_static_data_t HTMLFormElement_dispex = { "HTMLFormElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLFormElement_event_target_vtbl.dispex_vtbl, DispHTMLFormElement_tid, HTMLFormElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink FrameElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 015cfd9ec68554ad24a493be45e1dfba293d5032 URL: https://gitlab.winehq.org/wine/wine/-/commit/015cfd9ec68554ad24a493be45e1df… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:38 2023 +0300 mshtml: Traverse and unlink FrameElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlframe.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index a97040d270d..c39e11c4cd7 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -981,17 +981,24 @@ static HRESULT HTMLFrameElement_bind_to_tree(HTMLDOMNode *iface) return hres; } -static void HTMLFrameElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLFrameElement *frame_from_DispatchEx(DispatchEx *iface) { - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLFrameElement, framebase.element.node.event_target.dispex); +} + +static void HTMLFrameElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLFrameElement *This = frame_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->framebase.nsframe) - note_cc_edge((nsISupports*)This->framebase.nsframe, "This->nsframe", cb); + note_cc_edge((nsISupports*)This->framebase.nsframe, "nsframe", cb); } -static void HTMLFrameElement_unlink(HTMLDOMNode *iface) +static void HTMLFrameElement_unlink(DispatchEx *dispex) { - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + HTMLFrameElement *This = frame_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->framebase.nsframe); } @@ -1009,8 +1016,15 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { .get_name = HTMLFrameElement_get_name, .invoke = HTMLFrameElement_invoke, .bind_to_tree = HTMLFrameElement_bind_to_tree, - .traverse = HTMLFrameElement_traverse, - .unlink = HTMLFrameElement_unlink +}; + +static const event_target_vtbl_t HTMLFrameElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLFrameElement_traverse, + .unlink = HTMLFrameElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLFrameElement_iface_tids[] = { @@ -1023,7 +1037,7 @@ static const tid_t HTMLFrameElement_iface_tids[] = { static dispex_static_data_t HTMLFrameElement_dispex = { "HTMLFrameElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLFrameElement_event_target_vtbl.dispex_vtbl, DispHTMLFrameElement_tid, HTMLFrameElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink BodyElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 87a06268fc59e218f4332a45a0d53b6e02905f2a URL: https://gitlab.winehq.org/wine/wine/-/commit/87a06268fc59e218f4332a45a0d53b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:37 2023 +0300 mshtml: Traverse and unlink BodyElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlbody.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 19875915efe..46f3ddef0dd 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -906,20 +906,6 @@ static void *HTMLBodyElement_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLBodyElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) -{ - HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - - if(This->nsbody) - note_cc_edge((nsISupports*)This->nsbody, "This->nsbody", cb); -} - -static void HTMLBodyElement_unlink(HTMLDOMNode *iface) -{ - HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); - unlink_ref(&This->nsbody); -} - static EventTarget *HTMLBodyElement_get_event_prop_target(HTMLDOMNode *iface, int event_id) { HTMLBodyElement *This = impl_from_HTMLDOMNode(iface); @@ -953,6 +939,27 @@ static BOOL HTMLBodyElement_is_settable(HTMLDOMNode *iface, DISPID dispid) } } +static inline HTMLBodyElement *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLBodyElement, element.node.event_target.dispex); +} + +static void HTMLBodyElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLBodyElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); + + if(This->nsbody) + note_cc_edge((nsISupports*)This->nsbody, "nsbody", cb); +} + +static void HTMLBodyElement_unlink(DispatchEx *dispex) +{ + HTMLBodyElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + unlink_ref(&This->nsbody); +} + static const cpc_entry_t HTMLBodyElement_cpc[] = { {&DIID_HTMLTextContainerEvents}, {&IID_IPropertyNotifySink}, @@ -969,12 +976,19 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = { .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, .get_event_prop_target = HTMLBodyElement_get_event_prop_target, - .traverse = HTMLBodyElement_traverse, - .unlink = HTMLBodyElement_unlink, .is_text_edit = HTMLBodyElement_is_text_edit, .is_settable = HTMLBodyElement_is_settable }; +static const event_target_vtbl_t HTMLBodyElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLBodyElement_traverse, + .unlink = HTMLBodyElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement_tid, IHTMLBodyElement2_tid, @@ -985,7 +999,7 @@ static const tid_t HTMLBodyElement_iface_tids[] = { static dispex_static_data_t HTMLBodyElement_dispex = { "HTMLBodyElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLBodyElement_event_target_vtbl.dispex_vtbl, DispHTMLBody_tid, HTMLBodyElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink AnchorElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 36d923e20ee9d99f3b15fdf574749a15a2f15794 URL: https://gitlab.winehq.org/wine/wine/-/commit/36d923e20ee9d99f3b15fdf574749a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:37 2023 +0300 mshtml: Traverse and unlink AnchorElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 30 ++++++++++++++++++++++-------- dlls/mshtml/htmlelem.c | 38 +++++++++++++------------------------- dlls/mshtml/htmlevent.h | 23 +++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 4 ++++ 4 files changed, 62 insertions(+), 33 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink AreaElements using the dispex.
by Alexandre Julliard Sept. 14, 2023

Sept. 14, 2023

Module: wine Branch: master Commit: 20d8e72c65034d36772277eb41644fdaef003a4c URL: https://gitlab.winehq.org/wine/wine/-/commit/20d8e72c65034d36772277eb41644f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:37 2023 +0300 mshtml: Traverse and unlink AreaElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlarea.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 0a3a7efee2e..fd810a0baa1 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -454,17 +454,24 @@ fallback: return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default); } -static void HTMLAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLAreaElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLAreaElement, element.node.event_target.dispex); +} + +static void HTMLAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsarea) note_cc_edge((nsISupports*)This->nsarea, "nsarea", cb); } -static void HTMLAreaElement_unlink(HTMLDOMNode *iface) +static void HTMLAreaElement_unlink(DispatchEx *dispex) { - HTMLAreaElement *This = impl_from_HTMLDOMNode(iface); + HTMLAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsarea); } @@ -476,8 +483,15 @@ static const NodeImplVtbl HTMLAreaElementImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLAreaElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .traverse = HTMLAreaElement_traverse, - .unlink = HTMLAreaElement_unlink +}; + +static const event_target_vtbl_t HTMLAreaElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLAreaElement_traverse, + .unlink = HTMLAreaElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLAreaElement_iface_tids[] = { @@ -487,7 +501,7 @@ static const tid_t HTMLAreaElement_iface_tids[] = { }; static dispex_static_data_t HTMLAreaElement_dispex = { "HTMLAreaElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLAreaElement_event_target_vtbl.dispex_vtbl, DispHTMLAreaElement_tid, HTMLAreaElement_iface_tids, HTMLElement_init_dispex_info

1 0