From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlobject.c | 167 ++------------------------------------- 1 file changed, 6 insertions(+), 161 deletions(-)
diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 36293776ad6..471ea764da8 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -48,61 +48,8 @@ static inline HTMLObjectElement *impl_from_IHTMLObjectElement(IHTMLObjectElement return CONTAINING_RECORD(iface, HTMLObjectElement, IHTMLObjectElement_iface); }
-static HRESULT WINAPI HTMLObjectElement_QueryInterface(IHTMLObjectElement *iface, - REFIID riid, void **ppv) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->plugin_container.element.node.IHTMLDOMNode_iface, - riid, ppv); -} - -static ULONG WINAPI HTMLObjectElement_AddRef(IHTMLObjectElement *iface) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - - return IHTMLDOMNode_AddRef(&This->plugin_container.element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLObjectElement_Release(IHTMLObjectElement *iface) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - - return IHTMLDOMNode_Release(&This->plugin_container.element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLObjectElement_GetTypeInfoCount(IHTMLObjectElement *iface, UINT *pctinfo) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLObjectElement_GetTypeInfo(IHTMLObjectElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetTypeInfo(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLObjectElement_GetIDsOfNames(IHTMLObjectElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_GetIDsOfNames(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - riid, rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLObjectElement_Invoke(IHTMLObjectElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - return IDispatchEx_Invoke(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLObjectElement, IHTMLObjectElement, + impl_from_IHTMLObjectElement(iface)->plugin_container.element.node.event_target.dispex)
static HRESULT WINAPI HTMLObjectElement_get_object(IHTMLObjectElement *iface, IDispatch **p) { @@ -507,60 +454,8 @@ static inline HTMLObjectElement *impl_from_IHTMLObjectElement2(IHTMLObjectElemen return CONTAINING_RECORD(iface, HTMLObjectElement, IHTMLObjectElement2_iface); }
-static HRESULT WINAPI HTMLObjectElement2_QueryInterface(IHTMLObjectElement2 *iface, - REFIID riid, void **ppv) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - - return IHTMLDOMNode_QueryInterface(&This->plugin_container.element.node.IHTMLDOMNode_iface, - riid, ppv); -} - -static ULONG WINAPI HTMLObjectElement2_AddRef(IHTMLObjectElement2 *iface) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - - return IHTMLDOMNode_AddRef(&This->plugin_container.element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLObjectElement2_Release(IHTMLObjectElement2 *iface) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - - return IHTMLDOMNode_Release(&This->plugin_container.element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLObjectElement2_GetTypeInfoCount(IHTMLObjectElement2 *iface, UINT *pctinfo) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - return IDispatchEx_GetTypeInfoCount(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLObjectElement2_GetTypeInfo(IHTMLObjectElement2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - return IDispatchEx_GetTypeInfo(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLObjectElement2_GetIDsOfNames(IHTMLObjectElement2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - return IDispatchEx_GetIDsOfNames(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - riid, rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLObjectElement2_Invoke(IHTMLObjectElement2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLObjectElement *This = impl_from_IHTMLObjectElement2(iface); - return IDispatchEx_Invoke(&This->plugin_container.element.node.event_target.dispex.IDispatchEx_iface, - dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLObjectElement2, IHTMLObjectElement2, + impl_from_IHTMLObjectElement2(iface)->plugin_container.element.node.event_target.dispex)
static HRESULT WINAPI HTMLObjectElement2_namedRecordset(IHTMLObjectElement2 *iface, BSTR dataMember, VARIANT *hierarchy, IDispatch **ppRecordset) @@ -866,58 +761,8 @@ static inline HTMLEmbed *impl_from_IHTMLEmbedElement(IHTMLEmbedElement *iface) return CONTAINING_RECORD(iface, HTMLEmbed, IHTMLEmbedElement_iface); }
-static HRESULT WINAPI HTMLEmbedElement_QueryInterface(IHTMLEmbedElement *iface, - REFIID riid, void **ppv) -{ - HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLEmbedElement_AddRef(IHTMLEmbedElement *iface) -{ - HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLEmbedElement_Release(IHTMLEmbedElement *iface) -{ - HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLEmbedElement_GetTypeInfoCount(IHTMLEmbedElement *iface, UINT *pctinfo) -{ - HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLEmbedElement_GetTypeInfo(IHTMLEmbedElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLEmbedElement_GetIDsOfNames(IHTMLEmbedElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLEmbedElement_Invoke(IHTMLEmbedElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLEmbed *This = impl_from_IHTMLEmbedElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLEmbedElement, IHTMLEmbedElement, + impl_from_IHTMLEmbedElement(iface)->element.node.event_target.dispex)
static HRESULT WINAPI HTMLEmbedElement_put_hidden(IHTMLEmbedElement *iface, BSTR v) {
From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlscript.c | 55 ++-------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-)
diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 2e008d9a95b..9a4d9dd5242 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -38,59 +38,8 @@ static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement return CONTAINING_RECORD(iface, HTMLScriptElement, IHTMLScriptElement_iface); }
-static HRESULT WINAPI HTMLScriptElement_QueryInterface(IHTMLScriptElement *iface, - REFIID riid, void **ppv) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLScriptElement_AddRef(IHTMLScriptElement *iface) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLScriptElement_Release(IHTMLScriptElement *iface) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLScriptElement_GetTypeInfoCount(IHTMLScriptElement *iface, UINT *pctinfo) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLScriptElement_GetTypeInfo(IHTMLScriptElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLScriptElement_GetIDsOfNames(IHTMLScriptElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLScriptElement_Invoke(IHTMLScriptElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLScriptElement, IHTMLScriptElement, + impl_from_IHTMLScriptElement(iface)->element.node.event_target.dispex)
static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR v) {
From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlselect.c | 164 ++------------------------------------- 1 file changed, 6 insertions(+), 158 deletions(-)
diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 88bec85597b..24affaea4ca 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -45,59 +45,8 @@ static inline HTMLOptionElement *impl_from_IHTMLOptionElement(IHTMLOptionElement return CONTAINING_RECORD(iface, HTMLOptionElement, IHTMLOptionElement_iface); }
-static HRESULT WINAPI HTMLOptionElement_QueryInterface(IHTMLOptionElement *iface, - REFIID riid, void **ppv) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLOptionElement_AddRef(IHTMLOptionElement *iface) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLOptionElement_Release(IHTMLOptionElement *iface) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLOptionElement_GetTypeInfoCount(IHTMLOptionElement *iface, UINT *pctinfo) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLOptionElement_GetTypeInfo(IHTMLOptionElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLOptionElement_GetIDsOfNames(IHTMLOptionElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLOptionElement_Invoke(IHTMLOptionElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLOptionElement *This = impl_from_IHTMLOptionElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLOptionElement, IHTMLOptionElement, + impl_from_IHTMLOptionElement(iface)->element.node.event_target.dispex)
static HRESULT WINAPI HTMLOptionElement_put_selected(IHTMLOptionElement *iface, VARIANT_BOOL v) { @@ -430,54 +379,8 @@ static inline HTMLOptionElementFactory *impl_from_IHTMLOptionElementFactory(IHTM return CONTAINING_RECORD(iface, HTMLOptionElementFactory, IHTMLOptionElementFactory_iface); }
-static HRESULT WINAPI HTMLOptionElementFactory_QueryInterface(IHTMLOptionElementFactory *iface, - REFIID riid, void **ppv) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLOptionElementFactory_AddRef(IHTMLOptionElementFactory *iface) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLOptionElementFactory_Release(IHTMLOptionElementFactory *iface) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfoCount(IHTMLOptionElementFactory *iface, UINT *pctinfo) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLOptionElementFactory_GetTypeInfo(IHTMLOptionElementFactory *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLOptionElementFactory_GetIDsOfNames(IHTMLOptionElementFactory *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLOptionElementFactory_Invoke(IHTMLOptionElementFactory *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLOptionElementFactory *This = impl_from_IHTMLOptionElementFactory(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLOptionElementFactory, IHTMLOptionElementFactory, + impl_from_IHTMLOptionElementFactory(iface)->dispex)
static HRESULT WINAPI HTMLOptionElementFactory_create(IHTMLOptionElementFactory *iface, VARIANT text, VARIANT value, VARIANT defaultselected, VARIANT selected, @@ -831,63 +734,8 @@ static const IEnumVARIANTVtbl HTMLSelectElementEnumVtbl = { HTMLSelectElementEnum_Clone };
-static HRESULT WINAPI HTMLSelectElement_QueryInterface(IHTMLSelectElement *iface, - REFIID riid, void **ppv) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectElement_AddRef(IHTMLSelectElement *iface) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLSelectElement_Release(IHTMLSelectElement *iface) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLSelectElement_GetTypeInfoCount(IHTMLSelectElement *iface, UINT *pctinfo) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectElement_GetTypeInfo(IHTMLSelectElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLSelectElement_GetIDsOfNames(IHTMLSelectElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectElement_Invoke(IHTMLSelectElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectElement *This = impl_from_IHTMLSelectElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectElement, IHTMLSelectElement, + impl_from_IHTMLSelectElement(iface)->element.node.event_target.dispex)
static HRESULT WINAPI HTMLSelectElement_put_size(IHTMLSelectElement *iface, LONG v) {
From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlstorage.c | 50 +-------------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-)
diff --git a/dlls/mshtml/htmlstorage.c b/dlls/mshtml/htmlstorage.c index 68452794449..b865e5adc7e 100644 --- a/dlls/mshtml/htmlstorage.c +++ b/dlls/mshtml/htmlstorage.c @@ -371,55 +371,7 @@ done: return FAILED(hres) ? hres : S_OK; }
-static HRESULT WINAPI HTMLStorage_QueryInterface(IHTMLStorage *iface, REFIID riid, void **ppv) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStorage_AddRef(IHTMLStorage *iface) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLStorage_Release(IHTMLStorage *iface) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLStorage_GetTypeInfoCount(IHTMLStorage *iface, UINT *pctinfo) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStorage_GetTypeInfo(IHTMLStorage *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStorage_GetIDsOfNames(IHTMLStorage *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStorage_Invoke(IHTMLStorage *iface, DISPID dispIdMember, REFIID riid, LCID lcid, - WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStorage *This = impl_from_IHTMLStorage(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStorage, IHTMLStorage, impl_from_IHTMLStorage(iface)->dispex)
static BOOL create_path(const WCHAR *path) {
From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlstyle.c | 419 +--------------------------------------- 1 file changed, 10 insertions(+), 409 deletions(-)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 6dfa9744df3..0585f8314d6 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1120,54 +1120,7 @@ static inline HTMLStyle *impl_from_IHTMLStyle(IHTMLStyle *iface) return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle_iface); }
-static HRESULT WINAPI HTMLStyle_QueryInterface(IHTMLStyle *iface, REFIID riid, void **ppv) -{ - HTMLStyle *This = impl_from_IHTMLStyle(iface); - return IHTMLCSSStyleDeclaration_QueryInterface(&This->css_style.IHTMLCSSStyleDeclaration_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyle_AddRef(IHTMLStyle *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle(iface); - return IHTMLCSSStyleDeclaration_AddRef(&This->css_style.IHTMLCSSStyleDeclaration_iface); -} - -static ULONG WINAPI HTMLStyle_Release(IHTMLStyle *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle(iface); - return IHTMLCSSStyleDeclaration_Release(&This->css_style.IHTMLCSSStyleDeclaration_iface); -} - -static HRESULT WINAPI HTMLStyle_GetTypeInfoCount(IHTMLStyle *iface, UINT *pctinfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle(iface); - return IDispatchEx_GetTypeInfoCount(&This->css_style.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyle_GetTypeInfo(IHTMLStyle *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle(iface); - return IDispatchEx_GetTypeInfo(&This->css_style.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStyle_GetIDsOfNames(IHTMLStyle *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLStyle *This = impl_from_IHTMLStyle(iface); - return IDispatchEx_GetIDsOfNames(&This->css_style.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyle_Invoke(IHTMLStyle *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyle *This = impl_from_IHTMLStyle(iface); - return IDispatchEx_Invoke(&This->css_style.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyle, IHTMLStyle, impl_from_IHTMLStyle(iface)->css_style.dispex)
static HRESULT WINAPI HTMLStyle_put_fontFamily(IHTMLStyle *iface, BSTR v) { @@ -3211,57 +3164,7 @@ static inline HTMLStyle *impl_from_IHTMLStyle2(IHTMLStyle2 *iface) return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle2_iface); }
-static HRESULT WINAPI HTMLStyle2_QueryInterface(IHTMLStyle2 *iface, REFIID riid, void **ppv) -{ - HTMLStyle *This = impl_from_IHTMLStyle2(iface); - - return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyle2_AddRef(IHTMLStyle2 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle2(iface); - - return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); -} - -static ULONG WINAPI HTMLStyle2_Release(IHTMLStyle2 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle2(iface); - - return IHTMLStyle_Release(&This->IHTMLStyle_iface); -} - -static HRESULT WINAPI HTMLStyle2_GetTypeInfoCount(IHTMLStyle2 *iface, UINT *pctinfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle2(iface); - return IDispatchEx_GetTypeInfoCount(&This->css_style.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyle2_GetTypeInfo(IHTMLStyle2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle2(iface); - return IDispatchEx_GetTypeInfo(&This->css_style.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStyle2_GetIDsOfNames(IHTMLStyle2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLStyle *This = impl_from_IHTMLStyle2(iface); - return IDispatchEx_GetIDsOfNames(&This->css_style.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyle2_Invoke(IHTMLStyle2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyle *This = impl_from_IHTMLStyle2(iface); - return IDispatchEx_Invoke(&This->css_style.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyle2, IHTMLStyle2, impl_from_IHTMLStyle2(iface)->css_style.dispex)
static HRESULT WINAPI HTMLStyle2_put_tableLayout(IHTMLStyle2 *iface, BSTR v) { @@ -3814,57 +3717,7 @@ static inline HTMLStyle *impl_from_IHTMLStyle3(IHTMLStyle3 *iface) return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle3_iface); }
-static HRESULT WINAPI HTMLStyle3_QueryInterface(IHTMLStyle3 *iface, REFIID riid, void **ppv) -{ - HTMLStyle *This = impl_from_IHTMLStyle3(iface); - - return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyle3_AddRef(IHTMLStyle3 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle3(iface); - - return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); -} - -static ULONG WINAPI HTMLStyle3_Release(IHTMLStyle3 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle3(iface); - - return IHTMLStyle_Release(&This->IHTMLStyle_iface); -} - -static HRESULT WINAPI HTMLStyle3_GetTypeInfoCount(IHTMLStyle3 *iface, UINT *pctinfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle3(iface); - return IDispatchEx_GetTypeInfoCount(&This->css_style.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyle3_GetTypeInfo(IHTMLStyle3 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle3(iface); - return IDispatchEx_GetTypeInfo(&This->css_style.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStyle3_GetIDsOfNames(IHTMLStyle3 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLStyle *This = impl_from_IHTMLStyle3(iface); - return IDispatchEx_GetIDsOfNames(&This->css_style.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyle3_Invoke(IHTMLStyle3 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyle *This = impl_from_IHTMLStyle3(iface); - return IDispatchEx_Invoke(&This->css_style.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyle3, IHTMLStyle3, impl_from_IHTMLStyle3(iface)->css_style.dispex)
static HRESULT WINAPI HTMLStyle3_put_layoutFlow(IHTMLStyle3 *iface, BSTR v) { @@ -4132,57 +3985,7 @@ static inline HTMLStyle *impl_from_IHTMLStyle4(IHTMLStyle4 *iface) return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle4_iface); }
-static HRESULT WINAPI HTMLStyle4_QueryInterface(IHTMLStyle4 *iface, REFIID riid, void **ppv) -{ - HTMLStyle *This = impl_from_IHTMLStyle4(iface); - - return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyle4_AddRef(IHTMLStyle4 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle4(iface); - - return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); -} - -static ULONG WINAPI HTMLStyle4_Release(IHTMLStyle4 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle4(iface); - - return IHTMLStyle_Release(&This->IHTMLStyle_iface); -} - -static HRESULT WINAPI HTMLStyle4_GetTypeInfoCount(IHTMLStyle4 *iface, UINT *pctinfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle4(iface); - return IDispatchEx_GetTypeInfoCount(&This->css_style.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyle4_GetTypeInfo(IHTMLStyle4 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle4(iface); - return IDispatchEx_GetTypeInfo(&This->css_style.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStyle4_GetIDsOfNames(IHTMLStyle4 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLStyle *This = impl_from_IHTMLStyle4(iface); - return IDispatchEx_GetIDsOfNames(&This->css_style.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyle4_Invoke(IHTMLStyle4 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyle *This = impl_from_IHTMLStyle4(iface); - return IDispatchEx_Invoke(&This->css_style.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyle4, IHTMLStyle4, impl_from_IHTMLStyle4(iface)->css_style.dispex)
static HRESULT WINAPI HTMLStyle4_put_textOverflow(IHTMLStyle4 *iface, BSTR v) { @@ -4235,56 +4038,7 @@ static inline HTMLStyle *impl_from_IHTMLStyle5(IHTMLStyle5 *iface) return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle5_iface); }
-static HRESULT WINAPI HTMLStyle5_QueryInterface(IHTMLStyle5 *iface, REFIID riid, void **ppv) -{ - HTMLStyle *This = impl_from_IHTMLStyle5(iface); - - return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyle5_AddRef(IHTMLStyle5 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle5(iface); - - return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); -} - -static ULONG WINAPI HTMLStyle5_Release(IHTMLStyle5 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle5(iface); - - return IHTMLStyle_Release(&This->IHTMLStyle_iface); -} - -static HRESULT WINAPI HTMLStyle5_GetTypeInfoCount(IHTMLStyle5 *iface, UINT *pctinfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle5(iface); - return IDispatchEx_GetTypeInfoCount(&This->css_style.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyle5_GetTypeInfo(IHTMLStyle5 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle5(iface); - return IDispatchEx_GetTypeInfo(&This->css_style.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStyle5_GetIDsOfNames(IHTMLStyle5 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLStyle *This = impl_from_IHTMLStyle5(iface); - return IDispatchEx_GetIDsOfNames(&This->css_style.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyle5_Invoke(IHTMLStyle5 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyle *This = impl_from_IHTMLStyle5(iface); - return IDispatchEx_Invoke(&This->css_style.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyle5, IHTMLStyle5, impl_from_IHTMLStyle5(iface)->css_style.dispex)
static HRESULT WINAPI HTMLStyle5_put_msInterpolationMode(IHTMLStyle5 *iface, BSTR v) { @@ -4377,56 +4131,7 @@ static inline HTMLStyle *impl_from_IHTMLStyle6(IHTMLStyle6 *iface) return CONTAINING_RECORD(iface, HTMLStyle, IHTMLStyle6_iface); }
-static HRESULT WINAPI HTMLStyle6_QueryInterface(IHTMLStyle6 *iface, REFIID riid, void **ppv) -{ - HTMLStyle *This = impl_from_IHTMLStyle6(iface); - - return IHTMLStyle_QueryInterface(&This->IHTMLStyle_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyle6_AddRef(IHTMLStyle6 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle6(iface); - - return IHTMLStyle_AddRef(&This->IHTMLStyle_iface); -} - -static ULONG WINAPI HTMLStyle6_Release(IHTMLStyle6 *iface) -{ - HTMLStyle *This = impl_from_IHTMLStyle6(iface); - - return IHTMLStyle_Release(&This->IHTMLStyle_iface); -} - -static HRESULT WINAPI HTMLStyle6_GetTypeInfoCount(IHTMLStyle6 *iface, UINT *pctinfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle6(iface); - return IDispatchEx_GetTypeInfoCount(&This->css_style.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyle6_GetTypeInfo(IHTMLStyle6 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyle *This = impl_from_IHTMLStyle6(iface); - return IDispatchEx_GetTypeInfo(&This->css_style.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLStyle6_GetIDsOfNames(IHTMLStyle6 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLStyle *This = impl_from_IHTMLStyle6(iface); - return IDispatchEx_GetIDsOfNames(&This->css_style.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyle6_Invoke(IHTMLStyle6 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyle *This = impl_from_IHTMLStyle6(iface); - return IDispatchEx_Invoke(&This->css_style.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyle6, IHTMLStyle6, impl_from_IHTMLStyle6(iface)->css_style.dispex)
static HRESULT WINAPI HTMLStyle6_put_content(IHTMLStyle6 *iface, BSTR v) { @@ -4711,60 +4416,8 @@ static inline CSSStyle *impl_from_IHTMLCSSStyleDeclaration(IHTMLCSSStyleDeclarat return CONTAINING_RECORD(iface, CSSStyle, IHTMLCSSStyleDeclaration_iface); }
-static HRESULT WINAPI HTMLCSSStyleDeclaration_QueryInterface(IHTMLCSSStyleDeclaration *iface, - REFIID riid, void **ppv) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLCSSStyleDeclaration_AddRef(IHTMLCSSStyleDeclaration *iface) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLCSSStyleDeclaration_Release(IHTMLCSSStyleDeclaration *iface) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration_GetTypeInfoCount(IHTMLCSSStyleDeclaration *iface, - UINT *pctinfo) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - TRACE("(%p)->(%p)\n", This, pctinfo); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration_GetTypeInfo(IHTMLCSSStyleDeclaration *iface, - UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration_GetIDsOfNames(IHTMLCSSStyleDeclaration *iface, - REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - TRACE("(%p)->(%p %p %u %lu %p)\n", This, riid, rgszNames, cNames, lcid, rgDispId); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration_Invoke(IHTMLCSSStyleDeclaration *iface, - DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); - TRACE("(%p)->(%ld %p %lu %u %p %p %p %p)\n", This, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLCSSStyleDeclaration, IHTMLCSSStyleDeclaration, + impl_from_IHTMLCSSStyleDeclaration(iface)->dispex)
static HRESULT WINAPI HTMLCSSStyleDeclaration_get_length(IHTMLCSSStyleDeclaration *iface, LONG *p) { @@ -8023,60 +7676,8 @@ static inline CSSStyle *impl_from_IHTMLCSSStyleDeclaration2(IHTMLCSSStyleDeclara return CONTAINING_RECORD(iface, CSSStyle, IHTMLCSSStyleDeclaration2_iface); }
-static HRESULT WINAPI HTMLCSSStyleDeclaration2_QueryInterface(IHTMLCSSStyleDeclaration2 *iface, - REFIID riid, void **ppv) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - return IHTMLCSSStyleDeclaration_QueryInterface(&This->IHTMLCSSStyleDeclaration_iface, riid, ppv); -} - -static ULONG WINAPI HTMLCSSStyleDeclaration2_AddRef(IHTMLCSSStyleDeclaration2 *iface) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - return IHTMLCSSStyleDeclaration_AddRef(&This->IHTMLCSSStyleDeclaration_iface); -} - -static ULONG WINAPI HTMLCSSStyleDeclaration2_Release(IHTMLCSSStyleDeclaration2 *iface) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - return IHTMLCSSStyleDeclaration_Release(&This->IHTMLCSSStyleDeclaration_iface); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration2_GetTypeInfoCount(IHTMLCSSStyleDeclaration2 *iface, - UINT *pctinfo) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - TRACE("(%p)->(%p)\n", This, pctinfo); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration2_GetTypeInfo(IHTMLCSSStyleDeclaration2 *iface, - UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - TRACE("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration2_GetIDsOfNames(IHTMLCSSStyleDeclaration2 *iface, - REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - TRACE("(%p)->(%p %p %u %lu %p)\n", This, riid, rgszNames, cNames, lcid, rgDispId); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLCSSStyleDeclaration2_Invoke(IHTMLCSSStyleDeclaration2 *iface, - DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); - TRACE("(%p)->(%ld %p %lu %u %p %p %p %p)\n", This, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLCSSStyleDeclaration2, IHTMLCSSStyleDeclaration2, + impl_from_IHTMLCSSStyleDeclaration2(iface)->dispex)
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_msScrollChaining(IHTMLCSSStyleDeclaration2 *iface, BSTR v) {
From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlstyleelem.c | 108 ++---------------------------------- 1 file changed, 4 insertions(+), 104 deletions(-)
diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 5b3d9165964..af5831dd85a 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -49,58 +49,8 @@ static inline HTMLStyleElement *impl_from_IHTMLStyleElement(IHTMLStyleElement *i return CONTAINING_RECORD(iface, HTMLStyleElement, IHTMLStyleElement_iface); }
-static HRESULT WINAPI HTMLStyleElement_QueryInterface(IHTMLStyleElement *iface, - REFIID riid, void **ppv) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyleElement_AddRef(IHTMLStyleElement *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLStyleElement_Release(IHTMLStyleElement *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLStyleElement_GetTypeInfoCount(IHTMLStyleElement *iface, UINT *pctinfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyleElement_GetTypeInfo(IHTMLStyleElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLStyleElement_GetIDsOfNames(IHTMLStyleElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyleElement_Invoke(IHTMLStyleElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyleElement, IHTMLStyleElement, + impl_from_IHTMLStyleElement(iface)->element.node.event_target.dispex)
static HRESULT WINAPI HTMLStyleElement_put_type(IHTMLStyleElement *iface, BSTR v) { @@ -289,58 +239,8 @@ static inline HTMLStyleElement *impl_from_IHTMLStyleElement2(IHTMLStyleElement2 return CONTAINING_RECORD(iface, HTMLStyleElement, IHTMLStyleElement2_iface); }
-static HRESULT WINAPI HTMLStyleElement2_QueryInterface(IHTMLStyleElement2 *iface, - REFIID riid, void **ppv) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLStyleElement2_AddRef(IHTMLStyleElement2 *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLStyleElement2_Release(IHTMLStyleElement2 *iface) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLStyleElement2_GetTypeInfoCount(IHTMLStyleElement2 *iface, UINT *pctinfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLStyleElement2_GetTypeInfo(IHTMLStyleElement2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLStyleElement2_GetIDsOfNames(IHTMLStyleElement2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLStyleElement2_Invoke(IHTMLStyleElement2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLStyleElement *This = impl_from_IHTMLStyleElement2(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLStyleElement2, IHTMLStyleElement2, + impl_from_IHTMLStyleElement2(iface)->element.node.event_target.dispex)
static HRESULT WINAPI HTMLStyleElement2_get_sheet(IHTMLStyleElement2 *iface, IHTMLStyleSheet **p) {
-
Jacek Caban -
Jacek Caban (＠jacek)