From: Gabriel Ivăncescu gabrielopcode@gmail.com
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com --- dlls/mshtml/htmlanchor.c | 27 +++++-------- dlls/mshtml/htmlarea.c | 27 +++++-------- dlls/mshtml/htmlbody.c | 32 ++++++--------- dlls/mshtml/htmlcomment.c | 14 +++---- dlls/mshtml/htmldoc.c | 57 ++++++++------------------ dlls/mshtml/htmlelem.c | 14 +++---- dlls/mshtml/htmlform.c | 30 ++++++-------- dlls/mshtml/htmlframe.c | 66 ++++++++++++++---------------- dlls/mshtml/htmlgeneric.c | 14 +++---- dlls/mshtml/htmlhead.c | 70 +++++++++++++------------------- dlls/mshtml/htmlimg.c | 28 +++++-------- dlls/mshtml/htmlinput.c | 76 ++++++++++++++-------------------- dlls/mshtml/htmllink.c | 29 +++++-------- dlls/mshtml/htmlnode.c | 9 ++--- dlls/mshtml/htmlobject.c | 45 +++++++++------------ dlls/mshtml/htmlscript.c | 29 +++++-------- dlls/mshtml/htmlselect.c | 59 +++++++++++---------------- dlls/mshtml/htmlstyleelem.c | 27 +++++-------- dlls/mshtml/htmltable.c | 81 +++++++++++++------------------------ dlls/mshtml/htmltextarea.c | 31 ++++++-------- dlls/mshtml/htmltextnode.c | 9 ++--- dlls/mshtml/svg.c | 52 +++++++++++------------- 22 files changed, 324 insertions(+), 502 deletions(-)
diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index 9705c7722f5..e784de12443 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -868,24 +868,15 @@ static void HTMLAnchorElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLAnchorElementImplVtbl = { - &CLSID_HTMLAnchorElement, - HTMLAnchorElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLAnchorElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLAnchorElement_traverse, - HTMLAnchorElement_unlink + .clsid = &CLSID_HTMLAnchorElement, + .qi = HTMLAnchorElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLAnchorElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .traverse = HTMLAnchorElement_traverse, + .unlink = HTMLAnchorElement_unlink };
static const tid_t HTMLAnchorElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index 3f16f019c3f..d0e377ba96c 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -476,24 +476,15 @@ static void HTMLAreaElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLAreaElementImplVtbl = { - &CLSID_HTMLAreaElement, - HTMLAreaElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLAreaElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLAreaElement_traverse, - HTMLAreaElement_unlink + .clsid = &CLSID_HTMLAreaElement, + .qi = HTMLAreaElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLAreaElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .traverse = HTMLAreaElement_traverse, + .unlink = HTMLAreaElement_unlink };
static const tid_t HTMLAreaElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index 72a6366872b..277b9ed8cf0 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -973,26 +973,18 @@ static const cpc_entry_t HTMLBodyElement_cpc[] = { };
static const NodeImplVtbl HTMLBodyElementImplVtbl = { - &CLSID_HTMLBody, - HTMLBodyElement_QI, - HTMLElement_destructor, - HTMLBodyElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - HTMLBodyElement_get_event_prop_target, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLBodyElement_traverse, - HTMLBodyElement_unlink, - HTMLBodyElement_is_text_edit, - HTMLBodyElement_is_settable + .clsid = &CLSID_HTMLBody, + .qi = HTMLBodyElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLBodyElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .get_event_prop_target = HTMLBodyElement_get_event_prop_target, + .traverse = HTMLBodyElement_traverse, + .unlink = HTMLBodyElement_unlink, + .is_text_edit = HTMLBodyElement_is_text_edit, + .is_settable = HTMLBodyElement_is_settable };
static const tid_t HTMLBodyElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlcomment.c b/dlls/mshtml/htmlcomment.c index 6af08f25af8..f9c945bee8a 100644 --- a/dlls/mshtml/htmlcomment.c +++ b/dlls/mshtml/htmlcomment.c @@ -185,13 +185,13 @@ static HRESULT HTMLCommentElement_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, }
static const NodeImplVtbl HTMLCommentElementImplVtbl = { - &CLSID_HTMLCommentElement, - HTMLCommentElement_QI, - HTMLCommentElement_destructor, - HTMLElement_cpc, - HTMLCommentElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col + .clsid = &CLSID_HTMLCommentElement, + .qi = HTMLCommentElement_QI, + .destructor = HTMLCommentElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLCommentElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col };
static const tid_t HTMLCommentElement_iface_tids[] = { diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b0c88719b44..79f17a626af 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -325,11 +325,10 @@ static HRESULT DocumentType_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDO static const cpc_entry_t DocumentType_cpc[] = {{NULL}};
static const NodeImplVtbl DocumentTypeImplVtbl = { - NULL, - DocumentType_QI, - DocumentType_destructor, - DocumentType_cpc, - DocumentType_clone + .qi = DocumentType_QI, + .destructor = DocumentType_destructor, + .cpc_entries = DocumentType_cpc, + .clone = DocumentType_clone };
static nsISupports *DocumentType_get_gecko_target(DispatchEx *dispex) @@ -5860,24 +5859,12 @@ static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { - &CLSID_HTMLDocument, - HTMLDocumentNode_QI, - HTMLDocumentNode_destructor, - HTMLDocumentNode_cpc, - HTMLDocumentNode_clone, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLDocumentNode_unlink + .clsid = &CLSID_HTMLDocument, + .qi = HTMLDocumentNode_QI, + .destructor = HTMLDocumentNode_destructor, + .cpc_entries = HTMLDocumentNode_cpc, + .clone = HTMLDocumentNode_clone, + .unlink = HTMLDocumentNode_unlink };
static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) @@ -6096,24 +6083,12 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { };
static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { - &CLSID_HTMLDocument, - HTMLDocumentNode_QI, - HTMLDocumentNode_destructor, - HTMLDocumentNode_cpc, - HTMLDocumentFragment_clone, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLDocumentFragment_unlink + .clsid = &CLSID_HTMLDocument, + .qi = HTMLDocumentNode_QI, + .destructor = HTMLDocumentNode_destructor, + .cpc_entries = HTMLDocumentNode_cpc, + .clone = HTMLDocumentFragment_clone, + .unlink = HTMLDocumentFragment_unlink };
static const tid_t HTMLDocumentNode_iface_tids[] = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 2c13dadbbe0..82b8791968a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6945,13 +6945,13 @@ const cpc_entry_t HTMLElement_cpc[] = { };
static const NodeImplVtbl HTMLElementImplVtbl = { - &CLSID_HTMLUnknownElement, - HTMLElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col + .clsid = &CLSID_HTMLUnknownElement, + .qi = HTMLElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col };
static inline HTMLElement *impl_from_DispatchEx(DispatchEx *iface) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 7ecbbeca31b..b8497fd224d 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -973,24 +973,18 @@ static void HTMLFormElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLFormElementImplVtbl = { - &CLSID_HTMLFormElement, - HTMLFormElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLFormElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLFormElement_get_dispid, - HTMLFormElement_dispex_get_name, - HTMLFormElement_invoke, - NULL, - HTMLFormElement_traverse, - HTMLFormElement_unlink + .clsid = &CLSID_HTMLFormElement, + .qi = HTMLFormElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLFormElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .get_dispid = HTMLFormElement_get_dispid, + .get_name = HTMLFormElement_dispex_get_name, + .invoke = HTMLFormElement_invoke, + .traverse = HTMLFormElement_traverse, + .unlink = HTMLFormElement_unlink };
static const tid_t HTMLFormElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index c90ebe430dd..e5e43e55c65 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -1007,24 +1007,21 @@ static void HTMLFrameElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLFrameElementImplVtbl = { - &CLSID_HTMLFrameElement, - HTMLFrameElement_QI, - HTMLFrameElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - HTMLFrameElement_get_document, - HTMLFrameElement_get_readystate, - HTMLFrameElement_get_dispid, - HTMLFrameElement_get_name, - HTMLFrameElement_invoke, - HTMLFrameElement_bind_to_tree, - HTMLFrameElement_traverse, - HTMLFrameElement_unlink + .clsid = &CLSID_HTMLFrameElement, + .qi = HTMLFrameElement_QI, + .destructor = HTMLFrameElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .get_document = HTMLFrameElement_get_document, + .get_readystate = HTMLFrameElement_get_readystate, + .get_dispid = HTMLFrameElement_get_dispid, + .get_name = HTMLFrameElement_get_name, + .invoke = HTMLFrameElement_invoke, + .bind_to_tree = HTMLFrameElement_bind_to_tree, + .traverse = HTMLFrameElement_traverse, + .unlink = HTMLFrameElement_unlink };
static const tid_t HTMLFrameElement_iface_tids[] = { @@ -1594,24 +1591,21 @@ static void HTMLIFrame_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLIFrameImplVtbl = { - &CLSID_HTMLIFrame, - HTMLIFrame_QI, - HTMLIFrame_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - HTMLIFrame_get_document, - HTMLIFrame_get_readystate, - HTMLIFrame_get_dispid, - HTMLIFrame_get_name, - HTMLIFrame_invoke, - HTMLIFrame_bind_to_tree, - HTMLIFrame_traverse, - HTMLIFrame_unlink + .clsid = &CLSID_HTMLIFrame, + .qi = HTMLIFrame_QI, + .destructor = HTMLIFrame_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .get_document = HTMLIFrame_get_document, + .get_readystate = HTMLIFrame_get_readystate, + .get_dispid = HTMLIFrame_get_dispid, + .get_name = HTMLIFrame_get_name, + .invoke = HTMLIFrame_invoke, + .bind_to_tree = HTMLIFrame_bind_to_tree, + .traverse = HTMLIFrame_traverse, + .unlink = HTMLIFrame_unlink };
static const tid_t HTMLIFrame_iface_tids[] = { diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 450d49ff16c..5836ebd208a 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -153,13 +153,13 @@ static void HTMLGenericElement_destructor(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLGenericElementImplVtbl = { - &CLSID_HTMLGenericElement, - HTMLGenericElement_QI, - HTMLGenericElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col + .clsid = &CLSID_HTMLGenericElement, + .qi = HTMLGenericElement_QI, + .destructor = HTMLGenericElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col };
static const tid_t HTMLGenericElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 92d90a6d5aa..e11e0f05f7e 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -169,13 +169,13 @@ static void HTMLTitleElement_destructor(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLTitleElementImplVtbl = { - &CLSID_HTMLTitleElement, - HTMLTitleElement_QI, - HTMLTitleElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col + .clsid = &CLSID_HTMLTitleElement, + .qi = HTMLTitleElement_QI, + .destructor = HTMLTitleElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col };
static const tid_t HTMLTitleElement_iface_tids[] = { @@ -341,26 +341,14 @@ static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) }
static const NodeImplVtbl HTMLHtmlElementImplVtbl = { - &CLSID_HTMLHtmlElement, - HTMLHtmlElement_QI, - HTMLHtmlElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLHtmlElement_is_settable + .clsid = &CLSID_HTMLHtmlElement, + .qi = HTMLHtmlElement_QI, + .destructor = HTMLHtmlElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .is_settable = HTMLHtmlElement_is_settable };
static const tid_t HTMLHtmlElement_iface_tids[] = { @@ -590,13 +578,13 @@ static void HTMLMetaElement_destructor(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLMetaElementImplVtbl = { - &CLSID_HTMLMetaElement, - HTMLMetaElement_QI, - HTMLMetaElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col + .clsid = &CLSID_HTMLMetaElement, + .qi = HTMLMetaElement_QI, + .destructor = HTMLMetaElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col };
static const tid_t HTMLMetaElement_iface_tids[] = { @@ -755,13 +743,13 @@ static void HTMLHeadElement_destructor(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLHeadElementImplVtbl = { - &CLSID_HTMLHeadElement, - HTMLHeadElement_QI, - HTMLHeadElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col + .clsid = &CLSID_HTMLHeadElement, + .qi = HTMLHeadElement_QI, + .destructor = HTMLHeadElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col };
static const tid_t HTMLHeadElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index 746e1622af8..5486243eb08 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -697,24 +697,16 @@ static void HTMLImgElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLImgElementImplVtbl = { - &CLSID_HTMLImg, - HTMLImgElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - HTMLImgElement_get_readystate, - NULL, - NULL, - NULL, - NULL, - HTMLImgElement_traverse, - HTMLImgElement_unlink + .clsid = &CLSID_HTMLImg, + .qi = HTMLImgElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .get_readystate = HTMLImgElement_get_readystate, + .traverse = HTMLImgElement_traverse, + .unlink = HTMLImgElement_unlink };
static const tid_t HTMLImgElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 68bdc62e0c7..d71e5e0a5d5 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1421,25 +1421,18 @@ static void HTMLInputElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLInputElementImplVtbl = { - &CLSID_HTMLInputElement, - HTMLInputElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - HTMLInputElementImpl_put_disabled, - HTMLInputElementImpl_get_disabled, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLInputElement_traverse, - HTMLInputElement_unlink, - HTMLInputElement_is_text_edit + .clsid = &CLSID_HTMLInputElement, + .qi = HTMLInputElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .put_disabled = HTMLInputElementImpl_put_disabled, + .get_disabled = HTMLInputElementImpl_get_disabled, + .traverse = HTMLInputElement_traverse, + .unlink = HTMLInputElement_unlink, + .is_text_edit = HTMLInputElement_is_text_edit };
static const tid_t HTMLInputElement_iface_tids[] = { @@ -1630,13 +1623,13 @@ static HRESULT HTMLLabelElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }
static const NodeImplVtbl HTMLLabelElementImplVtbl = { - &CLSID_HTMLLabelElement, - HTMLLabelElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, + .clsid = &CLSID_HTMLLabelElement, + .qi = HTMLLabelElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, };
static const tid_t HTMLLabelElement_iface_tids[] = { @@ -1960,25 +1953,18 @@ static void HTMLButtonElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLButtonElementImplVtbl = { - &CLSID_HTMLButtonElement, - HTMLButtonElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - HTMLButtonElementImpl_put_disabled, - HTMLButtonElementImpl_get_disabled, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLButtonElement_traverse, - HTMLButtonElement_unlink, - HTMLButtonElement_is_text_edit + .clsid = &CLSID_HTMLButtonElement, + .qi = HTMLButtonElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .put_disabled = HTMLButtonElementImpl_put_disabled, + .get_disabled = HTMLButtonElementImpl_get_disabled, + .traverse = HTMLButtonElement_traverse, + .unlink = HTMLButtonElement_unlink, + .is_text_edit = HTMLButtonElement_is_text_edit };
static const tid_t HTMLButtonElement_iface_tids[] = { diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 6d15d9ee7ba..a13024f61cc 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -415,24 +415,17 @@ static void HTMLLinkElement_unlink(HTMLDOMNode *iface) unlink_ref(&This->nslink); } static const NodeImplVtbl HTMLLinkElementImplVtbl = { - &CLSID_HTMLLinkElement, - HTMLLinkElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - HTMLLinkElementImpl_put_disabled, - HTMLLinkElementImpl_get_disabled, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLLinkElement_traverse, - HTMLLinkElement_unlink + .clsid = &CLSID_HTMLLinkElement, + .qi = HTMLLinkElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .put_disabled = HTMLLinkElementImpl_put_disabled, + .get_disabled = HTMLLinkElementImpl_get_disabled, + .traverse = HTMLLinkElement_traverse, + .unlink = HTMLLinkElement_unlink };
static const tid_t HTMLLinkElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 9fa0b657100..03abc97b2de 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1476,11 +1476,10 @@ void HTMLDOMNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) static const cpc_entry_t HTMLDOMNode_cpc[] = {{NULL}};
static const NodeImplVtbl HTMLDOMNodeImplVtbl = { - NULL, - HTMLDOMNode_QI, - HTMLDOMNode_destructor, - HTMLDOMNode_cpc, - HTMLDOMNode_clone + .qi = HTMLDOMNode_QI, + .destructor = HTMLDOMNode_destructor, + .cpc_entries = HTMLDOMNode_cpc, + .clone = HTMLDOMNode_clone };
void HTMLDOMNode_Init(HTMLDocumentNode *doc, HTMLDOMNode *node, nsIDOMNode *nsnode, dispex_static_data_t *dispex_data) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 23858d39fbd..5d5e5e9ec33 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -744,24 +744,19 @@ static void HTMLObjectElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLObjectElementImplVtbl = { - &CLSID_HTMLObjectElement, - HTMLObjectElement_QI, - HTMLObjectElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - HTMLObjectElement_get_readystate, - HTMLObjectElement_get_dispid, - HTMLObjectElement_dispex_get_name, - HTMLObjectElement_invoke, - NULL, - HTMLObjectElement_traverse, - HTMLObjectElement_unlink + .clsid = &CLSID_HTMLObjectElement, + .qi = HTMLObjectElement_QI, + .destructor = HTMLObjectElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .get_readystate = HTMLObjectElement_get_readystate, + .get_dispid = HTMLObjectElement_get_dispid, + .get_name = HTMLObjectElement_dispex_get_name, + .invoke = HTMLObjectElement_invoke, + .traverse = HTMLObjectElement_traverse, + .unlink = HTMLObjectElement_unlink };
static const tid_t HTMLObjectElement_iface_tids[] = { @@ -1019,13 +1014,13 @@ static void HTMLEmbedElement_destructor(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLEmbedElementImplVtbl = { - &CLSID_HTMLEmbed, - HTMLEmbedElement_QI, - HTMLEmbedElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col + .clsid = &CLSID_HTMLEmbed, + .qi = HTMLEmbedElement_QI, + .destructor = HTMLEmbedElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col };
static const tid_t HTMLEmbedElement_iface_tids[] = { diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 6ce48362d96..7a9655150f8 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -427,24 +427,17 @@ static void HTMLScriptElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLScriptElementImplVtbl = { - &CLSID_HTMLScriptElement, - HTMLScriptElement_QI, - HTMLScriptElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - HTMLScriptElement_get_readystate, - NULL, - NULL, - NULL, - HTMLScriptElement_bind_to_tree, - HTMLScriptElement_traverse, - HTMLScriptElement_unlink + .clsid = &CLSID_HTMLScriptElement, + .qi = HTMLScriptElement_QI, + .destructor = HTMLScriptElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .get_readystate = HTMLScriptElement_get_readystate, + .bind_to_tree = HTMLScriptElement_bind_to_tree, + .traverse = HTMLScriptElement_traverse, + .unlink = HTMLScriptElement_unlink };
HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index f03a2e4d8a0..38f0b0fed9a 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -386,24 +386,15 @@ static void HTMLOptionElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLOptionElementImplVtbl = { - &CLSID_HTMLOptionElement, - HTMLOptionElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLOptionElement_traverse, - HTMLOptionElement_unlink + .clsid = &CLSID_HTMLOptionElement, + .qi = HTMLOptionElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .traverse = HTMLOptionElement_traverse, + .unlink = HTMLOptionElement_unlink };
static const tid_t HTMLOptionElement_iface_tids[] = { @@ -1458,24 +1449,20 @@ static void HTMLSelectElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLSelectElementImplVtbl = { - &CLSID_HTMLSelectElement, - HTMLSelectElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - HTMLSelectElementImpl_put_disabled, - HTMLSelectElementImpl_get_disabled, - NULL, - NULL, - HTMLSelectElement_get_dispid, - HTMLSelectElement_dispex_get_name, - HTMLSelectElement_invoke, - NULL, - HTMLSelectElement_traverse, - HTMLSelectElement_unlink + .clsid = &CLSID_HTMLSelectElement, + .qi = HTMLSelectElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .put_disabled = HTMLSelectElementImpl_put_disabled, + .get_disabled = HTMLSelectElementImpl_get_disabled, + .get_dispid = HTMLSelectElement_get_dispid, + .get_name = HTMLSelectElement_dispex_get_name, + .invoke = HTMLSelectElement_invoke, + .traverse = HTMLSelectElement_traverse, + .unlink = HTMLSelectElement_unlink };
static const tid_t HTMLSelectElement_tids[] = { diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index ce13fc815ba..7f6eeb0132b 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -429,24 +429,15 @@ static void HTMLStyleElement_init_dispex_info(dispex_data_t *info, compat_mode_t }
static const NodeImplVtbl HTMLStyleElementImplVtbl = { - &CLSID_HTMLStyleElement, - HTMLStyleElement_QI, - HTMLStyleElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLStyleElement_traverse, - HTMLStyleElement_unlink + .clsid = &CLSID_HTMLStyleElement, + .qi = HTMLStyleElement_QI, + .destructor = HTMLStyleElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .traverse = HTMLStyleElement_traverse, + .unlink = HTMLStyleElement_unlink };
static const tid_t HTMLStyleElement_iface_tids[] = { diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index a4b2b1f3621..7f4c4fafb0e 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -489,24 +489,15 @@ static void HTMLTableCell_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLTableCellImplVtbl = { - &CLSID_HTMLTableCell, - HTMLTableCell_QI, - HTMLTableCell_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLTableCell_traverse, - HTMLTableCell_unlink + .clsid = &CLSID_HTMLTableCell, + .qi = HTMLTableCell_QI, + .destructor = HTMLTableCell_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .traverse = HTMLTableCell_traverse, + .unlink = HTMLTableCell_unlink };
static const tid_t HTMLTableCell_iface_tids[] = { @@ -929,24 +920,15 @@ static void HTMLTableRow_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLTableRowImplVtbl = { - &CLSID_HTMLTableRow, - HTMLTableRow_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLTableRow_traverse, - HTMLTableRow_unlink + .clsid = &CLSID_HTMLTableRow, + .qi = HTMLTableRow_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .traverse = HTMLTableRow_traverse, + .unlink = HTMLTableRow_unlink };
static const tid_t HTMLTableRow_iface_tids[] = { @@ -1955,24 +1937,15 @@ static const cpc_entry_t HTMLTable_cpc[] = { };
static const NodeImplVtbl HTMLTableImplVtbl = { - &CLSID_HTMLTable, - HTMLTable_QI, - HTMLElement_destructor, - HTMLTable_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLTable_traverse, - HTMLTable_unlink + .clsid = &CLSID_HTMLTable, + .qi = HTMLTable_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLTable_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .traverse = HTMLTable_traverse, + .unlink = HTMLTable_unlink };
static const tid_t HTMLTable_iface_tids[] = { diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 47be8be4281..472f2814ae4 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -447,25 +447,18 @@ static void HTMLTextAreaElement_unlink(HTMLDOMNode *iface) }
static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { - &CLSID_HTMLTextAreaElement, - HTMLTextAreaElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - HTMLElement_handle_event, - HTMLElement_get_attr_col, - NULL, - HTMLTextAreaElementImpl_put_disabled, - HTMLTextAreaElementImpl_get_disabled, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - HTMLTextAreaElement_traverse, - HTMLTextAreaElement_unlink, - HTMLTextAreaElement_is_text_edit + .clsid = &CLSID_HTMLTextAreaElement, + .qi = HTMLTextAreaElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .handle_event = HTMLElement_handle_event, + .get_attr_col = HTMLElement_get_attr_col, + .put_disabled = HTMLTextAreaElementImpl_put_disabled, + .get_disabled = HTMLTextAreaElementImpl_get_disabled, + .traverse = HTMLTextAreaElement_traverse, + .unlink = HTMLTextAreaElement_unlink, + .is_text_edit = HTMLTextAreaElement_is_text_edit };
static const tid_t HTMLTextAreaElement_iface_tids[] = { diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index af3f57044b8..55b00fb4670 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -351,11 +351,10 @@ static HRESULT HTMLDOMTextNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTM static const cpc_entry_t HTMLDOMTextNode_cpc[] = {{NULL}};
static const NodeImplVtbl HTMLDOMTextNodeImplVtbl = { - NULL, - HTMLDOMTextNode_QI, - HTMLDOMNode_destructor, - HTMLDOMTextNode_cpc, - HTMLDOMTextNode_clone + .qi = HTMLDOMTextNode_QI, + .destructor = HTMLDOMNode_destructor, + .cpc_entries = HTMLDOMTextNode_cpc, + .clone = HTMLDOMTextNode_clone };
static const tid_t HTMLDOMTextNode_iface_tids[] = { diff --git a/dlls/mshtml/svg.c b/dlls/mshtml/svg.c index b03ad073244..5fb83fd3597 100644 --- a/dlls/mshtml/svg.c +++ b/dlls/mshtml/svg.c @@ -193,13 +193,12 @@ static HRESULT SVGElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }
static const NodeImplVtbl SVGElementImplVtbl = { - &CLSID_SVGElement, - SVGElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - NULL, - HTMLElement_get_attr_col, + .clsid = &CLSID_SVGElement, + .qi = SVGElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .get_attr_col = HTMLElement_get_attr_col, };
static void init_svg_element(SVGElement *svg_element, HTMLDocumentNode *doc, nsIDOMSVGElement *nselem) @@ -734,13 +733,12 @@ static HRESULT SVGSVGElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }
static const NodeImplVtbl SVGSVGElementImplVtbl = { - &CLSID_SVGSVGElement, - SVGSVGElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - NULL, - HTMLElement_get_attr_col, + .clsid = &CLSID_SVGSVGElement, + .qi = SVGSVGElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .get_attr_col = HTMLElement_get_attr_col, };
static HRESULT create_viewport_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) @@ -903,13 +901,12 @@ static HRESULT SVGCircleElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }
static const NodeImplVtbl SVGCircleElementImplVtbl = { - &CLSID_SVGCircleElement, - SVGCircleElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - NULL, - HTMLElement_get_attr_col, + .clsid = &CLSID_SVGCircleElement, + .qi = SVGCircleElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .get_attr_col = HTMLElement_get_attr_col, };
static HRESULT create_circle_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem) @@ -1147,13 +1144,12 @@ static HRESULT SVGTSpanElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) }
static const NodeImplVtbl SVGTSpanElementImplVtbl = { - &CLSID_SVGTSpanElement, - SVGTSpanElement_QI, - HTMLElement_destructor, - HTMLElement_cpc, - HTMLElement_clone, - NULL, - HTMLElement_get_attr_col, + .clsid = &CLSID_SVGTSpanElement, + .qi = SVGTSpanElement_QI, + .destructor = HTMLElement_destructor, + .cpc_entries = HTMLElement_cpc, + .clone = HTMLElement_clone, + .get_attr_col = HTMLElement_get_attr_col, };
static HRESULT create_tspan_element(HTMLDocumentNode *doc, nsIDOMSVGElement *nselem, HTMLElement **elem)