Skip to content

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

mshtml: Use the common HTMLElement dispex vtbl in the dispex definitions.

Rather than filling it during initialization, which was a bit confusing, even more later on when dispex will handle Cycle Collection. Signed-off-by: 's avatarGabriel Ivăncescu <gabrielopcode@gmail.com>
parent 5d377d8a
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 31 deletions
dlls/mshtml/htmlanchor.c
View file @ 7b30e3d3
......@@ -902,7 +902,7 @@ static const tid_t HTMLAnchorElement_iface_tids[] = {
static dispex_static_data_t HTMLAnchorElement_dispex = {
L"HTMLAnchorElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLAnchorElement_tid,
HTMLAnchorElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlarea.c
View file @ 7b30e3d3
......@@ -509,7 +509,7 @@ static const tid_t HTMLAreaElement_iface_tids[] = {
};
static dispex_static_data_t HTMLAreaElement_dispex = {
L"HTMLAreaElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLAreaElement_tid,
HTMLAreaElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlbody.c
View file @ 7b30e3d3
......@@ -1010,7 +1010,7 @@ static const tid_t HTMLBodyElement_iface_tids[] = {
static dispex_static_data_t HTMLBodyElement_dispex = {
L"HTMLBodyElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLBody_tid,
HTMLBodyElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlcomment.c
View file @ 7b30e3d3
......@@ -27,6 +27,7 @@
#include "ole2.h"
#include "mshtml_private.h"
#include "htmlevent.h"
#include "wine/debug.h"
......@@ -200,7 +201,7 @@ static const tid_t HTMLCommentElement_iface_tids[] = {
};
static dispex_static_data_t HTMLCommentElement_dispex = {
L"Comment",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLCommentElement_tid,
HTMLCommentElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlelem.c
View file @ 7b30e3d3
......@@ -7326,7 +7326,7 @@ static const tid_t HTMLElement_iface_tids[] = {
0
};
static event_target_vtbl_t HTMLElement_event_target_vtbl = {
const event_target_vtbl_t HTMLElement_event_target_vtbl = {
{
NULL,
HTMLElement_get_dispid,
......@@ -7946,9 +7946,6 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n
This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl;
This->IWineHTMLElementPrivate_iface.lpVtbl = &WineHTMLElementPrivateVtbl;
if(dispex_data && !dispex_data->vtbl)
dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl;
if(nselem) {
nsIDOMHTMLElement *html_element;
nsresult nsres;
......
dlls/mshtml/htmlevent.h
View file @ 7b30e3d3
......@@ -138,6 +138,7 @@ 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*);
static inline EventTarget *get_node_event_prop_target(HTMLDOMNode *node, eventid_t eid)
......
dlls/mshtml/htmlform.c
View file @ 7b30e3d3
......@@ -1007,7 +1007,7 @@ static const tid_t HTMLFormElement_iface_tids[] = {
static dispex_static_data_t HTMLFormElement_dispex = {
L"HTMLFormElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLFormElement_tid,
HTMLFormElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlframe.c
View file @ 7b30e3d3
......@@ -1043,7 +1043,7 @@ static const tid_t HTMLFrameElement_iface_tids[] = {
static dispex_static_data_t HTMLFrameElement_dispex = {
L"HTMLFrameElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLFrameElement_tid,
HTMLFrameElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -1638,7 +1638,7 @@ static const tid_t HTMLIFrame_iface_tids[] = {
static dispex_static_data_t HTMLIFrame_dispex = {
L"HTMLIFrameElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLIFrame_tid,
HTMLIFrame_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlgeneric.c
View file @ 7b30e3d3
......@@ -29,6 +29,7 @@
#include "wine/debug.h"
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
......@@ -169,7 +170,7 @@ static const tid_t HTMLGenericElement_iface_tids[] = {
static dispex_static_data_t HTMLGenericElement_dispex = {
L"HTMLUnknownElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLGenericElement_tid,
HTMLGenericElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlhead.c
View file @ 7b30e3d3
......@@ -29,6 +29,7 @@
#include "wine/debug.h"
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
......@@ -184,7 +185,7 @@ static const tid_t HTMLTitleElement_iface_tids[] = {
};
static dispex_static_data_t HTMLTitleElement_dispex = {
L"HTMLTitleElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTitleElement_tid,
HTMLTitleElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -369,7 +370,7 @@ static const tid_t HTMLHtmlElement_iface_tids[] = {
};
static dispex_static_data_t HTMLHtmlElement_dispex = {
L"HTMLHtmlElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLHtmlElement_tid,
HTMLHtmlElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -606,7 +607,7 @@ static const tid_t HTMLMetaElement_iface_tids[] = {
static dispex_static_data_t HTMLMetaElement_dispex = {
L"HTMLMetaElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLMetaElement_tid,
HTMLMetaElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -770,7 +771,7 @@ static const tid_t HTMLHeadElement_iface_tids[] = {
};
static dispex_static_data_t HTMLHeadElement_dispex = {
L"HTMLHeadElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLHeadElement_tid,
HTMLHeadElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlimg.c
View file @ 7b30e3d3
......@@ -742,7 +742,7 @@ static void HTMLImgElement_init_dispex_info(dispex_data_t *info, compat_mode_t m
static dispex_static_data_t HTMLImgElement_dispex = {
L"HTMLImageElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLImg_tid,
HTMLImgElement_iface_tids,
HTMLImgElement_init_dispex_info
......
dlls/mshtml/htmlinput.c
View file @ 7b30e3d3
......@@ -1456,7 +1456,7 @@ static const tid_t HTMLInputElement_iface_tids[] = {
};
static dispex_static_data_t HTMLInputElement_dispex = {
L"HTMLInputElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLInputElement_tid,
HTMLInputElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -1653,7 +1653,7 @@ static const tid_t HTMLLabelElement_iface_tids[] = {
static dispex_static_data_t HTMLLabelElement_dispex = {
L"HTMLLabelElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLLabelElement_tid,
HTMLLabelElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -2001,7 +2001,7 @@ static const tid_t HTMLButtonElement_iface_tids[] = {
static dispex_static_data_t HTMLButtonElement_dispex = {
L"HTMLButtonElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLButtonElement_tid,
HTMLButtonElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmllink.c
View file @ 7b30e3d3
......@@ -448,7 +448,7 @@ static const tid_t HTMLLinkElement_iface_tids[] = {
};
static dispex_static_data_t HTMLLinkElement_dispex = {
L"HTMLLinkElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLLinkElement_tid,
HTMLLinkElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlobject.c
View file @ 7b30e3d3
......@@ -29,6 +29,7 @@
#include "wine/debug.h"
#include "mshtml_private.h"
#include "htmlevent.h"
#include "pluginhost.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
......@@ -777,7 +778,7 @@ static const tid_t HTMLObjectElement_iface_tids[] = {
};
static dispex_static_data_t HTMLObjectElement_dispex = {
L"HTMLObjectElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLObjectElement_tid,
HTMLObjectElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -1040,7 +1041,7 @@ static const tid_t HTMLEmbedElement_iface_tids[] = {
};
static dispex_static_data_t HTMLEmbedElement_dispex = {
L"HTMLEmbedElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLEmbed_tid,
HTMLEmbedElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlscript.c
View file @ 7b30e3d3
......@@ -481,7 +481,7 @@ static const tid_t HTMLScriptElement_iface_tids[] = {
static dispex_static_data_t HTMLScriptElement_dispex = {
L"HTMLScriptElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLScriptElement_tid,
HTMLScriptElement_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlselect.c
View file @ 7b30e3d3
......@@ -419,7 +419,7 @@ static const tid_t HTMLOptionElement_iface_tids[] = {
};
static dispex_static_data_t HTMLOptionElement_dispex = {
L"HTMLOptionElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLOptionElement_tid,
HTMLOptionElement_iface_tids,
HTMLElement_init_dispex_info
......@@ -1496,7 +1496,7 @@ static const tid_t HTMLSelectElement_tids[] = {
static dispex_static_data_t HTMLSelectElement_dispex = {
L"HTMLSelectElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLSelectElement_tid,
HTMLSelectElement_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmlstyleelem.c
View file @ 7b30e3d3
......@@ -29,6 +29,7 @@
#include "wine/debug.h"
#include "mshtml_private.h"
#include "htmlevent.h"
#include "mshtmdid.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
......@@ -464,7 +465,7 @@ static const tid_t HTMLStyleElement_iface_tids[] = {
};
static dispex_static_data_t HTMLStyleElement_dispex = {
L"HTMLStyleElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLStyleElement_tid,
HTMLStyleElement_iface_tids,
HTMLStyleElement_init_dispex_info
......
dlls/mshtml/htmltable.c
View file @ 7b30e3d3
......@@ -28,6 +28,7 @@
#include "wine/debug.h"
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
......@@ -522,7 +523,7 @@ static const tid_t HTMLTableCell_iface_tids[] = {
static dispex_static_data_t HTMLTableCell_dispex = {
L"HTMLTableDataCellElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTableCell_tid,
HTMLTableCell_iface_tids,
HTMLElement_init_dispex_info
......@@ -968,7 +969,7 @@ static const tid_t HTMLTableRow_iface_tids[] = {
static dispex_static_data_t HTMLTableRow_dispex = {
L"HTMLTableRowElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTableRow_tid,
HTMLTableRow_iface_tids,
HTMLElement_init_dispex_info
......@@ -2002,7 +2003,7 @@ static const tid_t HTMLTable_iface_tids[] = {
static dispex_static_data_t HTMLTable_dispex = {
L"HTMLTableElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTable_tid,
HTMLTable_iface_tids,
HTMLElement_init_dispex_info
......
dlls/mshtml/htmltextarea.c
View file @ 7b30e3d3
......@@ -28,6 +28,7 @@
#include "wine/debug.h"
#include "mshtml_private.h"
#include "htmlevent.h"
WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
......@@ -481,7 +482,7 @@ static const tid_t HTMLTextAreaElement_iface_tids[] = {
static dispex_static_data_t HTMLTextAreaElement_dispex = {
L"HTMLTextAreaElement",
NULL,
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTextAreaElement_tid,
HTMLTextAreaElement_iface_tids,
HTMLElement_init_dispex_info
......
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