wine-commits May 2024

wine-commits@winehq.org

1 participants
705 discussions

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

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 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 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 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 htmlgeneric.c.
by Alexandre Julliard 16 May '24

16 May '24

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

1 0

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

16 May '24

Module: wine Branch: master Commit: 5e896684e3992fd28bda3265014b49e26536ddad URL: https://gitlab.winehq.org/wine/wine/-/commit/5e896684e3992fd28bda3265014b49… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 15:35:59 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlframe.c. --- dlls/mshtml/htmlframe.c | 277 ++---------------------------------------------- 1 file changed, 10 insertions(+), 267 deletions(-)

1 0

Esme Povirk : gdiplus: Reorder filled arrow cap points to match native.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 0a324152e75618041d55db2bf4a58daae7e1f50b URL: https://gitlab.winehq.org/wine/wine/-/commit/0a324152e75618041d55db2bf4a58d… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue May 7 11:31:01 2024 -0500 gdiplus: Reorder filled arrow cap points to match native. --- dlls/gdiplus/customlinecap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index b6dcf26fdd1..d493214904c 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -299,11 +299,11 @@ static void arrowcap_update_path(GpAdjustableArrowCap *cap) { memcpy(cap->cap.pathdata.Types, types_filled, sizeof(types_filled)); cap->cap.pathdata.Count = 4; - points[0].X = -cap->width / 2.0; + points[0].X = cap->width / 2.0; points[0].Y = -cap->height; points[1].X = 0.0; points[1].Y = 0.0; - points[2].X = cap->width / 2.0; + points[2].X = -cap->width / 2.0; points[2].Y = -cap->height; points[3].X = 0.0; points[3].Y = -cap->height + cap->middle_inset;

1 0

Esme Povirk : gdiplus: Fix signs on custom line cap rotation in add_anchor.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: 0400ed7ec7a8b180bf3eef01be54b8a3dc68cbd1 URL: https://gitlab.winehq.org/wine/wine/-/commit/0400ed7ec7a8b180bf3eef01be54b8… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon May 6 15:22:50 2024 -0500 gdiplus: Fix signs on custom line cap rotation in add_anchor. --- dlls/gdiplus/graphicspath.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 94fae70ad88..44077950a87 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2260,8 +2260,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, TRACE("GpCustomLineCap fill: %d basecap: %d inset: %f join: %d scale: %f pen_width:%f\n", custom->fill, custom->basecap, custom->inset, custom->join, custom->scale, pen_width); - sina = -pen_width * custom->scale * segment_dx / segment_length; - cosa = pen_width * custom->scale * segment_dy / segment_length; + sina = pen_width * custom->scale * segment_dx / segment_length; + cosa = -pen_width * custom->scale * segment_dy / segment_length; /* Coordination where cap needs to be drawn */ posx = endpoint->X; @@ -2277,8 +2277,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, for (INT i = 0; i < custom->pathdata.Count; i++) { - tmp_points[i].X = posx + custom->pathdata.Points[i].X * cosa + custom->pathdata.Points[i].Y * sina; - tmp_points[i].Y = posy + custom->pathdata.Points[i].X * sina - custom->pathdata.Points[i].Y * cosa; + tmp_points[i].X = posx + custom->pathdata.Points[i].X * cosa - custom->pathdata.Points[i].Y * sina; + tmp_points[i].Y = posy + custom->pathdata.Points[i].X * sina + custom->pathdata.Points[i].Y * cosa; } if ((custom->pathdata.Types[custom->pathdata.Count - 1] & PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) widen_closed_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, last_point); @@ -2291,8 +2291,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, for (INT i = 0; i < custom->pathdata.Count; i++) { /* rotation of CustomCap according to line */ - perp_dx = custom->pathdata.Points[i].X * cosa + custom->pathdata.Points[i].Y * sina; - perp_dy = custom->pathdata.Points[i].X * sina - custom->pathdata.Points[i].Y * cosa; + perp_dx = custom->pathdata.Points[i].X * cosa - custom->pathdata.Points[i].Y * sina; + perp_dy = custom->pathdata.Points[i].X * sina + custom->pathdata.Points[i].Y * cosa; *last_point = add_path_list_node(*last_point, posx + perp_dx, posy + perp_dy, custom->pathdata.Types[i]); }

1 0

Esme Povirk : gdiplus: Remove unnecessary math in add_anchor.
by Alexandre Julliard 16 May '24

16 May '24

Module: wine Branch: master Commit: aea505f58c0b5b9a24d23c87153bf9b6a7deb918 URL: https://gitlab.winehq.org/wine/wine/-/commit/aea505f58c0b5b9a24d23c87153bf9… Author: Esme Povirk <esme(a)codeweavers.com> Date: Mon May 6 14:08:22 2024 -0500 gdiplus: Remove unnecessary math in add_anchor. These additions and subtractions cancel each other out. --- dlls/gdiplus/graphicspath.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 105df4cacfd..94fae70ad88 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2264,8 +2264,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, cosa = pen_width * custom->scale * segment_dy / segment_length; /* Coordination where cap needs to be drawn */ - posx = endpoint->X + sina; - posy = endpoint->Y - cosa; + posx = endpoint->X; + posy = endpoint->Y; if (!custom->fill) { @@ -2277,8 +2277,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, for (INT i = 0; i < custom->pathdata.Count; i++) { - tmp_points[i].X = posx + custom->pathdata.Points[i].X * cosa + (custom->pathdata.Points[i].Y - 1.0) * sina; - tmp_points[i].Y = posy + custom->pathdata.Points[i].X * sina - (custom->pathdata.Points[i].Y - 1.0) * cosa; + tmp_points[i].X = posx + custom->pathdata.Points[i].X * cosa + custom->pathdata.Points[i].Y * sina; + tmp_points[i].Y = posy + custom->pathdata.Points[i].X * sina - custom->pathdata.Points[i].Y * cosa; } if ((custom->pathdata.Types[custom->pathdata.Count - 1] & PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) widen_closed_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, last_point); @@ -2291,8 +2291,8 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, for (INT i = 0; i < custom->pathdata.Count; i++) { /* rotation of CustomCap according to line */ - perp_dx = custom->pathdata.Points[i].X * cosa + (custom->pathdata.Points[i].Y - 1.0) * sina; - perp_dy = custom->pathdata.Points[i].X * sina - (custom->pathdata.Points[i].Y - 1.0) * cosa; + perp_dx = custom->pathdata.Points[i].X * cosa + custom->pathdata.Points[i].Y * sina; + perp_dy = custom->pathdata.Points[i].X * sina - custom->pathdata.Points[i].Y * cosa; *last_point = add_path_list_node(*last_point, posx + perp_dx, posy + perp_dy, custom->pathdata.Types[i]); }

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2024