September 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Traverse and unlink FormElements using the dispex.
by Alexandre Julliard 14 Sep '23

14 Sep '23

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 14 Sep '23

14 Sep '23

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 IFrames using the dispex.
by Alexandre Julliard 14 Sep '23

14 Sep '23

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 14 Sep '23

14 Sep '23

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 14 Sep '23

14 Sep '23

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 ButtonElements using the dispex.
by Alexandre Julliard 14 Sep '23

14 Sep '23

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

Gabriel Ivăncescu : mshtml: Traverse and unlink LinkElements using the dispex.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: e6c2395fd455261b09a61290b2a89d4bd587cc2b URL: https://gitlab.winehq.org/wine/wine/-/commit/e6c2395fd455261b09a61290b2a89d… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Sep 13 18:12:38 2023 +0300 mshtml: Traverse and unlink LinkElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmllink.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 3edc36ed96b..ef756494b76 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -396,17 +396,24 @@ static HRESULT HTMLLinkElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL return IHTMLLinkElement_get_disabled(&This->IHTMLLinkElement_iface, p); } -static void HTMLLinkElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLLinkElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLLinkElement, element.node.event_target.dispex); +} + +static void HTMLLinkElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLLinkElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nslink) - note_cc_edge((nsISupports*)This->nslink, "This->nslink", cb); + note_cc_edge((nsISupports*)This->nslink, "nslink", cb); } -static void HTMLLinkElement_unlink(HTMLDOMNode *iface) +static void HTMLLinkElement_unlink(DispatchEx *dispex) { - HTMLLinkElement *This = impl_from_HTMLDOMNode(iface); + HTMLLinkElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nslink); } static const NodeImplVtbl HTMLLinkElementImplVtbl = { @@ -419,8 +426,15 @@ static const NodeImplVtbl HTMLLinkElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLLinkElementImpl_put_disabled, .get_disabled = HTMLLinkElementImpl_get_disabled, - .traverse = HTMLLinkElement_traverse, - .unlink = HTMLLinkElement_unlink +}; + +static const event_target_vtbl_t HTMLLinkElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLLinkElement_traverse, + .unlink = HTMLLinkElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLLinkElement_iface_tids[] = { @@ -430,7 +444,7 @@ static const tid_t HTMLLinkElement_iface_tids[] = { }; static dispex_static_data_t HTMLLinkElement_dispex = { "HTMLLinkElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLLinkElement_event_target_vtbl.dispex_vtbl, DispHTMLLinkElement_tid, HTMLLinkElement_iface_tids, HTMLElement_init_dispex_info

1 0

Hans Leidekker : wpcap/tests: Accept another return value from pcap_can_set_rfmon().
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: 417dc2b40ed7bb8f46882fa4b8050bdbe6ee4494 URL: https://gitlab.winehq.org/wine/wine/-/commit/417dc2b40ed7bb8f46882fa4b8050b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 13 19:00:14 2023 +0200 wpcap/tests: Accept another return value from pcap_can_set_rfmon(). --- dlls/wpcap/tests/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/tests/wpcap.c b/dlls/wpcap/tests/wpcap.c index 017d3b77a4e..ec0f05c368a 100644 --- a/dlls/wpcap/tests/wpcap.c +++ b/dlls/wpcap/tests/wpcap.c @@ -152,7 +152,7 @@ static void test_capture( void ) ok( !ret, "got %d\n", ret ); ret = ppcap_can_set_rfmon( pcap ); - ok( !ret, "got %d\n", ret ); + ok( ret == 0 || ret == 1, "got %d\n", ret ); ret = ppcap_getnonblock( pcap, errbuf ); ok( ret == -3, "got %d\n", ret );

1 0

Hans Leidekker : winscard/tests: Skip tests when SCardListReadersA() returns an empty list.
by Alexandre Julliard 14 Sep '23

14 Sep '23

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

Alistair Leslie-Hughes : d3drm: Correct D3DRMIMAGE validation.
by Alexandre Julliard 14 Sep '23

14 Sep '23

Module: wine Branch: master Commit: cfae1ceb04a7e492c344190a656595f1c60af41f URL: https://gitlab.winehq.org/wine/wine/-/commit/cfae1ceb04a7e492c344190a656595… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri May 13 10:44:49 2022 +1000 d3drm: Correct D3DRMIMAGE validation. --- dlls/d3drm/tests/d3drm.c | 17 +++++++++++++++++ dlls/d3drm/texture.c | 27 ++++++++++++++++++++------- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 6922a70df24..5d478f24b1a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2724,6 +2724,12 @@ static void test_Texture(void) TRUE, 0, (void *)0xcafebabe, NULL, 0x000000ff, 0x0000ff00, 0x00ff0000, 0, 0, NULL }, + testimg_palette = + { + 2, 2, 1, 1, 32, + FALSE, 2 * sizeof(DWORD), (void *)0xcafebabe, NULL, + 0x00000000, 0x00000000, 0x00000000, 0, 2, (void *)0xcafebabe + }, *d3drm_img = NULL; DWORD pixel[4] = { 20000, 30000, 10000, 0 }; @@ -2785,6 +2791,17 @@ static void test_Texture(void) IDirect3DRMTexture2_Release(texture2); IDirect3DRMTexture3_Release(texture3); + /* Just palette set */ + hr = IDirect3DRM_CreateTexture(d3drm1, &testimg_palette, &texture1); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture interface, hr %#lx\n", hr); + hr = IDirect3DRM2_CreateTexture(d3drm2, &testimg_palette, &texture2); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture2 interface, hr %#lx\n", hr); + hr = IDirect3DRM3_CreateTexture(d3drm3, &testimg_palette, &texture3); + ok(SUCCEEDED(hr), "Cannot get IDirect3DRMTexture3 interface, hr %#lx\n", hr); + IDirect3DRMTexture_Release(texture1); + IDirect3DRMTexture2_Release(texture2); + IDirect3DRMTexture3_Release(texture3); + initimg.rgb = 0; texture1 = (IDirect3DRMTexture *)0xdeadbeef; hr = IDirect3DRM_CreateTexture(d3drm1, &initimg, &texture1); diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index b9d84114995..f0983d53e24 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -52,14 +52,27 @@ static void d3drm_texture_destroy(struct d3drm_texture *texture) static BOOL d3drm_validate_image(D3DRMIMAGE *image) { - if (!image - || !image->red_mask - || !image->green_mask - || !image->blue_mask - || !image->buffer1 - || !(image->rgb || (image->palette && image->palette_size))) - { + if (!image) return FALSE; + + TRACE("size (%d, %d), aspect (%d, %d), depth %d, red %#lx, green %#lx, blue %#lx, " + "buffer1 %p, buffer2 %p, rgb %d, pal %p, size %d\n", + image->width, image->height, image->aspectx, image->aspecty, + image->depth, image->red_mask, image->green_mask, image->blue_mask, image->buffer1, + image->buffer2, image->rgb, image->palette, image->palette_size ); + + if (!image->buffer1) + return FALSE; + + if (image->rgb) + { + if (!image->red_mask || !image->green_mask || !image->blue_mask) + return FALSE; + } + else + { + if (!image->palette || !image->palette_size) + return FALSE; } return TRUE;

1 0