From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/dispex.c | 8 +--- dlls/mshtml/htmlattr.c | 4 +- dlls/mshtml/htmldoc.c | 34 ++++++---------- dlls/mshtml/htmlelem.c | 77 +++++++++++++++--------------------- dlls/mshtml/htmlelemcol.c | 12 +++--- dlls/mshtml/htmlevent.c | 36 ++++++++--------- dlls/mshtml/htmlimg.c | 8 +--- dlls/mshtml/htmlnode.c | 12 +++--- dlls/mshtml/htmlselect.c | 8 +--- dlls/mshtml/htmlstorage.c | 15 +++---- dlls/mshtml/htmlstyle.c | 9 ++--- dlls/mshtml/htmlstylesheet.c | 30 +++++++------- dlls/mshtml/htmlwindow.c | 25 +++++------- dlls/mshtml/mutation.c | 9 ++--- dlls/mshtml/omnavigator.c | 36 ++++++++--------- dlls/mshtml/range.c | 8 ++-- dlls/mshtml/selection.c | 4 +- dlls/mshtml/xmlhttprequest.c | 13 +++--- 18 files changed, 146 insertions(+), 202 deletions(-)
diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 5f1fb98ddab..636c9f78d04 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -906,12 +906,8 @@ static HRESULT function_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPAR }
static const dispex_static_data_vtbl_t function_dispex_vtbl = { - function_destructor, - NULL, - function_value, - NULL, - NULL, - NULL + .destructor = function_destructor, + .value = function_value, };
static const tid_t function_iface_tids[] = {0}; diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index 112c03cb0b5..862b23fd0e6 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -496,8 +496,8 @@ static void HTMLDOMAttribute_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLDOMAttribute_dispex_vtbl = { - HTMLDOMAttribute_destructor, - HTMLDOMAttribute_unlink + .destructor = HTMLDOMAttribute_destructor, + .unlink = HTMLDOMAttribute_unlink };
static const tid_t HTMLDOMAttribute_iface_tids[] = { diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 77916ca1a0f..b0c88719b44 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -369,12 +369,9 @@ static const event_target_vtbl_t DocumentType_event_target_vtbl = { { NULL, }, - DocumentType_get_gecko_target, - NULL, - DocumentType_get_parent_event_target, - NULL, - NULL, - DocumentType_set_current_event + .get_gecko_target = DocumentType_get_gecko_target, + .get_parent_event_target = DocumentType_get_parent_event_target, + .set_current_event = DocumentType_set_current_event };
static const tid_t DocumentType_iface_tids[] = { @@ -6086,23 +6083,16 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI
static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { - NULL, - NULL, - NULL, - NULL, - HTMLDocumentNode_get_name, - HTMLDocumentNode_invoke, - NULL, - HTMLDocumentNode_next_dispid, - HTMLDocumentNode_get_compat_mode, - NULL + .get_name = HTMLDocumentNode_get_name, + .invoke = HTMLDocumentNode_invoke, + .next_dispid = HTMLDocumentNode_next_dispid, + .get_compat_mode = HTMLDocumentNode_get_compat_mode, }, - HTMLDocumentNode_get_gecko_target, - HTMLDocumentNode_bind_event, - HTMLDocumentNode_get_parent_event_target, - NULL, - HTMLDocumentNode_get_cp_container, - HTMLDocumentNode_set_current_event + .get_gecko_target = HTMLDocumentNode_get_gecko_target, + .bind_event = HTMLDocumentNode_bind_event, + .get_parent_event_target = HTMLDocumentNode_get_parent_event_target, + .get_cp_container = HTMLDocumentNode_get_cp_container, + .set_current_event = HTMLDocumentNode_set_current_event };
static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 838f4a2ae66..2c13dadbbe0 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -861,8 +861,8 @@ void HTMLRect_init_dispex_info(dispex_data_t *info, compat_mode_t mode) }
static const dispex_static_data_vtbl_t HTMLRect_dispex_vtbl = { - HTMLRect_destructor, - HTMLRect_unlink + .destructor = HTMLRect_destructor, + .unlink = HTMLRect_unlink };
static const tid_t HTMLRect_iface_tids[] = { @@ -1295,13 +1295,11 @@ static HRESULT HTMLRectCollection_invoke(DispatchEx *dispex, DISPID id, LCID lci }
static const dispex_static_data_vtbl_t HTMLRectCollection_dispex_vtbl = { - HTMLRectCollection_destructor, - HTMLRectCollection_unlink, - NULL, - HTMLRectCollection_get_dispid, - HTMLRectCollection_get_name, - HTMLRectCollection_invoke, - NULL + .destructor = HTMLRectCollection_destructor, + .unlink = HTMLRectCollection_unlink, + .get_dispid = HTMLRectCollection_get_dispid, + .get_name = HTMLRectCollection_get_name, + .invoke = HTMLRectCollection_invoke, }; static const tid_t HTMLRectCollection_iface_tids[] = { IHTMLRectCollection_tid, @@ -7356,23 +7354,17 @@ static const tid_t HTMLElement_iface_tids[] = {
const event_target_vtbl_t HTMLElement_event_target_vtbl = { { - NULL, - NULL, - NULL, - HTMLElement_get_dispid, - HTMLElement_get_name, - HTMLElement_invoke, - NULL, - NULL, - NULL, - HTMLElement_populate_props + .get_dispid = HTMLElement_get_dispid, + .get_name = HTMLElement_get_name, + .invoke = HTMLElement_invoke, + .populate_props = HTMLElement_populate_props }, - HTMLElement_get_gecko_target, - HTMLElement_bind_event, - HTMLElement_get_parent_event_target, - HTMLElement_handle_event_default, - HTMLElement_get_cp_container, - HTMLElement_set_current_event + .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 };
struct token_list { @@ -7834,12 +7826,12 @@ static HRESULT token_list_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD }
static const dispex_static_data_vtbl_t token_list_dispex_vtbl = { - token_list_destructor, - token_list_unlink, - token_list_value, - token_list_get_dispid, - token_list_get_name, - token_list_invoke + .destructor = token_list_destructor, + .unlink = token_list_unlink, + .value = token_list_value, + .get_dispid = token_list_get_dispid, + .get_name = token_list_get_name, + .invoke = token_list_invoke };
static const tid_t token_list_iface_tids[] = { @@ -8261,13 +8253,10 @@ static HRESULT HTMLFiltersCollection_invoke(DispatchEx *dispex, DISPID id, LCID }
static const dispex_static_data_vtbl_t HTMLFiltersCollection_dispex_vtbl = { - HTMLFiltersCollection_destructor, - NULL, - NULL, - HTMLFiltersCollection_get_dispid, - HTMLFiltersCollection_get_name, - HTMLFiltersCollection_invoke, - NULL + .destructor = HTMLFiltersCollection_destructor, + .get_dispid = HTMLFiltersCollection_get_dispid, + .get_name = HTMLFiltersCollection_get_name, + .invoke = HTMLFiltersCollection_invoke, };
static const tid_t HTMLFiltersCollection_iface_tids[] = { @@ -9028,13 +9017,11 @@ static HRESULT HTMLAttributeCollection_invoke(DispatchEx *dispex, DISPID id, LCI }
static const dispex_static_data_vtbl_t HTMLAttributeCollection_dispex_vtbl = { - HTMLAttributeCollection_destructor, - HTMLAttributeCollection_unlink, - NULL, - HTMLAttributeCollection_get_dispid, - HTMLAttributeCollection_get_name, - HTMLAttributeCollection_invoke, - NULL + .destructor = HTMLAttributeCollection_destructor, + .unlink = HTMLAttributeCollection_unlink, + .get_dispid = HTMLAttributeCollection_get_dispid, + .get_name = HTMLAttributeCollection_get_name, + .invoke = HTMLAttributeCollection_invoke, };
static const tid_t HTMLAttributeCollection_iface_tids[] = { diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 79dd59fca91..852c21ad3bd 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -633,13 +633,11 @@ static HRESULT HTMLElementCollection_invoke(DispatchEx *dispex, DISPID id, LCID }
static const dispex_static_data_vtbl_t HTMLElementColection_dispex_vtbl = { - HTMLElementCollection_destructor, - HTMLElementCollection_unlink, - NULL, - HTMLElementCollection_get_dispid, - HTMLElementCollection_get_name, - HTMLElementCollection_invoke, - NULL + .destructor = HTMLElementCollection_destructor, + .unlink = HTMLElementCollection_unlink, + .get_dispid = HTMLElementCollection_get_dispid, + .get_name = HTMLElementCollection_get_name, + .invoke = HTMLElementCollection_invoke, };
static const tid_t HTMLElementCollection_iface_tids[] = { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 41c8b36e941..c9290fdae60 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -890,8 +890,8 @@ static void HTMLEventObj_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLEventObj_dispex_vtbl = { - HTMLEventObj_destructor, - HTMLEventObj_unlink + .destructor = HTMLEventObj_destructor, + .unlink = HTMLEventObj_unlink };
static const tid_t HTMLEventObj_iface_tids[] = { @@ -2965,8 +2965,8 @@ static void DOMStorageEvent_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t DOMEvent_dispex_vtbl = { - DOMEvent_destructor, - DOMEvent_unlink + .destructor = DOMEvent_destructor, + .unlink = DOMEvent_unlink };
static const tid_t DOMEvent_iface_tids[] = { @@ -2982,8 +2982,8 @@ static dispex_static_data_t DOMEvent_dispex = { };
static const dispex_static_data_vtbl_t DOMUIEvent_dispex_vtbl = { - DOMEvent_destructor, - DOMUIEvent_unlink + .destructor = DOMEvent_destructor, + .unlink = DOMUIEvent_unlink };
static const tid_t DOMUIEvent_iface_tids[] = { @@ -3000,8 +3000,8 @@ static dispex_static_data_t DOMUIEvent_dispex = { };
static const dispex_static_data_vtbl_t DOMMouseEvent_dispex_vtbl = { - DOMEvent_destructor, - DOMMouseEvent_unlink + .destructor = DOMEvent_destructor, + .unlink = DOMMouseEvent_unlink };
static const tid_t DOMMouseEvent_iface_tids[] = { @@ -3019,8 +3019,8 @@ static dispex_static_data_t DOMMouseEvent_dispex = { };
static const dispex_static_data_vtbl_t DOMKeyboardEvent_dispex_vtbl = { - DOMEvent_destructor, - DOMKeyboardEvent_unlink + .destructor = DOMEvent_destructor, + .unlink = DOMKeyboardEvent_unlink };
static const tid_t DOMKeyboardEvent_iface_tids[] = { @@ -3052,8 +3052,8 @@ static dispex_static_data_t DOMPageTransitionEvent_dispex = { };
static const dispex_static_data_vtbl_t DOMCustomEvent_dispex_vtbl = { - DOMCustomEvent_destructor, - DOMCustomEvent_unlink + .destructor = DOMCustomEvent_destructor, + .unlink = DOMCustomEvent_unlink };
static const tid_t DOMCustomEvent_iface_tids[] = { @@ -3070,8 +3070,8 @@ static dispex_static_data_t DOMCustomEvent_dispex = { };
static const dispex_static_data_vtbl_t DOMMessageEvent_dispex_vtbl = { - DOMMessageEvent_destructor, - DOMMessageEvent_unlink + .destructor = DOMMessageEvent_destructor, + .unlink = DOMMessageEvent_unlink };
static const tid_t DOMMessageEvent_iface_tids[] = { @@ -3088,8 +3088,8 @@ static dispex_static_data_t DOMMessageEvent_dispex = { };
static const dispex_static_data_vtbl_t DOMProgressEvent_dispex_vtbl = { - DOMEvent_destructor, - DOMProgressEvent_unlink + .destructor = DOMEvent_destructor, + .unlink = DOMProgressEvent_unlink };
static const tid_t DOMProgressEvent_iface_tids[] = { @@ -3106,8 +3106,8 @@ static dispex_static_data_t DOMProgressEvent_dispex = { };
static const dispex_static_data_vtbl_t DOMStorageEvent_dispex_vtbl = { - DOMStorageEvent_destructor, - DOMEvent_unlink + .destructor = DOMStorageEvent_destructor, + .unlink = DOMEvent_unlink };
static const tid_t DOMStorageEvent_iface_tids[] = { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index aad4d1f6dfa..746e1622af8 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -979,12 +979,8 @@ static const tid_t HTMLImageElementFactory_iface_tids[] = { };
static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = { - HTMLImageElementFactory_destructor, - NULL, - HTMLImageElementFactory_value, - NULL, - NULL, - NULL + .destructor = HTMLImageElementFactory_destructor, + .value = HTMLImageElementFactory_value, };
static dispex_static_data_t HTMLImageElementFactory_dispex = { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 337dc282fe6..9fa0b657100 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -443,13 +443,11 @@ static HRESULT HTMLDOMChildrenCollection_invoke(DispatchEx *dispex, DISPID id, L }
static const dispex_static_data_vtbl_t HTMLDOMChildrenCollection_dispex_vtbl = { - HTMLDOMChildrenCollection_destructor, - HTMLDOMChildrenCollection_unlink, - NULL, - HTMLDOMChildrenCollection_get_dispid, - HTMLDOMChildrenCollection_get_name, - HTMLDOMChildrenCollection_invoke, - NULL + .destructor = HTMLDOMChildrenCollection_destructor, + .unlink = HTMLDOMChildrenCollection_unlink, + .get_dispid = HTMLDOMChildrenCollection_get_dispid, + .get_name = HTMLDOMChildrenCollection_get_name, + .invoke = HTMLDOMChildrenCollection_invoke, };
static const tid_t HTMLDOMChildrenCollection_iface_tids[] = { diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 0a5905e6f1f..f03a2e4d8a0 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -633,12 +633,8 @@ static const tid_t HTMLOptionElementFactory_iface_tids[] = { };
static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = { - HTMLOptionElementFactory_destructor, - NULL, - HTMLOptionElementFactory_value, - NULL, - NULL, - NULL + .destructor = HTMLOptionElementFactory_destructor, + .value = HTMLOptionElementFactory_value, };
static dispex_static_data_t HTMLOptionElementFactory_dispex = { diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 4ed909f79fb..6d321939296 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -1314,15 +1314,12 @@ static HRESULT HTMLStorage_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pi }
static const dispex_static_data_vtbl_t HTMLStorage_dispex_vtbl = { - HTMLStorage_destructor, - NULL, - NULL, - HTMLStorage_get_dispid, - HTMLStorage_get_name, - HTMLStorage_invoke, - HTMLStorage_delete, - HTMLStorage_next_dispid, - NULL + .destructor = HTMLStorage_destructor, + .get_dispid = HTMLStorage_get_dispid, + .get_name = HTMLStorage_get_name, + .invoke = HTMLStorage_invoke, + .delete = HTMLStorage_delete, + .next_dispid = HTMLStorage_next_dispid, };
static const tid_t HTMLStorage_iface_tids[] = { diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 16a1140f97d..25ce20ab815 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10005,12 +10005,9 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) }
const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { - CSSStyle_destructor, - CSSStyle_unlink, - NULL, - CSSStyle_get_dispid, - NULL, - NULL + .destructor = CSSStyle_destructor, + .unlink = CSSStyle_unlink, + .get_dispid = CSSStyle_get_dispid, };
static const tid_t HTMLStyle_iface_tids[] = { diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 8ce0f85b76e..4ee2da02d95 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -220,8 +220,8 @@ static void HTMLStyleSheetRule_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLStyleSheetRule_dispex_vtbl = { - HTMLStyleSheetRule_destructor, - HTMLStyleSheetRule_unlink + .destructor = HTMLStyleSheetRule_destructor, + .unlink = HTMLStyleSheetRule_unlink };
static const tid_t HTMLStyleSheetRule_iface_tids[] = { @@ -492,12 +492,11 @@ static HRESULT HTMLStyleSheetRulesCollection_invoke(DispatchEx *dispex, DISPID i }
static const dispex_static_data_vtbl_t HTMLStyleSheetRulesCollection_dispex_vtbl = { - HTMLStyleSheetRulesCollection_destructor, - HTMLStyleSheetRulesCollection_unlink, - NULL, - HTMLStyleSheetRulesCollection_get_dispid, - HTMLStyleSheetRulesCollection_get_name, - HTMLStyleSheetRulesCollection_invoke + .destructor = HTMLStyleSheetRulesCollection_destructor, + .unlink = HTMLStyleSheetRulesCollection_unlink, + .get_dispid = HTMLStyleSheetRulesCollection_get_dispid, + .get_name = HTMLStyleSheetRulesCollection_get_name, + .invoke = HTMLStyleSheetRulesCollection_invoke }; static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = { IHTMLStyleSheetRulesCollection_tid, @@ -929,12 +928,11 @@ static HRESULT HTMLStyleSheetsCollection_invoke(DispatchEx *dispex, DISPID id, L }
static const dispex_static_data_vtbl_t HTMLStyleSheetsCollection_dispex_vtbl = { - HTMLStyleSheetsCollection_destructor, - HTMLStyleSheetsCollection_unlink, - NULL, - HTMLStyleSheetsCollection_get_dispid, - HTMLStyleSheetsCollection_get_name, - HTMLStyleSheetsCollection_invoke + .destructor = HTMLStyleSheetsCollection_destructor, + .unlink = HTMLStyleSheetsCollection_unlink, + .get_dispid = HTMLStyleSheetsCollection_get_dispid, + .get_name = HTMLStyleSheetsCollection_get_name, + .invoke = HTMLStyleSheetsCollection_invoke }; static const tid_t HTMLStyleSheetsCollection_iface_tids[] = { IHTMLStyleSheetsCollection_tid, @@ -1520,8 +1518,8 @@ static void HTMLStyleSheet_init_dispex_info(dispex_data_t *info, compat_mode_t m }
static const dispex_static_data_vtbl_t HTMLStyleSheet_dispex_vtbl = { - HTMLStyleSheet_destructor, - HTMLStyleSheet_unlink + .destructor = HTMLStyleSheet_destructor, + .unlink = HTMLStyleSheet_unlink };
static const tid_t HTMLStyleSheet_iface_tids[] = { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ef71246d723..571b04d23c8 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -4163,23 +4163,16 @@ static IHTMLEventObj *HTMLWindow_set_current_event(DispatchEx *dispex, IHTMLEven
static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { { - HTMLWindow_destructor, - HTMLWindow_unlink, - NULL, - NULL, - HTMLWindow_get_name, - HTMLWindow_invoke, - NULL, - HTMLWindow_next_dispid, - HTMLWindow_get_compat_mode, - NULL + .destructor = HTMLWindow_destructor, + .unlink = HTMLWindow_unlink, + .get_name = HTMLWindow_get_name, + .invoke = HTMLWindow_invoke, + .next_dispid = HTMLWindow_next_dispid, + .get_compat_mode = HTMLWindow_get_compat_mode, }, - HTMLWindow_get_gecko_target, - HTMLWindow_bind_event, - NULL, - NULL, - NULL, - HTMLWindow_set_current_event + .get_gecko_target = HTMLWindow_get_gecko_target, + .bind_event = HTMLWindow_bind_event, + .set_current_event = HTMLWindow_set_current_event };
static const tid_t HTMLWindow_iface_tids[] = { diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 7890faa1b16..098f0eb61ba 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1228,8 +1228,8 @@ static void mutation_observer_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t mutation_observer_dispex_vtbl = { - mutation_observer_destructor, - mutation_observer_unlink + .destructor = mutation_observer_destructor, + .unlink = mutation_observer_unlink };
static const tid_t mutation_observer_iface_tids[] = { @@ -1388,9 +1388,8 @@ static HRESULT mutation_observer_ctor_value(DispatchEx *dispex, LCID lcid, }
static dispex_static_data_vtbl_t mutation_observer_ctor_dispex_vtbl = { - mutation_observer_ctor_destructor, - NULL, - mutation_observer_ctor_value + .destructor = mutation_observer_ctor_destructor, + .value = mutation_observer_ctor_value };
static const tid_t mutation_observer_ctor_iface_tids[] = { diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index b40438361cc..e89f6b43271 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -308,8 +308,8 @@ static void HTMLDOMImplementation_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLDOMImplementation_dispex_vtbl = { - HTMLDOMImplementation_destructor, - HTMLDOMImplementation_unlink + .destructor = HTMLDOMImplementation_destructor, + .unlink = HTMLDOMImplementation_unlink };
static void HTMLDOMImplementation_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) @@ -581,7 +581,7 @@ static void HTMLScreen_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLScreen_dispex_vtbl = { - HTMLScreen_destructor, + .destructor = HTMLScreen_destructor, };
static const tid_t HTMLScreen_iface_tids[] = { @@ -758,7 +758,7 @@ static void OmHistory_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t OmHistory_dispex_vtbl = { - OmHistory_destructor, + .destructor = OmHistory_destructor, };
static const tid_t OmHistory_iface_tids[] = { @@ -935,8 +935,8 @@ static void HTMLPluginsCollection_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLPluginsCollection_dispex_vtbl = { - HTMLPluginsCollection_destructor, - HTMLPluginsCollection_unlink + .destructor = HTMLPluginsCollection_destructor, + .unlink = HTMLPluginsCollection_unlink };
static const tid_t HTMLPluginsCollection_iface_tids[] = { @@ -1101,8 +1101,8 @@ static void HTMLMimeTypesCollection_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLMimeTypesCollection_dispex_vtbl = { - HTMLMimeTypesCollection_destructor, - HTMLMimeTypesCollection_unlink + .destructor = HTMLMimeTypesCollection_destructor, + .unlink = HTMLMimeTypesCollection_unlink };
static const tid_t HTMLMimeTypesCollection_iface_tids[] = { @@ -1552,8 +1552,8 @@ static void OmNavigator_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t OmNavigator_dispex_vtbl = { - OmNavigator_destructor, - OmNavigator_unlink + .destructor = OmNavigator_destructor, + .unlink = OmNavigator_unlink };
static const tid_t OmNavigator_iface_tids[] = { @@ -2148,8 +2148,8 @@ static void HTMLPerformanceNavigation_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLPerformanceNavigation_dispex_vtbl = { - HTMLPerformanceNavigation_destructor, - HTMLPerformanceNavigation_unlink + .destructor = HTMLPerformanceNavigation_destructor, + .unlink = HTMLPerformanceNavigation_unlink };
static const tid_t HTMLPerformanceNavigation_iface_tids[] = { @@ -2350,8 +2350,8 @@ static void HTMLPerformance_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLPerformance_dispex_vtbl = { - HTMLPerformance_destructor, - HTMLPerformance_unlink + .destructor = HTMLPerformance_destructor, + .unlink = HTMLPerformance_unlink };
static const tid_t HTMLPerformance_iface_tids[] = { @@ -2530,7 +2530,7 @@ static void HTMLNamespaceCollection_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLNamespaceCollection_dispex_vtbl = { - HTMLNamespaceCollection_destructor, + .destructor = HTMLNamespaceCollection_destructor, };
static const tid_t HTMLNamespaceCollection_iface_tids[] = { @@ -2799,7 +2799,7 @@ static void console_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t console_dispex_vtbl = { - console_destructor, + .destructor = console_destructor, };
static const tid_t console_iface_tids[] = { @@ -3142,8 +3142,8 @@ static void media_query_list_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t media_query_list_dispex_vtbl = { - media_query_list_destructor, - media_query_list_unlink + .destructor = media_query_list_destructor, + .unlink = media_query_list_unlink };
static const tid_t media_query_list_iface_tids[] = { diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index e7234994933..904fa736327 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1734,8 +1734,8 @@ static void HTMLTxtRange_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLTxtRange_dispex_vtbl = { - HTMLTxtRange_destructor, - HTMLTxtRange_unlink + .destructor = HTMLTxtRange_destructor, + .unlink = HTMLTxtRange_unlink };
static const tid_t HTMLTxtRange_iface_tids[] = { @@ -2097,8 +2097,8 @@ static void HTMLDOMRange_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLDOMRange_dispex_vtbl = { - HTMLDOMRange_destructor, - HTMLDOMRange_unlink + .destructor = HTMLDOMRange_destructor, + .unlink = HTMLDOMRange_unlink };
static const tid_t HTMLDOMRange_iface_tids[] = { diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 3067b1a43b1..e06fb9c81d5 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -345,8 +345,8 @@ static void HTMLSelectionObject_destructor(DispatchEx *dispex) }
static const dispex_static_data_vtbl_t HTMLSelectionObject_dispex_vtbl = { - HTMLSelectionObject_destructor, - HTMLSelectionObject_unlink + .destructor = HTMLSelectionObject_destructor, + .unlink = HTMLSelectionObject_unlink };
static const tid_t HTMLSelectionObject_iface_tids[] = { diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 9bfaefcd892..3a24c5cea5b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1594,11 +1594,11 @@ static void HTMLXMLHttpRequest_init_dispex_info(dispex_data_t *info, compat_mode
static const event_target_vtbl_t HTMLXMLHttpRequest_event_target_vtbl = { { - HTMLXMLHttpRequest_destructor, - HTMLXMLHttpRequest_unlink + .destructor = HTMLXMLHttpRequest_destructor, + .unlink = HTMLXMLHttpRequest_unlink }, - HTMLXMLHttpRequest_get_gecko_target, - HTMLXMLHttpRequest_bind_event + .get_gecko_target = HTMLXMLHttpRequest_get_gecko_target, + .bind_event = HTMLXMLHttpRequest_bind_event };
static const tid_t HTMLXMLHttpRequest_iface_tids[] = { @@ -1815,9 +1815,8 @@ static HRESULT HTMLXMLHttpRequestFactory_value(DispatchEx *iface, LCID lcid, WOR }
static const dispex_static_data_vtbl_t HTMLXMLHttpRequestFactory_dispex_vtbl = { - HTMLXMLHttpRequestFactory_destructor, - NULL, - HTMLXMLHttpRequestFactory_value + .destructor = HTMLXMLHttpRequestFactory_destructor, + .value = HTMLXMLHttpRequestFactory_value };
static const tid_t HTMLXMLHttpRequestFactory_iface_tids[] = {