November 2022 - Wine-commits

Bartosz Kosiorek : gdiplus: Add GdipSetCustomLineCapBaseInset implementation.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 200652075be4406ad1e104657e672849bab6c7c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/200652075be4406ad1e104657e6728… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 7 17:35:55 2022 +0100 gdiplus: Add GdipSetCustomLineCapBaseInset implementation. --- dlls/gdiplus/customlinecap.c | 10 +++++----- dlls/gdiplus/tests/customlinecap.c | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 2e7b000355e..c05aecae29a 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -220,14 +220,14 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, REAL inset) { - static int calls; - TRACE("(%p,%0.2f)\n", custom, inset); - if(!(calls++)) - FIXME("not implemented\n"); + if(!custom) + return InvalidParameter; - return NotImplemented; + custom->inset = inset; + + return Ok; } /*FIXME: LineJoin completely ignored now */ diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index c475216ff21..89323040ad1 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -165,6 +165,14 @@ static void test_inset(void) expect(Ok, stat); expectf(0.0, inset); + stat = GdipSetCustomLineCapBaseInset(custom, 2.0); + expect(Ok, stat); + + inset = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapBaseInset(custom, &inset); + expect(Ok, stat); + ok(inset == 2.0, "Unexpected inset value %f\n", inset); + GdipDeleteCustomLineCap(custom); GdipDeletePath(path); }

1 0

Bartosz Kosiorek : gdiplus: Use GpPointF for drawing in widen_closed_figure.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: a8e8730769d3dc3c8c7ebb33386550a5f9b54626 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8e8730769d3dc3c8c7ebb33386550… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Nov 18 14:51:57 2022 +0100 gdiplus: Use GpPointF for drawing in widen_closed_figure. --- dlls/gdiplus/graphicspath.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5ddd96778db..e24053004e0 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2129,7 +2129,7 @@ static void widen_open_figure(const GpPointF *points, int start, int end, (*last_point)->type |= PathPointTypeCloseSubpath; } -static void widen_closed_figure(GpPath *path, int start, int end, +static void widen_closed_figure(const GpPointF *points, int start, int end, GpPen *pen, REAL pen_width, path_list_node_t **last_point) { int i; @@ -2141,15 +2141,15 @@ static void widen_closed_figure(GpPath *path, int start, int end, /* left outline */ prev_point = *last_point; - widen_joint(&path->pathdata.Points[end], &path->pathdata.Points[start], - &path->pathdata.Points[start+1], pen, pen_width, last_point); + widen_joint(&points[end], &points[start], + &points[start+1], pen, pen_width, last_point); for (i=start+1; i<end; i++) - widen_joint(&path->pathdata.Points[i-1], &path->pathdata.Points[i], - &path->pathdata.Points[i+1], pen, pen_width, last_point); + widen_joint(&points[i-1], &points[i], + &points[i+1], pen, pen_width, last_point); - widen_joint(&path->pathdata.Points[end-1], &path->pathdata.Points[end], - &path->pathdata.Points[start], pen, pen_width, last_point); + widen_joint(&points[end-1], &points[end], + &points[start], pen, pen_width, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2157,15 +2157,15 @@ static void widen_closed_figure(GpPath *path, int start, int end, /* right outline */ prev_point = *last_point; - widen_joint(&path->pathdata.Points[start], &path->pathdata.Points[end], - &path->pathdata.Points[end-1], pen, pen_width, last_point); + widen_joint(&points[start], &points[end], + &points[end-1], pen, pen_width, last_point); for (i=end-1; i>start; i--) - widen_joint(&path->pathdata.Points[i+1], &path->pathdata.Points[i], - &path->pathdata.Points[i-1], pen, pen_width, last_point); + widen_joint(&points[i+1], &points[i], + &points[i-1], pen, pen_width, last_point); - widen_joint(&path->pathdata.Points[start+1], &path->pathdata.Points[start], - &path->pathdata.Points[end], pen, pen_width, last_point); + widen_joint(&points[start+1], &points[start], + &points[end], pen, pen_width, last_point); prev_point->next->type = PathPointTypeStart; (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2369,7 +2369,7 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->dash != DashStyleSolid) widen_dashed_figure(flat_path, subpath_start, i, 1, pen, pen_width, &last_point); else - widen_closed_figure(flat_path, subpath_start, i, pen, pen_width, &last_point); + widen_closed_figure(flat_path->pathdata.Points, subpath_start, i, pen, pen_width, &last_point); } else if (i == flat_path->pathdata.Count-1 || (types[i+1]&PathPointTypePathTypeMask) == PathPointTypeStart)

1 0

Bartosz Kosiorek : gdiplus: Add support for widen path with GpCustomLineCap.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 1271ae3ebdf9b5b6e39c5688b64c8a3f0a98b8d4 URL: https://gitlab.winehq.org/wine/wine/-/commit/1271ae3ebdf9b5b6e39c5688b64c8a… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Nov 7 17:36:05 2022 +0100 gdiplus: Add support for widen path with GpCustomLineCap. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45273 --- dlls/gdiplus/gdiplus_private.h | 4 +- dlls/gdiplus/graphicspath.c | 81 ++++++++++++++++++++++++++++++++++++--- dlls/gdiplus/tests/graphicspath.c | 13 +++++++ 3 files changed, 90 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 77b35659946..baae159d7f9 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -352,8 +352,8 @@ struct GpCustomLineCap{ GpPathData pathdata; BOOL fill; /* TRUE for fill, FALSE for stroke */ GpLineCap basecap; /* cap used together with customLineCap */ - REAL inset; /* how much to adjust the end of the line */ - GpLineJoin join; + REAL inset; /* distance between line end and cap beginning */ + GpLineJoin join; /* joins used for drawing custom cap*/ REAL scale; }; diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index e24053004e0..8bb835c1ca1 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1982,9 +1982,17 @@ static void widen_cap(const GpPointF *endpoint, const GpPointF *nextpoint, } } +static void widen_open_figure(const GpPointF *points, int start, int end, + GpPen *pen, REAL pen_width, GpLineCap start_cap, + GpLineCap end_cap, path_list_node_t **last_point); + +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, - REAL pen_width, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) + GpPen *pen, GpLineCap cap, GpCustomLineCap *custom, path_list_node_t **last_point) { + REAL pen_width = max(pen->width, 2.0); switch (cap) { default: @@ -2091,6 +2099,68 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, endpoint->Y + perp_dy, PathPointTypeLine); break; } + case LineCapCustom: + { + REAL segment_dy = nextpoint->Y - endpoint->Y; + REAL segment_dx = nextpoint->X - endpoint->X; + REAL segment_length = sqrtf(segment_dy * segment_dy + segment_dx * segment_dx); + REAL posx, posy; + REAL perp_dx, perp_dy; + REAL sina, cosa; + GpPointF *tmp_points; + + if(!custom) + break; + + if (custom->type == CustomLineCapTypeAdjustableArrow) + { + GpAdjustableArrowCap *arrow = (GpAdjustableArrowCap *)custom; + TRACE("GpAdjustableArrowCap middle_inset: %f height: %f width: %f\n", + arrow->middle_inset, arrow->height, arrow->width); + } + else + 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); + + /* Coordination where cap needs to be drawn */ + posx = endpoint->X - pen_width * segment_dx / segment_length; + posy = endpoint->Y - pen_width * segment_dy / segment_length; + + sina = -pen_width * custom->scale * segment_dx / segment_length; + cosa = pen_width * custom->scale * segment_dy / segment_length; + + if (!custom->fill) + { + tmp_points = heap_alloc_zero(custom->pathdata.Count * sizeof(GpPoint)); + if (!tmp_points) { + ERR("Out of memory\n"); + return; + } + + 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; + } + 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); + else + widen_open_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, LineCapFlat, LineCapFlat, last_point); + } + else + { + 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; + *last_point = add_path_list_node(*last_point, posx + perp_dx, + posy + perp_dy, custom->pathdata.Types[i]); + } + } + /* FIXME: The line should be adjusted by the inset value of the custom cap. */ + break; + } } (*last_point)->type |= PathPointTypeCloseSubpath; @@ -2335,16 +2405,15 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (status == Ok) { - REAL anchor_pen_width = max(pen->width, 2.0); REAL pen_width = (pen->unit == UnitWorld) ? max(pen->width, 1.0) : pen->width; BYTE *types = flat_path->pathdata.Types; last_point = points; - if (pen->endcap > LineCapDiamondAnchor) + if (pen->endcap > LineCapDiamondAnchor && pen->endcap != LineCapCustom) FIXME("unimplemented end cap %x\n", pen->endcap); - if (pen->startcap > LineCapDiamondAnchor) + if (pen->startcap > LineCapDiamondAnchor && pen->startcap != LineCapCustom) FIXME("unimplemented start cap %x\n", pen->startcap); if (pen->dashcap != DashCapFlat) @@ -2395,12 +2464,12 @@ GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix, if (pen->startcap & LineCapAnchorMask) add_anchor(&flat_path->pathdata.Points[subpath_start], &flat_path->pathdata.Points[subpath_start+1], - anchor_pen_width, pen->startcap, pen->customstart, &last_point); + pen, pen->startcap, pen->customstart, &last_point); if (pen->endcap & LineCapAnchorMask) add_anchor(&flat_path->pathdata.Points[i], &flat_path->pathdata.Points[i-1], - anchor_pen_width, pen->endcap, pen->customend, &last_point); + pen, pen->endcap, pen->customend, &last_point); } } diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 07e6dd166ad..ab1e7cb2fda 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1682,9 +1682,12 @@ static void test_widen_cap(void) { LineCapSquareAnchor, 10.0, widenline_capsquareanchor_dashed_path, ARRAY_SIZE(widenline_capsquareanchor_dashed_path), TRUE }, }; + + GpAdjustableArrowCap *arrowcap; GpStatus status; GpPath *path; GpPen *pen; + int i; status = GdipCreatePath(FillModeAlternate, &path); @@ -1749,6 +1752,16 @@ static void test_widen_cap(void) expect(Ok, status); ok_path_fudge(path, widenline_capsquareanchor_multifigure_path, ARRAY_SIZE(widenline_capsquareanchor_multifigure_path), FALSE, 0.000005); + + status = GdipCreateAdjustableArrowCap(4.0, 4.0, TRUE, &arrowcap); + ok(status == Ok, "Failed to create adjustable cap, %d\n", status); + status = GdipSetAdjustableArrowCapMiddleInset(arrowcap, 1.0); + ok(status == Ok, "Failed to set middle inset inadjustable cap, %d\n", status); + status = GdipSetPenCustomEndCap(pen, (GpCustomLineCap*)arrowcap); + ok(status == Ok, "Failed to create custom end cap, %d\n", status); + status = GdipWidenPath(path, pen, NULL, FlatnessDefault); + expect(Ok, status); + GdipDeletePen(pen); GdipDeletePath(path);

1 0

Bartosz Kosiorek : gdiplus: Fix shape of CustomLineCap created by GdipCreateAdjustableArrowCap.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: cd17de88279e23ccd0b20c7d50b1b35dd8297e39 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd17de88279e23ccd0b20c7d50b1b3… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Wed Nov 16 23:19:46 2022 +0100 gdiplus: Fix shape of CustomLineCap created by GdipCreateAdjustableArrowCap. --- dlls/gdiplus/customlinecap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index c05aecae29a..306c4db242b 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -305,18 +305,18 @@ static void arrowcap_update_path(GpAdjustableArrowCap *cap) 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; + points[3].Y = -cap->height + cap->middle_inset; } else { memcpy(cap->cap.pathdata.Types, types_unfilled, sizeof(types_unfilled)); cap->cap.pathdata.Count = 3; - points[0].X = -cap->width / 4.0; - points[0].Y = -cap->height / 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 / 4.0; - points[2].Y = -cap->height / 2.0; + points[2].X = cap->width / 2.0; + points[2].Y = -cap->height; } if (cap->width == 0.0)

1 0

Bartosz Kosiorek : gdiplus: Add GdipSetCustomLineCapStrokeCaps implementation and usage.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: e0f32f53d575cdffd0f35d39d97a941281e3e23d URL: https://gitlab.winehq.org/wine/wine/-/commit/e0f32f53d575cdffd0f35d39d97a94… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Nov 18 16:50:04 2022 +0100 gdiplus: Add GdipSetCustomLineCapStrokeCaps implementation and usage. --- dlls/gdiplus/customlinecap.c | 16 ++++++++-------- dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/tests/customlinecap.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 306c4db242b..f35fea90eba 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -97,6 +97,8 @@ static GpStatus init_custom_linecap(GpCustomLineCap *cap, GpPathData *pathdata, cap->inset = base_inset; cap->basecap = basecap; + cap->strokeStartCap = LineCapFlat; + cap->strokeEndCap = LineCapFlat; cap->join = LineJoinMiter; cap->scale = 1.0; @@ -177,19 +179,17 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap* custom, } GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap* custom, - GpLineCap start, GpLineCap end) + GpLineCap startcap, GpLineCap endcap) { - static int calls; + TRACE("(%p,%u,%u)\n", custom, startcap, endcap); - TRACE("(%p,%u,%u)\n", custom, start, end); - - if(!custom) + if(!custom || startcap > LineCapTriangle || endcap > LineCapTriangle) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); + custom->strokeStartCap = startcap; + custom->strokeEndCap = endcap; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index baae159d7f9..c68fdedb0b8 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -353,6 +353,8 @@ struct GpCustomLineCap{ BOOL fill; /* TRUE for fill, FALSE for stroke */ GpLineCap basecap; /* cap used together with customLineCap */ REAL inset; /* distance between line end and cap beginning */ + GpLineCap strokeStartCap; + GpLineCap strokeEndCap; GpLineJoin join; /* joins used for drawing custom cap*/ REAL scale; }; diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8bb835c1ca1..fdb7dd24906 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2145,7 +2145,7 @@ static void add_anchor(const GpPointF *endpoint, const GpPointF *nextpoint, 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); else - widen_open_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, LineCapFlat, LineCapFlat, last_point); + widen_open_figure(tmp_points, 0, custom->pathdata.Count - 1, pen, pen_width, custom->strokeEndCap, custom->strokeStartCap, last_point); } else { diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 89323040ad1..4ff090ddce0 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -380,6 +380,33 @@ static void test_captype(void) GdipDeleteCustomLineCap((GpCustomLineCap*)arrowcap); } +static void test_strokecap(void) +{ + GpCustomLineCap *cap; + GpStatus stat; + GpPath *path; + + /* default cap */ + stat = GdipCreatePath(FillModeAlternate, &path); + ok(stat == Ok, "Failed to create path, %d\n", stat); + stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + ok(stat == Ok, "AddPathRectangle failed, %d\n", stat); + + stat = GdipCreateCustomLineCap(NULL, path, LineCapFlat, 0.0, &cap); + ok(stat == Ok, "Failed to create cap, %d\n", stat); + + stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapSquare, LineCapFlat); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapSquareAnchor, LineCapFlat); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipSetCustomLineCapStrokeCaps((GpCustomLineCap*)cap, LineCapFlat, LineCapSquareAnchor); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + GdipDeleteCustomLineCap(cap); + GdipDeletePath(path); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -405,6 +432,7 @@ START_TEST(customlinecap) test_scale(); test_create_adjustable_cap(); test_captype(); + test_strokecap(); GdiplusShutdown(gdiplusToken); }

1 0

Zebediah Figura : ntdll: Add a get_free_list_block_size() helper.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: c9cf44a3638e07b2e57fc467158cb5064de626fe URL: https://gitlab.winehq.org/wine/wine/-/commit/c9cf44a3638e07b2e57fc467158cb5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:11:42 2022 -0600 ntdll: Add a get_free_list_block_size() helper. --- dlls/ntdll/heap.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 11c07d2e332..a6db3444374 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -488,26 +488,28 @@ static void heap_set_status( const struct heap *heap, ULONG flags, NTSTATUS stat if (status) RtlSetLastWin32ErrorAndNtStatusFromNtStatus( status ); } +static size_t get_free_list_block_size( unsigned int index ) +{ + if (index < HEAP_NB_SMALL_FREE_LISTS) + return index * ALIGNMENT + HEAP_MIN_BLOCK_SIZE; + return free_list_sizes[index - HEAP_NB_SMALL_FREE_LISTS]; +} + static void heap_dump( const struct heap *heap ) { const struct block *block; const ARENA_LARGE *large; const SUBHEAP *subheap; unsigned int i; - SIZE_T size; TRACE( "heap: %p\n", heap ); TRACE( " next %p\n", LIST_ENTRY( heap->entry.next, struct heap, entry ) ); TRACE( " free_lists: %p\n", heap->free_lists ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - { - if (i < HEAP_NB_SMALL_FREE_LISTS) size = HEAP_MIN_BLOCK_SIZE + i * ALIGNMENT; - else size = free_list_sizes[i - HEAP_NB_SMALL_FREE_LISTS]; - TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, size, + TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ), LIST_ENTRY( heap->free_lists[i].entry.prev, struct entry, entry ), LIST_ENTRY( heap->free_lists[i].entry.next, struct entry, entry ) ); - } TRACE( " subheaps: %p\n", &heap->subheap_list ); LIST_FOR_EACH_ENTRY( subheap, &heap->subheap_list, SUBHEAP, entry )

1 0

Zebediah Figura : ntdll: Always trace sizes with %#x.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 5741f94d1bebbb32eb32b422745e016866cd8a2a URL: https://gitlab.winehq.org/wine/wine/-/commit/5741f94d1bebbb32eb32b422745e01… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:16:57 2022 -0600 ntdll: Always trace sizes with %#x. --- dlls/ntdll/heap.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a6db3444374..014851c0dae 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -507,7 +507,7 @@ static void heap_dump( const struct heap *heap ) TRACE( " free_lists: %p\n", heap->free_lists ); for (i = 0; i < HEAP_NB_FREE_LISTS; i++) - TRACE( " %p: size %8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ), + TRACE( " %p: size %#8Ix, prev %p, next %p\n", heap->free_lists + i, get_free_list_block_size( i ), LIST_ENTRY( heap->free_lists[i].entry.prev, struct entry, entry ), LIST_ENTRY( heap->free_lists[i].entry.next, struct entry, entry ) ); @@ -801,7 +801,7 @@ static struct block *allocate_large_block( struct heap *heap, DWORD flags, SIZE_ if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &total_size, MEM_COMMIT, get_protection_type( flags ))) { - WARN("Could not allocate block for %08Ix bytes\n", size ); + WARN( "Could not allocate block for %#Ix bytes\n", size ); return NULL; } @@ -860,7 +860,7 @@ static struct block *realloc_large_block( struct heap *heap, DWORD flags, struct if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return NULL; if (!(block = allocate_large_block( heap, flags, size ))) { - WARN("Could not allocate block for %08Ix bytes\n", size ); + WARN( "Could not allocate block for %#Ix bytes\n", size ); return NULL; } @@ -934,13 +934,13 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &totalSize, MEM_RESERVE, get_protection_type( flags ) )) { - WARN("Could not allocate %08Ix bytes\n", totalSize ); + WARN( "Could not allocate %#Ix bytes\n", totalSize ); return NULL; } if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &commitSize, MEM_COMMIT, get_protection_type( flags ) )) { - WARN("Could not commit %08Ix bytes for sub-heap %p\n", commitSize, address ); + WARN( "Could not commit %#Ix bytes for sub-heap %p\n", commitSize, address ); return NULL; } } @@ -1037,7 +1037,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH if (!(heap->flags & HEAP_GROWABLE)) { - WARN("Not enough space in heap %p for %08Ix bytes\n", heap, block_size ); + WARN( "Not enough space in heap %p for %#Ix bytes\n", heap, block_size ); return NULL; } @@ -1058,7 +1058,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH max( heap->grow_size, total_size ) ); } - TRACE( "created new sub-heap %p of %08Ix bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap ); + TRACE( "created new sub-heap %p of %#Ix bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap ); entry = first_block( *subheap ); list_remove( &entry->entry );

1 0

Zebediah Figura : ntdll: Avoid casting a struct to its first field.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 793cc934d98b4c753abc60eebc94d3ada5238867 URL: https://gitlab.winehq.org/wine/wine/-/commit/793cc934d98b4c753abc60eebc94d3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:17:33 2022 -0600 ntdll: Avoid casting a struct to its first field. --- dlls/ntdll/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 014851c0dae..fd761215c5a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1022,7 +1022,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH while ((ptr = list_next( &heap->free_lists[0].entry, ptr ))) { entry = LIST_ENTRY( ptr, struct entry, entry ); - block = (struct block *)entry; + block = &entry->block; if (block_get_flags( block ) == BLOCK_FLAG_FREE_LINK) continue; if (block_get_size( block ) >= block_size) { @@ -1062,7 +1062,7 @@ static struct block *find_free_block( struct heap *heap, SIZE_T block_size, SUBH entry = first_block( *subheap ); list_remove( &entry->entry ); - return (struct block *)entry; + return &entry->block; } @@ -1091,11 +1091,11 @@ static BOOL validate_free_block( const struct heap *heap, const SUBHEAP *subheap err = "invalid block flags"; else if (!contains( base, subheap_size( subheap ), block, block_get_size( block ) )) err = "invalid block size"; - else if (!is_valid_free_block( heap, (next = (struct block *)LIST_ENTRY( entry->entry.next, struct entry, entry )) )) + else if (!is_valid_free_block( heap, (next = &LIST_ENTRY( entry->entry.next, struct entry, entry )->block) )) err = "invalid next free block pointer"; else if (!(block_get_flags( next ) & BLOCK_FLAG_FREE) || block_get_type( next ) != BLOCK_TYPE_FREE) err = "invalid next free block header"; - else if (!is_valid_free_block( heap, (prev = (struct block *)LIST_ENTRY( entry->entry.prev, struct entry, entry )) )) + else if (!is_valid_free_block( heap, (prev = &LIST_ENTRY( entry->entry.prev, struct entry, entry )->block) )) err = "invalid previous free block pointer"; else if (!(block_get_flags( prev ) & BLOCK_FLAG_FREE) || block_get_type( prev ) != BLOCK_TYPE_FREE) err = "invalid previous free block header";

1 0

Zebediah Figura : ntdll: Remove an unnecessary cast.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: fadefecd156bfd54f34bea660231c173e7070a6d URL: https://gitlab.winehq.org/wine/wine/-/commit/fadefecd156bfd54f34bea660231c1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 9 16:19:47 2022 -0600 ntdll: Remove an unnecessary cast. --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index fd761215c5a..048fc0e5264 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1099,7 +1099,7 @@ static BOOL validate_free_block( const struct heap *heap, const SUBHEAP *subheap err = "invalid previous free block pointer"; else if (!(block_get_flags( prev ) & BLOCK_FLAG_FREE) || block_get_type( prev ) != BLOCK_TYPE_FREE) err = "invalid previous free block header"; - else if ((next = next_block( subheap, (struct block *)block ))) + else if ((next = next_block( subheap, block ))) { if (!(block_get_flags( next ) & BLOCK_FLAG_PREV_FREE)) err = "invalid next block flags";

1 0

Nikolay Sivov : oleaut32/safearray: Fix an error code when trying to redim fixed arrays.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 7f01fdb6d4600308d811213323c579b838f649fb URL: https://gitlab.winehq.org/wine/wine/-/commit/7f01fdb6d4600308d811213323c579… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 07:11:05 2022 +0300 oleaut32/safearray: Fix an error code when trying to redim fixed arrays. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/safearray.c | 4 +- dlls/oleaut32/tests/safearray.c | 102 ++++++++++++++++++++++++++++------------ 2 files changed, 74 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 92d55752e8a..92a73c768da 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -1460,10 +1460,10 @@ HRESULT WINAPI SafeArrayRedim(SAFEARRAY *psa, SAFEARRAYBOUND *psabound) TRACE("(%p,%p)\n", psa, psabound); - if (!psa || psa->fFeatures & FADF_FIXEDSIZE || !psabound) + if (!psa || !psabound) return E_INVALIDARG; - if (psa->cLocks > 0) + if (psa->fFeatures & FADF_FIXEDSIZE || psa->cLocks) return DISP_E_ARRAYISLOCKED; hr = SafeArrayLock(psa); diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index dbbe86994f5..9bbb59193e4 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1291,35 +1291,6 @@ static void test_SafeArrayGetPutElement_IUnknown(void) ok(xtunk.ref == 2,"Failed to decrement refcount of iface.\n"); } -static void test_SafeArrayRedim_IUnknown(void) -{ - SAFEARRAYBOUND sab; - LONG indices[1]; - SAFEARRAY *sa; - HRESULT hres; - - sab.lLbound = 1; - sab.cElements = 2; - sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); - ok(sa != NULL, "UNKNOWN test couldn't create array\n"); - if (!sa) - return; - - ok(sa->cbElements == sizeof(LPUNKNOWN), "LPUNKNOWN size mismatch\n"); - - indices[0] = 2; - xtunk.ref = 1; - hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); - ok(hres == S_OK, "Failed to put IUnknown element hres 0x%lx\n", hres); - ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); - sab.cElements = 1; - hres = SafeArrayRedim(sa, &sab); - ok(hres == S_OK, "Failed to shrink array hres 0x%lx\n", hres); - ok(xtunk.ref == 1, "Failed to decrement refcount\n"); - hres = SafeArrayDestroy(sa); - ok(hres == S_OK, "got 0x%08lx\n", hres); -} - static void test_SafeArrayGetPutElement_VARIANT(void) { SAFEARRAYBOUND sab; @@ -2063,6 +2034,77 @@ static void test_safearray_layout(void) IRecordInfo_Release(&irec->IRecordInfo_iface); } +static void test_SafeArrayRedim(void) +{ + SAFEARRAYBOUND sab; + LONG indices[1]; + SAFEARRAY *sa; + HRESULT hres; + + sab.lLbound = 1; + sab.cElements = 2; + hres = SafeArrayRedim(NULL, &sab); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayRedim(sa, NULL); + ok(hres == E_INVALIDARG, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* VT_UNKNOWN */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_UNKNOWN, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + ok(sa->cbElements == sizeof(IUnknown *), "Unexpected element size.\n"); + + indices[0] = 2; + xtunk.ref = 1; + hres = SafeArrayPutElement(sa, indices, &xtunk.IUnknown_iface); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 2,"Failed to increment refcount of iface.\n"); + sab.cElements = 1; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + ok(xtunk.ref == 1, "Failed to decrement refcount\n"); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* FADF_FIXEDSIZE */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 4; + sa->fFeatures |= FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + sa->fFeatures &= ~FADF_FIXEDSIZE; + hres = SafeArrayRedim(sa, &sab); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + + /* Locked array */ + sab.lLbound = 1; + sab.cElements = 2; + sa = SafeArrayCreate(VT_I4, 1, &sab); + ok(!!sa, "Failed to create an array.\n"); + hres = SafeArrayLock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + sab.cElements = 3; + hres = SafeArrayRedim(sa, &sab); + ok(hres == DISP_E_ARRAYISLOCKED, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayUnlock(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); + hres = SafeArrayDestroy(sa); + ok(hres == S_OK, "Unexpected hr %#lx.\n", hres); +} + START_TEST(safearray) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -2089,7 +2131,7 @@ START_TEST(safearray) test_SafeArrayGetPutElement(); test_SafeArrayGetPutElement_BSTR(); test_SafeArrayGetPutElement_IUnknown(); - test_SafeArrayRedim_IUnknown(); + test_SafeArrayRedim(); test_SafeArrayGetPutElement_VARIANT(); test_safearray_layout(); }

1 0