Nikolay Sivov : gdiplus: Implemented GdipDrawPolygon/GdipDrawPolygonI.
Alexandre Julliard
julliard at winehq.org
Thu Apr 24 15:56:50 CDT 2008
Module: wine
Branch: master
Commit: 4697593e859920ebba73138253d01450546b0d21
URL: http://source.winehq.org/git/wine.git/?a=commit;h=4697593e859920ebba73138253d01450546b0d21
Author: Nikolay Sivov <bunglehead at gmail.com>
Date: Thu Apr 24 20:48:17 2008 +0400
gdiplus: Implemented GdipDrawPolygon/GdipDrawPolygonI.
---
dlls/gdiplus/gdiplus.spec | 4 ++--
dlls/gdiplus/graphics.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
include/gdiplusflat.h | 2 ++
3 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec
index 2e747ce..4ce7989 100644
--- a/dlls/gdiplus/gdiplus.spec
+++ b/dlls/gdiplus/gdiplus.spec
@@ -192,8 +192,8 @@
@ stdcall GdipDrawPath(ptr ptr ptr)
@ stdcall GdipDrawPie(ptr ptr long long long long long long)
@ stdcall GdipDrawPieI(ptr ptr long long long long long long)
-@ stub GdipDrawPolygon
-@ stub GdipDrawPolygonI
+@ stdcall GdipDrawPolygon(ptr ptr ptr long)
+@ stdcall GdipDrawPolygonI(ptr ptr ptr long)
@ stdcall GdipDrawRectangle(ptr ptr long long long long)
@ stdcall GdipDrawRectangleI(ptr ptr long long long long)
@ stdcall GdipDrawRectangles(ptr ptr ptr long)
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 238712a..c6a4e33 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2161,3 +2161,47 @@ GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpGraphics *graph
return NotImplemented;
}
+
+GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPointF *points,
+ INT count)
+{
+ INT save_state;
+ POINT *pti;
+
+ if(!graphics || !pen || count<=0)
+ return InvalidParameter;
+
+ pti = GdipAlloc(sizeof(POINT) * count);
+
+ save_state = prepare_dc(graphics, pen);
+ SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH));
+
+ transform_and_round_points(graphics, pti, (GpPointF*)points, count);
+ Polygon(graphics->hdc, pti, count);
+
+ restore_dc(graphics, save_state);
+ GdipFree(pti);
+
+ return Ok;
+}
+
+GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics *graphics,GpPen *pen,GDIPCONST GpPoint *points,
+ INT count)
+{
+ GpStatus ret;
+ GpPointF *ptf;
+ INT i;
+
+ if(count<=0) return InvalidParameter;
+ ptf = GdipAlloc(sizeof(GpPointF) * count);
+
+ for(i = 0;i < count; i++){
+ ptf[i].X = (REAL)points[i].X;
+ ptf[i].Y = (REAL)points[i].Y;
+ }
+
+ ret = GdipDrawPolygon(graphics,pen,ptf,count);
+ GdipFree(ptf);
+
+ return ret;
+}
diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h
index ba2c6ee..1e04a23 100644
--- a/include/gdiplusflat.h
+++ b/include/gdiplusflat.h
@@ -94,6 +94,8 @@ GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics*,GpPen*,GDIPCONST GpPoint*,INT);
GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*);
GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL);
GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics*,GpPen*,INT,INT,INT,INT,REAL,REAL);
+GpStatus WINGDIPAPI GdipDrawPolygon(GpGraphics*,GpPen*,GDIPCONST GpPointF*, INT);
+GpStatus WINGDIPAPI GdipDrawPolygonI(GpGraphics*,GpPen*,GDIPCONST GpPoint*, INT);
GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL);
GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT);
GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics*,GpPen*,GDIPCONST GpRectF*,INT);
More information about the wine-cvs
mailing list