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) {