[PATCH 0/7] MR5668: mshtml: Use DISPEX_IDISPATCH_IMPL (part 4)

List overview All Threads

newer

older

Re: [PATCH v5 0/5] MR5626:...

Re: [PATCH v2 0/2] MR5646:...

Jacek Caban (＠jacek)

16 May 2024 16 May '24

1:53 p.m.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Show replies by date

Jacek Caban

16 May 16 May

1:53 p.m.

New subject: [PATCH 1/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlframe.c.

From: Jacek Caban jacek@codeweavers.com

--- dlls/mshtml/htmlframe.c | 277 ++-------------------------------------- 1 file changed, 10 insertions(+), 267 deletions(-)

diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 28bf42e2569..d3dfae97b45 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -70,61 +70,8 @@ static inline HTMLFrameBase *impl_from_IHTMLFrameBase(IHTMLFrameBase *iface) return CONTAINING_RECORD(iface, HTMLFrameBase, IHTMLFrameBase_iface); }

-static HRESULT WINAPI HTMLFrameBase_QueryInterface(IHTMLFrameBase *iface, REFIID riid, void **ppv) -{ - HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLFrameBase_AddRef(IHTMLFrameBase *iface) -{ - HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLFrameBase_Release(IHTMLFrameBase *iface) -{ - HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLFrameBase_GetTypeInfoCount(IHTMLFrameBase *iface, UINT *pctinfo) -{ - HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLFrameBase_GetTypeInfo(IHTMLFrameBase *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLFrameBase_GetIDsOfNames(IHTMLFrameBase *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLFrameBase_Invoke(IHTMLFrameBase *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLFrameBase, IHTMLFrameBase, + impl_from_IHTMLFrameBase(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLFrameBase_put_src(IHTMLFrameBase *iface, BSTR v) { @@ -748,59 +695,8 @@ static inline HTMLFrameElement *impl_from_IHTMLFrameElement3(IHTMLFrameElement3 return CONTAINING_RECORD(iface, HTMLFrameElement, IHTMLFrameElement3_iface); }

-static HRESULT WINAPI HTMLFrameElement3_QueryInterface(IHTMLFrameElement3 *iface, - REFIID riid, void **ppv) -{ - HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); - - return IHTMLDOMNode_QueryInterface(&This->framebase.element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLFrameElement3_AddRef(IHTMLFrameElement3 *iface) -{ - HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); - - return IHTMLDOMNode_AddRef(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLFrameElement3_Release(IHTMLFrameElement3 *iface) -{ - HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); - - return IHTMLDOMNode_Release(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLFrameElement3_GetTypeInfoCount(IHTMLFrameElement3 *iface, UINT *pctinfo) -{ - HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); - return IDispatchEx_GetTypeInfoCount(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLFrameElement3_GetTypeInfo(IHTMLFrameElement3 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); - return IDispatchEx_GetTypeInfo(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, iTInfo, - lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLFrameElement3_GetIDsOfNames(IHTMLFrameElement3 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); - return IDispatchEx_GetIDsOfNames(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, riid, - rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLFrameElement3_Invoke(IHTMLFrameElement3 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); - return IDispatchEx_Invoke(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, - riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLFrameElement3, IHTMLFrameElement3, + impl_from_IHTMLFrameElement3(iface)->framebase.element.node.event_target.dispex)

static HRESULT WINAPI HTMLFrameElement3_get_contentDocument(IHTMLFrameElement3 *iface, IDispatch **p) { @@ -1071,59 +967,8 @@ static inline HTMLIFrame *impl_from_IHTMLIFrameElement(IHTMLIFrameElement *iface return CONTAINING_RECORD(iface, HTMLIFrame, IHTMLIFrameElement_iface); }

-static HRESULT WINAPI HTMLIFrameElement_QueryInterface(IHTMLIFrameElement *iface, - REFIID riid, void **ppv) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->framebase.element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLIFrameElement_AddRef(IHTMLIFrameElement *iface) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); - - return IHTMLDOMNode_AddRef(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLIFrameElement_Release(IHTMLIFrameElement *iface) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); - - return IHTMLDOMNode_Release(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLIFrameElement_GetTypeInfoCount(IHTMLIFrameElement *iface, UINT *pctinfo) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLIFrameElement_GetTypeInfo(IHTMLIFrameElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); - return IDispatchEx_GetTypeInfo(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, iTInfo, - lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLIFrameElement_GetIDsOfNames(IHTMLIFrameElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); - return IDispatchEx_GetIDsOfNames(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, riid, - rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLIFrameElement_Invoke(IHTMLIFrameElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); - return IDispatchEx_Invoke(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, - riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLIFrameElement, IHTMLIFrameElement, + impl_from_IHTMLIFrameElement(iface)->framebase.element.node.event_target.dispex)

static HRESULT WINAPI HTMLIFrameElement_put_vspace(IHTMLIFrameElement *iface, LONG v) { @@ -1188,59 +1033,8 @@ static inline HTMLIFrame *impl_from_IHTMLIFrameElement2(IHTMLIFrameElement2 *ifa return CONTAINING_RECORD(iface, HTMLIFrame, IHTMLIFrameElement2_iface); }

-static HRESULT WINAPI HTMLIFrameElement2_QueryInterface(IHTMLIFrameElement2 *iface, - REFIID riid, void **ppv) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - - return IHTMLDOMNode_QueryInterface(&This->framebase.element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLIFrameElement2_AddRef(IHTMLIFrameElement2 *iface) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - - return IHTMLDOMNode_AddRef(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLIFrameElement2_Release(IHTMLIFrameElement2 *iface) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - - return IHTMLDOMNode_Release(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLIFrameElement2_GetTypeInfoCount(IHTMLIFrameElement2 *iface, UINT *pctinfo) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - return IDispatchEx_GetTypeInfoCount(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLIFrameElement2_GetTypeInfo(IHTMLIFrameElement2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - return IDispatchEx_GetTypeInfo(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, iTInfo, - lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLIFrameElement2_GetIDsOfNames(IHTMLIFrameElement2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - return IDispatchEx_GetIDsOfNames(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, riid, - rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLIFrameElement2_Invoke(IHTMLIFrameElement2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement2(iface); - return IDispatchEx_Invoke(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, - riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLIFrameElement2, IHTMLIFrameElement2, + impl_from_IHTMLIFrameElement2(iface)->framebase.element.node.event_target.dispex)

static HRESULT WINAPI HTMLIFrameElement2_put_height(IHTMLIFrameElement2 *iface, VARIANT v) { @@ -1337,59 +1131,8 @@ static inline HTMLIFrame *impl_from_IHTMLIFrameElement3(IHTMLIFrameElement3 *ifa return CONTAINING_RECORD(iface, HTMLIFrame, IHTMLIFrameElement3_iface); }

-static HRESULT WINAPI HTMLIFrameElement3_QueryInterface(IHTMLIFrameElement3 *iface, - REFIID riid, void **ppv) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - - return IHTMLDOMNode_QueryInterface(&This->framebase.element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLIFrameElement3_AddRef(IHTMLIFrameElement3 *iface) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - - return IHTMLDOMNode_AddRef(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLIFrameElement3_Release(IHTMLIFrameElement3 *iface) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - - return IHTMLDOMNode_Release(&This->framebase.element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLIFrameElement3_GetTypeInfoCount(IHTMLIFrameElement3 *iface, UINT *pctinfo) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - return IDispatchEx_GetTypeInfoCount(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLIFrameElement3_GetTypeInfo(IHTMLIFrameElement3 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - return IDispatchEx_GetTypeInfo(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, iTInfo, - lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLIFrameElement3_GetIDsOfNames(IHTMLIFrameElement3 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - return IDispatchEx_GetIDsOfNames(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, riid, - rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLIFrameElement3_Invoke(IHTMLIFrameElement3 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLIFrame *This = impl_from_IHTMLIFrameElement3(iface); - return IDispatchEx_Invoke(&This->framebase.element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, - riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLIFrameElement3, IHTMLIFrameElement3, + impl_from_IHTMLIFrameElement3(iface)->framebase.element.node.event_target.dispex)

static HRESULT WINAPI HTMLIFrameElement3_get_contentDocument(IHTMLIFrameElement3 *iface, IDispatch **p) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Jacek Caban

1:53 p.m.

New subject: [PATCH 2/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlgeneric.c.

From: Jacek Caban jacek@codeweavers.com

--- dlls/mshtml/htmlgeneric.c | 53 ++------------------------------------- 1 file changed, 2 insertions(+), 51 deletions(-)

diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 2174a8f3ba2..88237fac403 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -44,57 +44,8 @@ static inline HTMLGenericElement *impl_from_IHTMLGenericElement(IHTMLGenericElem return CONTAINING_RECORD(iface, HTMLGenericElement, IHTMLGenericElement_iface); }

-static HRESULT WINAPI HTMLGenericElement_QueryInterface(IHTMLGenericElement *iface, REFIID riid, void **ppv) -{ - HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLGenericElement_AddRef(IHTMLGenericElement *iface) -{ - HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLGenericElement_Release(IHTMLGenericElement *iface) -{ - HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLGenericElement_GetTypeInfoCount(IHTMLGenericElement *iface, UINT *pctinfo) -{ - HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLGenericElement_GetTypeInfo(IHTMLGenericElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLGenericElement_GetIDsOfNames(IHTMLGenericElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLGenericElement_Invoke(IHTMLGenericElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLGenericElement, IHTMLGenericElement, + impl_from_IHTMLGenericElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLGenericElement_get_recordset(IHTMLGenericElement *iface, IDispatch **p) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Jacek Caban

1:53 p.m.

New subject: [PATCH 3/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlhead.c.

From: Jacek Caban jacek@codeweavers.com

--- dlls/mshtml/htmlhead.c | 229 ++--------------------------------------- 1 file changed, 8 insertions(+), 221 deletions(-)

diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index 2b2dc34e0ce..89c45b668a1 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -44,62 +44,8 @@ static inline HTMLTitleElement *impl_from_IHTMLTitleElement(IHTMLTitleElement *i return CONTAINING_RECORD(iface, HTMLTitleElement, IHTMLTitleElement_iface); }

-static HRESULT WINAPI HTMLTitleElement_QueryInterface(IHTMLTitleElement *iface, - REFIID riid, void **ppv) -{ - HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTitleElement_AddRef(IHTMLTitleElement *iface) -{ - HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLTitleElement_Release(IHTMLTitleElement *iface) -{ - HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLTitleElement_GetTypeInfoCount(IHTMLTitleElement *iface, UINT *pctinfo) -{ - HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTitleElement_GetTypeInfo(IHTMLTitleElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLTitleElement_GetIDsOfNames(IHTMLTitleElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTitleElement_Invoke(IHTMLTitleElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLTitleElement *This = impl_from_IHTMLTitleElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTitleElement, IHTMLTitleElement, + impl_from_IHTMLTitleElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLTitleElement_put_text(IHTMLTitleElement *iface, BSTR v) { @@ -216,63 +162,8 @@ static inline HTMLHtmlElement *impl_from_IHTMLHtmlElement(IHTMLHtmlElement *ifac return CONTAINING_RECORD(iface, HTMLHtmlElement, IHTMLHtmlElement_iface); }

-static HRESULT WINAPI HTMLHtmlElement_QueryInterface(IHTMLHtmlElement *iface, - REFIID riid, void **ppv) -{ - HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLHtmlElement_AddRef(IHTMLHtmlElement *iface) -{ - HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLHtmlElement_Release(IHTMLHtmlElement *iface) -{ - HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLHtmlElement_GetTypeInfoCount(IHTMLHtmlElement *iface, UINT *pctinfo) -{ - HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLHtmlElement_GetTypeInfo(IHTMLHtmlElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLHtmlElement_GetIDsOfNames(IHTMLHtmlElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLHtmlElement_Invoke(IHTMLHtmlElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLHtmlElement, IHTMLHtmlElement, + impl_from_IHTMLHtmlElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLHtmlElement_put_version(IHTMLHtmlElement *iface, BSTR v) { @@ -386,57 +277,8 @@ static inline HTMLMetaElement *impl_from_IHTMLMetaElement(IHTMLMetaElement *ifac return CONTAINING_RECORD(iface, HTMLMetaElement, IHTMLMetaElement_iface); }

-static HRESULT WINAPI HTMLMetaElement_QueryInterface(IHTMLMetaElement *iface, REFIID riid, void **ppv) -{ - HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLMetaElement_AddRef(IHTMLMetaElement *iface) -{ - HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLMetaElement_Release(IHTMLMetaElement *iface) -{ - HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLMetaElement_GetTypeInfoCount(IHTMLMetaElement *iface, UINT *pctinfo) -{ - HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLMetaElement_GetTypeInfo(IHTMLMetaElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLMetaElement_GetIDsOfNames(IHTMLMetaElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLMetaElement_Invoke(IHTMLMetaElement *iface, DISPID dispIdMember, REFIID riid, - LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, - UINT *puArgErr) -{ - HTMLMetaElement *This = impl_from_IHTMLMetaElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLMetaElement, IHTMLMetaElement, + impl_from_IHTMLMetaElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLMetaElement_put_httpEquiv(IHTMLMetaElement *iface, BSTR v) { @@ -614,63 +456,8 @@ static inline HTMLHeadElement *impl_from_IHTMLHeadElement(IHTMLHeadElement *ifac return CONTAINING_RECORD(iface, HTMLHeadElement, IHTMLHeadElement_iface); }

-static HRESULT WINAPI HTMLHeadElement_QueryInterface(IHTMLHeadElement *iface, - REFIID riid, void **ppv) -{ - HTMLHeadElement *This = impl_from_IHTMLHeadElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLHeadElement_AddRef(IHTMLHeadElement *iface) -{ - HTMLHeadElement *This = impl_from_IHTMLHeadElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLHeadElement_Release(IHTMLHeadElement *iface) -{ - HTMLHeadElement *This = impl_from_IHTMLHeadElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLHeadElement_GetTypeInfoCount(IHTMLHeadElement *iface, UINT *pctinfo) -{ - HTMLHeadElement *This = impl_from_IHTMLHeadElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLHeadElement_GetTypeInfo(IHTMLHeadElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLHeadElement *This = impl_from_IHTMLHeadElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLHeadElement_GetIDsOfNames(IHTMLHeadElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLHeadElement *This = impl_from_IHTMLHeadElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLHeadElement_Invoke(IHTMLHeadElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLHeadElement *This = impl_from_IHTMLHeadElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLHeadElement, IHTMLHeadElement, + impl_from_IHTMLHeadElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLHeadElement_put_profile(IHTMLHeadElement *iface, BSTR v) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Jacek Caban

1:53 p.m.

New subject: [PATCH 4/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlimg.c.

From: Jacek Caban jacek@codeweavers.com

--- dlls/mshtml/htmlimg.c | 106 ++---------------------------------------- 1 file changed, 4 insertions(+), 102 deletions(-)

diff --git a/dlls/mshtml/htmlimg.c b/dlls/mshtml/htmlimg.c index f037578e5d4..84eef1ad5ea 100644 --- a/dlls/mshtml/htmlimg.c +++ b/dlls/mshtml/htmlimg.c @@ -46,58 +46,8 @@ static inline HTMLImg *impl_from_IHTMLImgElement(IHTMLImgElement *iface) return CONTAINING_RECORD(iface, HTMLImg, IHTMLImgElement_iface); }

-static HRESULT WINAPI HTMLImgElement_QueryInterface(IHTMLImgElement *iface, REFIID riid, void **ppv) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLImgElement_AddRef(IHTMLImgElement *iface) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLImgElement_Release(IHTMLImgElement *iface) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLImgElement_GetTypeInfoCount(IHTMLImgElement *iface, UINT *pctinfo) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLImgElement_GetTypeInfo(IHTMLImgElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLImgElement_GetIDsOfNames(IHTMLImgElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLImgElement_Invoke(IHTMLImgElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLImg *This = impl_from_IHTMLImgElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLImgElement, IHTMLImgElement, + impl_from_IHTMLImgElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLImgElement_put_isMap(IHTMLImgElement *iface, VARIANT_BOOL v) { @@ -767,56 +717,8 @@ static inline HTMLImageElementFactory *impl_from_IHTMLImageElementFactory(IHTMLI return CONTAINING_RECORD(iface, HTMLImageElementFactory, IHTMLImageElementFactory_iface); }

-static HRESULT WINAPI HTMLImageElementFactory_QueryInterface(IHTMLImageElementFactory *iface, - REFIID riid, void **ppv) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLImageElementFactory_AddRef(IHTMLImageElementFactory *iface) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLImageElementFactory_Release(IHTMLImageElementFactory *iface) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfoCount(IHTMLImageElementFactory *iface, - UINT *pctinfo) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLImageElementFactory_GetTypeInfo(IHTMLImageElementFactory *iface, - UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLImageElementFactory_GetIDsOfNames(IHTMLImageElementFactory *iface, - REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, - DISPID *rgDispId) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLImageElementFactory_Invoke(IHTMLImageElementFactory *iface, - DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, - DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, - UINT *puArgErr) -{ - HTMLImageElementFactory *This = impl_from_IHTMLImageElementFactory(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLImageElementFactory, IHTMLImageElementFactory, + impl_from_IHTMLImageElementFactory(iface)->dispex)

static LONG var_to_size(const VARIANT *v) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Jacek Caban

1:53 p.m.

New subject: [PATCH 5/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlinput.c.

From: Jacek Caban jacek@codeweavers.com

--- dlls/mshtml/htmlinput.c | 276 ++-------------------------------------- 1 file changed, 10 insertions(+), 266 deletions(-)

diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index 8c7f738a298..c031dbff766 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -53,63 +53,8 @@ static inline HTMLInputElement *impl_from_IHTMLInputTextElement(IHTMLInputTextEl return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputTextElement_iface); }

-static HRESULT WINAPI HTMLInputElement_QueryInterface(IHTMLInputElement *iface, - REFIID riid, void **ppv) -{ - HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLInputElement_AddRef(IHTMLInputElement *iface) -{ - HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLInputElement_Release(IHTMLInputElement *iface) -{ - HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLInputElement_GetTypeInfoCount(IHTMLInputElement *iface, UINT *pctinfo) -{ - HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLInputElement_GetTypeInfo(IHTMLInputElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLInputElement_GetIDsOfNames(IHTMLInputElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLInputElement_Invoke(IHTMLInputElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLInputElement *This = impl_from_IHTMLInputElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLInputElement, IHTMLInputElement, + impl_from_IHTMLInputElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLInputElement_put_type(IHTMLInputElement *iface, BSTR v) { @@ -888,58 +833,8 @@ static const IHTMLInputElementVtbl HTMLInputElementVtbl = { HTMLInputElement_get_start };

-static HRESULT WINAPI HTMLInputTextElement_QueryInterface(IHTMLInputTextElement *iface, - REFIID riid, void **ppv) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLInputTextElement_AddRef(IHTMLInputTextElement *iface) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLInputTextElement_Release(IHTMLInputTextElement *iface) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLInputTextElement_GetTypeInfoCount(IHTMLInputTextElement *iface, UINT *pctinfo) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLInputTextElement_GetTypeInfo(IHTMLInputTextElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLInputTextElement_GetIDsOfNames(IHTMLInputTextElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLInputTextElement_Invoke(IHTMLInputTextElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLInputTextElement, IHTMLInputTextElement, + impl_from_IHTMLInputTextElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLInputTextElement_get_type(IHTMLInputTextElement *iface, BSTR *p) { @@ -1192,53 +1087,8 @@ static inline HTMLInputElement *impl_from_IHTMLInputTextElement2(IHTMLInputTextE return CONTAINING_RECORD(iface, HTMLInputElement, IHTMLInputTextElement2_iface); }

-static HRESULT WINAPI HTMLInputTextElement2_QueryInterface(IHTMLInputTextElement2 *iface, REFIID riid, void **ppv) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLInputTextElement2_AddRef(IHTMLInputTextElement2 *iface) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLInputTextElement2_Release(IHTMLInputTextElement2 *iface) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLInputTextElement2_GetTypeInfoCount(IHTMLInputTextElement2 *iface, UINT *pctinfo) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLInputTextElement2_GetTypeInfo(IHTMLInputTextElement2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLInputTextElement2_GetIDsOfNames(IHTMLInputTextElement2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLInputTextElement2_Invoke(IHTMLInputTextElement2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLInputElement *This = impl_from_IHTMLInputTextElement2(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLInputTextElement2, IHTMLInputTextElement2, + impl_from_IHTMLInputTextElement2(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLInputTextElement2_put_selectionStart(IHTMLInputTextElement2 *iface, LONG v) { @@ -1480,61 +1330,8 @@ static inline HTMLLabelElement *impl_from_IHTMLLabelElement(IHTMLLabelElement *i return CONTAINING_RECORD(iface, HTMLLabelElement, IHTMLLabelElement_iface); }

-static HRESULT WINAPI HTMLLabelElement_QueryInterface(IHTMLLabelElement *iface, - REFIID riid, void **ppv) -{ - HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLLabelElement_AddRef(IHTMLLabelElement *iface) -{ - HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLLabelElement_Release(IHTMLLabelElement *iface) -{ - HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLLabelElement_GetTypeInfoCount(IHTMLLabelElement *iface, UINT *pctinfo) -{ - HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLLabelElement_GetTypeInfo(IHTMLLabelElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLLabelElement_GetIDsOfNames(IHTMLLabelElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLLabelElement_Invoke(IHTMLLabelElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLLabelElement *This = impl_from_IHTMLLabelElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLLabelElement, IHTMLLabelElement, + impl_from_IHTMLLabelElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLLabelElement_put_htmlFor(IHTMLLabelElement *iface, BSTR v) { @@ -1671,61 +1468,8 @@ static inline HTMLButtonElement *impl_from_IHTMLButtonElement(IHTMLButtonElement return CONTAINING_RECORD(iface, HTMLButtonElement, IHTMLButtonElement_iface); }

-static HRESULT WINAPI HTMLButtonElement_QueryInterface(IHTMLButtonElement *iface, - REFIID riid, void **ppv) -{ - HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLButtonElement_AddRef(IHTMLButtonElement *iface) -{ - HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLButtonElement_Release(IHTMLButtonElement *iface) -{ - HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLButtonElement_GetTypeInfoCount(IHTMLButtonElement *iface, UINT *pctinfo) -{ - HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLButtonElement_GetTypeInfo(IHTMLButtonElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLButtonElement_GetIDsOfNames(IHTMLButtonElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLButtonElement_Invoke(IHTMLButtonElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLButtonElement, IHTMLButtonElement, + impl_from_IHTMLButtonElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLButtonElement_get_type(IHTMLButtonElement *iface, BSTR *p) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Jacek Caban

1:53 p.m.

New subject: [PATCH 6/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllink.c.

From: Jacek Caban jacek@codeweavers.com

--- dlls/mshtml/htmllink.c | 59 ++---------------------------------------- 1 file changed, 2 insertions(+), 57 deletions(-)

diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index f936c9dcfe3..805ec031227 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -44,63 +44,8 @@ static inline HTMLLinkElement *impl_from_IHTMLLinkElement(IHTMLLinkElement *ifac return CONTAINING_RECORD(iface, HTMLLinkElement, IHTMLLinkElement_iface); }

-static HRESULT WINAPI HTMLLinkElement_QueryInterface(IHTMLLinkElement *iface, - REFIID riid, void **ppv) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLLinkElement_AddRef(IHTMLLinkElement *iface) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLLinkElement_Release(IHTMLLinkElement *iface) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLLinkElement_GetTypeInfoCount(IHTMLLinkElement *iface, UINT *pctinfo) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLLinkElement_GetTypeInfo(IHTMLLinkElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLLinkElement_GetIDsOfNames(IHTMLLinkElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLLinkElement_Invoke(IHTMLLinkElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLLinkElement, IHTMLLinkElement, + impl_from_IHTMLLinkElement(iface)->element.node.event_target.dispex)

static HRESULT WINAPI HTMLLinkElement_put_href(IHTMLLinkElement *iface, BSTR v) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Jacek Caban

1:54 p.m.

New subject: [PATCH 7/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllocation.c.

From: Jacek Caban jacek@codeweavers.com

--- dlls/mshtml/htmllocation.c | 49 +------------------------------------- 1 file changed, 1 insertion(+), 48 deletions(-)

diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index 92701cb42bc..1a5972b50ac 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -59,54 +59,7 @@ static inline HTMLLocation *impl_from_IHTMLLocation(IHTMLLocation *iface) return CONTAINING_RECORD(iface, HTMLLocation, IHTMLLocation_iface); }

-static HRESULT WINAPI HTMLLocation_QueryInterface(IHTMLLocation *iface, REFIID riid, void **ppv) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLLocation_AddRef(IHTMLLocation *iface) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLLocation_Release(IHTMLLocation *iface) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLLocation_GetTypeInfoCount(IHTMLLocation *iface, UINT *pctinfo) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLLocation_GetTypeInfo(IHTMLLocation *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLLocation_GetIDsOfNames(IHTMLLocation *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLLocation_Invoke(IHTMLLocation *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLLocation *This = impl_from_IHTMLLocation(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLLocation, IHTMLLocation, impl_from_IHTMLLocation(iface)->dispex)

static HRESULT WINAPI HTMLLocation_put_href(IHTMLLocation *iface, BSTR v) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

Marvin

3:28 p.m.

New subject: [PATCH 7/7] mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllocation.c.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=145626

Your paranoid android.

=== debian11b (64 bit WoW report) ===

mfmediaengine: mfmediaengine.c:2616: Test failed: Unexpected time 0.133467.

Gabriel Ivăncescu (＠insn)

28 May 28 May

9:15 p.m.

New subject: [PATCH 0/7] MR5668: mshtml: Use DISPEX_IDISPATCH_IMPL (part 4) - approved

This merge request was approved by Gabriel Ivăncescu.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/5668

254

Age (days ago)

266

Last active (days ago)

wine-gitlab@winehq.org

9 comments

4 participants

tags (0)

participants (4)

Gabriel Ivăncescu (＠insn)
Jacek Caban
Jacek Caban (＠jacek)
Marvin