Andrew Eikum : gdiplus/tests: Add tests for GdipDrawCurve2I.
Alexandre Julliard
julliard at winehq.org
Mon Jun 29 09:17:42 CDT 2009
Module: wine
Branch: master
Commit: c2aa66d506c6b0ffb498102c0b02fe2f17d3dd73
URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2aa66d506c6b0ffb498102c0b02fe2f17d3dd73
Author: Andrew Eikum <andrew at brightnightgames.com>
Date: Sun Jun 28 13:33:59 2009 -0500
gdiplus/tests: Add tests for GdipDrawCurve2I.
---
dlls/gdiplus/graphics.c | 2 +-
dlls/gdiplus/tests/graphics.c | 68 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 4d7f096..c052bc3 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -1514,7 +1514,7 @@ GpStatus WINGDIPAPI GdipDrawCurve2I(GpGraphics *graphics, GpPen *pen,
TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension);
- if(!points || count <= 0)
+ if(!points)
return InvalidParameter;
pointsF = GdipAlloc(sizeof(GpPointF)*count);
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index f83d012..e42044a 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -428,6 +428,73 @@ static void test_GdipDrawCurve2(void)
ReleaseDC(0, hdc);
}
+static void test_GdipDrawCurve2I(void)
+{
+ GpStatus status;
+ GpGraphics *graphics = NULL;
+ GpPen *pen = NULL;
+ HDC hdc = GetDC(0);
+ GpPoint points[3];
+
+ points[0].X = 0;
+ points[0].Y = 0;
+
+ points[1].X = 40;
+ points[1].Y = 20;
+
+ points[2].X = 10;
+ points[2].Y = 40;
+
+ /* make a graphics object and pen object */
+ ok(hdc != NULL, "Expected HDC to be initialized\n");
+
+ status = GdipCreateFromHDC(hdc, &graphics);
+ expect(Ok, status);
+ ok(graphics != NULL, "Expected graphics to be initialized\n");
+
+ status = GdipCreatePen1((ARGB)0xffff00ff, 10.0f, UnitPixel, &pen);
+ expect(Ok, status);
+ ok(pen != NULL, "Expected pen to be initialized\n");
+
+ /* InvalidParameter cases: null graphics, null pen */
+ status = GdipDrawCurve2I(NULL, NULL, points, 3, 1);
+ expect(InvalidParameter, status);
+
+ status = GdipDrawCurve2I(graphics, NULL, points, 3, 1);
+ expect(InvalidParameter, status);
+
+ status = GdipDrawCurve2I(NULL, pen, points, 3, 1);
+ expect(InvalidParameter, status);
+
+ /* InvalidParameter cases: invalid count */
+ status = GdipDrawCurve2I(graphics, pen, points, -1, 1);
+ expect(OutOfMemory, status);
+
+ status = GdipDrawCurve2I(graphics, pen, points, 0, 1);
+ expect(InvalidParameter, status);
+
+ status = GdipDrawCurve2I(graphics, pen, points, 1, 1);
+ expect(InvalidParameter, status);
+
+ /* Valid test cases */
+ status = GdipDrawCurve2I(graphics, pen, points, 2, 1);
+ expect(Ok, status);
+
+ status = GdipDrawCurve2I(graphics, pen, points, 3, 2);
+ expect(Ok, status);
+
+ status = GdipDrawCurve2I(graphics, pen, points, 3, -2);
+ expect(Ok, status);
+
+ status = GdipDrawCurve2I(graphics, pen, points, 3, 0);
+ expect(Ok, status);
+
+ GdipDeletePen(pen);
+ GdipDeleteGraphics(graphics);
+
+ ReleaseDC(0, hdc);
+}
+
static void test_GdipDrawCurve(void)
{
GpStatus status;
@@ -1277,6 +1344,7 @@ START_TEST(graphics)
test_GdipDrawCurve();
test_GdipDrawCurveI();
test_GdipDrawCurve2();
+ test_GdipDrawCurve2I();
test_GdipDrawLineI();
test_GdipDrawLinesI();
test_GdipDrawString();
More information about the wine-cvs
mailing list