September 2023 - Wine-Commits

Gabriel Ivăncescu : mshtml: Use the dispex's query_interface for Document nodes and fragments.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 57f7159a21dac402b73dade0c7905efc5da3bf1e URL: https://gitlab.winehq.org/wine/wine/-/commit/57f7159a21dac402b73dade0c7905e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use the dispex's query_interface for Document nodes and fragments. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 152 ++++++++++++++++++++++++-------------------------- 1 file changed, 74 insertions(+), 78 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 96faa3c6efc..30a337c3761 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5696,12 +5696,82 @@ static inline HTMLDocumentNode *impl_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLDocumentNode, node); } -static void *HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid) +void detach_document_node(HTMLDocumentNode *doc) +{ + unsigned i; + + while(!list_empty(&doc->plugin_hosts)) + detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); + + if(doc->dom_implementation) + detach_dom_implementation(doc->dom_implementation); + + unlink_ref(&doc->dom_implementation); + unlink_ref(&doc->namespaces); + detach_events(doc); + detach_selection(doc); + detach_ranges(doc); + + for(i=0; i < doc->elem_vars_cnt; i++) + free(doc->elem_vars[i]); + free(doc->elem_vars); + doc->elem_vars_cnt = doc->elem_vars_size = 0; + doc->elem_vars = NULL; + + unlink_ref(&doc->catmgr); + if(doc->browser) { + list_remove(&doc->browser_entry); + doc->browser = NULL; + } +} + +static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) { HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - if(IsEqualGUID(&IID_IUnknown, riid)) - return &This->IHTMLDocument2_iface; + TRACE("(%p)\n", This); + + free(This->event_vector); + ConnectionPointContainer_Destroy(&This->cp_container); +} + +static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + FIXME("%p\n", This); + return E_NOTIMPL; +} + +static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { + .clsid = &CLSID_HTMLDocument, + .destructor = HTMLDocumentNode_destructor, + .cpc_entries = HTMLDocumentNode_cpc, + .clone = HTMLDocumentNode_clone, +}; + +static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) +{ + HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + HTMLDocumentNode *new_node; + HRESULT hres; + + hres = create_document_fragment(nsnode, This->node.doc, &new_node); + if(FAILED(hres)) + return hres; + + *ret = &new_node->node; + return S_OK; +} + +static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); +} + +static void *HTMLDocumentNode_query_interface(DispatchEx *dispex, REFIID riid) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + if(IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IDispatchEx, riid)) return &This->IDispatchEx_iface; if(IsEqualGUID(&IID_IHTMLDocument, riid) || IsEqualGUID(&IID_IHTMLDocument2, riid)) @@ -5796,79 +5866,6 @@ static void *HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid) return HTMLDOMNode_QI(&This->node, riid); } -void detach_document_node(HTMLDocumentNode *doc) -{ - unsigned i; - - while(!list_empty(&doc->plugin_hosts)) - detach_plugin_host(LIST_ENTRY(list_head(&doc->plugin_hosts), PluginHost, entry)); - - if(doc->dom_implementation) - detach_dom_implementation(doc->dom_implementation); - - unlink_ref(&doc->dom_implementation); - unlink_ref(&doc->namespaces); - detach_events(doc); - detach_selection(doc); - detach_ranges(doc); - - for(i=0; i < doc->elem_vars_cnt; i++) - free(doc->elem_vars[i]); - free(doc->elem_vars); - doc->elem_vars_cnt = doc->elem_vars_size = 0; - doc->elem_vars = NULL; - - unlink_ref(&doc->catmgr); - if(doc->browser) { - list_remove(&doc->browser_entry); - doc->browser = NULL; - } -} - -static void HTMLDocumentNode_destructor(HTMLDOMNode *iface) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - - TRACE("(%p)\n", This); - - free(This->event_vector); - ConnectionPointContainer_Destroy(&This->cp_container); -} - -static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - FIXME("%p\n", This); - return E_NOTIMPL; -} - -static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { - .clsid = &CLSID_HTMLDocument, - .qi = HTMLDocumentNode_QI, - .destructor = HTMLDocumentNode_destructor, - .cpc_entries = HTMLDocumentNode_cpc, - .clone = HTMLDocumentNode_clone, -}; - -static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - HTMLDocumentNode *new_node; - HRESULT hres; - - hres = create_document_fragment(nsnode, This->node.doc, &new_node); - if(FAILED(hres)) - return hres; - - *ret = &new_node->node; - return S_OK; -} - -static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); -} - static void HTMLDocumentNode_unlink(DispatchEx *dispex) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -6060,7 +6057,7 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { - .query_interface = HTMLDOMNode_query_interface, + .query_interface = HTMLDocumentNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDocumentNode_unlink, @@ -6078,7 +6075,6 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { .clsid = &CLSID_HTMLDocument, - .qi = HTMLDocumentNode_QI, .destructor = HTMLDocumentNode_destructor, .cpc_entries = HTMLDocumentNode_cpc, .clone = HTMLDocumentFragment_clone,

1 0

Gabriel Ivăncescu : mshtml: Use the dispex's query_interface for DocumentType nodes.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 1b2eb0d87931de967fbb9b265f3d6fb4daca46ee URL: https://gitlab.winehq.org/wine/wine/-/commit/1b2eb0d87931de967fbb9b265f3d6f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use the dispex's query_interface for DocumentType nodes. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index f5c9bf8ed1a..96faa3c6efc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -295,16 +295,6 @@ static inline DocumentType *DocumentType_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, DocumentType, node.event_target.dispex); } -static void *DocumentType_QI(HTMLDOMNode *iface, REFIID riid) -{ - DocumentType *This = DocumentType_from_HTMLDOMNode(iface); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid) || IsEqualGUID(&IID_IDOMDocumentType, riid)) - return &This->IDOMDocumentType_iface; - - return HTMLDOMNode_QI(&This->node, riid); -} - static HRESULT DocumentType_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) { DocumentType *This = DocumentType_from_HTMLDOMNode(iface); @@ -315,11 +305,20 @@ static HRESULT DocumentType_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDO static const cpc_entry_t DocumentType_cpc[] = {{NULL}}; static const NodeImplVtbl DocumentTypeImplVtbl = { - .qi = DocumentType_QI, .cpc_entries = DocumentType_cpc, .clone = DocumentType_clone }; +static void *DocumentType_query_interface(DispatchEx *dispex, REFIID riid) +{ + DocumentType *This = DocumentType_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IDOMDocumentType, riid)) + return &This->IDOMDocumentType_iface; + + return HTMLDOMNode_QI(&This->node, riid); +} + static nsISupports *DocumentType_get_gecko_target(DispatchEx *dispex) { DocumentType *This = DocumentType_from_DispatchEx(dispex); @@ -355,7 +354,7 @@ static IHTMLEventObj *DocumentType_set_current_event(DispatchEx *dispex, IHTMLEv static const event_target_vtbl_t DocumentType_event_target_vtbl = { { - .query_interface = HTMLDOMNode_query_interface, + .query_interface = DocumentType_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, .unlink = HTMLDOMNode_unlink

1 0

Gabriel Ivăncescu : mshtml: Use specific dispex for each SVG element.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: bbd9c41a0eca07febf010313b63c9bd7b91932e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbd9c41a0eca07febf010313b63c9b… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use specific dispex for each SVG element. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlelem.c | 4 +-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/svg.c | 84 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 79 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e10c5067d33..af1fef47026 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7314,7 +7314,7 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } } -static const tid_t HTMLElement_iface_tids[] = { +const tid_t HTMLElement_iface_tids[] = { HTMLELEMENT_TIDS, 0 }; @@ -7933,7 +7933,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n nsIDOMHTMLElement *html_element; nsresult nsres; - HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem, dispex_data ? dispex_data : &HTMLUnknownElement_dispex); + HTMLDOMNode_Init(doc, &This->node, (nsIDOMNode*)nselem, dispex_data); /* No AddRef, share reference with HTMLDOMNode */ assert((nsIDOMNode*)nselem == This->node.nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 41034f42636..86939b1874e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -888,6 +888,7 @@ typedef struct { IHTMLElement4_tid, \ IHTMLUniqueName_tid +extern const tid_t HTMLElement_iface_tids[]; extern cp_static_data_t HTMLElementEvents2_data; #define HTMLELEMENT_CPC {&DIID_HTMLElementEvents2, &HTMLElementEvents2_data} extern const cpc_entry_t HTMLElement_cpc[]; diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index 84324cacf2d..3ebf38fd7bd 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -31,6 +31,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -196,12 +197,27 @@ static const NodeImplVtbl SVGElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; -static void init_svg_element(SVGElement *svg_element, HTMLDocumentNode *doc, nsIDOMSVGElement *nselem) +static const event_target_vtbl_t SVGElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGElement_dispex = { + "HTMLUnknownElement", + &SVGElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + +static void init_svg_element(SVGElement *svg_element, HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, dispex_static_data_t *dispex_data) { - if(!svg_element->element.node.vtbl) - svg_element->element.node.vtbl = &SVGElementImplVtbl; svg_element->ISVGElement_iface.lpVtbl = &SVGElementVtbl; - HTMLElement_Init(&svg_element->element, doc, (nsIDOMElement*)nselem, NULL); + HTMLElement_Init(&svg_element->element, doc, (nsIDOMElement*)nselem, dispex_data); } struct SVGSVGElement { @@ -731,6 +747,23 @@ static const NodeImplVtbl SVGSVGElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t SVGSVGElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGSVGElement_dispex = { + "HTMLUnknownElement", + &SVGSVGElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + static HRESULT create_viewport_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) { SVGSVGElement *ret; @@ -742,7 +775,7 @@ static HRESULT create_viewport_element(HTMLDocumentNode *doc, nsIDOMSVGElement * ret->ISVGSVGElement_iface.lpVtbl = &SVGSVGElementVtbl; ret->svg_element.element.node.vtbl = &SVGSVGElementImplVtbl; - init_svg_element(&ret->svg_element, doc, nselem); + init_svg_element(&ret->svg_element, doc, nselem, &SVGSVGElement_dispex); *elem = &ret->svg_element.element; return S_OK; @@ -894,6 +927,23 @@ static const NodeImplVtbl SVGCircleElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t SVGCircleElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGCircleElement_dispex = { + "HTMLUnknownElement", + &SVGCircleElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + static HRESULT create_circle_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) { SVGCircleElement *ret; @@ -905,7 +955,7 @@ static HRESULT create_circle_element(HTMLDocumentNode *doc, nsIDOMSVGElement *ns ret->ISVGCircleElement_iface.lpVtbl = &SVGCircleElementVtbl; ret->svg_element.element.node.vtbl = &SVGCircleElementImplVtbl; - init_svg_element(&ret->svg_element, doc, nselem); + init_svg_element(&ret->svg_element, doc, nselem, &SVGCircleElement_dispex); *elem = &ret->svg_element.element; return S_OK; @@ -1132,6 +1182,23 @@ static const NodeImplVtbl SVGTSpanElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t SVGTSpanElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + +static dispex_static_data_t SVGTSpanElement_dispex = { + "HTMLUnknownElement", + &SVGTSpanElement_event_target_vtbl.dispex_vtbl, + DispHTMLUnknownElement_tid, + HTMLElement_iface_tids, + HTMLElement_init_dispex_info +}; + static HRESULT create_tspan_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) { SVGTSpanElement *ret; @@ -1142,7 +1209,7 @@ static HRESULT create_tspan_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nse ret->svg_element.element.node.vtbl = &SVGTSpanElementImplVtbl; init_text_content_element(&ret->text_content, &ret->svg_element); - init_svg_element(&ret->svg_element, doc, nselem); + init_svg_element(&ret->svg_element, doc, nselem, &SVGTSpanElement_dispex); *elem = &ret->svg_element.element; return S_OK; @@ -1165,7 +1232,8 @@ HRESULT create_svg_element(HTMLDocumentNode *doc, nsIDOMSVGElement *dom_element, if(!svg_element) return E_OUTOFMEMORY; - init_svg_element(svg_element, doc, dom_element); + svg_element->element.node.vtbl = &SVGElementImplVtbl; + init_svg_element(svg_element, doc, dom_element, &SVGElement_dispex); *elem = &svg_element->element; return S_OK; }

1 0

Gabriel Ivăncescu : mshtml: Use specific dispex vtbls for remaining HTML elements.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: d31e95a7a7a07398f7424aa593f6429babc2eb39 URL: https://gitlab.winehq.org/wine/wine/-/commit/d31e95a7a7a07398f7424aa593f642… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 19 17:26:14 2023 +0300 mshtml: Use specific dispex vtbls for remaining HTML elements. Will be needed when we move the query_interface to the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlcomment.c | 11 ++++++++++- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlgeneric.c | 11 ++++++++++- dlls/mshtml/htmlhead.c | 44 ++++++++++++++++++++++++++++++++++++++++---- dlls/mshtml/htmlinput.c | 11 ++++++++++- dlls/mshtml/htmlobject.c | 11 ++++++++++- 7 files changed, 81 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 9c720d9468e..7fd611c727c 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -180,6 +180,15 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLCommentElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLCommentElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLCommentElement_tid, @@ -187,7 +196,7 @@ static const tid_t HTMLCommentElement_iface_tids[] = { }; static dispex_static_data_t HTMLCommentElement_dispex = { "Comment", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLCommentElement_event_target_vtbl.dispex_vtbl, DispHTMLCommentElement_tid, HTMLCommentElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 314b85b8a72..e10c5067d33 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7319,7 +7319,7 @@ static const tid_t HTMLElement_iface_tids[] = { 0 }; -const event_target_vtbl_t HTMLElement_event_target_vtbl = { +static const event_target_vtbl_t HTMLElement_event_target_vtbl = { { HTMLELEMENT_DISPEX_VTBL_ENTRIES, .traverse = HTMLDOMNode_traverse, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index d8ff8db2d74..083d1ec46cf 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -135,7 +135,6 @@ typedef struct { IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*); } event_target_vtbl_t; -extern const event_target_vtbl_t HTMLElement_event_target_vtbl; IHTMLEventObj *default_set_current_event(HTMLInnerWindow*,IHTMLEventObj*); nsISupports *HTMLElement_get_gecko_target(DispatchEx*); diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 5f069e05f67..2aefcc02af5 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -148,6 +148,15 @@ static const NodeImplVtbl HTMLGenericElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLGenericElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLGenericElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLGenericElement_tid, @@ -156,7 +165,7 @@ static const tid_t HTMLGenericElement_iface_tids[] = { static dispex_static_data_t HTMLGenericElement_dispex = { "HTMLUnknownElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLGenericElement_event_target_vtbl.dispex_vtbl, DispHTMLGenericElement_tid, HTMLGenericElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index af17a35dbb7..897a58edc3c 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -166,6 +166,15 @@ static const NodeImplVtbl HTMLTitleElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLTitleElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLTitleElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLTitleElement_tid, @@ -173,7 +182,7 @@ static const tid_t HTMLTitleElement_iface_tids[] = { }; static dispex_static_data_t HTMLTitleElement_dispex = { "HTMLTitleElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLTitleElement_event_target_vtbl.dispex_vtbl, DispHTMLTitleElement_tid, HTMLTitleElement_iface_tids, HTMLElement_init_dispex_info @@ -327,6 +336,15 @@ static const NodeImplVtbl HTMLHtmlElementImplVtbl = { .is_settable = HTMLHtmlElement_is_settable }; +static const event_target_vtbl_t HTMLHtmlElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLHtmlElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLHtmlElement_tid, @@ -334,7 +352,7 @@ static const tid_t HTMLHtmlElement_iface_tids[] = { }; static dispex_static_data_t HTMLHtmlElement_dispex = { "HTMLHtmlElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLHtmlElement_event_target_vtbl.dispex_vtbl, DispHTMLHtmlElement_tid, HTMLHtmlElement_iface_tids, HTMLElement_init_dispex_info @@ -549,6 +567,15 @@ static const NodeImplVtbl HTMLMetaElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLMetaElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLMetaElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLMetaElement_tid, @@ -557,7 +584,7 @@ static const tid_t HTMLMetaElement_iface_tids[] = { static dispex_static_data_t HTMLMetaElement_dispex = { "HTMLMetaElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLMetaElement_event_target_vtbl.dispex_vtbl, DispHTMLMetaElement_tid, HTMLMetaElement_iface_tids, HTMLElement_init_dispex_info @@ -702,6 +729,15 @@ static const NodeImplVtbl HTMLHeadElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLHeadElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLHeadElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLHeadElement_tid, @@ -709,7 +745,7 @@ static const tid_t HTMLHeadElement_iface_tids[] = { }; static dispex_static_data_t HTMLHeadElement_dispex = { "HTMLHeadElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLHeadElement_event_target_vtbl.dispex_vtbl, DispHTMLHeadElement_tid, HTMLHeadElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index c6527309b8c..b952e52ca13 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1625,6 +1625,15 @@ static const NodeImplVtbl HTMLLabelElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, }; +static const event_target_vtbl_t HTMLLabelElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLLabelElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLLabelElement_tid, @@ -1633,7 +1642,7 @@ static const tid_t HTMLLabelElement_iface_tids[] = { static dispex_static_data_t HTMLLabelElement_dispex = { "HTMLLabelElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLLabelElement_event_target_vtbl.dispex_vtbl, DispHTMLLabelElement_tid, HTMLLabelElement_iface_tids, HTMLElement_init_dispex_info diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 6e903a0e97e..0e5c876538c 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -1016,6 +1016,15 @@ static const NodeImplVtbl HTMLEmbedElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col }; +static const event_target_vtbl_t HTMLEmbedElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLDOMNode_traverse, + .unlink = HTMLDOMNode_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLEmbedElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLEmbedElement_tid, @@ -1023,7 +1032,7 @@ static const tid_t HTMLEmbedElement_iface_tids[] = { }; static dispex_static_data_t HTMLEmbedElement_dispex = { "HTMLEmbedElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLEmbedElement_event_target_vtbl.dispex_vtbl, DispHTMLEmbed_tid, HTMLEmbedElement_iface_tids, HTMLElement_init_dispex_info

1 0

Joel Holdsworth : ntdll/tests: Test both FileRenameInformation and FileRenameInformationEx in test_file_rename_information.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 67479f8c2fc03c2043b8414bc063e671e36fdbda URL: https://gitlab.winehq.org/wine/wine/-/commit/67479f8c2fc03c2043b8414bc063e6… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Fri Sep 15 17:49:52 2023 +0100 ntdll/tests: Test both FileRenameInformation and FileRenameInformationEx in test_file_rename_information. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 123 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 83 insertions(+), 40 deletions(-)

1 0

Joel Holdsworth : include: Add flags to FILE_LINK_INFORMATION used by FileLinkInformationEx.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 26b8284d21c425f8eb039aaf230f216b4415ee79 URL: https://gitlab.winehq.org/wine/wine/-/commit/26b8284d21c425f8eb039aaf230f21… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Mon Aug 7 14:14:06 2023 +0100 include: Add flags to FILE_LINK_INFORMATION used by FileLinkInformationEx. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- include/winternl.h | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index eadb36aa028..d0f37c2bada 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1451,12 +1451,26 @@ typedef struct _FILE_RENAME_INFORMATION { #define FILE_RENAME_IGNORE_READONLY_ATTRIBUTE 0x00000040 typedef struct _FILE_LINK_INFORMATION { - BOOLEAN ReplaceIfExists; + union { + BOOLEAN ReplaceIfExists; + ULONG Flags; + } DUMMYUNIONNAME; HANDLE RootDirectory; ULONG FileNameLength; WCHAR FileName[1]; } FILE_LINK_INFORMATION, *PFILE_LINK_INFORMATION; +#define FILE_LINK_REPLACE_IF_EXISTS 0x00000001 +#define FILE_LINK_POSIX_SEMANTICS 0x00000002 +#define FILE_LINK_SUPPRESS_STORAGE_RESERVE_INHERITANCE 0x00000008 +#define FILE_LINK_NO_INCREASE_AVAILABLE_SPACE 0x00000010 +#define FILE_LINK_NO_DECREASE_AVAILABLE_SPACE 0x00000020 +#define FILE_LINK_PRESERVE_AVAILABLE_SPACE 0x00000030 +#define FILE_LINK_IGNORE_READONLY_ATTRIBUTE 0x00000040 +#define FILE_LINK_FORCE_RESIZE_TARGET_SR 0x00000080 +#define FILE_LINK_FORCE_RESIZE_SOURCE_SR 0x00000100 +#define FILE_LINK_FORCE_RESIZE_SR 0x00000180 + typedef struct _FILE_NAMES_INFORMATION { ULONG NextEntryOffset; ULONG FileIndex;

1 0

Joel Holdsworth : ntdll/tests: Test both FileLinkInformation and FileLinkInformationEx in test_file_link_information.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: c695f8906fc270c551ec9ebe0531d2ceabba5b79 URL: https://gitlab.winehq.org/wine/wine/-/commit/c695f8906fc270c551ec9ebe0531d2… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Fri Sep 15 17:56:30 2023 +0100 ntdll/tests: Test both FileLinkInformation and FileLinkInformationEx in test_file_link_information. Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 132 +++++++++++++++++++++++++++++++----------------- 1 file changed, 86 insertions(+), 46 deletions(-)

1 0

Yuxuan Shui : user32: Add hotpatchable wrapper for GetWindowLongA.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: f9f9481b67f7ecddd7cb5ddd308a9338d26445e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f9f9481b67f7ecddd7cb5ddd308a93… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Sep 15 12:32:06 2023 +0100 user32: Add hotpatchable wrapper for GetWindowLongA. ntlea for some reason expects GetWindowLongA to start with a "push $-2", and will try to skip over this instruction. If we don't anticipate this, it will ended up either skipping over critical instructions, or on a desync address. --- dlls/user32/win.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 28cf40441d9..7eaaa41e951 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -888,7 +888,28 @@ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) /********************************************************************** * GetWindowLongA (USER32.@) */ -LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) + +#ifdef __i386__ + +/* This wrapper is here to workaround a ntlea quirk. First of all, ntlea + * checks whether GetWindowLongA starts with the Win32 hotpatchable prologue, + * if it can find that, it will use a hooking strategy more difficult for us + * to deal with. Secondly, it assumes what follows the prologue is a `pushl $-2`, + * and will try to skip over this instruction when calling `GetWindowLongA`, + * (i.e. it tries to jump to `GetWindowLongA + 7`, 5 bytes for the prologue, 2 + * bytes for the `pushl`.). We have to anticipate that and make sure the result + * of doing this won't be a messed up stack, or a desynced PC. + */ +__ASM_STDCALL_FUNC( GetWindowLongA, 8, + ".byte 0x8b, 0xff, 0x55, 0x8b, 0xec\n" /* Win32 hotpatchable prologue. */ + "pushl $-2\n" + "addl $4, %esp\n" + "popl %ebp\n" + "jmp " __ASM_STDCALL("get_window_longA", 8) ) +LONG WINAPI get_window_longA( HWND hwnd, INT offset ) +#else +LONG WINAPI DECLSPEC_HOTPATCH GetWindowLongA( HWND hwnd, INT offset ) +#endif { switch (offset) {

1 0

Yuxuan Shui : gdi32: Make GetStockObject hotpatchable.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 74027f37311098859b1b279384e79dabb9468546 URL: https://gitlab.winehq.org/wine/wine/-/commit/74027f37311098859b1b279384e79d… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Sep 15 12:30:36 2023 +0100 gdi32: Make GetStockObject hotpatchable. Needed for ntlea. --- dlls/gdi32/objects.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 42bf6fcf111..070ce9c3885 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -418,7 +418,7 @@ HGDIOBJ WINAPI GetCurrentObject( HDC hdc, UINT type ) /*********************************************************************** * GetStockObject (GDI32.@) */ -HGDIOBJ WINAPI GetStockObject( INT obj ) +HGDIOBJ WINAPI DECLSPEC_HOTPATCH GetStockObject( INT obj ) { if (obj < 0 || obj > STOCK_LAST + 1 || obj == 9) return 0;

1 0

Martin Storsjö : include: Update the d3d12 headers from vkd3d.
by Alexandre Julliard Sept. 19, 2023

Sept. 19, 2023

Module: wine Branch: master Commit: 9a3266537d7c074c589e28dcaa5c41d64b5d515e URL: https://gitlab.winehq.org/wine/wine/-/commit/9a3266537d7c074c589e28dcaa5c41… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Sep 19 13:45:22 2023 +0300 include: Update the d3d12 headers from vkd3d. This corresponds to vkd3d as of commit e597b0d80f39f716a8740cb0be55edc78f4599d6. This brings in a function signature fix for the implementation of ID3D12CommandQueue::UpdateTileMappings() as well, from vkd3d commit e98e6c9b530995e68bd019a3319d90223ed864cf. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- include/d3d12.idl | 2648 +++++++++++++++++++++++++++++++++++++-- libs/vkd3d/libs/vkd3d/command.c | 2 +- 2 files changed, 2568 insertions(+), 82 deletions(-)

1 0