[PATCH v5 0/1] MR7560: Draft: gdiplus/tests: Extend millimiter test for GdipIsOutlineVisiblePathPoint.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55717
-- v5: gdiplus/tests: Extend millimeter test for GdipIsOutlineVisiblePathPoint.
From: Bartosz Kosiorek gang65@poczta.onet.pl
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55717 --- dlls/gdiplus/graphicspath.c | 2 +- dlls/gdiplus/tests/graphicspath.c | 132 ++++++++++++++++++++++++++++-- 2 files changed, 124 insertions(+), 10 deletions(-)
diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index b1e417842f8..7146f93229c 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -1804,7 +1804,7 @@ GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath* path, REAL x, REAL y,
if (stat != Ok) return stat; - + // if (graphics != NULL) // TODO Why we are checking Pen? if (pen->unit == UnitPixel && graphics != NULL) { stat = GdipCreateMatrix(&transform); diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 89a7dd786de..180e9caac7e 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1998,7 +1998,7 @@ static void test_is_outline_visible_path_point(void) GpBitmap *bitmap; GpGraphics *graphics = NULL; GpPath *path; - GpPen *pen = NULL; + GpPen *pen, *penmm = NULL; GpStatus status; static const int width = 20, height = 20;
@@ -2019,6 +2019,10 @@ static void test_is_outline_visible_path_point(void) expect(Ok, status); ok(pen != NULL, "Expected pen to be initialized\n");
+ status = GdipCreatePen1((ARGB)0xffff00ff, 4.0f, UnitMillimeter, &penmm); + expect(Ok, status); + ok(penmm != NULL, "Expected pen to be initialized\n"); + /* With NULL pen */ result = 9; status = GdipIsOutlineVisiblePathPoint(path, 0.0, 1.0, NULL, graphics, &result); @@ -2095,36 +2099,146 @@ static void test_is_outline_visible_path_point(void) expect(Ok, status); expect(FALSE, result);
- /* Page Unit */ + /* Page Unit in Millimeters, Pen Unit in pixels */ GdipResetWorldTransform(graphics); status = GdipSetPageUnit(graphics, UnitMillimeter); expect(Ok, status); result = TRUE; - status = GdipIsOutlineVisiblePathPoint(path, 0.0, 1.0, pen, graphics, &result); + status = GdipIsOutlineVisiblePathPoint(path, 0.0, 2.0, pen, graphics, &result); expect(Ok, status); expect(FALSE, result); result = TRUE; - status = GdipIsOutlineVisiblePathPoint(path, 1.0, 1.0, pen, graphics, &result); + status = GdipIsOutlineVisiblePathPoint(path, 1.0, 2.0, pen, graphics, &result); expect(Ok, status); expect(FALSE, result); result = FALSE; - status = GdipIsOutlineVisiblePathPoint(path, 2.0, 1.0, pen, graphics, &result); + status = GdipIsOutlineVisiblePathPoint(path, 2.0, 2.0, pen, graphics, &result); expect(Ok, status); expect(TRUE, result); result = TRUE; - status = GdipIsOutlineVisiblePathPoint(path, 3.0, 1.0, pen, graphics, &result); + status = GdipIsOutlineVisiblePathPoint(path, 3.0, 2.0, pen, graphics, &result); expect(Ok, status); expect(FALSE, result); result = TRUE; - status = GdipIsOutlineVisiblePathPoint(path, 14.0, 1.0, pen, graphics, &result); + status = GdipIsOutlineVisiblePathPoint(path, 14.0, 2.0, pen, graphics, &result); expect(Ok, status); expect(FALSE, result); result = FALSE; - status = GdipIsOutlineVisiblePathPoint(path, 15.0, 1.0, pen, graphics, &result); + status = GdipIsOutlineVisiblePathPoint(path, 15.0, 2.0, pen, graphics, &result); expect(Ok, status); expect(TRUE, result); result = TRUE; - status = GdipIsOutlineVisiblePathPoint(path, 16.0, 1.0, pen, graphics, &result); + status = GdipIsOutlineVisiblePathPoint(path, 16.0, 2.0, pen, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + + /* Pen Unit in Millimeters */ + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 0.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 0.5, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 1.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = FALSE; + status = GdipIsOutlineVisiblePathPoint(path, 2.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(TRUE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 3.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 4.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 5.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 6.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 7.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 8.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 9.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 10.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 11.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 12.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 13.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 14.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = FALSE; + status = GdipIsOutlineVisiblePathPoint(path, 15.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(TRUE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 16.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 20.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 24.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 30.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 34.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 40.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 44.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 45.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 46.0, 2.0, penmm, graphics, &result); + expect(Ok, status); + expect(FALSE, result); + result = TRUE; + status = GdipIsOutlineVisiblePathPoint(path, 47.0, 2.0, penmm, graphics, &result); expect(Ok, status); expect(FALSE, result);
This merge request was closed by Bartosz Kosiorek.
-
Bartosz Kosiorek -
Bartosz Kosiorek (＠gang65)