Commit c81c0aa7 authored by Gabriel Ivăncescu's avatar Gabriel Ivăncescu Committed by Alexandre Julliard

mshtml: Use ASCII strings for dispex object names.

parent 5cd11ade
......@@ -917,7 +917,7 @@ static const dispex_static_data_vtbl_t function_dispex_vtbl = {
static const tid_t function_iface_tids[] = {0};
static dispex_static_data_t function_dispex = {
L"Function",
"Function",
&function_dispex_vtbl,
NULL_tid,
function_iface_tids
......@@ -1549,8 +1549,7 @@ HRESULT dispex_to_string(DispatchEx *dispex, BSTR *ret)
static const WCHAR suffix[] = L"]";
WCHAR buf[ARRAY_SIZE(prefix) + 28 + ARRAY_SIZE(suffix)], *p = buf;
compat_mode_t compat_mode = dispex_compat_mode(dispex);
const WCHAR *name = dispex->info->desc->name;
unsigned len;
const char *name = dispex->info->desc->name;
if(!ret)
return E_INVALIDARG;
......@@ -1560,10 +1559,9 @@ HRESULT dispex_to_string(DispatchEx *dispex, BSTR *ret)
if(compat_mode < COMPAT_MODE_IE9)
p--;
else {
len = wcslen(name);
assert(len <= 28);
memcpy(p, name, len * sizeof(WCHAR));
p += len;
while(*name)
*p++ = *name++;
assert(p + ARRAY_SIZE(suffix) - buf <= ARRAY_SIZE(buf));
}
memcpy(p, suffix, sizeof(suffix));
......
......@@ -895,7 +895,7 @@ static const tid_t HTMLAnchorElement_iface_tids[] = {
};
static dispex_static_data_t HTMLAnchorElement_dispex = {
L"HTMLAnchorElement",
"HTMLAnchorElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLAnchorElement_tid,
HTMLAnchorElement_iface_tids,
......
......@@ -502,7 +502,7 @@ static const tid_t HTMLAreaElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLAreaElement_dispex = {
L"HTMLAreaElement",
"HTMLAreaElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLAreaElement_tid,
HTMLAreaElement_iface_tids,
......
......@@ -506,7 +506,7 @@ static const tid_t HTMLDOMAttribute_iface_tids[] = {
0
};
static dispex_static_data_t HTMLDOMAttribute_dispex = {
L"Attr",
"Attr",
&HTMLDOMAttribute_dispex_vtbl,
DispHTMLDOMAttribute_tid,
HTMLDOMAttribute_iface_tids
......
......@@ -1004,7 +1004,7 @@ static const tid_t HTMLBodyElement_iface_tids[] = {
};
static dispex_static_data_t HTMLBodyElement_dispex = {
L"HTMLBodyElement",
"HTMLBodyElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLBody_tid,
HTMLBodyElement_iface_tids,
......
......@@ -200,7 +200,7 @@ static const tid_t HTMLCommentElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLCommentElement_dispex = {
L"Comment",
"Comment",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLCommentElement_tid,
HTMLCommentElement_iface_tids,
......
......@@ -1300,7 +1300,7 @@ static const tid_t HTMLCurrentStyle_iface_tids[] = {
0
};
static dispex_static_data_t HTMLCurrentStyle_dispex = {
L"MSCurrentStyleCSSProperties",
"MSCurrentStyleCSSProperties",
&CSSStyle_dispex_vtbl,
DispHTMLCurrentStyle_tid,
HTMLCurrentStyle_iface_tids,
......
......@@ -386,7 +386,7 @@ static const tid_t DocumentType_iface_tids[] = {
};
static dispex_static_data_t DocumentType_dispex = {
L"DocumentType",
"DocumentType",
&DocumentType_event_target_vtbl.dispex_vtbl,
DispDOMDocumentType_tid,
DocumentType_iface_tids
......@@ -6180,7 +6180,7 @@ static void HTMLDocumentNode_init_dispex_info(dispex_data_t *info, compat_mode_t
}
static dispex_static_data_t HTMLDocumentNode_dispex = {
L"HTMLDocument",
"HTMLDocument",
&HTMLDocumentNode_event_target_vtbl.dispex_vtbl,
DispHTMLDocument_tid,
HTMLDocumentNode_iface_tids,
......
......@@ -870,7 +870,7 @@ static const tid_t HTMLRect_iface_tids[] = {
0
};
static dispex_static_data_t HTMLRect_dispex = {
L"ClientRect",
"ClientRect",
&HTMLRect_dispex_vtbl,
IHTMLRect_tid,
HTMLRect_iface_tids,
......@@ -1308,7 +1308,7 @@ static const tid_t HTMLRectCollection_iface_tids[] = {
0
};
static dispex_static_data_t HTMLRectCollection_dispex = {
L"ClientRectList",
"ClientRectList",
&HTMLRectCollection_dispex_vtbl,
IHTMLRectCollection_tid,
HTMLRectCollection_iface_tids
......@@ -7847,7 +7847,7 @@ static const tid_t token_list_iface_tids[] = {
0
};
static dispex_static_data_t token_list_dispex = {
L"DOMTokenList",
"DOMTokenList",
&token_list_dispex_vtbl,
IWineDOMTokenList_tid,
token_list_iface_tids
......@@ -7958,7 +7958,7 @@ static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = {
};
static dispex_static_data_t HTMLElement_dispex = {
L"HTMLElement",
"HTMLElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLUnknownElement_tid,
HTMLElement_iface_tids,
......@@ -7966,7 +7966,7 @@ static dispex_static_data_t HTMLElement_dispex = {
};
static dispex_static_data_t HTMLUnknownElement_dispex = {
L"HTMLUnknownElement",
"HTMLUnknownElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLUnknownElement_tid,
HTMLElement_iface_tids,
......@@ -8275,7 +8275,7 @@ static const tid_t HTMLFiltersCollection_iface_tids[] = {
0
};
static dispex_static_data_t HTMLFiltersCollection_dispex = {
L"FiltersCollection",
"FiltersCollection",
&HTMLFiltersCollection_dispex_vtbl,
IHTMLFiltersCollection_tid,
HTMLFiltersCollection_iface_tids
......@@ -9045,7 +9045,7 @@ static const tid_t HTMLAttributeCollection_iface_tids[] = {
};
static dispex_static_data_t HTMLAttributeCollection_dispex = {
L"NamedNodeMap",
"NamedNodeMap",
&HTMLAttributeCollection_dispex_vtbl,
DispHTMLAttributeCollection_tid,
HTMLAttributeCollection_iface_tids
......
......@@ -648,7 +648,7 @@ static const tid_t HTMLElementCollection_iface_tids[] = {
};
static dispex_static_data_t HTMLElementCollection_dispex = {
L"HTMLCollection",
"HTMLCollection",
&HTMLElementColection_dispex_vtbl,
DispHTMLElementCollection_tid,
HTMLElementCollection_iface_tids
......
......@@ -900,7 +900,7 @@ static const tid_t HTMLEventObj_iface_tids[] = {
};
static dispex_static_data_t HTMLEventObj_dispex = {
L"MSEventObj",
"MSEventObj",
&HTMLEventObj_dispex_vtbl,
DispCEventObj_tid,
HTMLEventObj_iface_tids
......@@ -2975,7 +2975,7 @@ static const tid_t DOMEvent_iface_tids[] = {
};
static dispex_static_data_t DOMEvent_dispex = {
L"Event",
"Event",
&DOMEvent_dispex_vtbl,
DispDOMEvent_tid,
DOMEvent_iface_tids
......@@ -2993,7 +2993,7 @@ static const tid_t DOMUIEvent_iface_tids[] = {
};
static dispex_static_data_t DOMUIEvent_dispex = {
L"UIEvent",
"UIEvent",
&DOMUIEvent_dispex_vtbl,
DispDOMUIEvent_tid,
DOMUIEvent_iface_tids
......@@ -3012,7 +3012,7 @@ static const tid_t DOMMouseEvent_iface_tids[] = {
};
static dispex_static_data_t DOMMouseEvent_dispex = {
L"MouseEvent",
"MouseEvent",
&DOMMouseEvent_dispex_vtbl,
DispDOMMouseEvent_tid,
DOMMouseEvent_iface_tids
......@@ -3031,7 +3031,7 @@ static const tid_t DOMKeyboardEvent_iface_tids[] = {
};
static dispex_static_data_t DOMKeyboardEvent_dispex = {
L"KeyboardEvent",
"KeyboardEvent",
&DOMKeyboardEvent_dispex_vtbl,
DispDOMKeyboardEvent_tid,
DOMKeyboardEvent_iface_tids
......@@ -3044,7 +3044,7 @@ static void DOMPageTransitionEvent_init_dispex_info(dispex_data_t *info, compat_
}
static dispex_static_data_t DOMPageTransitionEvent_dispex = {
L"PageTransitionEvent",
"PageTransitionEvent",
&DOMEvent_dispex_vtbl,
DispDOMEvent_tid,
DOMEvent_iface_tids,
......@@ -3063,7 +3063,7 @@ static const tid_t DOMCustomEvent_iface_tids[] = {
};
static dispex_static_data_t DOMCustomEvent_dispex = {
L"CustomEvent",
"CustomEvent",
&DOMCustomEvent_dispex_vtbl,
DispDOMCustomEvent_tid,
DOMCustomEvent_iface_tids
......@@ -3080,7 +3080,7 @@ static const tid_t DOMMessageEvent_iface_tids[] = {
};
static dispex_static_data_t DOMMessageEvent_dispex = {
L"MessageEvent",
"MessageEvent",
&DOMMessageEvent_dispex_vtbl,
DispDOMMessageEvent_tid,
DOMMessageEvent_iface_tids,
......@@ -3099,7 +3099,7 @@ static const tid_t DOMProgressEvent_iface_tids[] = {
};
static dispex_static_data_t DOMProgressEvent_dispex = {
L"ProgressEvent",
"ProgressEvent",
&DOMProgressEvent_dispex_vtbl,
DispDOMProgressEvent_tid,
DOMProgressEvent_iface_tids
......@@ -3117,7 +3117,7 @@ static const tid_t DOMStorageEvent_iface_tids[] = {
};
static dispex_static_data_t DOMStorageEvent_dispex = {
L"StorageEvent",
"StorageEvent",
&DOMStorageEvent_dispex_vtbl,
DispDOMStorageEvent_tid,
DOMStorageEvent_iface_tids
......
......@@ -1000,7 +1000,7 @@ static const tid_t HTMLFormElement_iface_tids[] = {
};
static dispex_static_data_t HTMLFormElement_dispex = {
L"HTMLFormElement",
"HTMLFormElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLFormElement_tid,
HTMLFormElement_iface_tids,
......
......@@ -1036,7 +1036,7 @@ static const tid_t HTMLFrameElement_iface_tids[] = {
};
static dispex_static_data_t HTMLFrameElement_dispex = {
L"HTMLFrameElement",
"HTMLFrameElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLFrameElement_tid,
HTMLFrameElement_iface_tids,
......@@ -1625,7 +1625,7 @@ static const tid_t HTMLIFrame_iface_tids[] = {
};
static dispex_static_data_t HTMLIFrame_dispex = {
L"HTMLIFrameElement",
"HTMLIFrameElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLIFrame_tid,
HTMLIFrame_iface_tids,
......
......@@ -169,7 +169,7 @@ static const tid_t HTMLGenericElement_iface_tids[] = {
};
static dispex_static_data_t HTMLGenericElement_dispex = {
L"HTMLUnknownElement",
"HTMLUnknownElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLGenericElement_tid,
HTMLGenericElement_iface_tids,
......
......@@ -184,7 +184,7 @@ static const tid_t HTMLTitleElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLTitleElement_dispex = {
L"HTMLTitleElement",
"HTMLTitleElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTitleElement_tid,
HTMLTitleElement_iface_tids,
......@@ -369,7 +369,7 @@ static const tid_t HTMLHtmlElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLHtmlElement_dispex = {
L"HTMLHtmlElement",
"HTMLHtmlElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLHtmlElement_tid,
HTMLHtmlElement_iface_tids,
......@@ -606,7 +606,7 @@ static const tid_t HTMLMetaElement_iface_tids[] = {
};
static dispex_static_data_t HTMLMetaElement_dispex = {
L"HTMLMetaElement",
"HTMLMetaElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLMetaElement_tid,
HTMLMetaElement_iface_tids,
......@@ -770,7 +770,7 @@ static const tid_t HTMLHeadElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLHeadElement_dispex = {
L"HTMLHeadElement",
"HTMLHeadElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLHeadElement_tid,
HTMLHeadElement_iface_tids,
......
......@@ -735,7 +735,7 @@ static void HTMLImgElement_init_dispex_info(dispex_data_t *info, compat_mode_t m
}
static dispex_static_data_t HTMLImgElement_dispex = {
L"HTMLImageElement",
"HTMLImageElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLImg_tid,
HTMLImgElement_iface_tids,
......@@ -988,7 +988,7 @@ static const dispex_static_data_vtbl_t HTMLImageElementFactory_dispex_vtbl = {
};
static dispex_static_data_t HTMLImageElementFactory_dispex = {
L"Function",
"Function",
&HTMLImageElementFactory_dispex_vtbl,
IHTMLImageElementFactory_tid,
HTMLImageElementFactory_iface_tids
......
......@@ -1449,7 +1449,7 @@ static const tid_t HTMLInputElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLInputElement_dispex = {
L"HTMLInputElement",
"HTMLInputElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLInputElement_tid,
HTMLInputElement_iface_tids,
......@@ -1646,7 +1646,7 @@ static const tid_t HTMLLabelElement_iface_tids[] = {
};
static dispex_static_data_t HTMLLabelElement_dispex = {
L"HTMLLabelElement",
"HTMLLabelElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLLabelElement_tid,
HTMLLabelElement_iface_tids,
......@@ -1988,7 +1988,7 @@ static const tid_t HTMLButtonElement_iface_tids[] = {
};
static dispex_static_data_t HTMLButtonElement_dispex = {
L"HTMLButtonElement",
"HTMLButtonElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLButtonElement_tid,
HTMLButtonElement_iface_tids,
......
......@@ -441,7 +441,7 @@ static const tid_t HTMLLinkElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLLinkElement_dispex = {
L"HTMLLinkElement",
"HTMLLinkElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLLinkElement_tid,
HTMLLinkElement_iface_tids,
......
......@@ -612,7 +612,7 @@ static const tid_t HTMLLocation_iface_tids[] = {
0
};
static dispex_static_data_t HTMLLocation_dispex = {
L"Location",
"Location",
NULL,
DispHTMLLocation_tid,
HTMLLocation_iface_tids
......
......@@ -458,7 +458,7 @@ static const tid_t HTMLDOMChildrenCollection_iface_tids[] = {
};
static dispex_static_data_t HTMLDOMChildrenCollection_dispex = {
L"NodeList",
"NodeList",
&HTMLDOMChildrenCollection_dispex_vtbl,
DispDOMChildrenCollection_tid,
HTMLDOMChildrenCollection_iface_tids,
......@@ -1512,7 +1512,7 @@ static const tid_t HTMLDOMNode_iface_tids[] = {
0
};
static dispex_static_data_t HTMLDOMNode_dispex = {
L"Node",
"Node",
NULL,
IHTMLDOMNode_tid,
HTMLDOMNode_iface_tids,
......
......@@ -771,7 +771,7 @@ static const tid_t HTMLObjectElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLObjectElement_dispex = {
L"HTMLObjectElement",
"HTMLObjectElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLObjectElement_tid,
HTMLObjectElement_iface_tids,
......@@ -1034,7 +1034,7 @@ static const tid_t HTMLEmbedElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLEmbedElement_dispex = {
L"HTMLEmbedElement",
"HTMLEmbedElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLEmbed_tid,
HTMLEmbedElement_iface_tids,
......
......@@ -474,7 +474,7 @@ static const tid_t HTMLScriptElement_iface_tids[] = {
};
static dispex_static_data_t HTMLScriptElement_dispex = {
L"HTMLScriptElement",
"HTMLScriptElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLScriptElement_tid,
HTMLScriptElement_iface_tids,
......
......@@ -412,7 +412,7 @@ static const tid_t HTMLOptionElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLOptionElement_dispex = {
L"HTMLOptionElement",
"HTMLOptionElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLOptionElement_tid,
HTMLOptionElement_iface_tids,
......@@ -642,7 +642,7 @@ static const dispex_static_data_vtbl_t HTMLOptionElementFactory_dispex_vtbl = {
};
static dispex_static_data_t HTMLOptionElementFactory_dispex = {
L"Function",
"Function",
&HTMLOptionElementFactory_dispex_vtbl,
IHTMLOptionElementFactory_tid,
HTMLOptionElementFactory_iface_tids,
......@@ -1489,7 +1489,7 @@ static const tid_t HTMLSelectElement_tids[] = {
};
static dispex_static_data_t HTMLSelectElement_dispex = {
L"HTMLSelectElement",
"HTMLSelectElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLSelectElement_tid,
HTMLSelectElement_tids,
......
......@@ -1330,7 +1330,7 @@ static const tid_t HTMLStorage_iface_tids[] = {
0
};
static dispex_static_data_t HTMLStorage_dispex = {
L"Storage",
"Storage",
&HTMLStorage_dispex_vtbl,
IHTMLStorage_tid,
HTMLStorage_iface_tids
......
......@@ -10023,7 +10023,7 @@ static const tid_t HTMLStyle_iface_tids[] = {
0
};
static dispex_static_data_t HTMLStyle_dispex = {
L"MSStyleCSSProperties",
"MSStyleCSSProperties",
&CSSStyle_dispex_vtbl,
DispHTMLStyle_tid,
HTMLStyle_iface_tids,
......@@ -10119,7 +10119,7 @@ static const tid_t HTMLW3CComputedStyle_iface_tids[] = {
0
};
static dispex_static_data_t HTMLW3CComputedStyle_dispex = {
L"CSSStyleDeclaration",
"CSSStyleDeclaration",
&CSSStyle_dispex_vtbl,
DispHTMLW3CComputedStyle_tid,
HTMLW3CComputedStyle_iface_tids,
......
......@@ -454,7 +454,7 @@ static const tid_t HTMLStyleElement_iface_tids[] = {
0
};
static dispex_static_data_t HTMLStyleElement_dispex = {
L"HTMLStyleElement",
"HTMLStyleElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLStyleElement_tid,
HTMLStyleElement_iface_tids,
......
......@@ -229,7 +229,7 @@ static const tid_t HTMLStyleSheetRule_iface_tids[] = {
0
};
static dispex_static_data_t HTMLStyleSheetRule_dispex = {
L"CSSStyleRule",
"CSSStyleRule",
&HTMLStyleSheetRule_dispex_vtbl,
DispHTMLStyleSheetRule_tid,
HTMLStyleSheetRule_iface_tids
......@@ -504,7 +504,7 @@ static const tid_t HTMLStyleSheetRulesCollection_iface_tids[] = {
0
};
static dispex_static_data_t HTMLStyleSheetRulesCollection_dispex = {
L"MSCSSRuleList",
"MSCSSRuleList",
&HTMLStyleSheetRulesCollection_dispex_vtbl,
DispHTMLStyleSheetRulesCollection_tid,
HTMLStyleSheetRulesCollection_iface_tids
......@@ -941,7 +941,7 @@ static const tid_t HTMLStyleSheetsCollection_iface_tids[] = {
0
};
static dispex_static_data_t HTMLStyleSheetsCollection_dispex = {
L"StyleSheetList",
"StyleSheetList",
&HTMLStyleSheetsCollection_dispex_vtbl,
DispHTMLStyleSheetsCollection_tid,
HTMLStyleSheetsCollection_iface_tids
......@@ -1529,7 +1529,7 @@ static const tid_t HTMLStyleSheet_iface_tids[] = {
0
};
static dispex_static_data_t HTMLStyleSheet_dispex = {
L"CSSStyleSheet",
"CSSStyleSheet",
&HTMLStyleSheet_dispex_vtbl,
DispHTMLStyleSheet_tid,
HTMLStyleSheet_iface_tids,
......
......@@ -516,7 +516,7 @@ static const tid_t HTMLTableCell_iface_tids[] = {
};
static dispex_static_data_t HTMLTableCell_dispex = {
L"HTMLTableDataCellElement",
"HTMLTableDataCellElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTableCell_tid,
HTMLTableCell_iface_tids,
......@@ -956,7 +956,7 @@ static const tid_t HTMLTableRow_iface_tids[] = {
};
static dispex_static_data_t HTMLTableRow_dispex = {
L"HTMLTableRowElement",
"HTMLTableRowElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTableRow_tid,
HTMLTableRow_iface_tids,
......@@ -1984,7 +1984,7 @@ static const tid_t HTMLTable_iface_tids[] = {
};
static dispex_static_data_t HTMLTable_dispex = {
L"HTMLTableElement",
"HTMLTableElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTable_tid,
HTMLTable_iface_tids,
......
......@@ -475,7 +475,7 @@ static const tid_t HTMLTextAreaElement_iface_tids[] = {
};
static dispex_static_data_t HTMLTextAreaElement_dispex = {
L"HTMLTextAreaElement",
"HTMLTextAreaElement",
&HTMLElement_event_target_vtbl.dispex_vtbl,
DispHTMLTextAreaElement_tid,
HTMLTextAreaElement_iface_tids,
......
......@@ -366,7 +366,7 @@ static const tid_t HTMLDOMTextNode_iface_tids[] = {
0
};
static dispex_static_data_t HTMLDOMTextNode_dispex = {
L"Text",
"Text",
NULL,
DispHTMLDOMTextNode_tid,
HTMLDOMTextNode_iface_tids,
......
......@@ -4065,7 +4065,7 @@ static const tid_t HTMLWindow_iface_tids[] = {
};
static dispex_static_data_t HTMLWindow_dispex = {
L"Window",
"Window",
&HTMLWindow_event_target_vtbl.dispex_vtbl,
DispHTMLWindow2_tid,
HTMLWindow_iface_tids,
......
......@@ -371,7 +371,7 @@ typedef struct {
} dispex_static_data_vtbl_t;
typedef struct {
const WCHAR *name;
const char *name;
const dispex_static_data_vtbl_t *vtbl;
const tid_t disp_tid;
const tid_t* const iface_tids;
......
......@@ -1237,7 +1237,7 @@ static const tid_t mutation_observer_iface_tids[] = {
0
};
static dispex_static_data_t mutation_observer_dispex = {
L"MutationObserver",
"MutationObserver",
&mutation_observer_dispex_vtbl,
IWineMSHTMLMutationObserver_tid,
mutation_observer_iface_tids
......@@ -1398,7 +1398,7 @@ static const tid_t mutation_observer_ctor_iface_tids[] = {
};
static dispex_static_data_t mutation_observer_ctor_dispex = {
L"Function",
"Function",
&mutation_observer_ctor_dispex_vtbl,
NULL_tid,
mutation_observer_ctor_iface_tids
......
......@@ -323,7 +323,7 @@ static const tid_t HTMLDOMImplementation_iface_tids[] = {
0
};
static dispex_static_data_t HTMLDOMImplementation_dispex = {
L"DOMImplementation",
"DOMImplementation",
&HTMLDOMImplementation_dispex_vtbl,
DispHTMLDOMImplementation_tid,
HTMLDOMImplementation_iface_tids,
......@@ -589,7 +589,7 @@ static const tid_t HTMLScreen_iface_tids[] = {
0
};
static dispex_static_data_t HTMLScreen_dispex = {
L"Screen",
"Screen",
&HTMLScreen_dispex_vtbl,
DispHTMLScreen_tid,
HTMLScreen_iface_tids
......@@ -766,7 +766,7 @@ static const tid_t OmHistory_iface_tids[] = {
0
};
static dispex_static_data_t OmHistory_dispex = {
L"History",
"History",
&OmHistory_dispex_vtbl,
DispHTMLHistory_tid,
OmHistory_iface_tids
......@@ -944,7 +944,7 @@ static const tid_t HTMLPluginsCollection_iface_tids[] = {
0
};
static dispex_static_data_t HTMLPluginsCollection_dispex = {
L"PluginArray",
"PluginArray",
&HTMLPluginsCollection_dispex_vtbl,
DispCPlugins_tid,
HTMLPluginsCollection_iface_tids
......@@ -1110,7 +1110,7 @@ static const tid_t HTMLMimeTypesCollection_iface_tids[] = {
0
};
static dispex_static_data_t HTMLMimeTypesCollection_dispex = {
L"MimeTypeArray",
"MimeTypeArray",
&HTMLMimeTypesCollection_dispex_vtbl,
IHTMLMimeTypesCollection_tid,
HTMLMimeTypesCollection_iface_tids
......@@ -1561,7 +1561,7 @@ static const tid_t OmNavigator_iface_tids[] = {
0
};
static dispex_static_data_t OmNavigator_dispex = {
L"Navigator",
"Navigator",
&OmNavigator_dispex_vtbl,
DispHTMLNavigator_tid,
OmNavigator_iface_tids
......@@ -1961,7 +1961,7 @@ static const tid_t HTMLPerformanceTiming_iface_tids[] = {
0
};
static dispex_static_data_t HTMLPerformanceTiming_dispex = {
L"PerformanceTiming",
"PerformanceTiming",
NULL,
IHTMLPerformanceTiming_tid,
HTMLPerformanceTiming_iface_tids
......@@ -2157,7 +2157,7 @@ static const tid_t HTMLPerformanceNavigation_iface_tids[] = {
0
};
static dispex_static_data_t HTMLPerformanceNavigation_dispex = {
L"PerformanceNavigation",
"PerformanceNavigation",
&HTMLPerformanceNavigation_dispex_vtbl,
IHTMLPerformanceNavigation_tid,
HTMLPerformanceNavigation_iface_tids
......@@ -2359,7 +2359,7 @@ static const tid_t HTMLPerformance_iface_tids[] = {
0
};
static dispex_static_data_t HTMLPerformance_dispex = {
L"Performance",
"Performance",
&HTMLPerformance_dispex_vtbl,
IHTMLPerformance_tid,
HTMLPerformance_iface_tids
......@@ -2538,7 +2538,7 @@ static const tid_t HTMLNamespaceCollection_iface_tids[] = {
0
};
static dispex_static_data_t HTMLNamespaceCollection_dispex = {
L"MSNamespaceInfoCollection",
"MSNamespaceInfoCollection",
&HTMLNamespaceCollection_dispex_vtbl,
DispHTMLNamespaceCollection_tid,
HTMLNamespaceCollection_iface_tids
......@@ -2807,7 +2807,7 @@ static const tid_t console_iface_tids[] = {
0
};
static dispex_static_data_t console_dispex = {
L"Console",
"Console",
&console_dispex_vtbl,
IWineMSHTMLConsole_tid,
console_iface_tids
......@@ -3151,7 +3151,7 @@ static const tid_t media_query_list_iface_tids[] = {
0
};
static dispex_static_data_t media_query_list_dispex = {
L"MediaQueryList",
"MediaQueryList",
&media_query_list_dispex_vtbl,
IWineMSHTMLMediaQueryList_tid,
media_query_list_iface_tids
......
......@@ -1743,7 +1743,7 @@ static const tid_t HTMLTxtRange_iface_tids[] = {
0
};
static dispex_static_data_t HTMLTxtRange_dispex = {
L"TextRange",
"TextRange",
&HTMLTxtRange_dispex_vtbl,
IHTMLTxtRange_tid,
HTMLTxtRange_iface_tids
......@@ -2107,7 +2107,7 @@ static const tid_t HTMLDOMRange_iface_tids[] = {
};
static dispex_static_data_t HTMLDOMRange_dispex = {
L"Range",
"Range",
&HTMLDOMRange_dispex_vtbl,
DispHTMLDOMRange_tid,
HTMLDOMRange_iface_tids
......
......@@ -355,7 +355,7 @@ static const tid_t HTMLSelectionObject_iface_tids[] = {
0
};
static dispex_static_data_t HTMLSelectionObject_dispex = {
L"MSSelection",
"MSSelection",
&HTMLSelectionObject_dispex_vtbl,
IHTMLSelectionObject_tid, /* FIXME: We have a test for that, but it doesn't expose IHTMLSelectionObject2 iface. */
HTMLSelectionObject_iface_tids
......
......@@ -1606,7 +1606,7 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = {
0
};
static dispex_static_data_t HTMLXMLHttpRequest_dispex = {
L"XMLHttpRequest",
"XMLHttpRequest",
&HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl,
DispHTMLXMLHttpRequest_tid,
HTMLXMLHttpRequest_iface_tids,
......@@ -1825,7 +1825,7 @@ static const tid_t HTMLXMLHttpRequestFactory_iface_tids[] = {
0
};
static dispex_static_data_t HTMLXMLHttpRequestFactory_dispex = {
L"Function",
"Function",
&HTMLXMLHttpRequestFactory_dispex_vtbl,
IHTMLXMLHttpRequestFactory_tid,
HTMLXMLHttpRequestFactory_iface_tids
......
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