gdiplus: Implemented GdipTranslateRegion.

This commit is contained in:
Nikolay Sivov 2009-01-30 23:01:14 +03:00 committed by Alexandre Julliard
parent 03a02d83dd
commit c3462b1101
2 changed files with 115 additions and 2 deletions

View File

@ -1097,11 +1097,46 @@ GpStatus WINGDIPAPI GdipTransformRegion(GpRegion *region, GpMatrix *matrix)
return NotImplemented;
}
/* Translates GpRegion elements with specified offsets */
static void translate_region_element(region_element* element, REAL dx, REAL dy)
{
INT i;
switch(element->type)
{
case RegionDataEmptyRect:
case RegionDataInfiniteRect:
return;
case RegionDataRect:
element->elementdata.rect.X += dx;
element->elementdata.rect.Y += dy;
return;
case RegionDataPath:
for(i = 0; i < element->elementdata.pathdata.path->pathdata.Count; i++){
element->elementdata.pathdata.path->pathdata.Points[i].X += dx;
element->elementdata.pathdata.path->pathdata.Points[i].Y += dy;
}
return;
default:
translate_region_element(element->elementdata.combine.left, dx, dy);
translate_region_element(element->elementdata.combine.right, dx, dy);
return;
}
}
/*****************************************************************************
* GdipTranslateRegion [GDIPLUS.@]
*/
GpStatus WINGDIPAPI GdipTranslateRegion(GpRegion *region, REAL dx, REAL dy)
{
FIXME("(%p, %f, %f): stub\n", region, dx, dy);
TRACE("(%p, %f, %f)\n", region, dx, dy);
return NotImplemented;
if(!region)
return InvalidParameter;
translate_region_element(&region->node, dx, dy);
return Ok;
}
GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *region, INT dx, INT dy)

View File

@ -1043,6 +1043,83 @@ static void test_isequal(void)
ReleaseDC(0, hdc);
}
static void test_translate(void)
{
GpRegion *region, *region2;
GpGraphics *graphics;
GpPath *path;
GpRectF rectf;
GpStatus status;
HDC hdc = GetDC(0);
BOOL res;
status = GdipCreateFromHDC(hdc, &graphics);
ok(status == Ok, "status %08x\n", status);
status = GdipCreatePath(FillModeAlternate, &path);
ok(status == Ok, "status %08x\n", status);
status = GdipCreateRegion(&region);
ok(status == Ok, "status %08x\n", status);
status = GdipCreateRegion(&region2);
ok(status == Ok, "status %08x\n", status);
/* NULL */
status = GdipTranslateRegion(NULL, 0.0, 0.0);
ok(status == InvalidParameter, "status %08x\n", status);
/* infinite */
status = GdipTranslateRegion(region, 10.0, 10.0);
ok(status == Ok, "status %08x\n", status);
/* empty */
status = GdipSetEmpty(region);
ok(status == Ok, "status %08x\n", status);
status = GdipTranslateRegion(region, 10.0, 10.0);
ok(status == Ok, "status %08x\n", status);
/* rect */
rectf.X = 10.0; rectf.Y = 0.0;
rectf.Width = rectf.Height = 100.0;
status = GdipCombineRegionRect(region, &rectf, CombineModeReplace);
ok(status == Ok, "status %08x\n", status);
rectf.X = 15.0; rectf.Y = -2.0;
rectf.Width = rectf.Height = 100.0;
status = GdipCombineRegionRect(region2, &rectf, CombineModeReplace);
ok(status == Ok, "status %08x\n", status);
status = GdipTranslateRegion(region, 5.0, -2.0);
ok(status == Ok, "status %08x\n", status);
res = FALSE;
status = GdipIsEqualRegion(region, region2, graphics, &res);
ok(status == Ok, "status %08x\n", status);
ok(res, "Expected to be equal.\n");
/* path */
status = GdipAddPathEllipse(path, 0.0, 10.0, 100.0, 150.0);
ok(status == Ok, "status %08x\n", status);
status = GdipCombineRegionPath(region, path, CombineModeReplace);
ok(status == Ok, "status %08x\n", status);
status = GdipResetPath(path);
ok(status == Ok, "status %08x\n", status);
status = GdipAddPathEllipse(path, 10.0, 21.0, 100.0, 150.0);
ok(status == Ok, "status %08x\n", status);
status = GdipCombineRegionPath(region2, path, CombineModeReplace);
ok(status == Ok, "status %08x\n", status);
status = GdipTranslateRegion(region, 10.0, 11.0);
ok(status == Ok, "status %08x\n", status);
res = FALSE;
status = GdipIsEqualRegion(region, region2, graphics, &res);
ok(status == Ok, "status %08x\n", status);
ok(res, "Expected to be equal.\n");
status = GdipDeleteRegion(region);
ok(status == Ok, "status %08x\n", status);
status = GdipDeleteRegion(region2);
ok(status == Ok, "status %08x\n", status);
status = GdipDeleteGraphics(graphics);
ok(status == Ok, "status %08x\n", status);
status = GdipDeletePath(path);
ok(status == Ok, "status %08x\n", status);
ReleaseDC(0, hdc);
}
START_TEST(region)
{
struct GdiplusStartupInput gdiplusStartupInput;
@ -1062,6 +1139,7 @@ START_TEST(region)
test_fromhrgn();
test_gethrgn();
test_isequal();
test_translate();
GdiplusShutdown(gdiplusToken);
}