From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/dispex.c | 9 +++++++++ dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlarea.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmldoc.c | 3 --- dlls/mshtml/htmlelem.c | 2 -- dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 2 -- dlls/mshtml/htmlhead.c | 4 ---- dlls/mshtml/htmlimg.c | 1 - dlls/mshtml/htmlinput.c | 3 --- dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlnode.c | 1 - dlls/mshtml/htmlobject.c | 2 -- dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 2 -- dlls/mshtml/htmlstorage.c | 1 - dlls/mshtml/htmlstyleelem.c | 1 - dlls/mshtml/htmltable.c | 4 ---- dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/htmltextnode.c | 2 -- dlls/mshtml/htmlwindow.c | 1 - dlls/mshtml/mutation.c | 1 - dlls/mshtml/omnavigator.c | 2 -- dlls/mshtml/svg.c | 6 ------ dlls/mshtml/xmlhttprequest.c | 1 - 26 files changed, 9 insertions(+), 46 deletions(-)
diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 65139c88b77..0e8d27773cc 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -520,6 +520,12 @@ static BOOL find_prototype_member(const dispex_data_t *info, DISPID id) return FALSE; }
+static const char *object_names[] = { +#define X(name) #name, + ALL_PROTOTYPES +#undef X +}; + static dispex_data_t *preprocess_dispex_data(dispex_static_data_t *desc, compat_mode_t compat_mode, BOOL is_prototype) { const tid_t *tid; @@ -528,6 +534,9 @@ static dispex_data_t *preprocess_dispex_data(dispex_static_data_t *desc, compat_ ITypeInfo *dti; HRESULT hres;
+ if(!desc->name && desc->id) + desc->name = object_names[desc->id - 1]; + if(desc->disp_tid) { hres = get_typeinfo(desc->disp_tid, &dti); if(FAILED(hres)) { diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 5f585ac61f6..0e1642b07bf 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -835,7 +835,6 @@ static const tid_t HTMLAnchorElement_iface_tids[] = { };
dispex_static_data_t HTMLAnchorElement_dispex = { - .name = "HTMLAnchorElement", .id = PROT_HTMLAnchorElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLAnchorElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index c26855e45e5..34e58473f72 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -445,7 +445,6 @@ static const tid_t HTMLAreaElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLAreaElement_dispex = { - .name = "HTMLAreaElement", .id = PROT_HTMLAreaElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLAreaElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 5e91ddd4fd5..9057dfc7cd9 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -894,7 +894,6 @@ static const tid_t HTMLBodyElement_iface_tids[] = { };
dispex_static_data_t HTMLBodyElement_dispex = { - .name = "HTMLBodyElement", .id = PROT_HTMLBodyElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLBodyElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 14234cdfd69..3f74dbd2826 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -323,7 +323,6 @@ static const tid_t DocumentType_iface_tids[] = { };
dispex_static_data_t DocumentType_dispex = { - .name = "DocumentType", .id = PROT_DocumentType, .prototype_id = PROT_Node, .vtbl = &DocumentType_event_target_vtbl.dispex_vtbl, @@ -5710,13 +5709,11 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t }
dispex_static_data_t Document_dispex = { - .name = "Document", .id = PROT_Document, .prototype_id = PROT_Node, };
dispex_static_data_t HTMLDocument_dispex = { - .name = "HTMLDocument", .id = PROT_HTMLDocument, .prototype_id = PROT_Document, .vtbl = &HTMLDocument_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 7001ff3b7da..2612b5988c1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7236,13 +7236,11 @@ static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { };
dispex_static_data_t Element_dispex = { - .name = "Element", .id = PROT_Element, .prototype_id = PROT_Node, };
dispex_static_data_t HTMLElement_dispex = { - .name = "HTMLElement", .id = PROT_HTMLElement, .prototype_id = PROT_Element, .vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 83c13626a45..f9fa68c498a 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -909,7 +909,6 @@ static const tid_t HTMLFormElement_iface_tids[] = { };
dispex_static_data_t HTMLFormElement_dispex = { - .name = "HTMLFormElement", .id = PROT_HTMLFormElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLFormElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 347861d2c10..bc8e76c3448 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -929,7 +929,6 @@ static const tid_t HTMLFrameElement_iface_tids[] = { };
dispex_static_data_t HTMLFrameElement_dispex = { - .name = "HTMLFrameElement", .id = PROT_HTMLFrameElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLFrameElement_event_target_vtbl.dispex_vtbl, @@ -1368,7 +1367,6 @@ static const tid_t HTMLIFrameElement_iface_tids[] = { };
dispex_static_data_t HTMLIFrameElement_dispex = { - .name = "HTMLIFrameElement", .id = PROT_HTMLIFrameElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLIFrameElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 8fa64522a5d..36c66065b29 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -127,7 +127,6 @@ static const tid_t HTMLTitleElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLTitleElement_dispex = { - .name = "HTMLTitleElement", .id = PROT_HTMLTitleElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLTitleElement_event_target_vtbl.dispex_vtbl, @@ -244,7 +243,6 @@ static const tid_t HTMLHtmlElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLHtmlElement_dispex = { - .name = "HTMLHtmlElement", .id = PROT_HTMLHtmlElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLHtmlElement_event_target_vtbl.dispex_vtbl, @@ -425,7 +423,6 @@ static const tid_t HTMLMetaElement_iface_tids[] = { };
dispex_static_data_t HTMLMetaElement_dispex = { - .name = "HTMLMetaElement", .id = PROT_HTMLMetaElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLMetaElement_event_target_vtbl.dispex_vtbl, @@ -533,7 +530,6 @@ static const tid_t HTMLHeadElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLHeadElement_dispex = { - .name = "HTMLHeadElement", .id = PROT_HTMLHeadElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLHeadElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 08119464806..baa55462039 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -684,7 +684,6 @@ static void HTMLImgElement_init_dispex_info(dispex_data_t *info, compat_mode_t m }
dispex_static_data_t HTMLImageElement_dispex = { - .name = "HTMLImageElement", .id = PROT_HTMLImageElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLImgElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index f56589bef15..6d436ecffc1 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1289,7 +1289,6 @@ static const tid_t HTMLInputElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLInputElement_dispex = { - .name = "HTMLInputElement", .id = PROT_HTMLInputElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLInputElement_event_target_vtbl.dispex_vtbl, @@ -1434,7 +1433,6 @@ static const tid_t HTMLLabelElement_iface_tids[] = { };
dispex_static_data_t HTMLLabelElement_dispex = { - .name = "HTMLLabelElement", .id = PROT_HTMLLabelElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLLabelElement_event_target_vtbl.dispex_vtbl, @@ -1722,7 +1720,6 @@ static const tid_t HTMLButtonElement_iface_tids[] = { };
dispex_static_data_t HTMLButtonElement_dispex = { - .name = "HTMLButtonElement", .id = PROT_HTMLButtonElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLButtonElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index e499ee2232d..6ceb5bc2249 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -388,7 +388,6 @@ static const tid_t HTMLLinkElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLLinkElement_dispex = { - .name = "HTMLLinkElement", .id = PROT_HTMLLinkElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLLinkElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 263c04c4485..b20fe678091 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1298,7 +1298,6 @@ static const tid_t HTMLDOMNode_iface_tids[] = { 0 }; dispex_static_data_t Node_dispex = { - .name = "Node", .id = PROT_Node, .vtbl = &Node_dispex_vtbl, .disp_tid = IHTMLDOMNode_tid, diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 05d81ba7892..77ccaf12936 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -683,7 +683,6 @@ static const tid_t HTMLObjectElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLObjectElement_dispex = { - .name = "HTMLObjectElement", .id = PROT_HTMLObjectElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLObjectElement_event_target_vtbl.dispex_vtbl, @@ -890,7 +889,6 @@ static const tid_t HTMLEmbedElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLEmbedElement_dispex = { - .name = "HTMLEmbedElement", .id = PROT_HTMLEmbedElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLEmbedElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 1defaba2efe..2a14b94bc08 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -415,7 +415,6 @@ static const tid_t HTMLScriptElement_iface_tids[] = { };
dispex_static_data_t HTMLScriptElement_dispex = { - .name = "HTMLScriptElement", .id = PROT_HTMLScriptElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLScriptElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 31f0e33a2b4..01729222041 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -346,7 +346,6 @@ static const tid_t HTMLOptionElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLOptionElement_dispex = { - .name = "HTMLOptionElement", .id = PROT_HTMLOptionElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLOptionElement_event_target_vtbl.dispex_vtbl, @@ -1301,7 +1300,6 @@ static const tid_t HTMLSelectElement_tids[] = { };
dispex_static_data_t HTMLSelectElement_dispex = { - .name = "HTMLSelectElement", .id = PROT_HTMLSelectElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLSelectElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index f6131d14691..2ce8b951c20 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -1295,7 +1295,6 @@ static const tid_t HTMLStorage_iface_tids[] = { 0 }; dispex_static_data_t Storage_dispex = { - .name = "Storage", .id = PROT_Storage, .vtbl = &Storage_dispex_vtbl, .disp_tid = IHTMLStorage_tid, diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 9a5d43ad36e..00142a353ec 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -336,7 +336,6 @@ static const tid_t HTMLStyleElement_iface_tids[] = { 0 }; dispex_static_data_t HTMLStyleElement_dispex = { - .name = "HTMLStyleElement", .id = PROT_HTMLStyleElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLStyleElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 64edc89fd41..40fd13bc03d 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -431,7 +431,6 @@ static const NodeImplVtbl HTMLTableCellImplVtbl = { };
dispex_static_data_t HTMLTableCellElement_dispex = { - .name = "HTMLTableCellElement", .id = PROT_HTMLTableCellElement, .prototype_id = PROT_HTMLElement, }; @@ -455,7 +454,6 @@ static const tid_t HTMLTableDataCellElement_iface_tids[] = { };
dispex_static_data_t HTMLTableDataCellElement_dispex = { - .name = "HTMLTableDataCellElement", .id = PROT_HTMLTableDataCellElement, .prototype_id = PROT_HTMLTableCellElement, .vtbl = &HTMLTableDataCellElement_event_target_vtbl.dispex_vtbl, @@ -831,7 +829,6 @@ static const tid_t HTMLTableRowElement_iface_tids[] = { };
dispex_static_data_t HTMLTableRowElement_dispex = { - .name = "HTMLTableRowElement", .id = PROT_HTMLTableRowElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLTableRowElement_event_target_vtbl.dispex_vtbl, @@ -1686,7 +1683,6 @@ static const tid_t HTMLTableElement_iface_tids[] = { };
dispex_static_data_t HTMLTableElement_dispex = { - .name = "HTMLTableElement", .id = PROT_HTMLTableElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLTableElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 613fe629117..4ab7ab961a9 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -416,7 +416,6 @@ static const tid_t HTMLTextAreaElement_iface_tids[] = { };
dispex_static_data_t HTMLTextAreaElement_dispex = { - .name = "HTMLTextAreaElement", .id = PROT_HTMLTextAreaElement, .prototype_id = PROT_HTMLElement, .vtbl = &HTMLTextAreaElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index d2bfc1fae58..7169e7f91db 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -258,7 +258,6 @@ static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { };
dispex_static_data_t CharacterData_dispex = { - .name = "CharactedData", .id = PROT_CharacterData, .prototype_id = PROT_Node, }; @@ -278,7 +277,6 @@ static const tid_t Text_iface_tids[] = { 0 }; dispex_static_data_t Text_dispex = { - .name = "Text", .id = PROT_Text, .prototype_id = PROT_CharacterData, .vtbl = &Text_dispex_vtbl, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 799ed0a1f93..ea1f7f4b278 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -4189,7 +4189,6 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { };
dispex_static_data_t Window_dispex = { - .name = "Window", .id = PROT_Window, .vtbl = &HTMLWindow_event_target_vtbl.dispex_vtbl, .disp_tid = DispHTMLWindow2_tid, diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 80079f79560..f23c31f861d 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1181,7 +1181,6 @@ static const tid_t mutation_observer_iface_tids[] = { 0 }; dispex_static_data_t MutationObserver_dispex = { - .name = "MutationObserver", .id = PROT_MutationObserver, .init_constructor = create_mutation_observer_ctor, .vtbl = &mutation_observer_dispex_vtbl, diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 873c55dcd40..043709d6de8 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -221,7 +221,6 @@ static const tid_t HTMLDOMImplementation_iface_tids[] = { 0 }; dispex_static_data_t DOMImplementation_dispex = { - .name = "DOMImplementation", .id = PROT_DOMImplementation, .vtbl = &DOMImplementation_dispex_vtbl, .disp_tid = DispHTMLDOMImplementation_tid, @@ -1153,7 +1152,6 @@ static const tid_t Navigator_iface_tids[] = { 0 }; dispex_static_data_t Navigator_dispex = { - .name = "Navigator", .id = PROT_Navigator, .vtbl = &Navigator_dispex_vtbl, .disp_tid = DispHTMLNavigator_tid, diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index ee06ea17061..ab72e0c95d9 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -157,7 +157,6 @@ static const event_target_vtbl_t SVGElement_event_target_vtbl = { };
dispex_static_data_t SVGElement_dispex = { - .name = "SVGElement", .id = PROT_SVGElement, .prototype_id = PROT_Element, .vtbl = &SVGElement_event_target_vtbl.dispex_vtbl, @@ -659,7 +658,6 @@ static const event_target_vtbl_t SVGSVGElement_event_target_vtbl = { };
dispex_static_data_t SVGSVGElement_dispex = { - .name = "SVGSVGElement", .id = PROT_SVGSVGElement, .prototype_id = PROT_SVGElement, .vtbl = &SVGSVGElement_event_target_vtbl.dispex_vtbl, @@ -791,7 +789,6 @@ static const event_target_vtbl_t SVGCircleElement_event_target_vtbl = { };
dispex_static_data_t SVGCircleElement_dispex = { - .name = "SVGCircleElement", .id = PROT_SVGCircleElement, .prototype_id = PROT_SVGElement, .vtbl = &SVGCircleElement_event_target_vtbl.dispex_vtbl, @@ -980,13 +977,11 @@ static void *SVGTSpanElement_query_interface(DispatchEx *dispex, REFIID riid) }
dispex_static_data_t SVGTextContentElement_dispex = { - .name = "SVGTextContentElement", .id = PROT_SVGTextContentElement, .prototype_id = PROT_SVGElement, };
dispex_static_data_t SVGTextPositioningElement_dispex = { - .name = "SVGTextPositioningElement", .id = PROT_SVGTextPositioningElement, .prototype_id = PROT_SVGTextContentElement, }; @@ -1011,7 +1006,6 @@ static const event_target_vtbl_t SVGTSpanElement_event_target_vtbl = { };
dispex_static_data_t SVGTSpanElement_dispex = { - .name = "SVGTSpanElement", .id = PROT_SVGTSpanElement, .prototype_id = PROT_SVGTextPositioningElement, .vtbl = &SVGTSpanElement_event_target_vtbl.dispex_vtbl, diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 0798b2e2abb..fffc9fab51b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1482,7 +1482,6 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = { 0 }; dispex_static_data_t XMLHttpRequest_dispex = { - .name = "XMLHttpRequest", .id = PROT_XMLHttpRequest, .init_constructor = HTMLXMLHttpRequestFactory_Create, .vtbl = &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl,