July 2007 - Wine-commits - list.winehq.org

Evan Stade : gdiplus: Added GdipGetPathWorldBounds.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 78510e70e76e8fe40a292c9dde79a4f1fa2f45f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78510e70e76e8fe40a292c9dd… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:08:10 2007 -0700 gdiplus: Added GdipGetPathWorldBounds. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 52 +++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + include/gdiplusgpstubs.h | 1 + include/gdiplustypes.h | 18 +++++++++++++++ 5 files changed, 74 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c1d6725..ad0e44c 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -330,7 +330,7 @@ @ stdcall GdipGetPathPoints(ptr ptr long) @ stub GdipGetPathPointsI @ stdcall GdipGetPathTypes(ptr ptr long) -@ stub GdipGetPathWorldBounds +@ stdcall GdipGetPathWorldBounds(ptr ptr ptr ptr) @ stub GdipGetPathWorldBoundsI @ stub GdipGetPenBrushFill @ stub GdipGetPenColor diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 4665fca..664cde2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -203,6 +203,58 @@ GpStatus WINGDIPAPI GdipGetPathTypes(GpPath *path, BYTE* types, INT count) return Ok; } +/* Windows expands the bounding box to the maximum possible bounding box + * for a given pen. For example, if a line join can extend past the point + * it's joining by x units, the bounding box is extended by x units in every + * direction (even though this is too conservative for most cases). */ +GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, + GDIPCONST GpMatrix *matrix, GDIPCONST GpPen *pen) +{ + /* extrema[0] is upper left corner of bounding box, + * extrema[1] is lower right corner */ + GpPointF extrema[2]; + GpPointF * points; + INT count, i; + + /* Matrix and pen can be null. */ + if(!path || !bounds) + return InvalidParameter; + + /* If path is empty just return. */ + count = path->pathdata.Count; + if(count == 0){ + bounds->X = bounds->Y = bounds->Width = bounds->Height = 0.0; + return Ok; + } + + /* FIXME: implement case where pen is non-NULL. */ + if(pen) + return NotImplemented; + + points = path->pathdata.Points; + extrema[0].X = extrema[1].X = points[0].X; + extrema[0].Y = extrema[1].Y = points[0].Y; + + for(i = 1; i < count; i++){ + extrema[0].X = min(points[i].X, extrema[0].X); + extrema[0].Y = min(points[i].Y, extrema[0].Y); + extrema[1].X = max(points[i].X, extrema[1].X); + extrema[1].Y = max(points[i].Y, extrema[1].Y); + } + + /* If matrix is non-null transform the points. */ + if(matrix){ + GdipTransformMatrixPoints((GpMatrix*)matrix, extrema, 2); + } + + bounds->X = extrema[0].X; + bounds->Y = extrema[0].Y; + bounds->Width = extrema[1].X - extrema[0].X; + bounds->Height = extrema[1].Y - extrema[0].Y; + + return Ok; +} + GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) { if(!path) diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 95dafde..4e5e95f 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -57,6 +57,8 @@ GpStatus WINGDIPAPI GdipCreatePath(GpFillMode,GpPath**); GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); +GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath*,GpRectF*,GDIPCONST GpMatrix*, + GDIPCONST GpPen*); GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipTransformPath(GpPath*,GpMatrix*); diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 39bca1f..5c02268 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -46,5 +46,6 @@ typedef PointF GpPointF; typedef FillMode GpFillMode; typedef PathData GpPathData; typedef LineCap GpLineCap; +typedef RectF GpRectF; #endif diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index 5810412..9404376 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -122,6 +122,16 @@ public: BYTE* Types; }; +/* FIXME: missing the methods. */ +class RectF +{ +public: + REAL X; + REAL Y; + REAL Width; + REAL Height; +}; + #else /* end of c++ typedefs */ typedef struct PointF @@ -137,6 +147,14 @@ typedef struct PathData BYTE* Types; } PathData; +typedef struct RectF +{ + REAL X; + REAL Y; + REAL Width; + REAL Height; +} RectF; + typedef enum Status Status; #endif /* end of c typedefs */

1 0

Evan Stade : gdiplus: Added GdipCreateMatrix2 test.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 05450b036611a8b7c5b5430bf89389dd397dda41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05450b036611a8b7c5b5430bf… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:56 2007 -0700 gdiplus: Added GdipCreateMatrix2 test. --- dlls/gdiplus/tests/Makefile.in | 1 + dlls/gdiplus/tests/matrix.c | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in index 4d8662a..9eb9e51 100644 --- a/dlls/gdiplus/tests/Makefile.in +++ b/dlls/gdiplus/tests/Makefile.in @@ -8,6 +8,7 @@ IMPORTS = gdiplus kernel32 CTESTS = \ brush.c \ graphicspath.c \ + matrix.c \ pen.c @MAKE_TEST_RULES@ diff --git a/dlls/gdiplus/tests/matrix.c b/dlls/gdiplus/tests/matrix.c new file mode 100644 index 0000000..d6fc0ed --- /dev/null +++ b/dlls/gdiplus/tests/matrix.c @@ -0,0 +1,60 @@ +/* + * Unit test suite for matrices + * + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "gdiplus.h" +#include "wine/test.h" + +#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) + +static void test_constructor_destructor(void) +{ + GpStatus status; + GpMatrix *matrix = NULL; + + status = GdipCreateMatrix2(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, &matrix); + expect(Ok, status); + ok(matrix != NULL, "Expected matrix to be initialized\n"); + + status = GdipDeleteMatrix(NULL); + expect(InvalidParameter, status); + + status = GdipDeleteMatrix(matrix); + expect(Ok, status); +} + +START_TEST(matrix) +{ + struct GdiplusStartupInput gdiplusStartupInput; + ULONG_PTR gdiplusToken; + + gdiplusStartupInput.GdiplusVersion = 1; + gdiplusStartupInput.DebugEventCallback = NULL; + gdiplusStartupInput.SuppressBackgroundThread = 0; + gdiplusStartupInput.SuppressExternalCodecs = 0; + + GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + + test_constructor_destructor(); + + GdiplusShutdown(gdiplusToken); +}

1 0

Evan Stade : gdiplus: Added basic matrix implementation.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: f28262b47da30f5d660bdc37244da81d4c3e1240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f28262b47da30f5d660bdc372… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:48 2007 -0700 gdiplus: Added basic matrix implementation. --- dlls/gdiplus/Makefile.in | 1 + dlls/gdiplus/gdiplus.spec | 4 +- dlls/gdiplus/gdiplus_private.h | 4 +++ dlls/gdiplus/matrix.c | 58 ++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 3 ++ include/gdiplusgpstubs.h | 2 + 6 files changed, 70 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/Makefile.in b/dlls/gdiplus/Makefile.in index 1194fc0..85c1f27 100644 --- a/dlls/gdiplus/Makefile.in +++ b/dlls/gdiplus/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ gdiplus.c \ graphics.c \ graphicspath.c \ + matrix.c \ pen.c @MAKE_DLL_RULES@ diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index a805bd8..b349e01 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -95,7 +95,7 @@ @ stub GdipCreateLineBrushFromRectWithAngle @ stub GdipCreateLineBrushFromRectWithAngleI @ stub GdipCreateLineBrushI -@ stub GdipCreateMatrix2 +@ stdcall GdipCreateMatrix2(long long long long long long ptr) @ stub GdipCreateMatrix3 @ stub GdipCreateMatrix3I @ stub GdipCreateMatrix @@ -133,7 +133,7 @@ @ stub GdipDeleteFont @ stub GdipDeleteFontFamily @ stdcall GdipDeleteGraphics(ptr) -@ stub GdipDeleteMatrix +@ stdcall GdipDeleteMatrix(ptr) @ stdcall GdipDeletePath(ptr) @ stub GdipDeletePathIter @ stdcall GdipDeletePen(ptr) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e37c20e..7b7ec62 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -71,4 +71,8 @@ struct GpPath{ INT datalen; /* size of the arrays in pathdata */ }; +struct GpMatrix{ + REAL matrix[6]; +}; + #endif diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c new file mode 100644 index 0000000..919e1d4 --- /dev/null +++ b/dlls/gdiplus/matrix.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2007 Google (Evan Stade) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" + +#include "gdiplus.h" +#include "gdiplus_private.h" + +GpStatus WINGDIPAPI GdipCreateMatrix2(REAL m11, REAL m12, REAL m21, REAL m22, + REAL dx, REAL dy, GpMatrix **matrix) +{ + if(!matrix) + return InvalidParameter; + + *matrix = GdipAlloc(sizeof(GpMatrix)); + if(!*matrix) return OutOfMemory; + + /* first row */ + (*matrix)->matrix[0] = m11; + (*matrix)->matrix[1] = m12; + /* second row */ + (*matrix)->matrix[2] = m21; + (*matrix)->matrix[3] = m22; + /* third row */ + (*matrix)->matrix[4] = dx; + (*matrix)->matrix[5] = dy; + + return Ok; +} + +GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix *matrix) +{ + if(!matrix) + return InvalidParameter; + + GdipFree(matrix); + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b5743eb..5a48fdc 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -60,6 +60,9 @@ GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); +GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); +GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); + #ifdef __cplusplus } #endif diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index 8be4e9c..39bca1f 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -26,6 +26,7 @@ class GpGraphics {}; class GpBrush {}; class GpSolidFill {}; class GpPath {}; +class GpMatrix {}; #else /* end of c++ declarations */ @@ -34,6 +35,7 @@ typedef struct GpPen GpPen; typedef struct GpBrush GpBrush; typedef struct GpSolidFill GpSolidFill; typedef struct GpPath GpPath; +typedef struct GpMatrix GpMatrix; #endif /* end of c declarations */

1 0

Evan Stade : gdiplus: Added GdipTransformMatrixPoints.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 47a605ef9bd2bae60ba74d5f60a2bd1792dfab9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a605ef9bd2bae60ba74d5f6… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:52 2007 -0700 gdiplus: Added GdipTransformMatrixPoints. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/matrix.c | 21 +++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index b349e01..5879360 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -582,7 +582,7 @@ @ stub GdipStringFormatGetGenericDefault @ stub GdipStringFormatGetGenericTypographic @ stub GdipTestControl -@ stub GdipTransformMatrixPoints +@ stdcall GdipTransformMatrixPoints(ptr ptr long) @ stub GdipTransformMatrixPointsI @ stub GdipTransformPath @ stub GdipTransformPoints diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 919e1d4..909bfee 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -56,3 +56,24 @@ GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix *matrix) return Ok; } + +GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix *matrix, GpPointF *pts, + INT count) +{ + REAL x, y; + INT i; + + if(!matrix || !pts) + return InvalidParameter; + + for(i = 0; i < count; i++) + { + x = pts[i].X; + y = pts[i].Y; + + pts[i].X = x * matrix->matrix[0] + y * matrix->matrix[2] + matrix->matrix[4]; + pts[i].Y = x * matrix->matrix[1] + y * matrix->matrix[3] + matrix->matrix[5]; + } + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5a48fdc..9185fd5 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -62,6 +62,7 @@ GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); GpStatus WINGDIPAPI GdipCreateMatrix2(REAL,REAL,REAL,REAL,REAL,REAL,GpMatrix**); GpStatus WINGDIPAPI GdipDeleteMatrix(GpMatrix*); +GpStatus WINGDIPAPI GdipTransformMatrixPoints(GpMatrix*,GpPointF*,INT); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Added GdipDrawPath.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 9d5f568183340e53e82fb623fed0d04490f66112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d5f568183340e53e82fb623f… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:34 2007 -0700 gdiplus: Added GdipDrawPath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 148 +++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 150 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index d18af7f..a805bd8 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -178,7 +178,7 @@ @ stdcall GdipDrawLineI(ptr ptr long long long long) @ stdcall GdipDrawLines(ptr ptr ptr long) @ stub GdipDrawLinesI -@ stub GdipDrawPath +@ stdcall GdipDrawPath(ptr ptr ptr) @ stdcall GdipDrawPie(ptr ptr long long long long long long) @ stub GdipDrawPieI @ stub GdipDrawPolygon diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 82260ec..c16a744 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -375,6 +375,120 @@ static void draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, GdipFree(ptf); } +/* Converts from gdiplus path point type to gdi path point type. */ +static BYTE convert_path_point_type(BYTE type) +{ + BYTE ret; + + switch(type & PathPointTypePathTypeMask){ + case PathPointTypeBezier: + ret = PT_BEZIERTO; + break; + case PathPointTypeLine: + ret = PT_LINETO; + break; + case PathPointTypeStart: + ret = PT_MOVETO; + break; + default: + ERR("Bad point type\n"); + return 0; + } + + if(type & PathPointTypeCloseSubpath) + ret |= PT_CLOSEFIGURE; + + return ret; +} + +/* Draws a combination of bezier curves and lines between points. */ +static GpStatus draw_poly(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, + GDIPCONST BYTE * types, INT count, BOOL caps) +{ + POINT *pti = GdipAlloc(count * sizeof(POINT)); + BYTE *tp = GdipAlloc(count); + GpPointF *ptf = NULL; + REAL x = pt[count - 1].X, y = pt[count - 1].Y; + INT i; + GpStatus status = GenericError; + + if(!count){ + status = Ok; + goto end; + } + if(!pti || !tp){ + status = OutOfMemory; + goto end; + } + + for(i = 0; i < count; i++){ + if((types[i] & PathPointTypePathTypeMask) == PathPointTypeBezier){ + if((i + 2 >= count) || !(types[i + 1] & PathPointTypeBezier) + || !(types[i + 1] & PathPointTypeBezier)){ + ERR("Bad bezier points\n"); + goto end; + } + + i += 2; + } + } + + if((types[count - 1] & PathPointTypePathTypeMask) == PathPointTypeBezier){ + ptf = GdipAlloc(4 * sizeof(GpPointF)); + memcpy(ptf, &pt[count-4], 4 * sizeof(GpPointF)); + + if(caps){ + if(pen->endcap == LineCapArrowAnchor) + shorten_bezier_amt(ptf, pen->width); + + draw_cap(hdc, pen->color, pen->endcap, pen->width, ptf[3].X, + ptf[3].Y, pt[count - 1].X, pt[count - 1].Y); + } + for(i = 0; i < 4; i ++){ + pti[i + count - 4].x = roundr(ptf[i].X); + pti[i + count - 4].y = roundr(ptf[i].Y); + } + for(i = 0; i < count - 4; i ++){ + pti[i].x = roundr(pt[i].X); + pti[i].y = roundr(pt[i].Y); + } + } + else if((types[count - 1] & PathPointTypePathTypeMask) == PathPointTypeLine){ + if(caps){ + if(pen->endcap == LineCapArrowAnchor) + shorten_line_amt(pt[count-2].X, pt[count-2].Y, &x, &y, pen->width); + + draw_cap(hdc, pen->color, pen->endcap, pen->width, pt[count-2].X, + pt[count-2].Y, pt[count - 1].X, pt[count - 1].Y); + } + pti[count - 1].x = roundr(x); + pti[count - 1].y = roundr(y); + for(i = 0; i < count - 1; i ++){ + pti[i].x = roundr(pt[i].X); + pti[i].y = roundr(pt[i].Y); + } + } + else{ + ERR("Bad path last point\n"); + goto end; + } + + for(i = 0; i < count; i++){ + tp[i] = convert_path_point_type(types[i]); + } + + PolyDraw(hdc, pti, tp, count); + + status = Ok; + +end: + GdipFree(pti); + GdipFree(ptf); + GdipFree(tp); + + return status; +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { if(hdc == NULL) @@ -564,6 +678,40 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST return Ok; } +GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) +{ + INT save_state, i, this_fig = 0; + GpStatus retval; + + if(!pen || !graphics) + return InvalidParameter; + + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, pen->gdipen); + + for(i = 0; i < path->pathdata.Count; i++){ + if(path->pathdata.Types[i] == PathPointTypeStart){ + retval = draw_poly(graphics->hdc, pen, + &path->pathdata.Points[this_fig], + &path->pathdata.Types[this_fig], i - this_fig, TRUE); + this_fig = i; + + if(retval != Ok) + goto end; + } + } + + retval = draw_poly(graphics->hdc, pen, &path->pathdata.Points[this_fig], + &path->pathdata.Types[this_fig], path->pathdata.Count - this_fig, + TRUE); + +end: + RestoreDC(graphics->hdc, save_state); + + return retval; +} + GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 04d71a9..b5743eb 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -40,6 +40,7 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL, GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT,REAL); GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipDrawLines(GpGraphics*,GpPen*,GDIPCONST GpPointF*,INT); +GpStatus WINGDIPAPI GdipDrawPath(GpGraphics*,GpPen*,GpPath*); GpStatus WINGDIPAPI GdipDrawPie(GpGraphics*,GpPen*,REAL,REAL,REAL,REAL,REAL,REAL); GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics*,GpPen*,INT,INT,INT,INT); GpStatus WINGDIPAPI GdipFillPie(GpGraphics*,GpBrush*,REAL,REAL,REAL,REAL,REAL,REAL);

1 0

Evan Stade : gdiplus: Added draw_polybezier error checking.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: fa31217d6e831bf7b04f05d42e0c3dd58f496979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa31217d6e831bf7b04f05d42… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:39 2007 -0700 gdiplus: Added draw_polybezier error checking. --- dlls/gdiplus/graphics.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c16a744..2a3ea33 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -344,12 +344,24 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt) /* Draws bezier curves between given points, and if caps is true then draws an * endcap at the end of the last line. FIXME: Startcaps not implemented. */ -static void draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, +static GpStatus draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, INT count, BOOL caps) { - POINT *pti = GdipAlloc(count * sizeof(POINT)); - GpPointF *ptf = GdipAlloc(4 * sizeof(GpPointF)); + POINT *pti; + GpPointF *ptf; INT i; + GpStatus status = GenericError; + + if(!count) + return Ok; + + pti = GdipAlloc(count * sizeof(POINT)); + ptf = GdipAlloc(4 * sizeof(GpPointF)); + + if(!pti || !ptf){ + status = OutOfMemory; + goto end; + } memcpy(ptf, &pt[count-4], 4 * sizeof(GpPointF)); @@ -371,8 +383,14 @@ static void draw_polybezier(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, } PolyBezier(hdc, pti, count); + + status = Ok; + +end: GdipFree(pti); GdipFree(ptf); + + return status; } /* Converts from gdiplus path point type to gdi path point type. */ @@ -534,6 +552,7 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, { INT save_state, num_pts; GpPointF points[MAX_ARC_PTS]; + GpStatus retval; if(!graphics || !pen) return InvalidParameter; @@ -544,11 +563,11 @@ GpStatus WINGDIPAPI GdipDrawArc(GpGraphics *graphics, GpPen *pen, REAL x, EndPath(graphics->hdc); SelectObject(graphics->hdc, pen->gdipen); - draw_polybezier(graphics->hdc, pen, points, num_pts, TRUE); + retval = draw_polybezier(graphics->hdc, pen, points, num_pts, TRUE); RestoreDC(graphics->hdc, save_state); - return Ok; + return retval; } GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, @@ -556,6 +575,7 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, { INT save_state; GpPointF pt[4]; + GpStatus retval; if(!graphics || !pen) return InvalidParameter; @@ -573,11 +593,11 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, EndPath(graphics->hdc); SelectObject(graphics->hdc, pen->gdipen); - draw_polybezier(graphics->hdc, pen, pt, 4, TRUE); + retval = draw_polybezier(graphics->hdc, pen, pt, 4, TRUE); RestoreDC(graphics->hdc, save_state); - return Ok; + return retval; } /* Approximates cardinal spline with Bezier curves. */ @@ -588,6 +608,7 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, INT i, len_pt = count*3-2, save_state; GpPointF *pt; REAL x1, x2, y1, y2; + GpStatus retval; if(!graphics || !pen) return InvalidParameter; @@ -626,12 +647,12 @@ GpStatus WINGDIPAPI GdipDrawCurve2(GpGraphics *graphics, GpPen *pen, EndPath(graphics->hdc); SelectObject(graphics->hdc, pen->gdipen); - draw_polybezier(graphics->hdc, pen, pt, len_pt, TRUE); + retval = draw_polybezier(graphics->hdc, pen, pt, len_pt, TRUE); GdipFree(pt); RestoreDC(graphics->hdc, save_state); - return Ok; + return retval; } GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1,

1 0

Evan Stade : gdiplus: Added draw_polyline error checking.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 6f4ab5282411cde3298fa1c036004f2894350d73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f4ab5282411cde3298fa1c03… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:44 2007 -0700 gdiplus: Added draw_polyline error checking. --- dlls/gdiplus/graphics.c | 29 +++++++++++++++++++++++------ 1 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 2a3ea33..93cbcd1 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -282,12 +282,23 @@ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) /* Draws lines between the given points, and if caps is true then draws an endcap * at the end of the last line. FIXME: Startcaps not implemented. */ -static void draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, +static GpStatus draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, INT count, BOOL caps) { - POINT *pti = GdipAlloc(count * sizeof(POINT)); + POINT *pti; REAL x = pt[count - 1].X, y = pt[count - 1].Y; INT i; + GpStatus status = GenericError; + + if(!count) + return Ok; + + pti = GdipAlloc(count * sizeof(POINT)); + + if(!pti){ + status = OutOfMemory; + goto end; + } if(caps){ if(pen->endcap == LineCapArrowAnchor) @@ -306,7 +317,11 @@ static void draw_polyline(HDC hdc, GpPen *pen, GDIPCONST GpPointF * pt, pti[i].y = roundr(y); Polyline(hdc, pti, count); + +end: GdipFree(pti); + + return status; } /* Conducts a linear search to find the bezier points that will back off @@ -660,6 +675,7 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, { INT save_state; GpPointF pt[2]; + GpStatus retval; if(!pen || !graphics) return InvalidParameter; @@ -673,17 +689,18 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, EndPath(graphics->hdc); SelectObject(graphics->hdc, pen->gdipen); - draw_polyline(graphics->hdc, pen, pt, 2, TRUE); + retval = draw_polyline(graphics->hdc, pen, pt, 2, TRUE); RestoreDC(graphics->hdc, save_state); - return Ok; + return retval; } GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { INT save_state; + GpStatus retval; if(!pen || !graphics || (count < 2)) return InvalidParameter; @@ -692,11 +709,11 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST EndPath(graphics->hdc); SelectObject(graphics->hdc, pen->gdipen); - draw_polyline(graphics->hdc, pen, points, count, TRUE); + retval = draw_polyline(graphics->hdc, pen, points, count, TRUE); RestoreDC(graphics->hdc, save_state); - return Ok; + return retval; } GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path)

1 0

Evan Stade : gdiplus: Added GdipStartPathFigure.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 8a76d1e82c6c39ca946f42d01b6875cceb737002 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a76d1e82c6c39ca946f42d01… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:28 2007 -0700 gdiplus: Added GdipStartPathFigure. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphicspath.c | 10 ++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 22b085e..d18af7f 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -578,7 +578,7 @@ @ stub GdipSetTextureWrapMode @ stub GdipSetWorldTransform @ stub GdipShearMatrix -@ stub GdipStartPathFigure +@ stdcall GdipStartPathFigure(ptr) @ stub GdipStringFormatGetGenericDefault @ stub GdipStringFormatGetGenericTypographic @ stub GdipTestControl diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index e65dabd..394b9f6 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -212,3 +212,13 @@ GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) return Ok; } + +GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path) +{ + if(!path) + return InvalidParameter; + + path->newfigure = TRUE; + + return Ok; +} diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index e49ecc3..04d71a9 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -57,6 +57,7 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath*); GpStatus WINGDIPAPI GdipGetPathPoints(GpPath*,GpPointF*,INT); GpStatus WINGDIPAPI GdipGetPathTypes(GpPath*,BYTE*,INT); GpStatus WINGDIPAPI GdipGetPointCount(GpPath*,INT*); +GpStatus WINGDIPAPI GdipStartPathFigure(GpPath*); #ifdef __cplusplus }

1 0

Evan Stade : gdiplus: Updated GdipDrawLines to use SaveDC()/RestoreDC()/ end caps.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 852aac8b54b12812187d5c4dc558b5fb52cbcc07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=852aac8b54b12812187d5c4dc… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:16 2007 -0700 gdiplus: Updated GdipDrawLines to use SaveDC()/RestoreDC()/end caps. --- dlls/gdiplus/graphics.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6e3bf1d..82260ec 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -548,20 +548,18 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { - HGDIOBJ old_obj; - INT i; + INT save_state; if(!pen || !graphics || (count < 2)) return InvalidParameter; - old_obj = SelectObject(graphics->hdc, pen->gdipen); - MoveToEx(graphics->hdc, roundr(points[0].X), roundr(points[0].Y), NULL); + save_state = SaveDC(graphics->hdc); + EndPath(graphics->hdc); + SelectObject(graphics->hdc, pen->gdipen); - for(i = 1; i < count; i++){ - LineTo(graphics->hdc, roundr(points[i].X), roundr(points[i].Y)); - } + draw_polyline(graphics->hdc, pen, points, count, TRUE); - SelectObject(graphics->hdc, old_obj); + RestoreDC(graphics->hdc, save_state); return Ok; }

1 0

Evan Stade : gdiplus: Added GdipAddPathArc test.
by Alexandre Julliard 12 Jul '07

12 Jul '07

Module: wine Branch: master Commit: 1f7cfb1dc829bcec72b3af324ef4c125cd82de91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7cfb1dc829bcec72b3af324… Author: Evan Stade <estade(a)gmail.com> Date: Wed Jul 11 18:07:04 2007 -0700 gdiplus: Added GdipAddPathArc test. --- dlls/gdiplus/tests/graphicspath.c | 70 +++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index e5fe592..a24853d 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -185,6 +185,75 @@ static void test_line2(void) ok_path(path, line2_path, sizeof(line2_path)/sizeof(path_test_t), FALSE); } +static path_test_t arc_path[] = { + {600.0, 450.0, PathPointTypeStart, 0, 0}, /*0*/ + {600.0, 643.3, PathPointTypeBezier, 0, 0}, /*1*/ + {488.1, 800.0, PathPointTypeBezier, 0, 0}, /*2*/ + {350.0, 800.0, PathPointTypeBezier, 0, 0}, /*3*/ + {600.0, 450.0, PathPointTypeLine, 0, 0}, /*4*/ + {600.0, 643.3, PathPointTypeBezier, 0, 0}, /*5*/ + {488.1, 800.0, PathPointTypeBezier, 0, 0}, /*6*/ + {350.0, 800.0, PathPointTypeBezier, 0, 0}, /*7*/ + {329.8, 800.0, PathPointTypeBezier, 0, 0}, /*8*/ + {309.7, 796.6, PathPointTypeBezier, 0, 0}, /*9*/ + {290.1, 789.8, PathPointTypeBezier, 0, 0}, /*10*/ + {409.9, 110.2, PathPointTypeLine, 0, 0}, /*11*/ + {544.0, 156.5, PathPointTypeBezier, 0, 0}, /*12*/ + {625.8, 346.2, PathPointTypeBezier, 0, 0}, /*13*/ + {592.7, 533.9, PathPointTypeBezier, 0, 0}, /*14*/ + {592.5, 535.3, PathPointTypeBezier, 0, 0}, /*15*/ + {592.2, 536.7, PathPointTypeBezier, 0, 0}, /*16*/ + {592.0, 538.1, PathPointTypeBezier, 0, 0}, /*17*/ + {409.9, 789.8, PathPointTypeLine, 0, 0}, /*18*/ + {544.0, 743.5, PathPointTypeBezier, 0, 0}, /*19*/ + {625.8, 553.8, PathPointTypeBezier, 0, 0}, /*20*/ + {592.7, 366.1, PathPointTypeBezier, 0, 0}, /*21*/ + {592.5, 364.7, PathPointTypeBezier, 0, 0}, /*22*/ + {592.2, 363.3, PathPointTypeBezier, 0, 0}, /*23*/ + {592.0, 361.9, PathPointTypeBezier, 0, 0}, /*24*/ + {540.4, 676.9, PathPointTypeLine, 0, 0}, /*25*/ + {629.9, 529.7, PathPointTypeBezier, 0, 0}, /*26*/ + {617.2, 308.8, PathPointTypeBezier, 0, 0}, /*27*/ + {512.1, 183.5, PathPointTypeBezier, 0, 0}, /*28*/ + {406.9, 58.2, PathPointTypeBezier, 0, 0}, /*29*/ + {249.1, 75.9, PathPointTypeBezier, 0, 0}, /*30*/ + {159.6, 223.1, PathPointTypeBezier, 0, 0}, /*31*/ + {70.1, 370.3, PathPointTypeBezier, 0, 0}, /*32*/ + {82.8, 591.2, PathPointTypeBezier, 0, 0}, /*33*/ + {187.9, 716.5, PathPointTypeBezier, 0, 0}, /*34*/ + {293.1, 841.8, PathPointTypeBezier, 0, 0}, /*35*/ + {450.9, 824.1, PathPointTypeBezier, 0, 0}, /*36*/ + {540.4, 676.9, PathPointTypeBezier, 0, 0} /*37*/ + }; + +static void test_arc(void) +{ + GpStatus status; + GpPath* path; + + GdipCreatePath(FillModeAlternate, &path); + /* Exactly 90 degrees */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 90.0); + expect(Ok, status); + /* Over 90 degrees */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 0.0, 100.0); + expect(Ok, status); + /* Negative start angle */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, -80.0, 100.0); + expect(Ok, status); + /* Negative sweep angle */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 80.0, -100.0); + expect(Ok, status); + /* More than a full revolution */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 50.0, -400.0); + expect(Ok, status); + /* 0 sweep angle */ + status = GdipAddPathArc(path, 100.0, 100.0, 500.0, 700.0, 50.0, 0.0); + expect(Ok, status); + + ok_path(path, arc_path, sizeof(arc_path)/sizeof(path_test_t), FALSE); +} + START_TEST(graphicspath) { struct GdiplusStartupInput gdiplusStartupInput; @@ -199,6 +268,7 @@ START_TEST(graphicspath) test_constructor_destructor(); test_line2(); + test_arc(); GdiplusShutdown(gdiplusToken); }

1 0