Nikolay Sivov : gdiplus: Added TRACE(..) for Pen calls.
Alexandre Julliard
julliard at winehq.org
Fri Nov 7 07:23:54 CST 2008
Module: wine
Branch: master
Commit: fa1e0313ee12570469f40369d0f8b0ff86e44ee2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa1e0313ee12570469f40369d0f8b0ff86e44ee2
Author: Nikolay Sivov <bunglehead at gmail.com>
Date: Thu Nov 6 20:44:10 2008 +0300
gdiplus: Added TRACE(..) for Pen calls.
---
dlls/gdiplus/pen.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 0 deletions(-)
diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c
index 104d9de..ea41a3a 100644
--- a/dlls/gdiplus/pen.c
+++ b/dlls/gdiplus/pen.c
@@ -69,6 +69,8 @@ static DWORD gdip_to_gdi_join(GpLineJoin join)
GpStatus WINGDIPAPI GdipClonePen(GpPen *pen, GpPen **clonepen)
{
+ TRACE("(%p, %p)\n", pen, clonepen);
+
if(!pen || !clonepen)
return InvalidParameter;
@@ -90,6 +92,8 @@ GpStatus WINGDIPAPI GdipCreatePen1(ARGB color, REAL width, GpUnit unit,
GpBrush *brush;
GpStatus status;
+ TRACE("(%x, %.2f, %d, %p)\n", color, width, unit, pen);
+
GdipCreateSolidFill(color, (GpSolidFill **)(&brush));
status = GdipCreatePen2(brush, width, unit, pen);
GdipDeleteBrush(brush);
@@ -102,6 +106,8 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit,
GpPen *gp_pen;
GpBrush *clone_brush;
+ TRACE("(%p, %.2f, %d, %p)", brush, width, unit, pen);
+
if(!pen || !brush)
return InvalidParameter;
@@ -135,6 +141,8 @@ GpStatus WINGDIPAPI GdipCreatePen2(GpBrush *brush, REAL width, GpUnit unit,
GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen)
{
+ TRACE("(%p)\n", pen);
+
if(!pen) return InvalidParameter;
GdipDeleteBrush(pen->brush);
@@ -148,6 +156,8 @@ GpStatus WINGDIPAPI GdipDeletePen(GpPen *pen)
GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen *pen, GpBrush **brush)
{
+ TRACE("(%p, %p)\n", pen, brush);
+
if(!pen || !brush)
return InvalidParameter;
@@ -156,6 +166,8 @@ GpStatus WINGDIPAPI GdipGetPenBrushFill(GpPen *pen, GpBrush **brush)
GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb)
{
+ TRACE("(%p, %p)\n", pen, argb);
+
if(!pen || !argb)
return InvalidParameter;
@@ -167,6 +179,8 @@ GpStatus WINGDIPAPI GdipGetPenColor(GpPen *pen, ARGB *argb)
GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen *pen, GpCustomLineCap** customCap)
{
+ TRACE("(%p, %p)\n", pen, customCap);
+
if(!pen || !customCap)
return InvalidParameter;
@@ -180,6 +194,8 @@ GpStatus WINGDIPAPI GdipGetPenCustomEndCap(GpPen *pen, GpCustomLineCap** customC
GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen *pen, GpCustomLineCap** customCap)
{
+ TRACE("(%p, %p)\n", pen, customCap);
+
if(!pen || !customCap)
return InvalidParameter;
@@ -193,6 +209,8 @@ GpStatus WINGDIPAPI GdipGetPenCustomStartCap(GpPen *pen, GpCustomLineCap** custo
GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count)
{
+ TRACE("(%p, %p, %d)\n", pen, dash, count);
+
if(!pen || !dash || count > pen->numdashes)
return InvalidParameter;
@@ -207,6 +225,8 @@ GpStatus WINGDIPAPI GdipGetPenDashArray(GpPen *pen, REAL *dash, INT count)
GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen *pen, GpDashCap *dashCap)
{
+ TRACE("(%p, %p)\n", pen, dashCap);
+
if(!pen || !dashCap)
return InvalidParameter;
@@ -217,6 +237,8 @@ GpStatus WINGDIPAPI GdipGetPenDashCap197819(GpPen *pen, GpDashCap *dashCap)
GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen *pen, INT *count)
{
+ TRACE("(%p, %p)\n", pen, count);
+
if(!pen || !count)
return InvalidParameter;
@@ -227,6 +249,8 @@ GpStatus WINGDIPAPI GdipGetPenDashCount(GpPen *pen, INT *count)
GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen *pen, REAL *offset)
{
+ TRACE("(%p, %p)\n", pen, offset);
+
if(!pen || !offset)
return InvalidParameter;
@@ -237,6 +261,8 @@ GpStatus WINGDIPAPI GdipGetPenDashOffset(GpPen *pen, REAL *offset)
GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash)
{
+ TRACE("(%p, %p)\n", pen, dash);
+
if(!pen || !dash)
return InvalidParameter;
@@ -247,6 +273,8 @@ GpStatus WINGDIPAPI GdipGetPenDashStyle(GpPen *pen, GpDashStyle *dash)
GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen *pen, GpLineCap *endCap)
{
+ TRACE("(%p, %p)\n", pen, endCap);
+
if(!pen || !endCap)
return InvalidParameter;
@@ -257,6 +285,8 @@ GpStatus WINGDIPAPI GdipGetPenEndCap(GpPen *pen, GpLineCap *endCap)
GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen *pen, GpLineJoin *lineJoin)
{
+ TRACE("(%p, %p)\n", pen, lineJoin);
+
if(!pen || !lineJoin)
return InvalidParameter;
@@ -267,6 +297,8 @@ GpStatus WINGDIPAPI GdipGetPenLineJoin(GpPen *pen, GpLineJoin *lineJoin)
GpStatus WINGDIPAPI GdipGetPenMode(GpPen *pen, GpPenAlignment *mode)
{
+ TRACE("(%p, %p)\n", pen, mode);
+
if(!pen || !mode)
return InvalidParameter;
@@ -277,6 +309,8 @@ GpStatus WINGDIPAPI GdipGetPenMode(GpPen *pen, GpPenAlignment *mode)
GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen *pen, REAL *miterLimit)
{
+ TRACE("(%p, %p)\n", pen, miterLimit);
+
if(!pen || !miterLimit)
return InvalidParameter;
@@ -287,6 +321,8 @@ GpStatus WINGDIPAPI GdipGetPenMiterLimit(GpPen *pen, REAL *miterLimit)
GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen *pen, GpLineCap *startCap)
{
+ TRACE("(%p, %p)\n", pen, startCap);
+
if(!pen || !startCap)
return InvalidParameter;
@@ -297,6 +333,8 @@ GpStatus WINGDIPAPI GdipGetPenStartCap(GpPen *pen, GpLineCap *startCap)
GpStatus WINGDIPAPI GdipGetPenUnit(GpPen *pen, GpUnit *unit)
{
+ TRACE("(%p, %p)\n", pen, unit);
+
if(!pen || !unit)
return InvalidParameter;
@@ -307,6 +345,8 @@ GpStatus WINGDIPAPI GdipGetPenUnit(GpPen *pen, GpUnit *unit)
GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width)
{
+ TRACE("(%p, %p)\n", pen, width);
+
if(!pen || !width)
return InvalidParameter;
@@ -317,6 +357,8 @@ GpStatus WINGDIPAPI GdipGetPenWidth(GpPen *pen, REAL *width)
GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush)
{
+ TRACE("(%p, %p)\n", pen, brush);
+
if(!pen || !brush)
return InvalidParameter;
@@ -326,6 +368,8 @@ GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen *pen, GpBrush *brush)
GpStatus WINGDIPAPI GdipSetPenColor(GpPen *pen, ARGB argb)
{
+ TRACE("(%p, %x)\n", pen, argb);
+
if(!pen)
return InvalidParameter;
@@ -340,6 +384,8 @@ GpStatus WINGDIPAPI GdipSetPenCustomEndCap(GpPen *pen, GpCustomLineCap* customCa
GpCustomLineCap * cap;
GpStatus ret;
+ TRACE("(%p, %p)\n", pen, customCap);
+
/* native crashes on pen == NULL, customCap != NULL */
if(!customCap) return InvalidParameter;
@@ -357,6 +403,8 @@ GpStatus WINGDIPAPI GdipSetPenCustomStartCap(GpPen *pen, GpCustomLineCap* custom
GpCustomLineCap * cap;
GpStatus ret;
+ TRACE("(%p, %p)\n", pen, customCap);
+
/* native crashes on pen == NULL, customCap != NULL */
if(!customCap) return InvalidParameter;
@@ -375,6 +423,8 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash,
INT i;
REAL sum = 0;
+ TRACE("(%p, %p, %d)\n", pen, dash, count);
+
if(!pen || !dash)
return InvalidParameter;
@@ -409,6 +459,8 @@ GpStatus WINGDIPAPI GdipSetPenDashArray(GpPen *pen, GDIPCONST REAL *dash,
GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen *pen, GpDashCap dashCap)
{
+ TRACE("(%p, %d)\n", pen, dashCap);
+
if(!pen)
return InvalidParameter;
@@ -420,6 +472,8 @@ GpStatus WINGDIPAPI GdipSetPenDashCap197819(GpPen *pen, GpDashCap dashCap)
/* FIXME: dash offset not used */
GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen *pen, REAL offset)
{
+ TRACE("(%p, %.2f)\n", pen, offset);
+
if(!pen)
return InvalidParameter;
@@ -430,6 +484,8 @@ GpStatus WINGDIPAPI GdipSetPenDashOffset(GpPen *pen, REAL offset)
GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen *pen, GpDashStyle dash)
{
+ TRACE("(%p, %d)\n", pen, dash);
+
if(!pen)
return InvalidParameter;
@@ -449,6 +505,8 @@ GpStatus WINGDIPAPI GdipSetPenDashStyle(GpPen *pen, GpDashStyle dash)
GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap)
{
+ TRACE("(%p, %d)\n", pen, cap);
+
if(!pen) return InvalidParameter;
/* The old custom cap gets deleted even if the new style is LineCapCustom. */
@@ -463,6 +521,8 @@ GpStatus WINGDIPAPI GdipSetPenEndCap(GpPen *pen, GpLineCap cap)
GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen *pen, GpLineCap start,
GpLineCap end, GpDashCap dash)
{
+ TRACE("%p, %d, %d, %d)\n", pen, start, end, dash);
+
if(!pen)
return InvalidParameter;
@@ -482,6 +542,8 @@ GpStatus WINGDIPAPI GdipSetPenLineCap197819(GpPen *pen, GpLineCap start,
* Both kinds of miter joins clip if the angle is less than 11 degrees. */
GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen *pen, GpLineJoin join)
{
+ TRACE("(%p, %d)\n", pen, join);
+
if(!pen) return InvalidParameter;
pen->join = join;
@@ -493,6 +555,8 @@ GpStatus WINGDIPAPI GdipSetPenLineJoin(GpPen *pen, GpLineJoin join)
GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen *pen, REAL limit)
{
+ TRACE("(%p, %.2f)\n", pen, limit);
+
if(!pen)
return InvalidParameter;
@@ -503,6 +567,8 @@ GpStatus WINGDIPAPI GdipSetPenMiterLimit(GpPen *pen, REAL limit)
GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen *pen, GpLineCap cap)
{
+ TRACE("(%p, %d)\n", pen, cap);
+
if(!pen) return InvalidParameter;
GdipDeleteCustomLineCap(pen->customstart);
@@ -514,6 +580,8 @@ GpStatus WINGDIPAPI GdipSetPenStartCap(GpPen *pen, GpLineCap cap)
GpStatus WINGDIPAPI GdipSetPenWidth(GpPen *pen, REAL width)
{
+ TRACE("(%p, %.2f)\n", pen, width);
+
if(!pen) return InvalidParameter;
pen->width = width;
@@ -523,6 +591,8 @@ GpStatus WINGDIPAPI GdipSetPenWidth(GpPen *pen, REAL width)
GpStatus WINGDIPAPI GdipSetPenMode(GpPen *pen, GpPenAlignment mode)
{
+ TRACE("(%p, %d)\n", pen, mode);
+
if(!pen) return InvalidParameter;
pen->align = mode;
More information about the wine-cvs
mailing list