mshtml: Moved dispex_data_t pointer to the end of dispex_static_data_t struct.

Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
2016-07-05 22:45:50 +02:00 · 2016-07-05 22:45:50 +02:00 · fd2f645d16
parent 00f74afeef
commit fd2f645d16
43 changed files with 1 additions and 60 deletions
--- a/dlls/mshtml/dispex.c
+++ b/dlls/mshtml/dispex.c
@ -783,7 +783,6 @@ static const tid_t function_iface_tids[] = {0};
 static dispex_static_data_t function_dispex = {
    &function_dispex_vtbl,
    NULL_tid,
-    NULL,
    function_iface_tids
 };

--- a/dlls/mshtml/htmlanchor.c
+++ b/dlls/mshtml/htmlanchor.c
@ -807,7 +807,6 @@ static const tid_t HTMLAnchorElement_iface_tids[] = {
 static dispex_static_data_t HTMLAnchorElement_dispex = {
    NULL,
    DispHTMLAnchorElement_tid,
-    NULL,
    HTMLAnchorElement_iface_tids
 };

--- a/dlls/mshtml/htmlarea.c
+++ b/dlls/mshtml/htmlarea.c
@ -451,7 +451,6 @@ static const tid_t HTMLAreaElement_iface_tids[] = {
 static dispex_static_data_t HTMLAreaElement_dispex = {
    NULL,
    DispHTMLAreaElement_tid,
-    NULL,
    HTMLAreaElement_iface_tids
 };

--- a/dlls/mshtml/htmlattr.c
+++ b/dlls/mshtml/htmlattr.c
@ -487,7 +487,6 @@ static const tid_t HTMLDOMAttribute_iface_tids[] = {
 static dispex_static_data_t HTMLDOMAttribute_dispex = {
    NULL,
    DispHTMLDOMAttribute_tid,
-    0,
    HTMLDOMAttribute_iface_tids
 };

--- a/dlls/mshtml/htmlbody.c
+++ b/dlls/mshtml/htmlbody.c
@ -889,7 +889,6 @@ static const tid_t HTMLBodyElement_iface_tids[] = {
 static dispex_static_data_t HTMLBodyElement_dispex = {
    NULL,
    DispHTMLBody_tid,
-    NULL,
    HTMLBodyElement_iface_tids
 };

--- a/dlls/mshtml/htmlcomment.c
+++ b/dlls/mshtml/htmlcomment.c
@ -200,7 +200,6 @@ static const tid_t HTMLCommentElement_iface_tids[] = {
 static dispex_static_data_t HTMLCommentElement_dispex = {
    NULL,
    DispHTMLCommentElement_tid,
-    NULL,
    HTMLCommentElement_iface_tids
 };

--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@ -1317,7 +1317,6 @@ static const tid_t HTMLCurrentStyle_iface_tids[] = {
 static dispex_static_data_t HTMLCurrentStyle_dispex = {
    NULL,
    DispHTMLCurrentStyle_tid,
-    NULL,
    HTMLCurrentStyle_iface_tids
 };

--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@ -4769,7 +4769,6 @@ static const tid_t HTMLDocumentNode_iface_tids[] = {
 static dispex_static_data_t HTMLDocumentNode_dispex = {
    &HTMLDocumentNode_dispex_vtbl,
    DispHTMLDocument_tid,
-    NULL,
    HTMLDocumentNode_iface_tids
 };

@ -4997,7 +4996,6 @@ static const tid_t HTMLDocumentObj_iface_tids[] = {
 static dispex_static_data_t HTMLDocumentObj_dispex = {
    NULL,
    DispHTMLDocument_tid,
-    NULL,
    HTMLDocumentObj_iface_tids
 };

--- a/dlls/mshtml/htmlelem.c
+++ b/dlls/mshtml/htmlelem.c
@ -538,7 +538,6 @@ static const tid_t HTMLRect_iface_tids[] = {
 static dispex_static_data_t HTMLRect_dispex = {
    NULL,
    IHTMLRect_tid,
-    NULL,
    HTMLRect_iface_tids
 };

@ -5115,7 +5114,6 @@ static dispex_static_data_vtbl_t HTMLElement_dispex_vtbl = {
 static dispex_static_data_t HTMLElement_dispex = {
    &HTMLElement_dispex_vtbl,
    DispHTMLUnknownElement_tid,
-    NULL,
    HTMLElement_iface_tids
 };

@ -5367,7 +5365,6 @@ static const tid_t HTMLFiltersCollection_iface_tids[] = {
 static dispex_static_data_t HTMLFiltersCollection_dispex = {
    &HTMLFiltersCollection_dispex_vtbl,
    IHTMLFiltersCollection_tid,
-    NULL,
    HTMLFiltersCollection_iface_tids
 };

@ -5937,7 +5934,6 @@ static const tid_t HTMLAttributeCollection_iface_tids[] = {
 static dispex_static_data_t HTMLAttributeCollection_dispex = {
    &HTMLAttributeCollection_dispex_vtbl,
    DispHTMLAttributeCollection_tid,
-    NULL,
    HTMLAttributeCollection_iface_tids
 };

--- a/dlls/mshtml/htmlelemcol.c
+++ b/dlls/mshtml/htmlelemcol.c
@ -621,7 +621,6 @@ static const tid_t HTMLElementCollection_iface_tids[] = {
 static dispex_static_data_t HTMLElementCollection_dispex = {
    &HTMLElementColection_dispex_vtbl,
    DispHTMLElementCollection_tid,
-    NULL,
    HTMLElementCollection_iface_tids
 };

--- a/dlls/mshtml/htmlembed.c
+++ b/dlls/mshtml/htmlembed.c
@ -267,7 +267,6 @@ static const tid_t HTMLEmbedElement_iface_tids[] = {
 static dispex_static_data_t HTMLEmbedElement_dispex = {
    NULL,
    DispHTMLEmbed_tid,
-    NULL,
    HTMLEmbedElement_iface_tids
 };

--- a/dlls/mshtml/htmlevent.c
+++ b/dlls/mshtml/htmlevent.c
@ -842,7 +842,6 @@ static const tid_t HTMLEventObj_iface_tids[] = {
 static dispex_static_data_t HTMLEventObj_dispex = {
    NULL,
    DispCEventObj_tid,
-    NULL,
    HTMLEventObj_iface_tids
 };

--- a/dlls/mshtml/htmlform.c
+++ b/dlls/mshtml/htmlform.c
@ -794,7 +794,6 @@ static const tid_t HTMLFormElement_iface_tids[] = {
 static dispex_static_data_t HTMLFormElement_dispex = {
    NULL,
    DispHTMLFormElement_tid,
-    NULL,
    HTMLFormElement_iface_tids
 };

--- a/dlls/mshtml/htmlframe.c
+++ b/dlls/mshtml/htmlframe.c
@ -317,7 +317,6 @@ static const tid_t HTMLFrameElement_iface_tids[] = {
 static dispex_static_data_t HTMLFrameElement_dispex = {
    NULL,
    DispHTMLFrameElement_tid,
-    NULL,
    HTMLFrameElement_iface_tids
 };

--- a/dlls/mshtml/htmlgeneric.c
+++ b/dlls/mshtml/htmlgeneric.c
@ -169,7 +169,6 @@ static const tid_t HTMLGenericElement_iface_tids[] = {
 static dispex_static_data_t HTMLGenericElement_dispex = {
    NULL,
    DispHTMLGenericElement_tid,
-    NULL,
    HTMLGenericElement_iface_tids
 };

--- a/dlls/mshtml/htmlhead.c
+++ b/dlls/mshtml/htmlhead.c
@ -170,7 +170,6 @@ static const tid_t HTMLTitleElement_iface_tids[] = {
 static dispex_static_data_t HTMLTitleElement_dispex = {
    NULL,
    DispHTMLTitleElement_tid,
-    NULL,
    HTMLTitleElement_iface_tids
 };

@ -353,7 +352,6 @@ static const tid_t HTMLHtmlElement_iface_tids[] = {
 static dispex_static_data_t HTMLHtmlElement_dispex = {
    NULL,
    DispHTMLHtmlElement_tid,
-    NULL,
    HTMLHtmlElement_iface_tids
 };

@ -513,7 +511,6 @@ static const tid_t HTMLHeadElement_iface_tids[] = {
 static dispex_static_data_t HTMLHeadElement_dispex = {
    NULL,
    DispHTMLHeadElement_tid,
-    NULL,
    HTMLHeadElement_iface_tids
 };

--- a/dlls/mshtml/htmliframe.c
+++ b/dlls/mshtml/htmliframe.c
@ -592,7 +592,6 @@ static const tid_t HTMLIFrame_iface_tids[] = {
 static dispex_static_data_t HTMLIFrame_dispex = {
    NULL,
    DispHTMLIFrame_tid,
-    NULL,
    HTMLIFrame_iface_tids
 };

--- a/dlls/mshtml/htmlimg.c
+++ b/dlls/mshtml/htmlimg.c
@ -734,7 +734,6 @@ static const tid_t HTMLImgElement_iface_tids[] = {
 static dispex_static_data_t HTMLImgElement_dispex = {
    NULL,
    DispHTMLImg_tid,
-    NULL,
    HTMLImgElement_iface_tids
 };

@ -980,7 +979,6 @@ static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = {
 static dispex_static_data_t HTMLImageElementFactory_dispex = {
    &HTMLImageElementFactory_dispex_vtbl,
    IHTMLImageElementFactory_tid,
-    NULL,
    HTMLImageElementFactory_iface_tids
 };

--- a/dlls/mshtml/htmlinput.c
+++ b/dlls/mshtml/htmlinput.c
@ -1345,7 +1345,6 @@ static const tid_t HTMLInputElement_iface_tids[] = {
 static dispex_static_data_t HTMLInputElement_dispex = {
    NULL,
    DispHTMLInputElement_tid,
-    NULL,
    HTMLInputElement_iface_tids
 };

@ -1539,7 +1538,6 @@ static const tid_t HTMLLabelElement_iface_tids[] = {
 static dispex_static_data_t HTMLLabelElement_dispex = {
    NULL,
    DispHTMLLabelElement_tid,
-    NULL,
    HTMLLabelElement_iface_tids
 };

@ -1890,7 +1888,6 @@ static const tid_t HTMLButtonElement_iface_tids[] = {
 static dispex_static_data_t HTMLButtonElement_dispex = {
    NULL,
    DispHTMLButtonElement_tid,
-    NULL,
    HTMLButtonElement_iface_tids
 };

--- a/dlls/mshtml/htmllink.c
+++ b/dlls/mshtml/htmllink.c
@ -449,7 +449,6 @@ static const tid_t HTMLLinkElement_iface_tids[] = {
 static dispex_static_data_t HTMLLinkElement_dispex = {
    NULL,
    DispHTMLLinkElement_tid,
-    NULL,
    HTMLLinkElement_iface_tids
 };

--- a/dlls/mshtml/htmllocation.c
+++ b/dlls/mshtml/htmllocation.c
@ -625,7 +625,6 @@ static const tid_t HTMLLocation_iface_tids[] = {
 static dispex_static_data_t HTMLLocation_dispex = {
    NULL,
    DispHTMLLocation_tid,
-    NULL,
    HTMLLocation_iface_tids
 };

--- a/dlls/mshtml/htmlmeta.c
+++ b/dlls/mshtml/htmlmeta.c
@ -250,7 +250,6 @@ static const tid_t HTMLMetaElement_iface_tids[] = {
 static dispex_static_data_t HTMLMetaElement_dispex = {
    NULL,
    DispHTMLMetaElement_tid,
-    NULL,
    HTMLMetaElement_iface_tids
 };

--- a/dlls/mshtml/htmlnode.c
+++ b/dlls/mshtml/htmlnode.c
@ -436,7 +436,6 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = {
 static dispex_static_data_t HTMLDOMChildrenCollection_dispex = {
    &HTMLDOMChildrenCollection_dispex_vtbl,
    DispDOMChildrenCollection_tid,
-    NULL,
    HTMLDOMChildrenCollection_iface_tids
 };

--- a/dlls/mshtml/htmlobject.c
+++ b/dlls/mshtml/htmlobject.c
@ -773,7 +773,6 @@ static const tid_t HTMLObjectElement_iface_tids[] = {
 static dispex_static_data_t HTMLObjectElement_dispex = {
    NULL,
    DispHTMLObjectElement_tid,
-    NULL,
    HTMLObjectElement_iface_tids
 };

--- a/dlls/mshtml/htmloption.c
+++ b/dlls/mshtml/htmloption.c
@ -444,7 +444,6 @@ static const tid_t HTMLOptionElement_iface_tids[] = {
 static dispex_static_data_t HTMLOptionElement_dispex = {
    NULL,
    DispHTMLOptionElement_tid,
-    NULL,
    HTMLOptionElement_iface_tids
 };

@ -625,7 +624,6 @@ static const tid_t HTMLOptionElementFactory_iface_tids[] = {
 static dispex_static_data_t HTMLOptionElementFactory_dispex = {
    NULL,
    IHTMLOptionElementFactory_tid,
-    NULL,
    HTMLOptionElementFactory_iface_tids
 };

--- a/dlls/mshtml/htmlscreen.c
+++ b/dlls/mshtml/htmlscreen.c
@ -240,7 +240,6 @@ static const tid_t HTMLScreen_iface_tids[] = {
 static dispex_static_data_t HTMLScreen_dispex = {
    NULL,
    DispHTMLScreen_tid,
-    NULL,
    HTMLScreen_iface_tids
 };

--- a/dlls/mshtml/htmlscript.c
+++ b/dlls/mshtml/htmlscript.c
@ -467,7 +467,6 @@ static const tid_t HTMLScriptElement_iface_tids[] = {
 static dispex_static_data_t HTMLScriptElement_dispex = {
    NULL,
    DispHTMLScriptElement_tid,
-    NULL,
    HTMLScriptElement_iface_tids
 };

--- a/dlls/mshtml/htmlselect.c
+++ b/dlls/mshtml/htmlselect.c
@ -717,7 +717,6 @@ static const tid_t HTMLSelectElement_tids[] = {
 static dispex_static_data_t HTMLSelectElement_dispex = {
    NULL,
    DispHTMLSelectElement_tid,
-    NULL,
    HTMLSelectElement_tids
 };

--- a/dlls/mshtml/htmlstorage.c
+++ b/dlls/mshtml/htmlstorage.c
@ -194,7 +194,6 @@ static const tid_t HTMLStorage_iface_tids[] = {
 static dispex_static_data_t HTMLStorage_dispex = {
    NULL,
    IHTMLStorage_tid,
-    NULL,
    HTMLStorage_iface_tids
 };

--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@ -4690,7 +4690,6 @@ static const tid_t HTMLStyle_iface_tids[] = {
 static dispex_static_data_t HTMLStyle_dispex = {
    &HTMLStyle_dispex_vtbl,
    DispHTMLStyle_tid,
-    NULL,
    HTMLStyle_iface_tids
 };

--- a/dlls/mshtml/htmlstyleelem.c
+++ b/dlls/mshtml/htmlstyleelem.c
@ -367,7 +367,6 @@ static const tid_t HTMLStyleElement_iface_tids[] = {
 static dispex_static_data_t HTMLStyleElement_dispex = {
    NULL,
    DispHTMLStyleElement_tid,
-    NULL,
    HTMLStyleElement_iface_tids
 };

--- a/dlls/mshtml/htmlstylesheet.c
+++ b/dlls/mshtml/htmlstylesheet.c
@ -192,7 +192,6 @@ static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = {
 static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = {
    NULL,
    DispHTMLStyleSheetRulesCollection_tid,
-    NULL,
    HTMLStyleSheetRulesCollection_iface_tids
 };

@ -382,7 +381,6 @@ static const tid_t HTMLStyleSheetsCollection_iface_tids[] = {
 static dispex_static_data_t HTMLStyleSheetsCollection_dispex = {
    NULL,
    DispHTMLStyleSheetsCollection_tid,
-    NULL,
    HTMLStyleSheetsCollection_iface_tids
 };

@ -753,7 +751,6 @@ static const tid_t HTMLStyleSheet_iface_tids[] = {
 static dispex_static_data_t HTMLStyleSheet_dispex = {
    NULL,
    DispHTMLStyleSheet_tid,
-    NULL,
    HTMLStyleSheet_iface_tids
 };

--- a/dlls/mshtml/htmltable.c
+++ b/dlls/mshtml/htmltable.c
@ -1072,7 +1072,6 @@ static const tid_t HTMLTable_iface_tids[] = {
 static dispex_static_data_t HTMLTable_dispex = {
    NULL,
    DispHTMLTable_tid,
-    NULL,
    HTMLTable_iface_tids
 };

--- a/dlls/mshtml/htmltablecell.c
+++ b/dlls/mshtml/htmltablecell.c
@ -447,7 +447,6 @@ static const tid_t HTMLTableCell_iface_tids[] = {
 static dispex_static_data_t HTMLTableCell_dispex = {
    NULL,
    DispHTMLTableCell_tid,
-    NULL,
    HTMLTableCell_iface_tids
 };

--- a/dlls/mshtml/htmltablerow.c
+++ b/dlls/mshtml/htmltablerow.c
@ -451,7 +451,6 @@ static const tid_t HTMLTableRow_iface_tids[] = {
 static dispex_static_data_t HTMLTableRow_dispex = {
    NULL,
    DispHTMLTableRow_tid,
-    NULL,
    HTMLTableRow_iface_tids
 };

--- a/dlls/mshtml/htmltextarea.c
+++ b/dlls/mshtml/htmltextarea.c
@ -505,7 +505,6 @@ static const tid_t HTMLTextAreaElement_iface_tids[] = {
 static dispex_static_data_t HTMLTextAreaElement_dispex = {
    NULL,
    DispHTMLTextAreaElement_tid,
-    NULL,
    HTMLTextAreaElement_iface_tids
 };

--- a/dlls/mshtml/htmltextnode.c
+++ b/dlls/mshtml/htmltextnode.c
@ -360,7 +360,6 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = {
 static dispex_static_data_t HTMLDOMTextNode_dispex = {
    NULL,
    DispHTMLDOMTextNode_tid,
-    0,
    HTMLDOMTextNode_iface_tids
 };

--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@ -2956,7 +2956,6 @@ static const tid_t HTMLWindow_iface_tids[] = {
 static dispex_static_data_t HTMLWindow_dispex = {
    &HTMLWindow_dispex_vtbl,
    DispHTMLWindow2_tid,
-    NULL,
    HTMLWindow_iface_tids,
    IHTMLWindow5_tid
 };
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@ -251,9 +251,9 @@ typedef struct {
 typedef struct {
    const dispex_static_data_vtbl_t *vtbl;
    const tid_t disp_tid;
-    dispex_data_t *data;
    const tid_t* const iface_tids;
    const tid_t additional_tid;
+    dispex_data_t *data;
 } dispex_static_data_t;

 struct DispatchEx {
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@ -164,7 +164,6 @@ static const tid_t HTMLDOMImplementation_iface_tids[] = {
 static dispex_static_data_t HTMLDOMImplementation_dispex = {
    NULL,
    IHTMLDOMImplementation_tid,
-    NULL,
    HTMLDOMImplementation_iface_tids
 };

@ -329,7 +328,6 @@ static const tid_t OmHistory_iface_tids[] = {
 static dispex_static_data_t OmHistory_dispex = {
    NULL,
    DispHTMLHistory_tid,
-    NULL,
    OmHistory_iface_tids
 };

@ -485,7 +483,6 @@ static const tid_t HTMLPluginsCollection_iface_tids[] = {
 static dispex_static_data_t HTMLPluginsCollection_dispex = {
    NULL,
    DispCPlugins_tid,
-    NULL,
    HTMLPluginsCollection_iface_tids
 };

@ -630,7 +627,6 @@ static const tid_t HTMLMimeTypesCollection_iface_tids[] = {
 static dispex_static_data_t HTMLMimeTypesCollection_dispex = {
    NULL,
    IHTMLMimeTypesCollection_tid,
-    NULL,
    HTMLMimeTypesCollection_iface_tids
 };

@ -1075,7 +1071,6 @@ static const tid_t OmNavigator_iface_tids[] = {
 static dispex_static_data_t OmNavigator_dispex = {
    NULL,
    DispHTMLNavigator_tid,
-    NULL,
    OmNavigator_iface_tids
 };

--- a/dlls/mshtml/selection.c
+++ b/dlls/mshtml/selection.c
@ -331,7 +331,6 @@ static const tid_t HTMLSelectionObject_iface_tids[] = {
 static dispex_static_data_t HTMLSelectionObject_dispex = {
    NULL,
    IHTMLSelectionObject_tid, /* FIXME: We have a test for that, but it doesn't expose IHTMLSelectionObject2 iface. */
-    NULL,
    HTMLSelectionObject_iface_tids
 };

--- a/dlls/mshtml/txtrange.c
+++ b/dlls/mshtml/txtrange.c
@ -1730,7 +1730,6 @@ static const tid_t HTMLTxtRange_iface_tids[] = {
 static dispex_static_data_t HTMLTxtRange_dispex = {
    NULL,
    IHTMLTxtRange_tid,
-    NULL,
    HTMLTxtRange_iface_tids
 };

--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@ -739,7 +739,6 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = {
 static dispex_static_data_t HTMLXMLHttpRequest_dispex = {
    &HTMLXMLHttpRequest_dispex_vtbl,
    DispHTMLXMLHttpRequest_tid,
-    NULL,
    HTMLXMLHttpRequest_iface_tids
 };

@ -909,7 +908,6 @@ static const tid_t HTMLXMLHttpRequestFactory_iface_tids[] = {
 static dispex_static_data_t HTMLXMLHttpRequestFactory_dispex = {
    &HTMLXMLHttpRequestFactory_dispex_vtbl,
    IHTMLXMLHttpRequestFactory_tid,
-    NULL,
    HTMLXMLHttpRequestFactory_iface_tids
 };