Module: wine Branch: master Commit: 85750f0963548bbd0e2671045c7e747288206f21 URL: https://gitlab.winehq.org/wine/wine/-/commit/85750f0963548bbd0e2671045c7e747...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Wed Sep 20 16:14:30 2023 +0300
mshtml: Use the dispex's get_name for all nodes.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com
---
dlls/mshtml/htmlelem.c | 11 ----------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 6 +++--- dlls/mshtml/htmlframe.c | 12 ++++++------ dlls/mshtml/htmlobject.c | 6 +++--- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 -- 7 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ed8d3923854..8fdce41df99 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6886,17 +6886,6 @@ void HTMLElement_destructor(DispatchEx *dispex) HTMLDOMNode_destructor(&This->node.event_target.dispex); }
-HRESULT HTMLElement_get_name(DispatchEx *dispex, DISPID id, BSTR *name) -{ - HTMLElement *This = impl_from_DispatchEx(dispex); - - if(This->node.vtbl->get_name) - return This->node.vtbl->get_name(&This->node, id, name); - - ERR("(%p): element has no get_name method\n", This); - return DISP_E_MEMBERNOTFOUND; -} - HRESULT HTMLElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index e6031168ac8..cf17dc9943c 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -145,7 +145,6 @@ ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx*); IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*);
#define HTMLELEMENT_DISPEX_VTBL_ENTRIES \ - .get_name = HTMLElement_get_name, \ .invoke = HTMLElement_invoke, \ .populate_props = HTMLElement_populate_props
diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index b5159ef4888..7f1986b839f 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -902,9 +902,9 @@ static HRESULT HTMLFormElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD g return hres; }
-static HRESULT HTMLFormElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLFormElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLFormElement *This = impl_from_HTMLDOMNode(iface); + HTMLFormElement *This = impl_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN; nsIDOMHTMLCollection *elements; nsresult nsres; @@ -967,7 +967,6 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLFormElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .get_name = HTMLFormElement_dispex_get_name, .invoke = HTMLFormElement_invoke, };
@@ -979,6 +978,7 @@ static const event_target_vtbl_t HTMLFormElement_event_target_vtbl = { .traverse = HTMLFormElement_traverse, .unlink = HTMLFormElement_unlink, .get_dispid = HTMLFormElement_get_dispid, + .get_name = HTMLFormElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 77185dea6ef..f122066af9c 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -974,9 +974,9 @@ static HRESULT HTMLFrameElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); }
-static HRESULT HTMLFrameElement_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLFrameElement_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLFrameElement *This = frame_from_HTMLDOMNode(iface); + HTMLFrameElement *This = frame_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN;
if(!This->framebase.content_window || @@ -1009,7 +1009,6 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .get_document = HTMLFrameElement_get_document, .get_readystate = HTMLFrameElement_get_readystate, - .get_name = HTMLFrameElement_get_name, .invoke = HTMLFrameElement_invoke, .bind_to_tree = HTMLFrameElement_bind_to_tree, }; @@ -1022,6 +1021,7 @@ static const event_target_vtbl_t HTMLFrameElement_event_target_vtbl = { .traverse = HTMLFrameElement_traverse, .unlink = HTMLFrameElement_unlink, .get_dispid = HTMLFrameElement_get_dispid, + .get_name = HTMLFrameElement_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; @@ -1564,9 +1564,9 @@ static HRESULT HTMLIFrame_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex return search_window_props(This->framebase.content_window->base.inner_window, name, grfdex, dispid); }
-static HRESULT HTMLIFrame_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLIFrame_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLIFrame *This = iframe_from_HTMLDOMNode(iface); + HTMLIFrame *This = iframe_from_DispatchEx(dispex); DWORD idx = id - MSHTML_DISPID_CUSTOM_MIN;
if(!This->framebase.content_window || @@ -1599,7 +1599,6 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .get_document = HTMLIFrame_get_document, .get_readystate = HTMLIFrame_get_readystate, - .get_name = HTMLIFrame_get_name, .invoke = HTMLIFrame_invoke, .bind_to_tree = HTMLIFrame_bind_to_tree, }; @@ -1612,6 +1611,7 @@ static const event_target_vtbl_t HTMLIFrame_event_target_vtbl = { .traverse = HTMLIFrame_traverse, .unlink = HTMLIFrame_unlink, .get_dispid = HTMLIFrame_get_dispid, + .get_name = HTMLIFrame_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 3a8dbdb1f02..bff2fc64bb8 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -719,9 +719,9 @@ static HRESULT HTMLObjectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return get_plugin_dispid(&This->plugin_container, name, dispid); }
-static HRESULT HTMLObjectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLObjectElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { - HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + HTMLObjectElement *This = impl_from_DispatchEx(dispex);
FIXME("(%p)->(%lx %p)\n", This, id, name);
@@ -745,7 +745,6 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, .get_readystate = HTMLObjectElement_get_readystate, - .get_name = HTMLObjectElement_dispex_get_name, .invoke = HTMLObjectElement_invoke, };
@@ -757,6 +756,7 @@ static const event_target_vtbl_t HTMLObjectElement_event_target_vtbl = { .traverse = HTMLObjectElement_traverse, .unlink = HTMLObjectElement_unlink, .get_dispid = HTMLObjectElement_get_dispid, + .get_name = HTMLObjectElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index a9b53dfacee..20906c86037 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -1373,7 +1373,7 @@ static HRESULT HTMLSelectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD return S_OK; }
-static HRESULT HTMLSelectElement_dispex_get_name(HTMLDOMNode *iface, DISPID id, BSTR *name) +static HRESULT HTMLSelectElement_dispex_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { DWORD idx = id - DISPID_OPTIONCOL_0; WCHAR buf[11]; @@ -1427,7 +1427,6 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLSelectElementImpl_put_disabled, .get_disabled = HTMLSelectElementImpl_get_disabled, - .get_name = HTMLSelectElement_dispex_get_name, .invoke = HTMLSelectElement_invoke, };
@@ -1439,6 +1438,7 @@ static const event_target_vtbl_t HTMLSelectElement_event_target_vtbl = { .traverse = HTMLSelectElement_traverse, .unlink = HTMLSelectElement_unlink, .get_dispid = HTMLSelectElement_get_dispid, + .get_name = HTMLSelectElement_dispex_get_name, }, HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d08768fa012..0779db88dd8 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -822,7 +822,6 @@ typedef struct { HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*); HRESULT (*get_document)(HTMLDOMNode*,IDispatch**); HRESULT (*get_readystate)(HTMLDOMNode*,BSTR*); - HRESULT (*get_name)(HTMLDOMNode*,DISPID,BSTR*); HRESULT (*invoke)(HTMLDOMNode*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*bind_to_tree)(HTMLDOMNode*); BOOL (*is_text_edit)(HTMLDOMNode*); @@ -1209,7 +1208,6 @@ void HTMLDOMNode_init_dispex_info(dispex_data_t*,compat_mode_t);
void *HTMLElement_query_interface(DispatchEx*,REFIID); void HTMLElement_destructor(DispatchEx*); -HRESULT HTMLElement_get_name(DispatchEx*,DISPID,BSTR*); HRESULT HTMLElement_invoke(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT HTMLElement_populate_props(DispatchEx*); HRESULT HTMLElement_clone(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**);
-
Alexandre Julliard