From: Jacek Caban jacek@codeweavers.com
--- dlls/mshtml/htmlelem.c | 299 ++--------------------------------------- 1 file changed, 10 insertions(+), 289 deletions(-)
diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e8a5b3a1861..e62c08f1148 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -934,54 +934,7 @@ static inline HTMLRectCollection *impl_from_IHTMLRectCollection(IHTMLRectCollect return CONTAINING_RECORD(iface, HTMLRectCollection, IHTMLRectCollection_iface); }
-static HRESULT WINAPI HTMLRectCollection_QueryInterface(IHTMLRectCollection *iface, REFIID riid, void **ppv) -{ - HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLRectCollection_AddRef(IHTMLRectCollection *iface) -{ - HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLRectCollection_Release(IHTMLRectCollection *iface) -{ - HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLRectCollection_GetTypeInfoCount(IHTMLRectCollection *iface, UINT *pctinfo) -{ - HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; -} - -static HRESULT WINAPI HTMLRectCollection_GetTypeInfo(IHTMLRectCollection *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLRectCollection_GetIDsOfNames(IHTMLRectCollection *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLRectCollection_Invoke(IHTMLRectCollection *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLRectCollection, IHTMLRectCollection, impl_from_IHTMLRectCollection(iface)->dispex)
static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, LONG *p) { @@ -6807,57 +6760,7 @@ static inline struct token_list *impl_from_IWineDOMTokenList(IWineDOMTokenList * return CONTAINING_RECORD(iface, struct token_list, IWineDOMTokenList_iface); }
-static HRESULT WINAPI token_list_QueryInterface(IWineDOMTokenList *iface, REFIID riid, void **ppv) -{ - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - return IDispatchEx_QueryInterface(&token_list->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI token_list_AddRef(IWineDOMTokenList *iface) -{ - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - return IDispatchEx_AddRef(&token_list->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI token_list_Release(IWineDOMTokenList *iface) -{ - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - return IDispatchEx_Release(&token_list->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI token_list_GetTypeInfoCount(IWineDOMTokenList *iface, UINT *pctinfo) -{ - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - FIXME("(%p)->(%p)\n", token_list, pctinfo); - return E_NOTIMPL; -} - -static HRESULT WINAPI token_list_GetTypeInfo(IWineDOMTokenList *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - - return IDispatchEx_GetTypeInfo(&token_list->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI token_list_GetIDsOfNames(IWineDOMTokenList *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - - return IDispatchEx_GetIDsOfNames(&token_list->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI token_list_Invoke(IWineDOMTokenList *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - struct token_list *token_list = impl_from_IWineDOMTokenList(iface); - - return IDispatchEx_Invoke(&token_list->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(token_list, IWineDOMTokenList, impl_from_IWineDOMTokenList(iface)->dispex)
static const WCHAR *find_token(const WCHAR *list, const WCHAR *token, unsigned int token_len) { @@ -7503,55 +7406,8 @@ HRESULT get_element(nsIDOMElement *nselem, HTMLElement **ret) return S_OK; }
-/* interface IHTMLFiltersCollection */ -static HRESULT WINAPI HTMLFiltersCollection_QueryInterface(IHTMLFiltersCollection *iface, REFIID riid, void **ppv) -{ - HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLFiltersCollection_AddRef(IHTMLFiltersCollection *iface) -{ - HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLFiltersCollection_Release(IHTMLFiltersCollection *iface) -{ - HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLFiltersCollection_GetTypeInfoCount(IHTMLFiltersCollection *iface, UINT *pctinfo) -{ - HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLFiltersCollection_GetTypeInfo(IHTMLFiltersCollection *iface, - UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLFiltersCollection_GetIDsOfNames(IHTMLFiltersCollection *iface, - REFIID riid, LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLFiltersCollection_Invoke(IHTMLFiltersCollection *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLFiltersCollection *This = impl_from_IHTMLFiltersCollection(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLFiltersCollection, IHTMLFiltersCollection, + impl_from_IHTMLFiltersCollection(iface)->dispex)
static HRESULT WINAPI HTMLFiltersCollection_get_length(IHTMLFiltersCollection *iface, LONG *p) { @@ -7929,53 +7785,8 @@ static inline HTMLAttributeCollection *impl_from_IHTMLAttributeCollection(IHTMLA return CONTAINING_RECORD(iface, HTMLAttributeCollection, IHTMLAttributeCollection_iface); }
-static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeCollection *iface, REFIID riid, void **ppv) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLAttributeCollection_AddRef(IHTMLAttributeCollection *iface) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLAttributeCollection_Release(IHTMLAttributeCollection *iface) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLAttributeCollection_GetTypeInfoCount(IHTMLAttributeCollection *iface, UINT *pctinfo) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLAttributeCollection_GetTypeInfo(IHTMLAttributeCollection *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLAttributeCollection_GetIDsOfNames(IHTMLAttributeCollection *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLAttributeCollection_Invoke(IHTMLAttributeCollection *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLAttributeCollection, IHTMLAttributeCollection, + impl_from_IHTMLAttributeCollection(iface)->dispex)
static HRESULT WINAPI HTMLAttributeCollection_get_length(IHTMLAttributeCollection *iface, LONG *p) { @@ -8063,53 +7874,8 @@ static inline HTMLAttributeCollection *impl_from_IHTMLAttributeCollection2(IHTML return CONTAINING_RECORD(iface, HTMLAttributeCollection, IHTMLAttributeCollection2_iface); }
-static HRESULT WINAPI HTMLAttributeCollection2_QueryInterface(IHTMLAttributeCollection2 *iface, REFIID riid, void **ppv) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); - return IHTMLAttributeCollection_QueryInterface(&This->IHTMLAttributeCollection_iface, riid, ppv); -} - -static ULONG WINAPI HTMLAttributeCollection2_AddRef(IHTMLAttributeCollection2 *iface) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); - return IHTMLAttributeCollection_AddRef(&This->IHTMLAttributeCollection_iface); -} - -static ULONG WINAPI HTMLAttributeCollection2_Release(IHTMLAttributeCollection2 *iface) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); - return IHTMLAttributeCollection_Release(&This->IHTMLAttributeCollection_iface); -} - -static HRESULT WINAPI HTMLAttributeCollection2_GetTypeInfoCount(IHTMLAttributeCollection2 *iface, UINT *pctinfo) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLAttributeCollection2_GetTypeInfo(IHTMLAttributeCollection2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLAttributeCollection2_GetIDsOfNames(IHTMLAttributeCollection2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLAttributeCollection2_Invoke(IHTMLAttributeCollection2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLAttributeCollection2, IHTMLAttributeCollection2, + impl_from_IHTMLAttributeCollection2(iface)->dispex)
static HRESULT WINAPI HTMLAttributeCollection2_getNamedItem(IHTMLAttributeCollection2 *iface, BSTR bstrName, IHTMLDOMAttribute **newretNode) @@ -8171,53 +7937,8 @@ static inline HTMLAttributeCollection *impl_from_IHTMLAttributeCollection3(IHTML return CONTAINING_RECORD(iface, HTMLAttributeCollection, IHTMLAttributeCollection3_iface); }
-static HRESULT WINAPI HTMLAttributeCollection3_QueryInterface(IHTMLAttributeCollection3 *iface, REFIID riid, void **ppv) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - return IHTMLAttributeCollection_QueryInterface(&This->IHTMLAttributeCollection_iface, riid, ppv); -} - -static ULONG WINAPI HTMLAttributeCollection3_AddRef(IHTMLAttributeCollection3 *iface) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - return IHTMLAttributeCollection_AddRef(&This->IHTMLAttributeCollection_iface); -} - -static ULONG WINAPI HTMLAttributeCollection3_Release(IHTMLAttributeCollection3 *iface) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - return IHTMLAttributeCollection_Release(&This->IHTMLAttributeCollection_iface); -} - -static HRESULT WINAPI HTMLAttributeCollection3_GetTypeInfoCount(IHTMLAttributeCollection3 *iface, UINT *pctinfo) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLAttributeCollection3_GetTypeInfo(IHTMLAttributeCollection3 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLAttributeCollection3_GetIDsOfNames(IHTMLAttributeCollection3 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLAttributeCollection3_Invoke(IHTMLAttributeCollection3 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLAttributeCollection3, IHTMLAttributeCollection3, + impl_from_IHTMLAttributeCollection3(iface)->dispex)
static HRESULT WINAPI HTMLAttributeCollection3_getNamedItem(IHTMLAttributeCollection3 *iface, BSTR bstrName, IHTMLDOMAttribute **ppNodeOut)