Skip to content

W
wine-winehq
Commit a5ab4bae authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard
Browse files
Options

mshtml: Use the dispex's get_dispid for all nodes.

Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com>
parent 70dcbe73
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 32 deletions
dlls/mshtml/htmlelem.c
View file @ a5ab4bae
......@@ -6886,16 +6886,6 @@ void HTMLElement_destructor(DispatchEx *dispex)
HTMLDOMNode_destructor(&This->node.event_target.dispex);
}
HRESULT HTMLElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *pid)
{
HTMLElement *This = impl_from_DispatchEx(dispex);
if(This->node.vtbl->get_dispid)
return This->node.vtbl->get_dispid(&This->node, name, grfdex, pid);
return DISP_E_UNKNOWNNAME;
}
HRESULT HTMLElement_get_name(DispatchEx *dispex, DISPID id, BSTR *name)
{
HTMLElement *This = impl_from_DispatchEx(dispex);
......
dlls/mshtml/htmlevent.h
View file @ a5ab4bae
......@@ -145,7 +145,6 @@ ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx*);
IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*);
#define HTMLELEMENT_DISPEX_VTBL_ENTRIES \
.get_dispid = HTMLElement_get_dispid, \
.get_name = HTMLElement_get_name, \
.invoke = HTMLElement_invoke, \
.populate_props = HTMLElement_populate_props
......
dlls/mshtml/htmlform.c
View file @ a5ab4bae
......@@ -806,9 +806,9 @@ static void HTMLFormElement_unlink(DispatchEx *dispex)
unlink_ref(&This->nsform);
}
static HRESULT HTMLFormElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid)
static HRESULT HTMLFormElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid)
{
HTMLFormElement *This = impl_from_HTMLDOMNode(iface);
HTMLFormElement *This = impl_from_DispatchEx(dispex);
nsIDOMHTMLCollection *elements;
nsAString nsstr, name_str;
UINT32 len, i;
......@@ -967,7 +967,6 @@ static const NodeImplVtbl HTMLFormElementImplVtbl = {
.clone = HTMLElement_clone,
.handle_event = HTMLFormElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.get_dispid = HTMLFormElement_get_dispid,
.get_name = HTMLFormElement_dispex_get_name,
.invoke = HTMLFormElement_invoke,
};
......@@ -978,7 +977,8 @@ static const event_target_vtbl_t HTMLFormElement_event_target_vtbl = {
.query_interface= HTMLFormElement_query_interface,
.destructor = HTMLElement_destructor,
.traverse = HTMLFormElement_traverse,
.unlink = HTMLFormElement_unlink
.unlink = HTMLFormElement_unlink,
.get_dispid = HTMLFormElement_get_dispid,
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
};
......
dlls/mshtml/htmlframe.c
View file @ a5ab4bae
......@@ -964,9 +964,9 @@ static void HTMLFrameElement_destructor(DispatchEx *dispex)
HTMLFrameBase_destructor(&This->framebase);
}
static HRESULT HTMLFrameElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid)
static HRESULT HTMLFrameElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid)
{
HTMLFrameElement *This = frame_from_HTMLDOMNode(iface);
HTMLFrameElement *This = frame_from_DispatchEx(dispex);
if(!This->framebase.content_window)
return DISP_E_UNKNOWNNAME;
......@@ -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_dispid = HTMLFrameElement_get_dispid,
.get_name = HTMLFrameElement_get_name,
.invoke = HTMLFrameElement_invoke,
.bind_to_tree = HTMLFrameElement_bind_to_tree,
......@@ -1021,7 +1020,8 @@ static const event_target_vtbl_t HTMLFrameElement_event_target_vtbl = {
.query_interface= HTMLFrameElement_query_interface,
.destructor = HTMLFrameElement_destructor,
.traverse = HTMLFrameElement_traverse,
.unlink = HTMLFrameElement_unlink
.unlink = HTMLFrameElement_unlink,
.get_dispid = HTMLFrameElement_get_dispid,
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
};
......@@ -1554,9 +1554,9 @@ static void HTMLIFrame_destructor(DispatchEx *dispex)
HTMLFrameBase_destructor(&This->framebase);
}
static HRESULT HTMLIFrame_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid)
static HRESULT HTMLIFrame_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid)
{
HTMLIFrame *This = iframe_from_HTMLDOMNode(iface);
HTMLIFrame *This = iframe_from_DispatchEx(dispex);
if(!This->framebase.content_window)
return DISP_E_UNKNOWNNAME;
......@@ -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_dispid = HTMLIFrame_get_dispid,
.get_name = HTMLIFrame_get_name,
.invoke = HTMLIFrame_invoke,
.bind_to_tree = HTMLIFrame_bind_to_tree,
......@@ -1611,7 +1610,8 @@ static const event_target_vtbl_t HTMLIFrame_event_target_vtbl = {
.query_interface= HTMLIFrame_query_interface,
.destructor = HTMLIFrame_destructor,
.traverse = HTMLIFrame_traverse,
.unlink = HTMLIFrame_unlink
.unlink = HTMLIFrame_unlink,
.get_dispid = HTMLIFrame_get_dispid,
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
};
......
dlls/mshtml/htmlobject.c
View file @ a5ab4bae
......@@ -710,9 +710,9 @@ static void HTMLObjectElement_destructor(DispatchEx *dispex)
HTMLElement_destructor(&This->plugin_container.element.node.event_target.dispex);
}
static HRESULT HTMLObjectElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD grfdex, DISPID *dispid)
static HRESULT HTMLObjectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD grfdex, DISPID *dispid)
{
HTMLObjectElement *This = impl_from_HTMLDOMNode(iface);
HTMLObjectElement *This = impl_from_DispatchEx(dispex);
TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(name), grfdex, dispid);
......@@ -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_dispid = HTMLObjectElement_get_dispid,
.get_name = HTMLObjectElement_dispex_get_name,
.invoke = HTMLObjectElement_invoke,
};
......@@ -756,7 +755,8 @@ static const event_target_vtbl_t HTMLObjectElement_event_target_vtbl = {
.query_interface= HTMLObjectElement_query_interface,
.destructor = HTMLObjectElement_destructor,
.traverse = HTMLObjectElement_traverse,
.unlink = HTMLObjectElement_unlink
.unlink = HTMLObjectElement_unlink,
.get_dispid = HTMLObjectElement_get_dispid,
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
};
......
dlls/mshtml/htmlselect.c
View file @ a5ab4bae
......@@ -1354,7 +1354,7 @@ static void HTMLSelectElement_unlink(DispatchEx *dispex)
#define DISPID_OPTIONCOL_0 MSHTML_DISPID_CUSTOM_MIN
static HRESULT HTMLSelectElement_get_dispid(HTMLDOMNode *iface, BSTR name, DWORD flags, DISPID *dispid)
static HRESULT HTMLSelectElement_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid)
{
const WCHAR *ptr;
DWORD idx = 0;
......@@ -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_dispid = HTMLSelectElement_get_dispid,
.get_name = HTMLSelectElement_dispex_get_name,
.invoke = HTMLSelectElement_invoke,
};
......@@ -1438,7 +1437,8 @@ static const event_target_vtbl_t HTMLSelectElement_event_target_vtbl = {
.query_interface= HTMLSelectElement_query_interface,
.destructor = HTMLElement_destructor,
.traverse = HTMLSelectElement_traverse,
.unlink = HTMLSelectElement_unlink
.unlink = HTMLSelectElement_unlink,
.get_dispid = HTMLSelectElement_get_dispid,
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
};
......
dlls/mshtml/mshtml_private.h
View file @ a5ab4bae
......@@ -822,7 +822,6 @@ typedef struct {
HRESULT (*get_disabled)(HTMLDOMNode*,VARIANT_BOOL*);
HRESULT (*get_document)(HTMLDOMNode*,IDispatch**);
HRESULT (*get_readystate)(HTMLDOMNode*,BSTR*);
HRESULT (*get_dispid)(HTMLDOMNode*,BSTR,DWORD,DISPID*);
HRESULT (*get_name)(HTMLDOMNode*,DISPID,BSTR*);
HRESULT (*invoke)(HTMLDOMNode*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*);
HRESULT (*bind_to_tree)(HTMLDOMNode*);
......@@ -1210,7 +1209,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_dispid(DispatchEx*,BSTR,DWORD,DISPID*);
HRESULT HTMLElement_get_name(DispatchEx*,DISPID,BSTR*);
HRESULT HTMLElement_invoke(DispatchEx*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*);
HRESULT HTMLElement_populate_props(DispatchEx*);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment