From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlarea.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmlelem.c | 18 +++++++----------- dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 2 -- dlls/mshtml/htmlgeneric.c | 1 - dlls/mshtml/htmlhead.c | 4 ---- dlls/mshtml/htmlimg.c | 6 ------ dlls/mshtml/htmlinput.c | 3 --- dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlobject.c | 2 -- dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 2 -- dlls/mshtml/htmlstyleelem.c | 5 ----- dlls/mshtml/htmltable.c | 3 --- dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/htmltextnode.c | 7 +------ dlls/mshtml/mshtml_private.h | 6 ------ dlls/mshtml/svg.c | 4 ---- 20 files changed, 8 insertions(+), 62 deletions(-)
diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 2e0be3d4241..6f328b8173c 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -842,7 +842,6 @@ static void HTMLAnchorElement_init_dispex_info(dispex_data_t *info, compat_mode_
static const tid_t HTMLAnchorElement_iface_tids[] = { IHTMLAnchorElement_tid, - HTMLELEMENT_TIDS, 0 };
diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 153bfd514b7..bde44cb9075 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -452,7 +452,6 @@ static void HTMLAreaElement_init_dispex_info(dispex_data_t *info, compat_mode_t }
static const tid_t HTMLAreaElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLAreaElement_tid, 0 }; diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 9057dfc7cd9..4ca08e0e3a4 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -888,7 +888,6 @@ static const event_target_vtbl_t HTMLBodyElement_event_target_vtbl = { static const tid_t HTMLBodyElement_iface_tids[] = { IHTMLBodyElement_tid, IHTMLBodyElement2_tid, - HTMLELEMENT_TIDS, IHTMLTextContainer_tid, 0 }; diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index be2557d629d..3d586db02d2 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6788,6 +6788,9 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IHTMLElement_tid, mode >= COMPAT_MODE_IE11 ? elem_ie11_hooks : mode >= COMPAT_MODE_IE10 ? elem_ie10_hooks : mode >= COMPAT_MODE_IE9 ? elem_ie9_hooks : NULL); + dispex_info_add_interface(info, IHTMLElement4_tid, NULL); + dispex_info_add_interface(info, IHTMLDOMNode_tid, NULL); + dispex_info_add_interface(info, IHTMLUniqueName_tid, NULL); }
const DISPID HTMLElement_toString_dispids[] = { @@ -6795,11 +6798,6 @@ const DISPID HTMLElement_toString_dispids[] = { DISPID_UNKNOWN };
-const tid_t HTMLElement_iface_tids[] = { - HTMLELEMENT_TIDS, - 0 -}; - static const event_target_vtbl_t HTMLElement_event_target_vtbl = { { HTMLELEMENT_DISPEX_VTBL_ENTRIES, @@ -7427,16 +7425,14 @@ dispex_static_data_t HTMLElement_dispex = { .prototype_id = PROT_Element, .vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLUnknownElement_tid, - .iface_tids = HTMLElement_iface_tids, .init_info = HTMLElement_init_dispex_info, };
static dispex_static_data_t LegacyUnknownElement_dispex = { - "HTMLUnknownElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, - DispHTMLUnknownElement_tid, - HTMLElement_iface_tids, - HTMLElement_init_dispex_info + .name = "HTMLUnknownElement", + .vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl, + .disp_tid = DispHTMLUnknownElement_tid, + .init_info = HTMLElement_init_dispex_info };
void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *nselem, dispex_static_data_t *dispex_data) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index f9fa68c498a..153133493f6 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -903,7 +903,6 @@ static const event_target_vtbl_t HTMLFormElement_event_target_vtbl = { };
static const tid_t HTMLFormElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLFormElement_tid, 0 }; diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index bc8e76c3448..193be9f6323 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -921,7 +921,6 @@ static const event_target_vtbl_t HTMLFrameElement_event_target_vtbl = { };
static const tid_t HTMLFrameElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLFrameElement3_tid, @@ -1357,7 +1356,6 @@ static const event_target_vtbl_t HTMLIFrameElement_event_target_vtbl = { };
static const tid_t HTMLIFrameElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLFrameBase_tid, IHTMLFrameBase2_tid, IHTMLIFrameElement_tid, diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index acd4998832b..e57e3558a49 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -109,7 +109,6 @@ static const event_target_vtbl_t HTMLGenericElement_event_target_vtbl = { };
static const tid_t HTMLUnknownElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLGenericElement_tid, 0 }; diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 36c66065b29..7f05e506dce 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -122,7 +122,6 @@ static const event_target_vtbl_t HTMLTitleElement_event_target_vtbl = { };
static const tid_t HTMLTitleElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLTitleElement_tid, 0 }; @@ -238,7 +237,6 @@ static const event_target_vtbl_t HTMLHtmlElement_event_target_vtbl = { };
static const tid_t HTMLHtmlElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLHtmlElement_tid, 0 }; @@ -417,7 +415,6 @@ static const event_target_vtbl_t HTMLMetaElement_event_target_vtbl = { };
static const tid_t HTMLMetaElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLMetaElement_tid, 0 }; @@ -525,7 +522,6 @@ static const event_target_vtbl_t HTMLHeadElement_event_target_vtbl = { };
static const tid_t HTMLHeadElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLHeadElement_tid, 0 }; diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index baa55462039..f6a4b992ab6 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -666,11 +666,6 @@ static const event_target_vtbl_t HTMLImgElement_event_target_vtbl = { .handle_event = HTMLElement_handle_event };
-static const tid_t HTMLImgElement_iface_tids[] = { - HTMLELEMENT_TIDS, - 0 -}; - static void HTMLImgElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { static const dispex_hook_t img_ie11_hooks[] = { @@ -688,7 +683,6 @@ dispex_static_data_t HTMLImageElement_dispex = { .prototype_id = PROT_HTMLElement, .vtbl = &HTMLImgElement_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLImg_tid, - .iface_tids = HTMLImgElement_iface_tids, .init_info = HTMLImgElement_init_dispex_info, };
diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 6d436ecffc1..4605005d6fd 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1283,7 +1283,6 @@ static const event_target_vtbl_t HTMLInputElement_event_target_vtbl = { };
static const tid_t HTMLInputElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLInputElement_tid, IHTMLInputTextElement2_tid, 0 @@ -1427,7 +1426,6 @@ static const event_target_vtbl_t HTMLLabelElement_event_target_vtbl = { };
static const tid_t HTMLLabelElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLLabelElement_tid, 0 }; @@ -1714,7 +1712,6 @@ static const event_target_vtbl_t HTMLButtonElement_event_target_vtbl = { };
static const tid_t HTMLButtonElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLButtonElement_tid, 0 }; diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 6ceb5bc2249..c9e35d69d95 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -383,7 +383,6 @@ static const event_target_vtbl_t HTMLLinkElement_event_target_vtbl = { };
static const tid_t HTMLLinkElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLLinkElement_tid, 0 }; diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 77ccaf12936..c99afb03137 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -679,7 +679,6 @@ static const event_target_vtbl_t HTMLObjectElement_event_target_vtbl = { static const tid_t HTMLObjectElement_iface_tids[] = { IHTMLObjectElement2_tid, IHTMLObjectElement_tid, - HTMLELEMENT_TIDS, 0 }; dispex_static_data_t HTMLObjectElement_dispex = { @@ -884,7 +883,6 @@ static const event_target_vtbl_t HTMLEmbedElement_event_target_vtbl = { };
static const tid_t HTMLEmbedElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLEmbedElement_tid, 0 }; diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 2a14b94bc08..b490e374356 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -409,7 +409,6 @@ HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement *nsscript, HTMLScriptE }
static const tid_t HTMLScriptElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLScriptElement_tid, 0 }; diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 01729222041..2d02589db38 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -341,7 +341,6 @@ static const event_target_vtbl_t HTMLOptionElement_event_target_vtbl = { };
static const tid_t HTMLOptionElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLOptionElement_tid, 0 }; @@ -1294,7 +1293,6 @@ static const event_target_vtbl_t HTMLSelectElement_event_target_vtbl = { };
static const tid_t HTMLSelectElement_tids[] = { - HTMLELEMENT_TIDS, IHTMLSelectElement_tid, 0 }; diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 00142a353ec..b08e73b767e 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -331,16 +331,11 @@ static const event_target_vtbl_t HTMLStyleElement_event_target_vtbl = { .handle_event = HTMLElement_handle_event };
-static const tid_t HTMLStyleElement_iface_tids[] = { - HTMLELEMENT_TIDS, - 0 -}; dispex_static_data_t HTMLStyleElement_dispex = { .id = PROT_HTMLStyleElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLStyleElement_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLStyleElement_tid, - .iface_tids = HTMLStyleElement_iface_tids, .init_info = HTMLStyleElement_init_dispex_info, };
diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index b043dd4d773..934047412d6 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -431,7 +431,6 @@ static const NodeImplVtbl HTMLTableCellImplVtbl = { };
static const tid_t HTMLTableDataCellElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLTableCell_tid, 0 }; @@ -826,7 +825,6 @@ static const event_target_vtbl_t HTMLTableRowElement_event_target_vtbl = { };
static const tid_t HTMLTableRowElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLTableRow_tid, 0 }; @@ -1678,7 +1676,6 @@ static const event_target_vtbl_t HTMLTableElement_event_target_vtbl = { };
static const tid_t HTMLTableElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLTable_tid, IHTMLTable2_tid, IHTMLTable3_tid, diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 4ab7ab961a9..659ebbe2776 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -410,7 +410,6 @@ static const event_target_vtbl_t HTMLTextAreaElement_event_target_vtbl = { };
static const tid_t HTMLTextAreaElement_iface_tids[] = { - HTMLELEMENT_TIDS, IHTMLTextAreaElement_tid, 0 }; diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 9c4476dc79b..63158f7cb8a 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -661,13 +661,8 @@ static void Comment_init_dispex_info(dispex_data_t *info, compat_mode_t mode)
if(mode >= COMPAT_MODE_IE9) HTMLDOMNode_init_dispex_info(info, mode); - else { + else HTMLElement_init_dispex_info(info, mode); - dispex_info_add_interface(info, IHTMLElement_tid, NULL); - dispex_info_add_interface(info, IHTMLElement3_tid, NULL); - dispex_info_add_interface(info, IHTMLElement4_tid, NULL); - dispex_info_add_interface(info, IHTMLUniqueName_tid, NULL); - } CharacterData_init_dispex_info(info, mode);
dispex_info_add_interface(info, IHTMLCommentElement_tid, mode >= COMPAT_MODE_IE9 ? ie9_hooks : NULL); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 4f47d5786c9..19a546e269f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1058,12 +1058,6 @@ typedef struct { unsigned unique_id; } HTMLElement;
-#define HTMLELEMENT_TIDS \ - IHTMLDOMNode_tid, \ - 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 ab72e0c95d9..3baf422989a 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -161,7 +161,6 @@ dispex_static_data_t SVGElement_dispex = { .prototype_id = PROT_Element, .vtbl = &SVGElement_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLUnknownElement_tid, - .iface_tids = HTMLElement_iface_tids, .init_info = HTMLElement_init_dispex_info, };
@@ -662,7 +661,6 @@ dispex_static_data_t SVGSVGElement_dispex = { .prototype_id = PROT_SVGElement, .vtbl = &SVGSVGElement_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLUnknownElement_tid, - .iface_tids = HTMLElement_iface_tids, .init_info = HTMLElement_init_dispex_info, };
@@ -793,7 +791,6 @@ dispex_static_data_t SVGCircleElement_dispex = { .prototype_id = PROT_SVGElement, .vtbl = &SVGCircleElement_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLUnknownElement_tid, - .iface_tids = HTMLElement_iface_tids, .init_info = HTMLElement_init_dispex_info, };
@@ -1010,7 +1007,6 @@ dispex_static_data_t SVGTSpanElement_dispex = { .prototype_id = PROT_SVGTextPositioningElement, .vtbl = &SVGTSpanElement_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLUnknownElement_tid, - .iface_tids = HTMLElement_iface_tids, .init_info = HTMLElement_init_dispex_info, };