commit 52bf030b84c502bc67bcf5a082a4fcbf98c7d571
author Vincent Povirk <vincent@codeweavers.com> Sat Mar 31 12:59:24 2012 -0500
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 02 12:37:55 2012 +0200
tree cf7b0d9446d63848e491d7fc9692b6b50bf70f13
parent aed62dbff11f40aa6bf41af50deb103bb458e9d5

gdiplus: Implement GdipGetPathGradientTransform.

dlls/gdiplus/brush.c

diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c
index 07d32dc..aa02598 100644
--- a/dlls/gdiplus/brush.c
+++ b/dlls/gdiplus/brush.c
@@ -78,6 +78,14 @@
                 return stat;
             }
 
+            stat = GdipCloneMatrix(src->transform, &dest->transform);
+
+            if(stat != Ok){
+                GdipDeletePath(dest->path);
+                GdipFree(dest);
+                return stat;
+            }
+
             /* blending */
             count = src->blendcount;
             dest->blendcount = count;
@@ -94,6 +102,7 @@
             if(!dest->blendfac || !dest->blendpos || !dest->surroundcolors ||
                (pcount && (!dest->pblendcolor || !dest->pblendpos))){
                 GdipDeletePath(dest->path);
+                GdipDeleteMatrix(dest->transform);
                 GdipFree(dest->blendfac);
                 GdipFree(dest->blendpos);
                 GdipFree(dest->surroundcolors);
@@ -503,6 +512,7 @@
 static GpStatus create_path_gradient(GpPath *path, GpPathGradient **grad)
 {
     GpRectF bounds;
+    GpStatus stat;
 
     if(!path || !grad)
         return InvalidParameter;
@@ -515,10 +525,18 @@
         return OutOfMemory;
     }
 
+    stat = GdipCreateMatrix(&(*grad)->transform);
+    if (stat != Ok)
+    {
+        GdipFree(*grad);
+        return stat;
+    }
+
     (*grad)->blendfac = GdipAlloc(sizeof(REAL));
     (*grad)->blendpos = GdipAlloc(sizeof(REAL));
     (*grad)->surroundcolors = GdipAlloc(sizeof(ARGB));
     if(!(*grad)->blendfac || !(*grad)->blendpos || !(*grad)->surroundcolors){
+        GdipDeleteMatrix((*grad)->transform);
         GdipFree((*grad)->blendfac);
         GdipFree((*grad)->blendpos);
         GdipFree((*grad)->surroundcolors);
@@ -890,6 +908,7 @@
     {
         case BrushTypePathGradient:
             GdipDeletePath(((GpPathGradient*) brush)->path);
+            GdipDeleteMatrix(((GpPathGradient*) brush)->transform);
             GdipFree(((GpPathGradient*) brush)->blendfac);
             GdipFree(((GpPathGradient*) brush)->blendpos);
             GdipFree(((GpPathGradient*) brush)->surroundcolors);
@@ -1641,14 +1660,14 @@
 GpStatus WINGDIPAPI GdipGetPathGradientTransform(GpPathGradient *grad,
     GpMatrix *matrix)
 {
-    static int calls;
-
     TRACE("(%p,%p)\n", grad, matrix);
 
-    if(!(calls++))
-        FIXME("not implemented\n");
+    if (!grad || !matrix)
+        return InvalidParameter;
 
-    return NotImplemented;
+    memcpy(matrix, grad->transform, sizeof(GpMatrix));
+
+    return Ok;
 }
 
 GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad,

dlls/gdiplus/gdiplus_private.h

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index c9853ec..5d5a92c 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -201,6 +201,7 @@
     ARGB* pblendcolor; /* preset blend colors */
     REAL* pblendpos; /* preset blend positions */
     INT pblendcount;
+    GpMatrix *transform;
 };
 
 struct GpLineGradient{

dlls/gdiplus/graphics.c

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 885d9a7..2c6c4b2 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -1192,6 +1192,7 @@
         INT min_y, max_y, min_x, max_x;
         INT x, y;
         ARGB outer_color;
+        static int transform_fixme_once;
 
         if (fill->focus.X != 0.0 || fill->focus.Y != 0.0)
         {
@@ -1221,6 +1222,17 @@
                 FIXME("path gradient preset blend not implemented\n");
         }
 
+        if (!transform_fixme_once)
+        {
+            BOOL is_identity=TRUE;
+            GdipIsMatrixIdentity(fill->transform, &is_identity);
+            if (!is_identity)
+            {
+                FIXME("path gradient transform not implemented\n");
+                transform_fixme_once = 1;
+            }
+        }
+
         stat = GdipClonePath(fill->path, &flat_path);
 
         if (stat != Ok)