Skip to content

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

mshtml: Use the event_target vtbl's handle_event for all nodes.

Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com>
parent 5b59ba0c
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 70 deletions
dlls/mshtml/htmlanchor.c
View file @ ee80f1a0
......@@ -792,11 +792,6 @@ static const IHTMLAnchorElementVtbl HTMLAnchorElementVtbl = {
HTMLAnchorElement_blur
};
static inline HTMLAnchorElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
{
return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node);
}
static inline HTMLAnchorElement *impl_from_DispatchEx(DispatchEx *iface)
{
return CONTAINING_RECORD(iface, HTMLAnchorElement, element.node.event_target.dispex);
......@@ -828,9 +823,9 @@ static void HTMLAnchorElement_unlink(DispatchEx *dispex)
unlink_ref(&This->nsanchor);
}
static HRESULT HTMLAnchorElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default)
static HRESULT HTMLAnchorElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
{
HTMLAnchorElement *This = impl_from_HTMLDOMNode(iface);
HTMLAnchorElement *This = impl_from_DispatchEx(dispex);
nsAString href_str, target_str;
nsresult nsres;
......@@ -856,14 +851,13 @@ fallback:
nsAString_Finish(&target_str);
}
return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default);
return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default);
}
static const NodeImplVtbl HTMLAnchorElementImplVtbl = {
.clsid = &CLSID_HTMLAnchorElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLAnchorElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -876,6 +870,7 @@ static const event_target_vtbl_t HTMLAnchorElement_event_target_vtbl = {
.unlink = HTMLAnchorElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLAnchorElement_handle_event
};
static const tid_t HTMLAnchorElement_iface_tids[] = {
......
dlls/mshtml/htmlarea.c
View file @ ee80f1a0
......@@ -408,11 +408,6 @@ static const IHTMLAreaElementVtbl HTMLAreaElementVtbl = {
HTMLAreaElement_blur
};
static inline HTMLAreaElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
{
return CONTAINING_RECORD(iface, HTMLAreaElement, element.node);
}
static inline HTMLAreaElement *impl_from_DispatchEx(DispatchEx *iface)
{
return CONTAINING_RECORD(iface, HTMLAreaElement, element.node.event_target.dispex);
......@@ -444,9 +439,9 @@ static void HTMLAreaElement_unlink(DispatchEx *dispex)
unlink_ref(&This->nsarea);
}
static HRESULT HTMLAreaElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default)
static HRESULT HTMLAreaElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
{
HTMLAreaElement *This = impl_from_HTMLDOMNode(iface);
HTMLAreaElement *This = impl_from_DispatchEx(dispex);
nsAString href_str, target_str;
nsresult nsres;
......@@ -472,14 +467,13 @@ fallback:
nsAString_Finish(&target_str);
}
return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default);
return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default);
}
static const NodeImplVtbl HTMLAreaElementImplVtbl = {
.clsid = &CLSID_HTMLAreaElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLAreaElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -492,6 +486,7 @@ static const event_target_vtbl_t HTMLAreaElement_event_target_vtbl = {
.unlink = HTMLAreaElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLAreaElement_handle_event
};
static const tid_t HTMLAreaElement_iface_tids[] = {
......
dlls/mshtml/htmlbody.c
View file @ ee80f1a0
......@@ -967,7 +967,6 @@ static const NodeImplVtbl HTMLBodyElementImplVtbl = {
.clsid = &CLSID_HTMLBody,
.cpc_entries = HTMLBodyElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.get_event_prop_target = HTMLBodyElement_get_event_prop_target,
.is_text_edit = HTMLBodyElement_is_text_edit,
......@@ -983,6 +982,7 @@ static const event_target_vtbl_t HTMLBodyElement_event_target_vtbl = {
.unlink = HTMLBodyElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLBodyElement_iface_tids[] = {
......
dlls/mshtml/htmlcomment.c
View file @ ee80f1a0
......@@ -179,7 +179,6 @@ static const NodeImplVtbl HTMLCommentElementImplVtbl = {
.clsid = &CLSID_HTMLCommentElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLCommentElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col
};
......@@ -192,6 +191,7 @@ static const event_target_vtbl_t HTMLCommentElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLCommentElement_iface_tids[] = {
......
dlls/mshtml/htmlelem.c
View file @ ee80f1a0
......@@ -6813,7 +6813,6 @@ static const NodeImplVtbl HTMLElementImplVtbl = {
.clsid = &CLSID_HTMLUnknownElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col
};
......@@ -6983,19 +6982,10 @@ void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid)
ensure_doc_nsevent_handler(This->node.doc, This->node.nsnode, eid);
}
HRESULT HTMLElement_handle_event_default(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *nsevent, BOOL *prevent_default)
HRESULT HTMLElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
{
HTMLElement *This = impl_from_DispatchEx(dispex);
if(!This->node.vtbl->handle_event)
return S_OK;
return This->node.vtbl->handle_event(&This->node, eid, nsevent, prevent_default);
}
HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default)
{
HTMLElement *This = impl_from_HTMLDOMNode(iface);
switch(eid) {
case EVENTID_KEYDOWN: {
nsIDOMKeyEvent *key_event;
......@@ -7023,7 +7013,10 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve
nsIDOMKeyEvent_Release(key_event);
}
break;
}
default:
break;
}
return S_OK;
......@@ -7289,6 +7282,7 @@ static const event_target_vtbl_t HTMLElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink,
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
struct token_list {
......
dlls/mshtml/htmlevent.c
View file @ ee80f1a0
......@@ -3887,10 +3887,9 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event,
BOOL prevent_default = event->prevent_default;
for(i = 0; !prevent_default && i < chain_cnt; i++) {
vtbl = dispex_get_vtbl(&target_chain[i]->dispex);
if(!vtbl->handle_event_default)
if(!vtbl->handle_event)
continue;
hres = vtbl->handle_event_default(&event_target->dispex, event->event_id,
event->nsevent, &prevent_default);
hres = vtbl->handle_event(&event_target->dispex, event->event_id, event->nsevent, &prevent_default);
if(FAILED(hres) || event->stop_propagation)
break;
if(prevent_default)
......
dlls/mshtml/htmlevent.h
View file @ ee80f1a0
......@@ -130,7 +130,7 @@ typedef struct {
nsISupports *(*get_gecko_target)(DispatchEx*);
void (*bind_event)(DispatchEx*,eventid_t);
EventTarget *(*get_parent_event_target)(DispatchEx*);
HRESULT (*handle_event_default)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*);
HRESULT (*handle_event)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*);
ConnectionPointContainer *(*get_cp_container)(DispatchEx*);
IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*);
} event_target_vtbl_t;
......@@ -140,7 +140,7 @@ IHTMLEventObj *default_set_current_event(HTMLInnerWindow*,IHTMLEventObj*);
nsISupports *HTMLElement_get_gecko_target(DispatchEx*);
void HTMLElement_bind_event(DispatchEx*,eventid_t);
EventTarget *HTMLElement_get_parent_event_target(DispatchEx*);
HRESULT HTMLElement_handle_event_default(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*);
HRESULT HTMLElement_handle_event(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*);
ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx*);
IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*);
......@@ -151,7 +151,6 @@ IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*);
.get_gecko_target = HTMLElement_get_gecko_target, \
.bind_event = HTMLElement_bind_event, \
.get_parent_event_target = HTMLElement_get_parent_event_target, \
.handle_event_default = HTMLElement_handle_event_default, \
.get_cp_container = HTMLElement_get_cp_container, \
.set_current_event = HTMLElement_set_current_event
......
dlls/mshtml/htmlform.c
View file @ ee80f1a0
......@@ -768,11 +768,6 @@ static const IHTMLFormElementVtbl HTMLFormElementVtbl = {
HTMLFormElement_tags
};
static inline HTMLFormElement *impl_from_HTMLDOMNode(HTMLDOMNode *iface)
{
return CONTAINING_RECORD(iface, HTMLFormElement, element.node);
}
static inline HTMLFormElement *impl_from_DispatchEx(DispatchEx *iface)
{
return CONTAINING_RECORD(iface, HTMLFormElement, element.node.event_target.dispex);
......@@ -949,23 +944,22 @@ static HRESULT HTMLFormElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid,
return S_OK;
}
static HRESULT HTMLFormElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *event, BOOL *prevent_default)
static HRESULT HTMLFormElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default)
{
HTMLFormElement *This = impl_from_HTMLDOMNode(iface);
HTMLFormElement *This = impl_from_DispatchEx(dispex);
if(eid == EVENTID_SUBMIT) {
*prevent_default = TRUE;
return IHTMLFormElement_submit(&This->IHTMLFormElement_iface);
}
return HTMLElement_handle_event(&This->element.node, eid, event, prevent_default);
return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default);
}
static const NodeImplVtbl HTMLFormElementImplVtbl = {
.clsid = &CLSID_HTMLFormElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLFormElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -981,6 +975,7 @@ static const event_target_vtbl_t HTMLFormElement_event_target_vtbl = {
.invoke = HTMLFormElement_invoke
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLFormElement_handle_event
};
static const tid_t HTMLFormElement_iface_tids[] = {
......
dlls/mshtml/htmlframe.c
View file @ ee80f1a0
......@@ -1005,7 +1005,6 @@ static const NodeImplVtbl HTMLFrameElementImplVtbl = {
.clsid = &CLSID_HTMLFrameElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.get_document = HTMLFrameElement_get_document,
.get_readystate = HTMLFrameElement_get_readystate,
......@@ -1024,6 +1023,7 @@ static const event_target_vtbl_t HTMLFrameElement_event_target_vtbl = {
.invoke = HTMLFrameElement_invoke
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLFrameElement_iface_tids[] = {
......@@ -1595,7 +1595,6 @@ static const NodeImplVtbl HTMLIFrameImplVtbl = {
.clsid = &CLSID_HTMLIFrame,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.get_document = HTMLIFrame_get_document,
.get_readystate = HTMLIFrame_get_readystate,
......@@ -1614,6 +1613,7 @@ static const event_target_vtbl_t HTMLIFrame_event_target_vtbl = {
.invoke = HTMLIFrame_invoke
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLIFrame_iface_tids[] = {
......
dlls/mshtml/htmlgeneric.c
View file @ ee80f1a0
......@@ -142,7 +142,6 @@ static const NodeImplVtbl HTMLGenericElementImplVtbl = {
.clsid = &CLSID_HTMLGenericElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col
};
......@@ -155,6 +154,7 @@ static const event_target_vtbl_t HTMLGenericElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLGenericElement_iface_tids[] = {
......
dlls/mshtml/htmlhead.c
View file @ ee80f1a0
......@@ -160,7 +160,6 @@ static const NodeImplVtbl HTMLTitleElementImplVtbl = {
.clsid = &CLSID_HTMLTitleElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col
};
......@@ -173,6 +172,7 @@ static const event_target_vtbl_t HTMLTitleElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLTitleElement_iface_tids[] = {
......@@ -329,7 +329,6 @@ static const NodeImplVtbl HTMLHtmlElementImplVtbl = {
.clsid = &CLSID_HTMLHtmlElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.is_settable = HTMLHtmlElement_is_settable
};
......@@ -343,6 +342,7 @@ static const event_target_vtbl_t HTMLHtmlElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLHtmlElement_iface_tids[] = {
......@@ -557,7 +557,6 @@ static const NodeImplVtbl HTMLMetaElementImplVtbl = {
.clsid = &CLSID_HTMLMetaElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col
};
......@@ -570,6 +569,7 @@ static const event_target_vtbl_t HTMLMetaElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLMetaElement_iface_tids[] = {
......@@ -719,7 +719,6 @@ static const NodeImplVtbl HTMLHeadElementImplVtbl = {
.clsid = &CLSID_HTMLHeadElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col
};
......@@ -732,6 +731,7 @@ static const event_target_vtbl_t HTMLHeadElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLHeadElement_iface_tids[] = {
......
dlls/mshtml/htmlimg.c
View file @ ee80f1a0
......@@ -700,7 +700,6 @@ static const NodeImplVtbl HTMLImgElementImplVtbl = {
.clsid = &CLSID_HTMLImg,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.get_readystate = HTMLImgElement_get_readystate,
};
......@@ -714,6 +713,7 @@ static const event_target_vtbl_t HTMLImgElement_event_target_vtbl = {
.unlink = HTMLImgElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLImgElement_iface_tids[] = {
......
dlls/mshtml/htmlinput.c
View file @ ee80f1a0
......@@ -1414,7 +1414,6 @@ static const NodeImplVtbl HTMLInputElementImplVtbl = {
.clsid = &CLSID_HTMLInputElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.put_disabled = HTMLInputElementImpl_put_disabled,
.get_disabled = HTMLInputElementImpl_get_disabled,
......@@ -1430,6 +1429,7 @@ static const event_target_vtbl_t HTMLInputElement_event_target_vtbl = {
.unlink = HTMLInputElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLInputElement_iface_tids[] = {
......@@ -1613,7 +1613,6 @@ static const NodeImplVtbl HTMLLabelElementImplVtbl = {
.clsid = &CLSID_HTMLLabelElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -1626,6 +1625,7 @@ static const event_target_vtbl_t HTMLLabelElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLLabelElement_iface_tids[] = {
......@@ -1949,7 +1949,6 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = {
.clsid = &CLSID_HTMLButtonElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.put_disabled = HTMLButtonElementImpl_put_disabled,
.get_disabled = HTMLButtonElementImpl_get_disabled,
......@@ -1965,6 +1964,7 @@ static const event_target_vtbl_t HTMLButtonElement_event_target_vtbl = {
.unlink = HTMLButtonElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLButtonElement_iface_tids[] = {
......
dlls/mshtml/htmllink.c
View file @ ee80f1a0
......@@ -420,7 +420,6 @@ static const NodeImplVtbl HTMLLinkElementImplVtbl = {
.clsid = &CLSID_HTMLLinkElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.put_disabled = HTMLLinkElementImpl_put_disabled,
.get_disabled = HTMLLinkElementImpl_get_disabled,
......@@ -435,6 +434,7 @@ static const event_target_vtbl_t HTMLLinkElement_event_target_vtbl = {
.unlink = HTMLLinkElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLLinkElement_iface_tids[] = {
......
dlls/mshtml/htmlobject.c
View file @ ee80f1a0
......@@ -742,7 +742,6 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = {
.clsid = &CLSID_HTMLObjectElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.get_readystate = HTMLObjectElement_get_readystate,
};
......@@ -759,6 +758,7 @@ static const event_target_vtbl_t HTMLObjectElement_event_target_vtbl = {
.invoke = HTMLObjectElement_invoke
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLObjectElement_iface_tids[] = {
......@@ -1002,7 +1002,6 @@ static const NodeImplVtbl HTMLEmbedElementImplVtbl = {
.clsid = &CLSID_HTMLEmbed,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col
};
......@@ -1015,6 +1014,7 @@ static const event_target_vtbl_t HTMLEmbedElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLEmbedElement_iface_tids[] = {
......
dlls/mshtml/htmlscript.c
View file @ ee80f1a0
......@@ -422,7 +422,6 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = {
.clsid = &CLSID_HTMLScriptElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.get_readystate = HTMLScriptElement_get_readystate,
.bind_to_tree = HTMLScriptElement_bind_to_tree,
......@@ -437,6 +436,7 @@ static const event_target_vtbl_t HTMLScriptElement_event_target_vtbl = {
.unlink = HTMLScriptElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret)
......
dlls/mshtml/htmlselect.c
View file @ ee80f1a0
......@@ -376,7 +376,6 @@ static const NodeImplVtbl HTMLOptionElementImplVtbl = {
.clsid = &CLSID_HTMLOptionElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -389,6 +388,7 @@ static const event_target_vtbl_t HTMLOptionElement_event_target_vtbl = {
.unlink = HTMLOptionElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLOptionElement_iface_tids[] = {
......@@ -1418,7 +1418,6 @@ static const NodeImplVtbl HTMLSelectElementImplVtbl = {
.clsid = &CLSID_HTMLSelectElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.put_disabled = HTMLSelectElementImpl_put_disabled,
.get_disabled = HTMLSelectElementImpl_get_disabled,
......@@ -1436,6 +1435,7 @@ static const event_target_vtbl_t HTMLSelectElement_event_target_vtbl = {
.invoke = HTMLSelectElement_invoke
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLSelectElement_tids[] = {
......
dlls/mshtml/htmlstyleelem.c
View file @ ee80f1a0
......@@ -422,7 +422,6 @@ static const NodeImplVtbl HTMLStyleElementImplVtbl = {
.clsid = &CLSID_HTMLStyleElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -435,6 +434,7 @@ static const event_target_vtbl_t HTMLStyleElement_event_target_vtbl = {
.unlink = HTMLStyleElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLStyleElement_iface_tids[] = {
......
dlls/mshtml/htmltable.c
View file @ ee80f1a0
......@@ -481,7 +481,6 @@ static const NodeImplVtbl HTMLTableCellImplVtbl = {
.clsid = &CLSID_HTMLTableCell,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -494,6 +493,7 @@ static const event_target_vtbl_t HTMLTableCell_event_target_vtbl = {
.unlink = HTMLTableCell_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLTableCell_iface_tids[] = {
......@@ -911,7 +911,6 @@ static const NodeImplVtbl HTMLTableRowImplVtbl = {
.clsid = &CLSID_HTMLTableRow,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -924,6 +923,7 @@ static const event_target_vtbl_t HTMLTableRow_event_target_vtbl = {
.unlink = HTMLTableRow_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLTableRow_iface_tids[] = {
......@@ -1925,7 +1925,6 @@ static const NodeImplVtbl HTMLTableImplVtbl = {
.clsid = &CLSID_HTMLTable,
.cpc_entries = HTMLTable_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
};
......@@ -1938,6 +1937,7 @@ static const event_target_vtbl_t HTMLTable_event_target_vtbl = {
.unlink = HTMLTable_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLTable_iface_tids[] = {
......
dlls/mshtml/htmltextarea.c
View file @ ee80f1a0
......@@ -442,7 +442,6 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = {
.clsid = &CLSID_HTMLTextAreaElement,
.cpc_entries = HTMLElement_cpc,
.clone = HTMLElement_clone,
.handle_event = HTMLElement_handle_event,
.get_attr_col = HTMLElement_get_attr_col,
.put_disabled = HTMLTextAreaElementImpl_put_disabled,
.get_disabled = HTMLTextAreaElementImpl_get_disabled,
......@@ -458,6 +457,7 @@ static const event_target_vtbl_t HTMLTextAreaElement_event_target_vtbl = {
.unlink = HTMLTextAreaElement_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static const tid_t HTMLTextAreaElement_iface_tids[] = {
......
dlls/mshtml/mshtml_private.h
View file @ ee80f1a0
......@@ -815,7 +815,6 @@ typedef struct {
const CLSID *clsid;
const cpc_entry_t *cpc_entries;
HRESULT (*clone)(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**);
HRESULT (*handle_event)(HTMLDOMNode*,DWORD,nsIDOMEvent*,BOOL*);
HRESULT (*get_attr_col)(HTMLDOMNode*,HTMLAttributeCollection**);
EventTarget *(*get_event_prop_target)(HTMLDOMNode*,int);
HRESULT (*put_disabled)(HTMLDOMNode*,VARIANT_BOOL);
......@@ -1210,7 +1209,6 @@ void HTMLElement_destructor(DispatchEx*);
HRESULT HTMLElement_populate_props(DispatchEx*);
HRESULT HTMLElement_clone(HTMLDOMNode*,nsIDOMNode*,HTMLDOMNode**);
HRESULT HTMLElement_get_attr_col(HTMLDOMNode*,HTMLAttributeCollection**);
HRESULT HTMLElement_handle_event(HTMLDOMNode*,DWORD,nsIDOMEvent*,BOOL*);
void HTMLElement_init_dispex_info(dispex_data_t*,compat_mode_t);
HRESULT get_node(nsIDOMNode*,BOOL,HTMLDOMNode**);
......
dlls/mshtml/svg.c
View file @ ee80f1a0
......@@ -204,6 +204,7 @@ static const event_target_vtbl_t SVGElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static dispex_static_data_t SVGElement_dispex = {
......@@ -754,6 +755,7 @@ static const event_target_vtbl_t SVGSVGElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static dispex_static_data_t SVGSVGElement_dispex = {
......@@ -934,6 +936,7 @@ static const event_target_vtbl_t SVGCircleElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static dispex_static_data_t SVGCircleElement_dispex = {
......@@ -1189,6 +1192,7 @@ static const event_target_vtbl_t SVGTSpanElement_event_target_vtbl = {
.unlink = HTMLDOMNode_unlink
},
HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES,
.handle_event = HTMLElement_handle_event
};
static dispex_static_data_t SVGTSpanElement_dispex = {
......
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