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

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlhead.c.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 1e2df994ef24ebef0bb79d52fd55346e46a57185 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e2df994ef24ebef0bb79d52fd5534… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:40:04 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlhead.c. --- dlls/mshtml/htmlhead.c | 229 ++----------------------------------------------- 1 file changed, 8 insertions(+), 221 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlimg.c.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 2ffe440b3453a93506ef9b25cd2516d35f3762d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ffe440b3453a93506ef9b25cd2516… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:42:31 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlimg.c. --- 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) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlinput.c.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: be175f848704ae28f5385b1d40de66b93b06d783 URL: https://gitlab.winehq.org/wine/wine/-/commit/be175f848704ae28f5385b1d40de66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:46:00 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlinput.c. --- dlls/mshtml/htmlinput.c | 276 ++---------------------------------------------- 1 file changed, 10 insertions(+), 266 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllink.c.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: bb157e487e0fd6b3e4549a75f41de6369b1e1b04 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb157e487e0fd6b3e4549a75f41de6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:49:19 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllink.c. --- 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) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllocation.c.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: d2c11cdd945a438ccaf86658a6fb62a0a419414f URL: https://gitlab.winehq.org/wine/wine/-/commit/d2c11cdd945a438ccaf86658a6fb62… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:50:51 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmllocation.c. --- 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) {

1 0

Henri Verbeet : vkd3d-shader/ir: Do not store the vkd3d-shader configuration flags in struct vkd3d_shader_parser.
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: efe9dfd73aac352fbe81e4baef3c3e54592ee484 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/efe9dfd73aac352fbe81e4baef3c3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:16 2024 +0200 vkd3d-shader/ir: Do not store the vkd3d-shader configuration flags in struct vkd3d_shader_parser. --- libs/vkd3d-shader/d3dbc.c | 4 ++-- libs/vkd3d-shader/dxil.c | 4 ++-- libs/vkd3d-shader/hlsl.c | 7 ++++--- libs/vkd3d-shader/tpf.c | 4 ++-- libs/vkd3d-shader/vkd3d_shader_main.c | 19 ++++++++++--------- libs/vkd3d-shader/vkd3d_shader_private.h | 13 ++++++------- 6 files changed, 26 insertions(+), 25 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/d3dbc: Parse the shader into a vsir program in vkd3d_shader_sm1_parser_create().
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: 402b96ef3bc219b060cd537f6dc9f5ff2bf59a2c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/402b96ef3bc219b060cd537f6dc9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:22 2024 +0200 vkd3d-shader/d3dbc: Parse the shader into a vsir program in vkd3d_shader_sm1_parser_create(). --- libs/vkd3d-shader/d3dbc.c | 57 +++++++++----------------------- libs/vkd3d-shader/hlsl.c | 14 +++++--- libs/vkd3d-shader/vkd3d_shader_main.c | 34 +++++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 4 +-- 4 files changed, 51 insertions(+), 58 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/tpf: Parse the shader into a vsir program in vkd3d_shader_sm4_parser_create().
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: 6474e8cc7bc371d7b412b4e1622c6c2cdff0a1f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6474e8cc7bc371d7b412b4e1622c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:26 2024 +0200 vkd3d-shader/tpf: Parse the shader into a vsir program in vkd3d_shader_sm4_parser_create(). --- libs/vkd3d-shader/hlsl.c | 14 ++---- libs/vkd3d-shader/tpf.c | 78 ++++++++++---------------------- libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++-- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +- 4 files changed, 35 insertions(+), 69 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/dxil: Parse the shader into a vsir program in vkd3d_shader_sm6_parser_create().
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: ce6f8a6a30b6b3d03f502c8f12bd4a89b641a0c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ce6f8a6a30b6b3d03f502c8f12bd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:42:29 2024 +0200 vkd3d-shader/dxil: Parse the shader into a vsir program in vkd3d_shader_sm6_parser_create(). --- libs/vkd3d-shader/d3dbc.c | 11 +--- libs/vkd3d-shader/dxil.c | 108 +++++++++++++------------------ libs/vkd3d-shader/tpf.c | 11 +--- libs/vkd3d-shader/vkd3d_shader_main.c | 38 ++++------- libs/vkd3d-shader/vkd3d_shader_private.h | 19 +----- 5 files changed, 61 insertions(+), 126 deletions(-)

1 0

Henri Verbeet : vkd3d-shader/ir: Use a separate allocation for the vsir program in struct vkd3d_shader_parser.
by Alexandre Julliard 16 May '24

16 May '24

Module: vkd3d Branch: master Commit: 9e4a790de10cd892ca247951a63dc3fe87eb7c89 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9e4a790de10cd892ca247951a63dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 11:41:58 2024 +0200 vkd3d-shader/ir: Use a separate allocation for the vsir program in struct vkd3d_shader_parser. --- libs/vkd3d-shader/d3dbc.c | 41 ++++++------ libs/vkd3d-shader/dxil.c | 103 +++++++++++++++++-------------- libs/vkd3d-shader/hlsl.c | 2 +- libs/vkd3d-shader/tpf.c | 73 ++++++++++++---------- libs/vkd3d-shader/vkd3d_shader_main.c | 12 +++- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +- 6 files changed, 134 insertions(+), 101 deletions(-)

1 0