[Gdiplus 5/5] Partially Implement GdipIsEqualRegion
Adam Petaccia
adam at tpetaccia.com
Sat Aug 16 22:28:27 CDT 2008
---
dlls/gdiplus/region.c | 104 +++++++++++++++++++++++++++++++++++++++++--
dlls/gdiplus/tests/region.c | 12 -----
2 files changed, 100 insertions(+), 16 deletions(-)
diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c
index 3e0a1b4..f686877 100644
--- a/dlls/gdiplus/region.c
+++ b/dlls/gdiplus/region.c
@@ -838,12 +838,108 @@ GpStatus WINGDIPAPI GdipIsEmptyRegion(GpRegion *region, GpGraphics *graphics, BO
return NotImplemented;
}
-GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2, GpGraphics *graphics,
- BOOL *res)
+static inline BOOL is_equal_element(region_element* element,
+ region_element* element2)
{
- FIXME("(%p, %p, %p, %p): stub\n", region, region2, graphics, res);
+ INT i;
- return NotImplemented;
+ switch (element->type)
+ {
+ case RegionDataRect:
+ switch (element2->type)
+ {
+ case RegionDataRect:
+ if ((element->elementdata.rect.X == element2->elementdata.rect.X) &&
+ (element->elementdata.rect.Y == element2->elementdata.rect.Y) &&
+ (element->elementdata.rect.Width == element2->elementdata.rect.Width) &&
+ (element->elementdata.rect.Height == element2->elementdata.rect.Height))
+ return TRUE;
+ break;
+ case RegionDataPath:
+ if (element2->elementdata.pathdata.pathheader.count == 4)
+ {
+ GpPointF *points1, *points2;
+ GpPath* path;
+
+ GdipCreatePath(FillModeAlternate, &path);
+ GdipAddPathRectangle(path, element->elementdata.rect.X,
+ element->elementdata.rect.Y,
+ element->elementdata.rect.Width,
+ element->elementdata.rect.Height);
+ points1 = GdipAlloc(sizeof(GpPointF) * 4);
+ points2 = GdipAlloc(sizeof(GpPointF) * 4);
+ GdipGetPathPoints(path, points1, 4);
+ GdipGetPathPoints(element2->elementdata.pathdata.path, points2, 4);
+ for (i = 0; i < 4; i++)
+ {
+ if (!(points1[i].X == points2[i].X && points1[i].Y == points2[i].Y))
+ return FALSE;
+ }
+ return TRUE;
+ }
+ break;
+ /* We might be equivalent to a path or rectangle, but nothing else. Break */
+ default:
+ break;
+ }
+ break;
+
+ case RegionDataPath:
+ switch (element2->type)
+ {
+ case RegionDataRect:
+ break;
+ case RegionDataPath:
+ if (element->elementdata.pathdata.pathheader.count ==
+ element2->elementdata.pathdata.pathheader.count)
+ {
+ for (i = 0; i < element->elementdata.pathdata.pathheader.count; i++)
+ {
+ if (!(element->elementdata.pathdata.path->pathdata.Points[i].X ==
+ element2->elementdata.pathdata.path->pathdata.Points[i].X &&
+ element->elementdata.pathdata.path->pathdata.Points[i].Y ==
+ element2->elementdata.pathdata.path->pathdata.Points[i].Y &&
+ element->elementdata.pathdata.path->pathdata.Types[i] ==
+ element2->elementdata.pathdata.path->pathdata.Types[i]))
+ return FALSE;
+ }
+ return TRUE;
+ }
+ break;
+ /* We might be equivalent to a path or rectangle, but nothing else. Break */
+ default:
+ break;
+ }
+ break;
+
+ case RegionDataEmptyRect:
+ if (element2->type == RegionDataEmptyRect)
+ return TRUE;
+ break;
+ case RegionDataInfiniteRect:
+ if (element2->type == RegionDataInfiniteRect)
+ return TRUE;
+ break;
+ default:
+ FIXME("Unable to handle combined regions!\n");
+ break;
+ }
+
+ return FALSE;
+}
+
+/* FIXME: Use graphics */
+GpStatus WINGDIPAPI GdipIsEqualRegion(GpRegion *region, GpRegion *region2,
+ GpGraphics *graphics, BOOL *res)
+{
+ TRACE("%p, %p, %p, %p\n", region, region2, graphics, res);
+
+ if (!(region && region2 && graphics && res))
+ return InvalidParameter;
+
+ *res = is_equal_element(®ion->node, ®ion2->node);
+
+ return Ok;
}
GpStatus WINGDIPAPI GdipIsInfiniteRegion(GpRegion *region, GpGraphics *graphics, BOOL *res)
diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c
index 7d99fcf..2a80c0b 100644
--- a/dlls/gdiplus/tests/region.c
+++ b/dlls/gdiplus/tests/region.c
@@ -481,22 +481,18 @@ static void test_equals(void)
expect(Ok, stat);
stat = GdipCreateRegion(®ion2);
expect(Ok, stat);
-todo_wine {
stat = GdipIsEqualRegion(region, region2, graphics, &equals);
expect(Ok, stat);
expect(TRUE, equals);
-}
/* Test SetEmpty */
stat = GdipSetEmpty(region);
expect(Ok, stat);
stat = GdipSetEmpty(region2);
expect(Ok, stat);
-todo_wine {
stat = GdipIsEqualRegion(region, region2, graphics, &equals);
expect(Ok, stat);
expect(TRUE, equals);
-}
stat = GdipDeleteRegion(region);
expect(Ok, stat);
@@ -512,11 +508,9 @@ todo_wine {
expect(Ok, stat);
stat = GdipCreateRegionRect(&rect, ®ion2);
expect(Ok, stat);
-todo_wine {
stat = GdipIsEqualRegion(region, region2, graphics, &equals);
expect(Ok, stat);
expect(TRUE, equals);
-}
stat = GdipDeleteRegion(region2);
expect(Ok, stat);
@@ -524,11 +518,9 @@ todo_wine {
/* Test for CloneRegion */
stat = GdipCloneRegion(region, ®ion2);
expect(Ok, stat);
-todo_wine {
stat = GdipIsEqualRegion(region, region2, graphics, &equals);
expect(Ok, stat);
expect(TRUE, equals);
-}
stat = GdipDeleteRegion(region2);
expect(Ok, stat);
@@ -542,7 +534,6 @@ todo_wine {
GdipCreateRegionPath(path, ®ion2);
GdipIsEqualRegion(region, region2, graphics, &equals);
expect(Ok, stat);
-todo_wine
expect(TRUE, equals);
stat = GdipDeleteRegion(region2);
@@ -557,12 +548,9 @@ todo_wine
expect(Ok, stat);
stat = GdipCreateRegionPath(path, ®ion2);
expect(Ok, stat);
-todo_wine
-{
stat = GdipIsEqualRegion(region, region2, graphics, &equals);
expect(Ok, stat);
expect(FALSE, equals);
-}
GdipDeletePath(path);
GdipDeleteRegion(region);
--
1.5.4.3
More information about the wine-patches
mailing list