May 2024 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in selection.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 411ae17fe81282acfd688ff8e753bb5b96a440b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/411ae17fe81282acfd688ff8e753bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:11:02 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in selection.c. --- dlls/mshtml/selection.c | 112 ++---------------------------------------------- 1 file changed, 4 insertions(+), 108 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 0da2246a69e..fdf2be9acd5 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -47,60 +47,8 @@ static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject(IHTMLSelection return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject_iface); } -static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *iface, - REFIID riid, void **ppv) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject *iface, UINT *pctinfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectionObject, IHTMLSelectionObject, + impl_from_IHTMLSelectionObject(iface)->dispex) static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) { @@ -205,60 +153,8 @@ static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject2(IHTMLSelectio return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject2_iface); } -static HRESULT WINAPI HTMLSelectionObject2_QueryInterface(IHTMLSelectionObject2 *iface, REFIID riid, void **ppv) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_QueryInterface(&This->IHTMLSelectionObject_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectionObject2_AddRef(IHTMLSelectionObject2 *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_AddRef(&This->IHTMLSelectionObject_iface); -} - -static ULONG WINAPI HTMLSelectionObject2_Release(IHTMLSelectionObject2 *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_Release(&This->IHTMLSelectionObject_iface); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfoCount(IHTMLSelectionObject2 *iface, UINT *pctinfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfo(IHTMLSelectionObject2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetIDsOfNames(IHTMLSelectionObject2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectionObject2_Invoke(IHTMLSelectionObject2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectionObject2, IHTMLSelectionObject2, + impl_from_IHTMLSelectionObject2(iface)->dispex) static HRESULT WINAPI HTMLSelectionObject2_createRangeCollection(IHTMLSelectionObject2 *iface, IDispatch **rangeCollection) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in mutation.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 3add3a2457a1c74b033e72633a9bb345863b3b7f URL: https://gitlab.winehq.org/wine/wine/-/commit/3add3a2457a1c74b033e72633a9bb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:01:55 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in mutation.c. --- dlls/mshtml/mutation.c | 55 ++------------------------------------------------ 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 845c189f98b..44cb2f491af 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1089,59 +1089,8 @@ static inline struct mutation_observer *impl_from_IWineMSHTMLMutationObserver(IW return CONTAINING_RECORD(iface, struct mutation_observer, IWineMSHTMLMutationObserver_iface); } -static HRESULT WINAPI MutationObserver_QueryInterface(IWineMSHTMLMutationObserver *iface, REFIID riid, void **ppv) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI MutationObserver_AddRef(IWineMSHTMLMutationObserver *iface) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI MutationObserver_Release(IWineMSHTMLMutationObserver *iface) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI MutationObserver_GetTypeInfoCount(IWineMSHTMLMutationObserver *iface, UINT *pctinfo) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI MutationObserver_GetTypeInfo(IWineMSHTMLMutationObserver *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI MutationObserver_GetIDsOfNames(IWineMSHTMLMutationObserver *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, - DISPID *rgDispId) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, - rgDispId); -} - -static HRESULT WINAPI MutationObserver_Invoke(IWineMSHTMLMutationObserver *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(MutationObserver, IWineMSHTMLMutationObserver, + impl_from_IWineMSHTMLMutationObserver(iface)->dispex) static HRESULT WINAPI MutationObserver_disconnect(IWineMSHTMLMutationObserver *iface) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextnode.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: ff32b269b90af2a153b3ed62b7977c019750763d URL: https://gitlab.winehq.org/wine/wine/-/commit/ff32b269b90af2a153b3ed62b7977c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:59:52 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextnode.c. --- dlls/mshtml/htmltextnode.c | 106 ++------------------------------------------- 1 file changed, 4 insertions(+), 102 deletions(-) diff --git a/dlls/mshtml/htmltextnode.c b/dlls/mshtml/htmltextnode.c index 0d59204ad00..06dac8fff24 100644 --- a/dlls/mshtml/htmltextnode.c +++ b/dlls/mshtml/htmltextnode.c @@ -45,58 +45,8 @@ static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode(IHTMLDOMTextNode *ifac return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode_iface); } -static HRESULT WINAPI HTMLDOMTextNode_QueryInterface(IHTMLDOMTextNode *iface, - REFIID riid, void **ppv) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMTextNode_AddRef(IHTMLDOMTextNode *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLDOMTextNode_Release(IHTMLDOMTextNode *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - - return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfoCount(IHTMLDOMTextNode *iface, UINT *pctinfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetTypeInfo(IHTMLDOMTextNode *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMTextNode_GetIDsOfNames(IHTMLDOMTextNode *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMTextNode_Invoke(IHTMLDOMTextNode *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode(iface); - return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode, IHTMLDOMTextNode, + impl_from_IHTMLDOMTextNode(iface)->node.event_target.dispex) static HRESULT WINAPI HTMLDOMTextNode_put_data(IHTMLDOMTextNode *iface, BSTR v) { @@ -206,56 +156,8 @@ static inline HTMLDOMTextNode *impl_from_IHTMLDOMTextNode2(IHTMLDOMTextNode2 *if return CONTAINING_RECORD(iface, HTMLDOMTextNode, IHTMLDOMTextNode2_iface); } -static HRESULT WINAPI HTMLDOMTextNode2_QueryInterface(IHTMLDOMTextNode2 *iface, REFIID riid, void **ppv) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_QueryInterface(&This->node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMTextNode2_AddRef(IHTMLDOMTextNode2 *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_AddRef(&This->node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLDOMTextNode2_Release(IHTMLDOMTextNode2 *iface) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - - return IHTMLDOMNode_Release(&This->node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfoCount(IHTMLDOMTextNode2 *iface, UINT *pctinfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetTypeInfoCount(&This->node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetTypeInfo(IHTMLDOMTextNode2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetTypeInfo(&This->node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMTextNode2_GetIDsOfNames(IHTMLDOMTextNode2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_GetIDsOfNames(&This->node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMTextNode2_Invoke(IHTMLDOMTextNode2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMTextNode *This = impl_from_IHTMLDOMTextNode2(iface); - return IDispatchEx_Invoke(&This->node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, lcid, - wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMTextNode2, IHTMLDOMTextNode2, + impl_from_IHTMLDOMTextNode2(iface)->node.event_target.dispex) static HRESULT WINAPI HTMLDOMTextNode2_substringData(IHTMLDOMTextNode2 *iface, LONG offset, LONG count, BSTR *string) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in omnavigator.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 9d4aa67cbbda20a94fe77728759f7501a3d13a06 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d4aa67cbbda20a94fe77728759f75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:08:41 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in omnavigator.c. --- dlls/mshtml/omnavigator.c | 674 ++-------------------------------------------- 1 file changed, 21 insertions(+), 653 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextarea.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 9f6d1da89d451d0cbddb3459f5c17ca15cf95063 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f6d1da89d451d0cbddb3459f5c17c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:57:23 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltextarea.c. --- dlls/mshtml/htmltextarea.c | 55 ++-------------------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index 6964c1c06a0..de0cd735e9e 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -45,59 +45,8 @@ static inline HTMLTextAreaElement *impl_from_IHTMLTextAreaElement(IHTMLTextAreaE return CONTAINING_RECORD(iface, HTMLTextAreaElement, IHTMLTextAreaElement_iface); } -static HRESULT WINAPI HTMLTextAreaElement_QueryInterface(IHTMLTextAreaElement *iface, - REFIID riid, void **ppv) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTextAreaElement_AddRef(IHTMLTextAreaElement *iface) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLTextAreaElement_Release(IHTMLTextAreaElement *iface) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfoCount(IHTMLTextAreaElement *iface, UINT *pctinfo) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetTypeInfo(IHTMLTextAreaElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLTextAreaElement_GetIDsOfNames(IHTMLTextAreaElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTextAreaElement_Invoke(IHTMLTextAreaElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLTextAreaElement *This = impl_from_IHTMLTextAreaElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTextAreaElement, IHTMLTextAreaElement, + impl_from_IHTMLTextAreaElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLTextAreaElement_get_type(IHTMLTextAreaElement *iface, BSTR *p) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltable.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 49f8b384500537c4d61c9dd04e0c5d7bacdf574b URL: https://gitlab.winehq.org/wine/wine/-/commit/49f8b384500537c4d61c9dd04e0c5d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:55:42 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmltable.c. --- dlls/mshtml/htmltable.c | 272 ++---------------------------------------------- 1 file changed, 7 insertions(+), 265 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstylesheet.c.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 95c37b8208a67a4f2b79d1947f5e16fc671d2f66 URL: https://gitlab.winehq.org/wine/wine/-/commit/95c37b8208a67a4f2b79d1947f5e16… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 11:53:06 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlstylesheet.c. --- dlls/mshtml/htmlstylesheet.c | 251 ++----------------------------------------- 1 file changed, 8 insertions(+), 243 deletions(-)

1 0

Conor McCarthy : tests/d3d12: Add a separate null 'views' pointer test in test_null_vbv().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 7d3c286e9b99a18c7d80d85c7c27eda5df15d608 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7d3c286e9b99a18c7d80d85c7c27e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Apr 21 22:09:46 2024 +1000 tests/d3d12: Add a separate null 'views' pointer test in test_null_vbv(). --- tests/d3d12.c | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 31d6a86e..bbfa51e5 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20070,12 +20070,6 @@ static void test_null_vbv(void) }; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; - if (test_options.use_warp_device) - { - skip("Broken on WARP.\n"); - return; - } - memset(&desc, 0, sizeof(desc)); desc.no_root_signature = true; if (!init_test_context(&context, &desc)) @@ -20111,14 +20105,35 @@ static void test_null_vbv(void) vbv[1].SizeInBytes = 0; ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); - /* Calls with NULL "views" pointers should be ignored. */ - ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, NULL); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); + reset_command_list(command_list, context.allocator); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + + vbv[1] = vbv[0]; + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, ARRAY_SIZE(vbv), vbv); + /* A call with a NULL "views" pointer is interpreted as a null buffer. */ ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 1, 1, NULL); ID3D12GraphicsCommandList_DrawInstanced(command_list, 4, 4, 0, 0); transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + todo check_sub_resource_uint(context.render_target, 0, queue, command_list, 0x00000000, 0); ID3D12Resource_Release(vb);

1 0

Conor McCarthy : tests/d3d12: Check UnalignedBlockTexturesSupported when testing GetCopyableFootprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 42d369d5950790c04e8e19672282daca5fea99c5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/42d369d5950790c04e8e19672282d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Apr 21 13:31:42 2024 +1000 tests/d3d12: Check UnalignedBlockTexturesSupported when testing GetCopyableFootprints(). --- tests/d3d12.c | 68 +++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 83990ada..1100b80b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -547,6 +547,21 @@ static bool is_typed_uav_format_supported(ID3D12Device *device, DXGI_FORMAT form return format_support.Support1 & D3D12_FORMAT_SUPPORT1_TYPED_UNORDERED_ACCESS_VIEW; } +static bool are_unaligned_block_textures_supported(ID3D12Device *device) +{ + D3D12_FEATURE_DATA_D3D12_OPTIONS8 options; + HRESULT hr; + + if (FAILED(hr = ID3D12Device_CheckFeatureSupport(device, + D3D12_FEATURE_D3D12_OPTIONS8, &options, sizeof(options)))) + { + /* Requires Windows 11 build 10.0.22000.194. */ + return false; + } + + return options.UnalignedBlockTexturesSupported; +} + #define create_cb_root_signature(a, b, c, e) create_cb_root_signature_(__LINE__, a, b, c, e) static ID3D12RootSignature *create_cb_root_signature_(unsigned int line, ID3D12Device *device, unsigned int reg_idx, D3D12_SHADER_VISIBILITY shader_visibility, @@ -20191,6 +20206,7 @@ static void test_get_copyable_footprints(void) uint64_t row_sizes[10], total_size; D3D12_RESOURCE_DESC resource_desc; unsigned int sub_resource_count; + bool unaligned_block_textures; ID3D12Device8 *device8; unsigned int i, j, k; ID3D12Device *device; @@ -20274,6 +20290,10 @@ static void test_get_copyable_footprints(void) {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 4, 4, 1, 1, DXGI_FORMAT_R32_UINT, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 2, }, + { + {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 3, 4, 4, 1, 1, DXGI_FORMAT_R32_UINT, + {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, + }, { {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 3, 1, 1, 2, DXGI_FORMAT_BC1_UNORM, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 2, @@ -20291,7 +20311,7 @@ static void test_get_copyable_footprints(void) {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, }, { - {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 3, 2, 2, 2, 2, DXGI_FORMAT_BC1_UNORM, + {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 0, 2, 2, 2, 2, DXGI_FORMAT_BC1_UNORM, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, }, { @@ -20304,12 +20324,6 @@ static void test_get_copyable_footprints(void) }, }; - if (test_options.use_warp_device) - { - skip("Broken on WARP.\n"); - return; - } - if (!(device = create_device())) { skip("Failed to create device.\n"); @@ -20460,9 +20474,15 @@ static void test_get_copyable_footprints(void) ID3D12Device8_Release(device8); } + unaligned_block_textures = are_unaligned_block_textures_supported(device); + for (i = 0; i < ARRAY_SIZE(invalid_descs); ++i) { + bool expect_success; + resource_desc = invalid_descs[i].resource_desc; + /* If supported, succeeds for block compressed formats and returns aligned width and height. */ + expect_success = unaligned_block_textures && format_block_width(resource_desc.Format) > 1; memset(layouts, 0, sizeof(layouts)); memset(row_counts, 0, sizeof(row_counts)); @@ -20476,18 +20496,34 @@ static void test_get_copyable_footprints(void) { const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[j]; - ok(l->Offset == ~(uint64_t)0, "Got offset %"PRIu64".\n", l->Offset); - ok(l->Footprint.Format == ~(DXGI_FORMAT)0, "Got format %#x.\n", l->Footprint.Format); - ok(l->Footprint.Width == ~0u, "Got width %u.\n", l->Footprint.Width); - ok(l->Footprint.Height == ~0u, "Got height %u.\n", l->Footprint.Height); - ok(l->Footprint.Depth == ~0u, "Got depth %u.\n", l->Footprint.Depth); - ok(l->Footprint.RowPitch == ~0u, "Got row pitch %u.\n", l->Footprint.RowPitch); + vkd3d_test_push_context("resource %u, subresource %u", i, j); + + if (expect_success) + { + resource_desc.Width = align(resource_desc.Width, 4); + resource_desc.Height = align(resource_desc.Height, 4); + todo + check_copyable_footprints(&resource_desc, 0, invalid_descs[i].sub_resource_count, 0, + layouts, row_counts, row_sizes, &total_size); + } + else + { + ok(l->Offset == ~(uint64_t)0, "Got offset %"PRIu64".\n", l->Offset); + ok(l->Footprint.Format == ~(DXGI_FORMAT)0, "Got format %#x.\n", l->Footprint.Format); + ok(l->Footprint.Width == ~0u, "Got width %u.\n", l->Footprint.Width); + ok(l->Footprint.Height == ~0u, "Got height %u.\n", l->Footprint.Height); + ok(l->Footprint.Depth == ~0u, "Got depth %u.\n", l->Footprint.Depth); + ok(l->Footprint.RowPitch == ~0u, "Got row pitch %u.\n", l->Footprint.RowPitch); + + ok(row_counts[j] == ~0u, "Got row count %u.\n", row_counts[j]); + ok(row_sizes[j] == ~(uint64_t)0, "Got row size %"PRIu64".\n", row_sizes[j]); + } - ok(row_counts[j] == ~0u, "Got row count %u.\n", row_counts[j]); - ok(row_sizes[j] == ~(uint64_t)0, "Got row size %"PRIu64".\n", row_sizes[j]); + vkd3d_test_pop_context(); } - ok(total_size == ~(uint64_t)0, "Got total size %"PRIu64".\n", total_size); + if (!expect_success) + ok(total_size == ~(uint64_t)0, "Got total size %"PRIu64".\n", total_size); } refcount = ID3D12Device_Release(device);

1 0

Conor McCarthy : tests/d3d12: Use get_cpu_sampler_handle() for the sampler heap in test_unbounded_samplers().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: fd416b492c4ac4fa0fddc3470a724624463995b6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd416b492c4ac4fa0fddc3470a724… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 15:20:38 2024 +1000 tests/d3d12: Use get_cpu_sampler_handle() for the sampler heap in test_unbounded_samplers(). --- tests/d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index acd263c9..31d6a86e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -37440,7 +37440,7 @@ static void test_unbounded_samplers(void) sampler_desc.AddressU = (i & 1) ? D3D12_TEXTURE_ADDRESS_MODE_CLAMP : D3D12_TEXTURE_ADDRESS_MODE_WRAP; sampler_desc.AddressV = (i & 2) ? D3D12_TEXTURE_ADDRESS_MODE_CLAMP : D3D12_TEXTURE_ADDRESS_MODE_WRAP; sampler_desc.AddressW = D3D12_TEXTURE_ADDRESS_MODE_WRAP; - ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_descriptor_handle(&context, sampler_heap, i)); + ID3D12Device_CreateSampler(device, &sampler_desc, get_cpu_sampler_handle(&context, sampler_heap, i)); } ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, context.root_signature);

1 0