From 7d71805afc57567f0e0d37f2cd101c43f1b48e33 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Thu, 28 Aug 2008 18:27:55 +0400 Subject: [PATCH] gdiplus: Add TRACE(..) to graphicspath.c. --- dlls/gdiplus/graphicspath.c | 118 +++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index d465aaf8bd..7727721661 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -38,6 +38,9 @@ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, { INT count, old_count, i; + TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", + path, x1, y1, x2, y2, startAngle, sweepAngle); + if(!path) return InvalidParameter; @@ -67,6 +70,9 @@ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2, GpStatus WINGDIPAPI GdipAddPathArcI(GpPath *path, INT x1, INT y1, INT x2, INT y2, REAL startAngle, REAL sweepAngle) { + TRACE("(%p, %d, %d, %d, %d, %.2f, %.2f)\n", + path, x1, y1, x2, y2, startAngle, sweepAngle); + return GdipAddPathArc(path,(REAL)x1,(REAL)y1,(REAL)x2,(REAL)y2,startAngle,sweepAngle); } @@ -75,6 +81,9 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, { INT old_count; + TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", + path, x1, y1, x2, y2, x3, y3, x4, y4); + if(!path) return InvalidParameter; @@ -107,6 +116,9 @@ GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2, GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, INT y2, INT x3, INT y3, INT x4, INT y4) { + TRACE("(%p, %d, %d, %d, %d, %d, %d, %d, %d)\n", + path, x1, y1, x2, y2, x3, y3, x4, y4); + return GdipAddPathBezier(path,(REAL)x1,(REAL)y1,(REAL)x2,(REAL)y2,(REAL)x3,(REAL)y3, (REAL)x4,(REAL)y4); } @@ -116,6 +128,8 @@ GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, { INT i, old_count; + TRACE("(%p, %p, %d)\n", path, points, count); + if(!path || !points || ((count - 1) % 3)) return InvalidParameter; @@ -145,6 +159,8 @@ GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, GpStatus ret; INT i; + TRACE("(%p, %p, %d)\n", path, points, count); + if(!points || ((count - 1) % 3)) return InvalidParameter; @@ -166,12 +182,16 @@ GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, GpStatus WINGDIPAPI GdipAddPathClosedCurve(GpPath *path, GDIPCONST GpPointF *points, INT count) { + TRACE("(%p, %p, %d)\n", path, points, count); + return GdipAddPathClosedCurve2(path, points, count, 1.0); } GpStatus WINGDIPAPI GdipAddPathClosedCurveI(GpPath *path, GDIPCONST GpPoint *points, INT count) { + TRACE("(%p, %p, %d)\n", path, points, count); + return GdipAddPathClosedCurve2I(path, points, count, 1.0); } @@ -184,6 +204,8 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *po REAL x1, x2, y1, y2; GpStatus stat; + TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension); + if(!path || !points || count <= 1) return InvalidParameter; @@ -251,6 +273,8 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve2I(GpPath *path, GDIPCONST GpPoint *po INT i; GpStatus stat; + TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension); + if(!path || !points || count <= 1) return InvalidParameter; @@ -272,18 +296,22 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve2I(GpPath *path, GDIPCONST GpPoint *po GpStatus WINGDIPAPI GdipAddPathCurve(GpPath *path, GDIPCONST GpPointF *points, INT count) { + TRACE("(%p, %p, %d)\n", path, points, count); + if(!path || !points || count <= 1) return InvalidParameter; - return GdipAddPathCurve2(path, points, count, 1.0); + return GdipAddPathCurve2(path, points, count, 1.0); } GpStatus WINGDIPAPI GdipAddPathCurveI(GpPath *path, GDIPCONST GpPoint *points, INT count) { + TRACE("(%p, %p, %d)\n", path, points, count); + if(!path || !points || count <= 1) return InvalidParameter; - return GdipAddPathCurve2I(path, points, count, 1.0); + return GdipAddPathCurve2I(path, points, count, 1.0); } GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, INT count, @@ -294,6 +322,8 @@ GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, REAL x1, x2, y1, y2; GpStatus stat; + TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension); + if(!path || !points || count <= 1) return InvalidParameter; @@ -344,6 +374,8 @@ GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath *path, GDIPCONST GpPoint *points, INT i; GpStatus stat; + TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension); + if(!path || !points || count <= 1) return InvalidParameter; @@ -368,6 +400,8 @@ GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, { INT old_count, numpts; + TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x, y, width, height); + if(!path) return InvalidParameter; @@ -396,6 +430,8 @@ GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width, GpStatus WINGDIPAPI GdipAddPathEllipseI(GpPath *path, INT x, INT y, INT width, INT height) { + TRACE("(%p, %d, %d, %d, %d)\n", path, x, y, width, height); + return GdipAddPathEllipse(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); } @@ -404,6 +440,8 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points, { INT i, old_count; + TRACE("(%p, %p, %d)\n", path, points, count); + if(!path || !points) return InvalidParameter; @@ -434,6 +472,8 @@ GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, I INT i; GpStatus stat; + TRACE("(%p, %p, %d)\n", path, points, count); + if(count <= 0) return InvalidParameter; @@ -456,6 +496,8 @@ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REA { INT old_count; + TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x1, y1, x2, y2); + if(!path) return InvalidParameter; @@ -481,6 +523,8 @@ GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REA GpStatus WINGDIPAPI GdipAddPathLineI(GpPath *path, INT x1, INT y1, INT x2, INT y2) { + TRACE("(%p, %d, %d, %d, %d)\n", path, x1, y1, x2, y2); + return GdipAddPathLine(path, (REAL)x1, (REAL)y1, (REAL)x2, (REAL)y2); } @@ -489,6 +533,8 @@ GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath, { INT old_count, count; + TRACE("(%p, %p, %d)\n", path, addingPath, connect); + if(!path || !addingPath) return InvalidParameter; @@ -520,6 +566,9 @@ GpStatus WINGDIPAPI GdipAddPathPie(GpPath *path, REAL x, REAL y, REAL width, REA GpStatus status; INT i, count; + TRACE("(%p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", + path, x, y, width, height, startAngle, sweepAngle); + if(!path) return InvalidParameter; @@ -561,6 +610,9 @@ GpStatus WINGDIPAPI GdipAddPathPie(GpPath *path, REAL x, REAL y, REAL width, REA GpStatus WINGDIPAPI GdipAddPathPieI(GpPath *path, INT x, INT y, INT width, INT height, REAL startAngle, REAL sweepAngle) { + TRACE("(%p, %d, %d, %d, %d, %.2f, %.2f)\n", + path, x, y, width, height, startAngle, sweepAngle); + return GdipAddPathPieI(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); } @@ -568,6 +620,8 @@ GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, { INT old_count; + TRACE("(%p, %p, %d)\n", path, points, count); + if(!path || !points || count < 3) return InvalidParameter; @@ -594,6 +648,8 @@ GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath *path, GDIPCONST GpPoint *points, GpStatus status; INT i; + TRACE("(%p, %p, %d)\n", path, points, count); + if(!points || count < 3) return InvalidParameter; @@ -615,6 +671,8 @@ GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath *path, GDIPCONST GpPoint *points, GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) { + TRACE("(%p, %p)\n", path, clone); + if(!path || !clone) return InvalidParameter; @@ -641,6 +699,8 @@ GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone) GpStatus WINGDIPAPI GdipClosePathFigure(GpPath* path) { + TRACE("(%p)\n", path); + if(!path) return InvalidParameter; @@ -656,6 +716,8 @@ GpStatus WINGDIPAPI GdipClosePathFigures(GpPath* path) { INT i; + TRACE("(%p)\n", path); + if(!path) return InvalidParameter; @@ -671,6 +733,8 @@ GpStatus WINGDIPAPI GdipClosePathFigures(GpPath* path) GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path) { + TRACE("(%d, %p)\n", fill, path); + if(!path) return InvalidParameter; @@ -686,6 +750,8 @@ GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path) GpStatus WINGDIPAPI GdipCreatePath2(GDIPCONST GpPointF* points, GDIPCONST BYTE* types, INT count, GpFillMode fill, GpPath **path) { + TRACE("(%p, %p, %d, %d, %p)\n", points, types, count, fill, path); + if(!path) return InvalidParameter; @@ -720,6 +786,8 @@ GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint* points, GpStatus ret; INT i; + TRACE("(%p, %p, %d, %d, %p)\n", points, types, count, fill, path); + ptF = GdipAlloc(sizeof(GpPointF)*count); for(i = 0;i < count; i++){ @@ -736,6 +804,8 @@ GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint* points, GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) { + TRACE("(%p)\n", path); + if(!path) return InvalidParameter; @@ -748,6 +818,8 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path) GpStatus WINGDIPAPI GdipGetPathData(GpPath *path, GpPathData* pathData) { + TRACE("(%p, %p)\n", path, pathData); + if(!path || !pathData) return InvalidParameter; @@ -761,6 +833,8 @@ GpStatus WINGDIPAPI GdipGetPathData(GpPath *path, GpPathData* pathData) GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath *path, GpFillMode *fillmode) { + TRACE("(%p, %p)\n", path, fillmode); + if(!path || !fillmode) return InvalidParameter; @@ -773,6 +847,8 @@ GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath* path, GpPointF* lastPoint) { INT count; + TRACE("(%p, %p)\n", path, lastPoint); + if(!path || !lastPoint) return InvalidParameter; @@ -785,6 +861,8 @@ GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath* path, GpPointF* lastPoint) GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count) { + TRACE("(%p, %p, %d)\n", path, points, count); + if(!path) return InvalidParameter; @@ -802,6 +880,8 @@ GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath *path, GpPoint* points, INT count) GpPointF *ptf; INT i; + TRACE("(%p, %p, %d)\n", path, points, count); + if(count <= 0) return InvalidParameter; @@ -821,6 +901,8 @@ GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath *path, GpPoint* points, INT count) GpStatus WINGDIPAPI GdipGetPathTypes(GpPath *path, BYTE* types, INT count) { + TRACE("(%p, %p, %d)\n", path, types, count); + if(!path) return InvalidParameter; @@ -843,6 +925,8 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds, INT count, i; REAL path_width = 1.0, width, height, temp, low_x, low_y, high_x, high_y; + TRACE("(%p, %p, %p, %p)\n", path, bounds, matrix, pen); + /* Matrix and pen can be null. */ if(!path || !bounds) return InvalidParameter; @@ -923,6 +1007,8 @@ GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath* path, GpRect* bounds, GpStatus ret; GpRectF boundsF; + TRACE("(%p, %p, %p, %p)\n", path, bounds, matrix, pen); + ret = GdipGetPathWorldBounds(path,&boundsF,matrix,pen); if(ret == Ok){ @@ -937,6 +1023,8 @@ GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath* path, GpRect* bounds, GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count) { + TRACE("(%p, %p)\n", path, count); + if(!path) return InvalidParameter; @@ -951,6 +1039,8 @@ GpStatus WINGDIPAPI GdipReversePath(GpPath* path) INT start = 0; /* position in reversed path */ GpPathData revpath; + TRACE("(%p)\n", path); + if(!path) return InvalidParameter; @@ -1002,6 +1092,8 @@ GpStatus WINGDIPAPI GdipReversePath(GpPath* path) GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPointI(GpPath* path, INT x, INT y, GpPen *pen, GpGraphics *graphics, BOOL *result) { + TRACE("(%p, %d, %d, %p, %p, %p)\n", path, x, y, pen, graphics, result); + return GdipIsOutlineVisiblePathPoint(path, x, y, pen, graphics, result); } @@ -1021,6 +1113,8 @@ GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath* path, REAL x, REAL y, GpStatus WINGDIPAPI GdipIsVisiblePathPointI(GpPath* path, INT x, INT y, GpGraphics *graphics, BOOL *result) { + TRACE("(%p, %d, %d, %p, %p)\n", path, x, y, graphics, result); + return GdipIsVisiblePathPoint(path, x, y, graphics, result); } @@ -1038,6 +1132,8 @@ GpStatus WINGDIPAPI GdipIsVisiblePathPoint(GpPath* path, REAL x, REAL y, GpGraph GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path) { + TRACE("(%p)\n", path); + if(!path) return InvalidParameter; @@ -1048,6 +1144,8 @@ GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path) GpStatus WINGDIPAPI GdipResetPath(GpPath *path) { + TRACE("(%p)\n", path); + if(!path) return InvalidParameter; @@ -1060,6 +1158,8 @@ GpStatus WINGDIPAPI GdipResetPath(GpPath *path) GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath *path, GpFillMode fill) { + TRACE("(%p, %d)\n", path, fill); + if(!path) return InvalidParameter; @@ -1070,6 +1170,8 @@ GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath *path, GpFillMode fill) GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix) { + TRACE("(%p, %p)\n", path, matrix); + if(!path) return InvalidParameter; @@ -1088,6 +1190,8 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, GpStatus retstat; BOOL old_new; + TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x, y, width, height); + if(!path || width < 0.0 || height < 0.0) return InvalidParameter; @@ -1127,6 +1231,8 @@ fail: GpStatus WINGDIPAPI GdipAddPathRectangleI(GpPath *path, INT x, INT y, INT width, INT height) { + TRACE("(%p, %d, %d, %d, %d)\n", path, x, y, width, height); + return GdipAddPathRectangle(path,(REAL)x,(REAL)y,(REAL)width,(REAL)height); } @@ -1136,6 +1242,8 @@ GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath *path, GDIPCONST GpRectF *rects GpStatus retstat; INT i; + TRACE("(%p, %p, %d)\n", path, rects, count); + /* count == 0 - verified condition */ if(!path || !rects || count == 0) return InvalidParameter; @@ -1171,6 +1279,8 @@ GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath *path, GDIPCONST GpRect *rects GpStatus retstat; INT i; + TRACE("(%p, %p, %d)\n", path, rects, count); + if(!rects || count == 0) return InvalidParameter; @@ -1196,6 +1306,8 @@ GpStatus WINGDIPAPI GdipSetPathMarker(GpPath* path) { INT count; + TRACE("(%p)\n", path); + if(!path) return InvalidParameter; @@ -1213,6 +1325,8 @@ GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath* path) INT count; INT i; + TRACE("(%p)\n", path); + if(!path) return InvalidParameter;