- Wine-Commits - list.winehq.org

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

May 16, 2024

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

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

May 16, 2024

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

May 16, 2024

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

Esme Povirk : gdiplus: Remove unnecessary math in add_anchor.
by Alexandre Julliard May 16, 2024

May 16, 2024

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

Eric Pouech : winedump: Demangle std::nullptr_t datatype.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 3a95341ef6d0777132a069c5b179fd07f88ab1ad URL: https://gitlab.winehq.org/wine/wine/-/commit/3a95341ef6d0777132a069c5b179fd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 30 18:38:07 2023 +0100 winedump: Demangle std::nullptr_t datatype. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/msmangle.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index d24a9f0b881..94e91706585 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -1050,6 +1050,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!get_qualified_type(ct, sym, '$', flags)) goto done; } + else if (*sym->current == 'T') + { + sym->current++; + ct->left = str_printf(sym, "std::nullptr_t"); + } break; } break;

1 0

Eric Pouech : msvcrt: Demangle std::nullptr_t datatype.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 2464b47d7813c9ba7fb2efd88f172905b3579fb6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2464b47d7813c9ba7fb2efd88f1729… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Oct 30 18:38:07 2023 +0100 msvcrt: Demangle std::nullptr_t datatype. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/msvcrt/undname.c | 5 +++++ dlls/ucrtbase/tests/cpp.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 6b255109e1f..55661f21e2b 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -1160,6 +1160,11 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct, sym->current++; if (!get_qualified_type(ct, sym, '$', flags)) goto done; } + else if (*sym->current == 'T') + { + sym->current++; + ct->left = str_printf(sym, "std::nullptr_t"); + } break; } break; diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index c20f889d686..7f63a1216a0 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -220,6 +220,9 @@ static void test___unDName(void) "struct my_iter<int,0>", NULL, UNDNAME_NO_ARGUMENTS}, +/* 8 */ {"??$foo(a)J_W$$T(a)bar@@YAJQB_W$$THQAUgod@@@Z", + "long __cdecl bar::foo<long,wchar_t,std::nullptr_t>(wchar_t const * const,std::nullptr_t,int,struct god * const)"}, + }; unsigned i; for (i = 0; i < ARRAY_SIZE(und_tests); i++)

1 0

Esme Povirk : gdiplus: Support anchors on thin paths.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: b7caffea25b4a066301dbd4007c3f4e92e2f3fab URL: https://gitlab.winehq.org/wine/wine/-/commit/b7caffea25b4a066301dbd4007c3f4… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat May 4 18:27:46 2024 +0000 gdiplus: Support anchors on thin paths. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 80 ++++++++++++++++++++++++++++++++++++- dlls/gdiplus/graphicspath.c | 91 +++++++++++++++++++++++++++++++----------- 3 files changed, 148 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c3b516a9a2b..c327d44af66 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -137,6 +137,8 @@ extern void free_installed_fonts(void); extern BOOL lengthen_path(GpPath *path, INT len); +extern GpStatus widen_flat_path_anchors(GpPath *flat_path, GpPen *pen, REAL pen_width, GpPath **anchors); + extern DWORD write_region_data(const GpRegion *region, void *data); extern DWORD write_path_data(GpPath *path, void *data); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 86c156354ef..7eea3f58c77 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3737,7 +3737,8 @@ end: static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPath *path) { GpStatus stat; - GpPath* flat_path; + GpPath *flat_path, *anchor_path; + GpRegion *anchor_region; GpMatrix* transform; GpRectF gp_bound_rect; GpRect gp_output_area; @@ -3765,6 +3766,9 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa if (stat == Ok) stat = GdipFlattenPath(flat_path, transform, 1.0); + if (stat == Ok) + stat = widen_flat_path_anchors(flat_path, pen, 1.0, &anchor_path); + GdipDeleteMatrix(transform); } @@ -3788,6 +3792,18 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa if (ceilf(y) > output_area.bottom) output_area.bottom = ceilf(y); } + for (i=0; i<anchor_path->pathdata.Count; i++) + { + REAL x, y; + x = anchor_path->pathdata.Points[i].X; + y = anchor_path->pathdata.Points[i].Y; + + if (floorf(x) < output_area.left) output_area.left = floorf(x); + if (floorf(y) < output_area.top) output_area.top = floorf(y); + if (ceilf(x) > output_area.right) output_area.right = ceilf(x); + if (ceilf(y) > output_area.bottom) output_area.bottom = ceilf(y); + } + stat = get_graphics_device_bounds(graphics, &gp_bound_rect); } @@ -3804,6 +3820,7 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa if (output_width <= 0 || output_height <= 0) { GdipDeletePath(flat_path); + GdipDeletePath(anchor_path); return Ok; } @@ -4015,6 +4032,66 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa } } } + + /* draw anchors */ + stat = GdipCreateRegionPath(anchor_path, &anchor_region); + if (stat == Ok) + { + HRGN hrgn; + DWORD rgn_data_size; + RGNDATA *rgn_data; + RECT *rects; + INT x, y; + + stat = GdipCombineRegionRectI(anchor_region, &gp_output_area, CombineModeIntersect); + + if (stat == Ok) + stat = GdipGetRegionHRgn(anchor_region, NULL, &hrgn); + + if (stat == Ok) + { + rgn_data_size = GetRegionData(hrgn, 0, NULL); + + if (rgn_data_size) + { + rgn_data = malloc(rgn_data_size); + + if (rgn_data) + { + GetRegionData(hrgn, rgn_data_size, rgn_data); + + rects = (RECT*)&rgn_data->Buffer; + + for (i=0; i < rgn_data->rdh.nCount; i++) + { + RECT rc; + rc = rects[i]; + + OffsetRect(&rc, -output_area.left, -output_area.top); + + for (y = rc.top; y < rc.bottom; y++) + { + for (x = rc.left; x < rc.right; x++) + { + if (brush_bits) + output_bits[x + y*output_width] = brush_bits[x + y*output_width]; + else + output_bits[x + y*output_width] = ((GpSolidFill*)pen->brush)->color; + } + } + } + + free(rgn_data); + } + else + stat = OutOfMemory; + } + + DeleteObject(hrgn); + } + + GdipDeleteRegion(anchor_region); + } } /* draw output image */ @@ -4035,6 +4112,7 @@ static GpStatus SOFTWARE_GdipDrawThinPath(GpGraphics *graphics, GpPen *pen, GpPa } GdipDeletePath(flat_path); + GdipDeletePath(anchor_path); return stat; } diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 662e20071aa..105df4cacfd 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2111,9 +2111,8 @@ static void widen_closed_figure(const GpPointF *points, int start, int end, GpPen *pen, REAL pen_width, path_list_node_t **last_point); static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, - GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) + GpPen *pen, REAL pen_width, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) { - REAL pen_width = max(pen->width, 2.0); switch (cap) { default: @@ -2520,6 +2519,71 @@ static void widen_dashed_figure(GpPath *path, int start, int end, int closed, free(tmp_points); } +void widen_anchors(GpPath *flat_path, GpPen *pen, REAL pen_width, path_list_node_t** last_point) +{ + BYTE *types = flat_path->pathdata.Types; + int i, subpath_start=0; + + for (i=0; i < flat_path->pathdata.Count; i++) + { + if ((types[i]&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) + continue; + + if ((types[i]&PathPointTypePathTypeMask) == PathPointTypeStart) + subpath_start = i; + + if (i == flat_path->pathdata.Count-1 || + (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) + { + if (pen->startcap & LineCapAnchorMask) + add_anchor(&flat_path->pathdata.Points[subpath_start], + &flat_path->pathdata.Points[subpath_start+1], + pen, pen_width, pen->startcap, pen->customstart, last_point); + + if (pen->endcap & LineCapAnchorMask) + add_anchor(&flat_path->pathdata.Points[i], + &flat_path->pathdata.Points[i-1], + pen, pen_width, pen->endcap, pen->customend, last_point); + } + } +} + +GpStatus widen_flat_path_anchors(GpPath *flat_path, GpPen *pen, REAL pen_width, GpPath **anchors) +{ + GpStatus stat; + path_list_node_t *points=NULL, *last_point=NULL; + + if (!flat_path || !pen) + return InvalidParameter; + + if (init_path_list(&points, 314.0, 22.0)) + { + last_point = points; + + stat = GdipCreatePath(flat_path->fill, anchors); + if (stat == Ok) + { + widen_anchors(flat_path, pen, pen_width, &last_point); + + if (!path_list_to_path(points->next, *anchors)) + stat = OutOfMemory; + + if (stat != Ok) + { + GdipDeletePath(*anchors); + *anchors = NULL; + } + } + free_path_list(points); + } + else + stat = OutOfMemory; + + /* FIXME: Apply insets to flat_path */ + + return stat; +} + GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, REAL flatness) { @@ -2586,28 +2650,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, } } - for (i=0; i < flat_path->pathdata.Count; i++) - { - if ((types[i]&PathPointTypeCloseSubpath) == PathPointTypeCloseSubpath) - continue; - - if ((types[i]&PathPointTypePathTypeMask) == PathPointTypeStart) - subpath_start = i; - - if (i == flat_path->pathdata.Count-1 || - (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart) - { - if (pen->startcap & LineCapAnchorMask) - add_anchor(&flat_path->pathdata.Points[subpath_start], - &flat_path->pathdata.Points[subpath_start+1], - pen, pen->startcap, pen->customstart, &last_point); - - if (pen->endcap & LineCapAnchorMask) - add_anchor(&flat_path->pathdata.Points[i], - &flat_path->pathdata.Points[i-1], - pen, pen->endcap, pen->customend, &last_point); - } - } + widen_anchors(flat_path, pen, fmax(pen->width, 2.0), &last_point); if (!path_list_to_path(points->next, path)) status = OutOfMemory;

1 0

Tim Clem : winemac.drv: Exclude dictation when looking for input methods.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: d77006fd5a68a3aaefdeeb9985e4b39b67e58b2b URL: https://gitlab.winehq.org/wine/wine/-/commit/d77006fd5a68a3aaefdeeb9985e4b3… Author: Tim Clem <tclem(a)codeweavers.com> Date: Wed May 15 13:09:51 2024 -0700 winemac.drv: Exclude dictation when looking for input methods. After a recent OS update, the dictation input source remains "selected" in *all* apps for about 10 minutes after it is activated, even when it is not in use. There doesn't seem to be any way to determine whether it's actually active or just lingering, and sending input to it regardless means that we falsely process input as if it was going to an IME. --- dlls/winemac.drv/cocoa_app.m | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index f6a9cd145ea..61ab38cdc82 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2065,9 +2065,7 @@ static NSString* WineLocalizedString(unsigned int stringID) static BOOL InputSourceShouldBeIgnored(TISInputSourceRef inputSource) { /* Certain system utilities are technically input sources, but we - shouldn't consider them as such for our purposes. - Dictation is its own source too (com.apple.inputmethod.ironwood), but - it should receive keypresses; it cancels input on escape. */ + shouldn't consider them as such for our purposes. */ static CFStringRef ignoredIDs[] = { /* The "Emoji & Symbols" palette. */ CFSTR("com.apple.CharacterPaletteIM"), @@ -2077,6 +2075,11 @@ static NSString* WineLocalizedString(unsigned int stringID) CFSTR("com.apple.PressAndHold"), /* Emoji list on MacBooks with the Touch Bar. */ CFSTR("com.apple.inputmethod.EmojiFunctionRowItem"), + /* Dictation. Ideally this would actually receive key events, since + escape cancels it, but it remains a "selected" input source even + when not active, so we need to ignore it to avoid incorrectly + sending input to it. */ + CFSTR("com.apple.inputmethod.ironwood"), }; CFStringRef sourceID = TISGetInputSourceProperty(inputSource, kTISPropertyInputSourceID);

1 0

Esme Povirk : gdiplus: Bitmap stride is ignored when Scan0 is non-NULL.
by Alexandre Julliard May 16, 2024

May 16, 2024

Module: wine Branch: master Commit: 079f533d9c6f3ee78a5c5e91a08220f2cfe93349 URL: https://gitlab.winehq.org/wine/wine/-/commit/079f533d9c6f3ee78a5c5e91a08220… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri May 3 14:25:24 2024 -0500 gdiplus: Bitmap stride is ignored when Scan0 is non-NULL. --- dlls/gdiplus/image.c | 2 +- dlls/gdiplus/tests/graphics.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d3d4ec7de42..3a5e338c4ac 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1817,7 +1817,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, row_size = (width * PIXELFORMATBPP(format)+7) / 8; dib_stride = (row_size + 3) & ~3; - if(stride == 0) + if(!scan0) stride = dib_stride; if (format & PixelFormatGDI && !(format & (PixelFormatAlpha|PixelFormatIndexed)) && !scan0) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ff6a64e1fb5..73e2a9b2c3a 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -7406,6 +7406,76 @@ static void test_printer_dc(void) DeleteDC(hdc_printer); } +void test_bitmap_stride(void) +{ + GpStatus status; + GpBitmap *bitmap = NULL; + BitmapData locked_data; + GpRect bounds = {0, 0, 10, 10}; + BYTE buffer[400]; + BYTE *scan0; + int i; + struct { + INT stride; + BOOL use_scan0; + INT expected_stride; + GpStatus status; + } test_data[] = { + { 12, FALSE, 20 }, + { 40, FALSE, 20 }, + { 0, FALSE, 20 }, + { 20, FALSE, 20 }, + { -12, FALSE, 20 }, + { -32, FALSE, 20 }, + { 30, TRUE, 0, InvalidParameter }, + { 12, TRUE, 12 }, + { 40, TRUE, 40 }, + { 0, TRUE, 0, InvalidParameter }, + { 32, TRUE, 32 }, + { -12, TRUE, -12 }, + { -32, TRUE, -32 }, + { -13, TRUE, 0, InvalidParameter }, + }; + + for (i=0; i < ARRAY_SIZE(test_data); i++) + { + if (test_data[i].use_scan0) + { + if (test_data[i].stride >= 0) + scan0 = buffer; + else + scan0 = buffer + sizeof(buffer) + test_data[i].stride; + } + else + scan0 = NULL; + + winetest_push_context("%i: %i %i", i, test_data[i].stride, test_data[i].use_scan0); + + status = GdipCreateBitmapFromScan0(10, 10, test_data[i].stride, PixelFormat16bppGrayScale, scan0, &bitmap); + expect(test_data[i].status, status); + + if (status == Ok) + { + status = GdipBitmapLockBits(bitmap, &bounds, ImageLockModeRead, PixelFormat16bppGrayScale, &locked_data); + expect(Ok, status); + + expect(10, locked_data.Width); + expect(10, locked_data.Height); + expect(test_data[i].expected_stride, locked_data.Stride); + expect(PixelFormat16bppGrayScale, locked_data.PixelFormat); + if (test_data[i].use_scan0) + ok(locked_data.Scan0 == scan0, "got %p, expected %p\n", locked_data.Scan0, scan0); + + status = GdipBitmapUnlockBits(bitmap, &locked_data); + expect(Ok, status); + + GdipDisposeImage((GpImage*)bitmap); + } + + winetest_pop_context(); + } +} + START_TEST(graphics) { struct GdiplusStartupInput gdiplusStartupInput; @@ -7504,6 +7574,7 @@ START_TEST(graphics) test_gdi_interop_bitmap(); test_gdi_interop_hdc(); test_printer_dc(); + test_bitmap_stride(); GdiplusShutdown(gdiplusToken); DestroyWindow( hwnd );

1 0

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

May 16, 2024

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