mshtml: Handle DISPATCH_CONSTRUCT flag for DispatchEx objects.
[wine] / dlls / gdiplus / graphicspath.c
index df6c6d6..94e17dd 100644 (file)
 #include "winbase.h"
 #include "winuser.h"
 #include "wingdi.h"
+
+#include "objbase.h"
+
 #include "gdiplus.h"
 #include "gdiplus_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(gdiplus);
 
-/* make sure path has enough space for len more points */
-static BOOL lengthen_path(GpPath *path, INT len)
+typedef struct path_list_node_t path_list_node_t;
+struct path_list_node_t {
+    GpPointF pt;
+    BYTE type; /* PathPointTypeStart or PathPointTypeLine */
+    path_list_node_t *next;
+};
+
+/* init list */
+static BOOL init_path_list(path_list_node_t **node, REAL x, REAL y)
 {
-    /* initial allocation */
-    if(path->datalen == 0){
-        path->datalen = len * 2;
+    *node = GdipAlloc(sizeof(path_list_node_t));
+    if(!*node)
+        return FALSE;
 
-        path->pathdata.Points = GdipAlloc(path->datalen * sizeof(PointF));
-        if(!path->pathdata.Points)   return FALSE;
+    (*node)->pt.X = x;
+    (*node)->pt.Y = y;
+    (*node)->type = PathPointTypeStart;
+    (*node)->next = NULL;
 
-        path->pathdata.Types = GdipAlloc(path->datalen);
-        if(!path->pathdata.Types){
-            GdipFree(path->pathdata.Points);
-            return FALSE;
-        }
+    return TRUE;
+}
+
+/* free all nodes including argument */
+static void free_path_list(path_list_node_t *node)
+{
+    path_list_node_t *n = node;
+
+    while(n){
+        n = n->next;
+        GdipFree(node);
+        node = n;
     }
-    /* reallocation, double size of arrays */
-    else if(path->datalen - path->pathdata.Count < len){
-        while(path->datalen - path->pathdata.Count < len)
-            path->datalen *= 2;
+}
 
-        path->pathdata.Points = HeapReAlloc(GetProcessHeap(), 0,
-            path->pathdata.Points, path->datalen * sizeof(PointF));
-        if(!path->pathdata.Points)  return FALSE;
+/* Add a node after 'node' */
+/*
+ * Returns
+ *  pointer on success
+ *  NULL    on allocation problems
+ */
+static path_list_node_t* add_path_list_node(path_list_node_t *node, REAL x, REAL y, BOOL type)
+{
+    path_list_node_t *new;
+
+    new = GdipAlloc(sizeof(path_list_node_t));
+    if(!new)
+        return NULL;
+
+    new->pt.X  = x;
+    new->pt.Y  = y;
+    new->type  = type;
+    new->next  = node->next;
+    node->next = new;
+
+    return new;
+}
+
+/* returns element count */
+static INT path_list_count(path_list_node_t *node)
+{
+    INT count = 1;
+
+    while((node = node->next))
+        ++count;
+
+    return count;
+}
 
-        path->pathdata.Types = HeapReAlloc(GetProcessHeap(), 0,
-            path->pathdata.Types, path->datalen);
-        if(!path->pathdata.Types)   return FALSE;
+/* GdipFlattenPath helper */
+/*
+ * Used to recursively flatten single Bezier curve
+ * Parameters:
+ *  - start   : pointer to start point node;
+ *  - (x2, y2): first control point;
+ *  - (x3, y3): second control point;
+ *  - end     : pointer to end point node
+ *  - flatness: admissible error of linear approximation.
+ *
+ * Return value:
+ *  TRUE : success
+ *  FALSE: out of memory
+ *
+ * TODO: used quality criteria should be revised to match native as
+ *       closer as possible.
+ */
+static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, REAL y3,
+                           path_list_node_t *end, REAL flatness)
+{
+    /* this 5 middle points with start/end define to half-curves */
+    GpPointF mp[5];
+    GpPointF pt, pt_st;
+    path_list_node_t *node;
+
+    /* calculate bezier curve middle points == new control points */
+    mp[0].X = (start->pt.X + x2) / 2.0;
+    mp[0].Y = (start->pt.Y + y2) / 2.0;
+    /* middle point between control points */
+    pt.X = (x2 + x3) / 2.0;
+    pt.Y = (y2 + y3) / 2.0;
+    mp[1].X = (mp[0].X + pt.X) / 2.0;
+    mp[1].Y = (mp[0].Y + pt.Y) / 2.0;
+    mp[4].X = (end->pt.X + x3) / 2.0;
+    mp[4].Y = (end->pt.Y + y3) / 2.0;
+    mp[3].X = (mp[4].X + pt.X) / 2.0;
+    mp[3].Y = (mp[4].Y + pt.Y) / 2.0;
+
+    mp[2].X = (mp[1].X + mp[3].X) / 2.0;
+    mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0;
+
+    pt = end->pt;
+    pt_st = start->pt;
+    /* check flatness as a half of distance between middle point and a linearized path */
+    if(fabs(((pt.Y - pt_st.Y)*mp[2].X + (pt_st.X - pt.X)*mp[2].Y +
+        (pt_st.Y*pt.X - pt_st.X*pt.Y))) <=
+        (0.5 * flatness*sqrtf((powf(pt.Y - pt_st.Y, 2.0) + powf(pt_st.X - pt.X, 2.0))))){
+        return TRUE;
     }
+    else
+        /* add a middle point */
+        if(!(node = add_path_list_node(start, mp[2].X, mp[2].Y, PathPointTypeLine)))
+            return FALSE;
+
+    /* do the same with halfs */
+    flatten_bezier(start, mp[0].X, mp[0].Y, mp[1].X, mp[1].Y, node, flatness);
+    flatten_bezier(node,  mp[3].X, mp[3].Y, mp[4].X, mp[4].Y, end,  flatness);
 
     return TRUE;
 }
@@ -68,6 +167,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;
 
@@ -94,11 +196,403 @@ GpStatus WINGDIPAPI GdipAddPathArc(GpPath *path, REAL x1, REAL y1, REAL x2,
     return Ok;
 }
 
+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);
+}
+
+GpStatus WINGDIPAPI GdipAddPathBezier(GpPath *path, REAL x1, REAL y1, REAL x2,
+    REAL y2, REAL x3, REAL y3, REAL x4, REAL y4)
+{
+    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;
+
+    if(!lengthen_path(path, 4))
+        return OutOfMemory;
+
+    old_count = path->pathdata.Count;
+
+    path->pathdata.Points[old_count].X = x1;
+    path->pathdata.Points[old_count].Y = y1;
+    path->pathdata.Points[old_count + 1].X = x2;
+    path->pathdata.Points[old_count + 1].Y = y2;
+    path->pathdata.Points[old_count + 2].X = x3;
+    path->pathdata.Points[old_count + 2].Y = y3;
+    path->pathdata.Points[old_count + 3].X = x4;
+    path->pathdata.Points[old_count + 3].Y = y4;
+
+    path->pathdata.Types[old_count] =
+        (path->newfigure ? PathPointTypeStart : PathPointTypeLine);
+    path->pathdata.Types[old_count + 1] = PathPointTypeBezier;
+    path->pathdata.Types[old_count + 2] = PathPointTypeBezier;
+    path->pathdata.Types[old_count + 3] = PathPointTypeBezier;
+
+    path->newfigure = FALSE;
+    path->pathdata.Count += 4;
+
+    return Ok;
+}
+
+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);
+}
+
+GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points,
+    INT count)
+{
+    INT i, old_count;
+
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
+    if(!path || !points || ((count - 1) % 3))
+        return InvalidParameter;
+
+    if(!lengthen_path(path, count))
+        return OutOfMemory;
+
+    old_count = path->pathdata.Count;
+
+    for(i = 0; i < count; i++){
+        path->pathdata.Points[old_count + i].X = points[i].X;
+        path->pathdata.Points[old_count + i].Y = points[i].Y;
+        path->pathdata.Types[old_count + i] = PathPointTypeBezier;
+    }
+
+    path->pathdata.Types[old_count] =
+        (path->newfigure ? PathPointTypeStart : PathPointTypeLine);
+    path->newfigure = FALSE;
+    path->pathdata.Count += count;
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points,
+    INT count)
+{
+    GpPointF *ptsF;
+    GpStatus ret;
+    INT i;
+
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
+    if(!points || ((count - 1) % 3))
+        return InvalidParameter;
+
+    ptsF = GdipAlloc(sizeof(GpPointF) * count);
+    if(!ptsF)
+        return OutOfMemory;
+
+    for(i = 0; i < count; i++){
+        ptsF[i].X = (REAL)points[i].X;
+        ptsF[i].Y = (REAL)points[i].Y;
+    }
+
+    ret = GdipAddPathBeziers(path, ptsF, count);
+    GdipFree(ptsF);
+
+    return ret;
+}
+
+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);
+}
+
+GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *points,
+    INT count, REAL tension)
+{
+    INT i, len_pt = (count + 1)*3-2;
+    GpPointF *pt;
+    GpPointF *pts;
+    REAL x1, x2, y1, y2;
+    GpStatus stat;
+
+    TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension);
+
+    if(!path || !points || count <= 1)
+        return InvalidParameter;
+
+    pt = GdipAlloc(len_pt * sizeof(GpPointF));
+    pts = GdipAlloc((count + 1)*sizeof(GpPointF));
+    if(!pt || !pts){
+        GdipFree(pt);
+        GdipFree(pts);
+        return OutOfMemory;
+    }
+
+    /* copy source points to extend with the last one */
+    memcpy(pts, points, sizeof(GpPointF)*count);
+    pts[count] = pts[0];
+
+    tension = tension * TENSION_CONST;
+
+    for(i = 0; i < count-1; i++){
+        calc_curve_bezier(&(pts[i]), tension, &x1, &y1, &x2, &y2);
+
+        pt[3*i+2].X = x1;
+        pt[3*i+2].Y = y1;
+        pt[3*i+3].X = pts[i+1].X;
+        pt[3*i+3].Y = pts[i+1].Y;
+        pt[3*i+4].X = x2;
+        pt[3*i+4].Y = y2;
+    }
+
+    /* points [len_pt-2] and [0] are calculated
+       separetely to connect splines properly */
+    pts[0] = points[count-1];
+    pts[1] = points[0]; /* equals to start and end of a resulting path */
+    pts[2] = points[1];
+
+    calc_curve_bezier(pts, tension, &x1, &y1, &x2, &y2);
+    pt[len_pt-2].X = x1;
+    pt[len_pt-2].Y = y1;
+    pt[0].X = pts[1].X;
+    pt[0].Y = pts[1].Y;
+    pt[1].X = x2;
+    pt[1].Y = y2;
+    /* close path */
+    pt[len_pt-1].X = pt[0].X;
+    pt[len_pt-1].Y = pt[0].Y;
+
+    stat = GdipAddPathBeziers(path, pt, len_pt);
+
+    /* close figure */
+    if(stat == Ok){
+        INT count = path->pathdata.Count;
+        path->pathdata.Types[count - 1] |= PathPointTypeCloseSubpath;
+        path->newfigure = TRUE;
+    }
+
+    GdipFree(pts);
+    GdipFree(pt);
+
+    return stat;
+}
+
+GpStatus WINGDIPAPI GdipAddPathClosedCurve2I(GpPath *path, GDIPCONST GpPoint *points,
+    INT count, REAL tension)
+{
+    GpPointF *ptf;
+    INT i;
+    GpStatus stat;
+
+    TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension);
+
+    if(!path || !points || count <= 1)
+        return InvalidParameter;
+
+    ptf = GdipAlloc(sizeof(GpPointF)*count);
+    if(!ptf)
+        return OutOfMemory;
+
+    for(i = 0; i < count; i++){
+        ptf[i].X = (REAL)points[i].X;
+        ptf[i].Y = (REAL)points[i].Y;
+    }
+
+    stat = GdipAddPathClosedCurve2(path, ptf, count, tension);
+
+    GdipFree(ptf);
+
+    return stat;
+}
+
+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);
+}
+
+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);
+}
+
+GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, INT count,
+    REAL tension)
+{
+    INT i, len_pt = count*3-2;
+    GpPointF *pt;
+    REAL x1, x2, y1, y2;
+    GpStatus stat;
+
+    TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension);
+
+    if(!path || !points || count <= 1)
+        return InvalidParameter;
+
+    pt = GdipAlloc(len_pt * sizeof(GpPointF));
+    if(!pt)
+        return OutOfMemory;
+
+    tension = tension * TENSION_CONST;
+
+    calc_curve_bezier_endp(points[0].X, points[0].Y, points[1].X, points[1].Y,
+        tension, &x1, &y1);
+
+    pt[0].X = points[0].X;
+    pt[0].Y = points[0].Y;
+    pt[1].X = x1;
+    pt[1].Y = y1;
+
+    for(i = 0; i < count-2; i++){
+        calc_curve_bezier(&(points[i]), tension, &x1, &y1, &x2, &y2);
+
+        pt[3*i+2].X = x1;
+        pt[3*i+2].Y = y1;
+        pt[3*i+3].X = points[i+1].X;
+        pt[3*i+3].Y = points[i+1].Y;
+        pt[3*i+4].X = x2;
+        pt[3*i+4].Y = y2;
+    }
+
+    calc_curve_bezier_endp(points[count-1].X, points[count-1].Y,
+        points[count-2].X, points[count-2].Y, tension, &x1, &y1);
+
+    pt[len_pt-2].X = x1;
+    pt[len_pt-2].Y = y1;
+    pt[len_pt-1].X = points[count-1].X;
+    pt[len_pt-1].Y = points[count-1].Y;
+
+    stat = GdipAddPathBeziers(path, pt, len_pt);
+
+    GdipFree(pt);
+
+    return stat;
+}
+
+GpStatus WINGDIPAPI GdipAddPathCurve2I(GpPath *path, GDIPCONST GpPoint *points,
+    INT count, REAL tension)
+{
+    GpPointF *ptf;
+    INT i;
+    GpStatus stat;
+
+    TRACE("(%p, %p, %d, %.2f)\n", path, points, count, tension);
+
+    if(!path || !points || count <= 1)
+        return InvalidParameter;
+
+    ptf = GdipAlloc(sizeof(GpPointF)*count);
+    if(!ptf)
+        return OutOfMemory;
+
+    for(i = 0; i < count; i++){
+        ptf[i].X = (REAL)points[i].X;
+        ptf[i].Y = (REAL)points[i].Y;
+    }
+
+    stat = GdipAddPathCurve2(path, ptf, count, tension);
+
+    GdipFree(ptf);
+
+    return stat;
+}
+
+GpStatus WINGDIPAPI GdipAddPathCurve3(GpPath *path, GDIPCONST GpPointF *points,
+    INT count, INT offset, INT nseg, REAL tension)
+{
+    TRACE("(%p, %p, %d, %d, %d, %.2f)\n", path, points, count, offset, nseg, tension);
+
+    if(!path || !points || offset + 1 >= count || count - offset < nseg + 1)
+        return InvalidParameter;
+
+    return GdipAddPathCurve2(path, &points[offset], nseg + 1, tension);
+}
+
+GpStatus WINGDIPAPI GdipAddPathCurve3I(GpPath *path, GDIPCONST GpPoint *points,
+    INT count, INT offset, INT nseg, REAL tension)
+{
+    TRACE("(%p, %p, %d, %d, %d, %.2f)\n", path, points, count, offset, nseg, tension);
+
+    if(!path || !points || offset + 1 >= count || count - offset < nseg + 1)
+        return InvalidParameter;
+
+    return GdipAddPathCurve2I(path, &points[offset], nseg + 1, tension);
+}
+
+GpStatus WINGDIPAPI GdipAddPathEllipse(GpPath *path, REAL x, REAL y, REAL width,
+    REAL height)
+{
+    INT old_count, numpts;
+
+    TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x, y, width, height);
+
+    if(!path)
+        return InvalidParameter;
+
+    if(!lengthen_path(path, MAX_ARC_PTS))
+        return OutOfMemory;
+
+    old_count = path->pathdata.Count;
+    if((numpts = arc2polybezier(&path->pathdata.Points[old_count],  x, y, width,
+                               height, 0.0, 360.0)) != MAX_ARC_PTS){
+        ERR("expected %d points but got %d\n", MAX_ARC_PTS, numpts);
+        return GenericError;
+    }
+
+    memset(&path->pathdata.Types[old_count + 1], PathPointTypeBezier,
+           MAX_ARC_PTS - 1);
+
+    /* An ellipse is an intrinsic figure (always is its own subpath). */
+    path->pathdata.Types[old_count] = PathPointTypeStart;
+    path->pathdata.Types[old_count + MAX_ARC_PTS - 1] |= PathPointTypeCloseSubpath;
+    path->newfigure = TRUE;
+    path->pathdata.Count += MAX_ARC_PTS;
+
+    return Ok;
+}
+
+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);
+}
+
 GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points,
     INT count)
 {
     INT i, old_count;
 
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
     if(!path || !points)
         return InvalidParameter;
 
@@ -118,13 +612,269 @@ GpStatus WINGDIPAPI GdipAddPathLine2(GpPath *path, GDIPCONST GpPointF *points,
         path->newfigure = FALSE;
     }
 
-    path->pathdata.Count += count;
+    path->pathdata.Count += count;
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipAddPathLine2I(GpPath *path, GDIPCONST GpPoint *points, INT count)
+{
+    GpPointF *pointsF;
+    INT i;
+    GpStatus stat;
+
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
+    if(count <= 0)
+        return InvalidParameter;
+
+    pointsF = GdipAlloc(sizeof(GpPointF) * count);
+    if(!pointsF)    return OutOfMemory;
+
+    for(i = 0;i < count; i++){
+        pointsF[i].X = (REAL)points[i].X;
+        pointsF[i].Y = (REAL)points[i].Y;
+    }
+
+    stat = GdipAddPathLine2(path, pointsF, count);
+
+    GdipFree(pointsF);
+
+    return stat;
+}
+
+GpStatus WINGDIPAPI GdipAddPathLine(GpPath *path, REAL x1, REAL y1, REAL x2, REAL y2)
+{
+    INT old_count;
+
+    TRACE("(%p, %.2f, %.2f, %.2f, %.2f)\n", path, x1, y1, x2, y2);
+
+    if(!path)
+        return InvalidParameter;
+
+    if(!lengthen_path(path, 2))
+        return OutOfMemory;
+
+    old_count = path->pathdata.Count;
+
+    path->pathdata.Points[old_count].X = x1;
+    path->pathdata.Points[old_count].Y = y1;
+    path->pathdata.Points[old_count + 1].X = x2;
+    path->pathdata.Points[old_count + 1].Y = y2;
+
+    path->pathdata.Types[old_count] =
+        (path->newfigure ? PathPointTypeStart : PathPointTypeLine);
+    path->pathdata.Types[old_count + 1] = PathPointTypeLine;
+
+    path->newfigure = FALSE;
+    path->pathdata.Count += 2;
+
+    return Ok;
+}
+
+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);
+}
+
+GpStatus WINGDIPAPI GdipAddPathPath(GpPath *path, GDIPCONST GpPath* addingPath,
+    BOOL connect)
+{
+    INT old_count, count;
+
+    TRACE("(%p, %p, %d)\n", path, addingPath, connect);
+
+    if(!path || !addingPath)
+        return InvalidParameter;
+
+    old_count = path->pathdata.Count;
+    count = addingPath->pathdata.Count;
+
+    if(!lengthen_path(path, count))
+        return OutOfMemory;
+
+    memcpy(&path->pathdata.Points[old_count], addingPath->pathdata.Points,
+           count * sizeof(GpPointF));
+    memcpy(&path->pathdata.Types[old_count], addingPath->pathdata.Types, count);
+
+    if(path->newfigure || !connect)
+        path->pathdata.Types[old_count] = PathPointTypeStart;
+    else
+        path->pathdata.Types[old_count] = PathPointTypeLine;
+
+    path->newfigure = FALSE;
+    path->pathdata.Count += count;
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipAddPathPie(GpPath *path, REAL x, REAL y, REAL width, REAL height,
+    REAL startAngle, REAL sweepAngle)
+{
+    GpPointF *ptf;
+    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;
+
+    /* on zero width/height only start point added */
+    if(width <= 1e-7 || height <= 1e-7){
+        if(!lengthen_path(path, 1))
+            return OutOfMemory;
+        path->pathdata.Points[0].X = x + width  / 2.0;
+        path->pathdata.Points[0].Y = y + height / 2.0;
+        path->pathdata.Types[0] = PathPointTypeStart | PathPointTypeCloseSubpath;
+        path->pathdata.Count = 1;
+        return InvalidParameter;
+    }
+
+    count = arc2polybezier(NULL, x, y, width, height, startAngle, sweepAngle);
+
+    if(count == 0)
+        return Ok;
+
+    ptf = GdipAlloc(sizeof(GpPointF)*count);
+    if(!ptf)
+        return OutOfMemory;
+
+    arc2polybezier(ptf, x, y, width, height, startAngle, sweepAngle);
+
+    status = GdipAddPathLine(path, (width - x)/2, (height - y)/2, ptf[0].X, ptf[0].Y);
+    if(status != Ok){
+        GdipFree(ptf);
+        return status;
+    }
+    /* one spline is already added as a line endpoint */
+    if(!lengthen_path(path, count - 1)){
+        GdipFree(ptf);
+        return OutOfMemory;
+    }
+
+    memcpy(&(path->pathdata.Points[path->pathdata.Count]), &(ptf[1]),sizeof(GpPointF)*(count-1));
+    for(i = 0; i < count-1; i++)
+        path->pathdata.Types[path->pathdata.Count+i] = PathPointTypeBezier;
+
+    path->pathdata.Count += count-1;
+
+    GdipClosePathFigure(path);
+
+    GdipFree(ptf);
+
+    return status;
+}
+
+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 GdipAddPathPie(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle);
+}
+
+GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count)
+{
+    INT old_count;
+
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
+    if(!path || !points || count < 3)
+        return InvalidParameter;
+
+    if(!lengthen_path(path, count))
+        return OutOfMemory;
+
+    old_count = path->pathdata.Count;
+
+    memcpy(&path->pathdata.Points[old_count], points, count*sizeof(GpPointF));
+    memset(&path->pathdata.Types[old_count + 1], PathPointTypeLine, count - 1);
+
+    /* A polygon is an intrinsic figure */
+    path->pathdata.Types[old_count] = PathPointTypeStart;
+    path->pathdata.Types[old_count + count - 1] |= PathPointTypeCloseSubpath;
+    path->newfigure = TRUE;
+    path->pathdata.Count += count;
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipAddPathPolygonI(GpPath *path, GDIPCONST GpPoint *points, INT count)
+{
+    GpPointF *ptf;
+    GpStatus status;
+    INT i;
+
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
+    if(!points || count < 3)
+        return InvalidParameter;
+
+    ptf = GdipAlloc(sizeof(GpPointF) * count);
+    if(!ptf)
+        return OutOfMemory;
+
+    for(i = 0; i < count; i++){
+        ptf[i].X = (REAL)points[i].X;
+        ptf[i].Y = (REAL)points[i].Y;
+    }
+
+    status = GdipAddPathPolygon(path, ptf, count);
+
+    GdipFree(ptf);
+
+    return status;
+}
+
+GpStatus WINGDIPAPI GdipAddPathString(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat* format)
+{
+    FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format);
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipAddPathStringI(GpPath* path, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFontFamily* family, INT style, REAL emSize, GDIPCONST Rect* layoutRect, GDIPCONST GpStringFormat* format)
+{
+    FIXME("(%p, %p, %d, %p, %d, %f, %p, %p): stub\n", path, string, length, family, style, emSize, layoutRect, format);
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipClonePath(GpPath* path, GpPath **clone)
+{
+    TRACE("(%p, %p)\n", path, clone);
+
+    if(!path || !clone)
+        return InvalidParameter;
+
+    *clone = GdipAlloc(sizeof(GpPath));
+    if(!*clone) return OutOfMemory;
+
+    **clone = *path;
+
+    (*clone)->pathdata.Points = GdipAlloc(path->datalen * sizeof(PointF));
+    (*clone)->pathdata.Types = GdipAlloc(path->datalen);
+    if(!(*clone)->pathdata.Points || !(*clone)->pathdata.Types){
+        GdipFree(*clone);
+        GdipFree((*clone)->pathdata.Points);
+        GdipFree((*clone)->pathdata.Types);
+        return OutOfMemory;
+    }
+
+    memcpy((*clone)->pathdata.Points, path->pathdata.Points,
+           path->datalen * sizeof(PointF));
+    memcpy((*clone)->pathdata.Types, path->pathdata.Types, path->datalen);
 
     return Ok;
 }
 
 GpStatus WINGDIPAPI GdipClosePathFigure(GpPath* path)
 {
+    TRACE("(%p)\n", path);
+
     if(!path)
         return InvalidParameter;
 
@@ -140,6 +890,8 @@ GpStatus WINGDIPAPI GdipClosePathFigures(GpPath* path)
 {
     INT i;
 
+    TRACE("(%p)\n", path);
+
     if(!path)
         return InvalidParameter;
 
@@ -155,20 +907,79 @@ GpStatus WINGDIPAPI GdipClosePathFigures(GpPath* path)
 
 GpStatus WINGDIPAPI GdipCreatePath(GpFillMode fill, GpPath **path)
 {
+    TRACE("(%d, %p)\n", fill, path);
+
+    if(!path)
+        return InvalidParameter;
+
+    *path = GdipAlloc(sizeof(GpPath));
+    if(!*path)  return OutOfMemory;
+
+    (*path)->fill = fill;
+    (*path)->newfigure = TRUE;
+
+    return Ok;
+}
+
+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;
 
     *path = GdipAlloc(sizeof(GpPath));
     if(!*path)  return OutOfMemory;
 
+    (*path)->pathdata.Points = GdipAlloc(count * sizeof(PointF));
+    (*path)->pathdata.Types = GdipAlloc(count);
+
+    if(!(*path)->pathdata.Points || !(*path)->pathdata.Types){
+        GdipFree((*path)->pathdata.Points);
+        GdipFree((*path)->pathdata.Types);
+        GdipFree(*path);
+        return OutOfMemory;
+    }
+
+    memcpy((*path)->pathdata.Points, points, count * sizeof(PointF));
+    memcpy((*path)->pathdata.Types, types, count);
+    (*path)->pathdata.Count = count;
+    (*path)->datalen = count;
+
     (*path)->fill = fill;
     (*path)->newfigure = TRUE;
 
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipCreatePath2I(GDIPCONST GpPoint* points,
+    GDIPCONST BYTE* types, INT count, GpFillMode fill, GpPath **path)
+{
+    GpPointF *ptF;
+    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++){
+        ptF[i].X = (REAL)points[i].X;
+        ptF[i].Y = (REAL)points[i].Y;
+    }
+
+    ret = GdipCreatePath2(ptF, types, count, fill, path);
+
+    GdipFree(ptF);
+
+    return ret;
+}
+
 GpStatus WINGDIPAPI GdipDeletePath(GpPath *path)
 {
+    TRACE("(%p)\n", path);
+
     if(!path)
         return InvalidParameter;
 
@@ -179,8 +990,129 @@ GpStatus WINGDIPAPI GdipDeletePath(GpPath *path)
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipFlattenPath(GpPath *path, GpMatrix* matrix, REAL flatness)
+{
+    path_list_node_t *list, *node;
+    GpPointF pt;
+    INT i = 1;
+    INT startidx = 0;
+
+    TRACE("(%p, %p, %.2f)\n", path, matrix, flatness);
+
+    if(!path)
+        return InvalidParameter;
+
+    if(matrix){
+        WARN("transformation not supported yet!\n");
+        return NotImplemented;
+    }
+
+    if(path->pathdata.Count == 0)
+        return Ok;
+
+    pt = path->pathdata.Points[0];
+    if(!init_path_list(&list, pt.X, pt.Y))
+        return OutOfMemory;
+
+    node = list;
+
+    while(i < path->pathdata.Count){
+
+        BYTE type = path->pathdata.Types[i] & PathPointTypePathTypeMask;
+        path_list_node_t *start;
+
+        pt = path->pathdata.Points[i];
+
+        /* save last start point index */
+        if(type == PathPointTypeStart)
+            startidx = i;
+
+        /* always add line points and start points */
+        if((type == PathPointTypeStart) || (type == PathPointTypeLine)){
+            if(!add_path_list_node(node, pt.X, pt.Y, path->pathdata.Types[i]))
+                goto memout;
+
+            node = node->next;
+            ++i;
+            continue;
+        }
+
+        /* Bezier curve always stored as 4 points */
+        if((path->pathdata.Types[i-1] & PathPointTypePathTypeMask) != PathPointTypeStart){
+            type = (path->pathdata.Types[i] & ~PathPointTypePathTypeMask) | PathPointTypeLine;
+            if(!add_path_list_node(node, pt.X, pt.Y, type))
+                goto memout;
+
+            node = node->next;
+        }
+
+        /* test for closed figure */
+        if(path->pathdata.Types[i+1] & PathPointTypeCloseSubpath){
+            pt = path->pathdata.Points[startidx];
+            ++i;
+        }
+        else
+        {
+            i += 2;
+            pt = path->pathdata.Points[i];
+        };
+
+        start = node;
+        /* add Bezier end point */
+        type = (path->pathdata.Types[i] & ~PathPointTypePathTypeMask) | PathPointTypeLine;
+        if(!add_path_list_node(node, pt.X, pt.Y, type))
+            goto memout;
+        node = node->next;
+
+        /* flatten curve */
+        if(!flatten_bezier(start, path->pathdata.Points[i-2].X, path->pathdata.Points[i-2].Y,
+                                  path->pathdata.Points[i-1].X, path->pathdata.Points[i-1].Y,
+                           node, flatness))
+            goto memout;
+
+        ++i;
+    }/* while */
+
+    /* store path data back */
+    i = path_list_count(list);
+    if(!lengthen_path(path, i))
+        goto memout;
+    path->pathdata.Count = i;
+
+    node = list;
+    for(i = 0; i < path->pathdata.Count; i++){
+        path->pathdata.Points[i] = node->pt;
+        path->pathdata.Types[i]  = node->type;
+        node = node->next;
+    }
+
+    free_path_list(list);
+    return Ok;
+
+memout:
+    free_path_list(list);
+    return OutOfMemory;
+}
+
+GpStatus WINGDIPAPI GdipGetPathData(GpPath *path, GpPathData* pathData)
+{
+    TRACE("(%p, %p)\n", path, pathData);
+
+    if(!path || !pathData)
+        return InvalidParameter;
+
+    /* Only copy data. pathData allocation/freeing controlled by wrapper class.
+       Assumed that pathData is enough wide to get all data - controlled by wrapper too. */
+    memcpy(pathData->Points, path->pathdata.Points, sizeof(PointF) * pathData->Count);
+    memcpy(pathData->Types , path->pathdata.Types , pathData->Count);
+
+    return Ok;
+}
+
 GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath *path, GpFillMode *fillmode)
 {
+    TRACE("(%p, %p)\n", path, fillmode);
+
     if(!path || !fillmode)
         return InvalidParameter;
 
@@ -189,8 +1121,26 @@ GpStatus WINGDIPAPI GdipGetPathFillMode(GpPath *path, GpFillMode *fillmode)
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipGetPathLastPoint(GpPath* path, GpPointF* lastPoint)
+{
+    INT count;
+
+    TRACE("(%p, %p)\n", path, lastPoint);
+
+    if(!path || !lastPoint)
+        return InvalidParameter;
+
+    count = path->pathdata.Count;
+    if(count > 0)
+        *lastPoint = path->pathdata.Points[count-1];
+
+    return Ok;
+}
+
 GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count)
 {
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
     if(!path)
         return InvalidParameter;
 
@@ -202,8 +1152,35 @@ GpStatus WINGDIPAPI GdipGetPathPoints(GpPath *path, GpPointF* points, INT count)
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipGetPathPointsI(GpPath *path, GpPoint* points, INT count)
+{
+    GpStatus ret;
+    GpPointF *ptf;
+    INT i;
+
+    TRACE("(%p, %p, %d)\n", path, points, count);
+
+    if(count <= 0)
+        return InvalidParameter;
+
+    ptf = GdipAlloc(sizeof(GpPointF)*count);
+    if(!ptf)    return OutOfMemory;
+
+    ret = GdipGetPathPoints(path,ptf,count);
+    if(ret == Ok)
+        for(i = 0;i < count;i++){
+            points[i].X = roundr(ptf[i].X);
+            points[i].Y = roundr(ptf[i].Y);
+        };
+    GdipFree(ptf);
+
+    return ret;
+}
+
 GpStatus WINGDIPAPI GdipGetPathTypes(GpPath *path, BYTE* types, INT count)
 {
+    TRACE("(%p, %p, %d)\n", path, types, count);
+
     if(!path)
         return InvalidParameter;
 
@@ -226,6 +1203,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;
@@ -300,8 +1279,30 @@ GpStatus WINGDIPAPI GdipGetPathWorldBounds(GpPath* path, GpRectF* bounds,
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipGetPathWorldBoundsI(GpPath* path, GpRect* bounds,
+    GDIPCONST GpMatrix *matrix, GDIPCONST GpPen *pen)
+{
+    GpStatus ret;
+    GpRectF boundsF;
+
+    TRACE("(%p, %p, %p, %p)\n", path, bounds, matrix, pen);
+
+    ret = GdipGetPathWorldBounds(path,&boundsF,matrix,pen);
+
+    if(ret == Ok){
+        bounds->X      = roundr(boundsF.X);
+        bounds->Y      = roundr(boundsF.Y);
+        bounds->Width  = roundr(boundsF.Width);
+        bounds->Height = roundr(boundsF.Height);
+    }
+
+    return ret;
+}
+
 GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count)
 {
+    TRACE("(%p, %p)\n", path, count);
+
     if(!path)
         return InvalidParameter;
 
@@ -310,8 +1311,124 @@ GpStatus WINGDIPAPI GdipGetPointCount(GpPath *path, INT *count)
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipReversePath(GpPath* path)
+{
+    INT i, count;
+    INT start = 0; /* position in reversed path */
+    GpPathData revpath;
+
+    TRACE("(%p)\n", path);
+
+    if(!path)
+        return InvalidParameter;
+
+    count = path->pathdata.Count;
+
+    if(count == 0) return Ok;
+
+    revpath.Points = GdipAlloc(sizeof(GpPointF)*count);
+    revpath.Types  = GdipAlloc(sizeof(BYTE)*count);
+    revpath.Count  = count;
+    if(!revpath.Points || !revpath.Types){
+        GdipFree(revpath.Points);
+        GdipFree(revpath.Types);
+        return OutOfMemory;
+    }
+
+    for(i = 0; i < count; i++){
+
+        /* find next start point */
+        if(path->pathdata.Types[count-i-1] == PathPointTypeStart){
+            INT j;
+            for(j = start; j <= i; j++){
+                revpath.Points[j] = path->pathdata.Points[count-j-1];
+                revpath.Types[j] = path->pathdata.Types[count-j-1];
+            }
+            /* mark start point */
+            revpath.Types[start] = PathPointTypeStart;
+            /* set 'figure' endpoint type */
+            if(i-start > 1){
+                revpath.Types[i] = path->pathdata.Types[count-start-1] & ~PathPointTypePathTypeMask;
+                revpath.Types[i] |= revpath.Types[i-1];
+            }
+            else
+                revpath.Types[i] = path->pathdata.Types[start];
+
+            start = i+1;
+        }
+    }
+
+    memcpy(path->pathdata.Points, revpath.Points, sizeof(GpPointF)*count);
+    memcpy(path->pathdata.Types,  revpath.Types,  sizeof(BYTE)*count);
+
+    GdipFree(revpath.Points);
+    GdipFree(revpath.Types);
+
+    return Ok;
+}
+
+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);
+}
+
+GpStatus WINGDIPAPI GdipIsOutlineVisiblePathPoint(GpPath* path, REAL x, REAL y,
+    GpPen *pen, GpGraphics *graphics, BOOL *result)
+{
+    static int calls;
+
+    if(!path || !pen)
+        return InvalidParameter;
+
+    if(!(calls++))
+        FIXME("not implemented\n");
+
+    return NotImplemented;
+}
+
+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);
+}
+
+/*****************************************************************************
+ * GdipIsVisiblePathPoint [GDIPLUS.@]
+ */
+GpStatus WINGDIPAPI GdipIsVisiblePathPoint(GpPath* path, REAL x, REAL y, GpGraphics *graphics, BOOL *result)
+{
+    GpRegion *region;
+    HRGN hrgn;
+    GpStatus status;
+
+    if(!path || !result) return InvalidParameter;
+
+    status = GdipCreateRegionPath(path, &region);
+    if(status != Ok)
+        return status;
+
+    status = GdipGetRegionHRgn(region, graphics, &hrgn);
+    if(status != Ok){
+        GdipDeleteRegion(region);
+        return status;
+    }
+
+    *result = PtInRegion(hrgn, roundr(x), roundr(y));
+
+    DeleteObject(hrgn);
+    GdipDeleteRegion(region);
+
+    return Ok;
+}
+
 GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path)
 {
+    TRACE("(%p)\n", path);
+
     if(!path)
         return InvalidParameter;
 
@@ -322,6 +1439,8 @@ GpStatus WINGDIPAPI GdipStartPathFigure(GpPath *path)
 
 GpStatus WINGDIPAPI GdipResetPath(GpPath *path)
 {
+    TRACE("(%p)\n", path);
+
     if(!path)
         return InvalidParameter;
 
@@ -332,14 +1451,203 @@ GpStatus WINGDIPAPI GdipResetPath(GpPath *path)
     return Ok;
 }
 
+GpStatus WINGDIPAPI GdipSetPathFillMode(GpPath *path, GpFillMode fill)
+{
+    TRACE("(%p, %d)\n", path, fill);
+
+    if(!path)
+        return InvalidParameter;
+
+    path->fill = fill;
+
+    return Ok;
+}
+
 GpStatus WINGDIPAPI GdipTransformPath(GpPath *path, GpMatrix *matrix)
 {
+    TRACE("(%p, %p)\n", path, matrix);
+
     if(!path)
         return InvalidParameter;
 
     if(path->pathdata.Count == 0)
         return Ok;
 
-    return GdipTransformMatrixPoints(matrix, (GpPointF*) path->pathdata.Points,
+    return GdipTransformMatrixPoints(matrix, path->pathdata.Points,
                                      path->pathdata.Count);
 }
+
+GpStatus WINGDIPAPI GdipWarpPath(GpPath *path, GpMatrix* matrix,
+    GDIPCONST GpPointF *points, INT count, REAL x, REAL y, REAL width,
+    REAL height, WarpMode warpmode, REAL flatness)
+{
+    FIXME("(%p,%p,%p,%i,%0.2f,%0.2f,%0.2f,%0.2f,%i,%0.2f)\n", path, matrix,
+        points, count, x, y, width, height, warpmode, flatness);
+
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipWidenPath(GpPath *path, GpPen *pen, GpMatrix *matrix,
+    REAL flatness)
+{
+    FIXME("(%p,%p,%p,%0.2f)\n", path, pen, matrix, flatness);
+
+    return NotImplemented;
+}
+
+GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y,
+    REAL width, REAL height)
+{
+    GpPath *backup;
+    GpPointF ptf[2];
+    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;
+
+    /* make a backup copy of path data */
+    if((retstat = GdipClonePath(path, &backup)) != Ok)
+        return retstat;
+
+    /* rectangle should start as new path */
+    old_new = path->newfigure;
+    path->newfigure = TRUE;
+    if((retstat = GdipAddPathLine(path,x,y,x+width,y)) != Ok){
+        path->newfigure = old_new;
+        goto fail;
+    }
+
+    ptf[0].X = x+width;
+    ptf[0].Y = y+height;
+    ptf[1].X = x;
+    ptf[1].Y = y+height;
+
+    if((retstat = GdipAddPathLine2(path, ptf, 2)) != Ok)  goto fail;
+    path->pathdata.Types[path->pathdata.Count-1] |= PathPointTypeCloseSubpath;
+
+    /* free backup */
+    GdipDeletePath(backup);
+    return Ok;
+
+fail:
+    /* reverting */
+    GdipDeletePath(path);
+    GdipClonePath(backup, &path);
+    GdipDeletePath(backup);
+
+    return retstat;
+}
+
+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);
+}
+
+GpStatus WINGDIPAPI GdipAddPathRectangles(GpPath *path, GDIPCONST GpRectF *rects, INT count)
+{
+    GpPath *backup;
+    GpStatus retstat;
+    INT i;
+
+    TRACE("(%p, %p, %d)\n", path, rects, count);
+
+    /* count == 0 - verified condition  */
+    if(!path || !rects || count == 0)
+        return InvalidParameter;
+
+    if(count < 0)
+        return OutOfMemory;
+
+    /* make a backup copy */
+    if((retstat = GdipClonePath(path, &backup)) != Ok)
+        return retstat;
+
+    for(i = 0; i < count; i++){
+        if((retstat = GdipAddPathRectangle(path,rects[i].X,rects[i].Y,rects[i].Width,rects[i].Height)) != Ok)
+            goto fail;
+    }
+
+    /* free backup */
+    GdipDeletePath(backup);
+    return Ok;
+
+fail:
+    /* reverting */
+    GdipDeletePath(path);
+    GdipClonePath(backup, &path);
+    GdipDeletePath(backup);
+
+    return retstat;
+}
+
+GpStatus WINGDIPAPI GdipAddPathRectanglesI(GpPath *path, GDIPCONST GpRect *rects, INT count)
+{
+    GpRectF *rectsF;
+    GpStatus retstat;
+    INT i;
+
+    TRACE("(%p, %p, %d)\n", path, rects, count);
+
+    if(!rects || count == 0)
+        return InvalidParameter;
+
+    if(count < 0)
+        return OutOfMemory;
+
+    rectsF = GdipAlloc(sizeof(GpRectF)*count);
+
+    for(i = 0;i < count;i++){
+        rectsF[i].X      = (REAL)rects[i].X;
+        rectsF[i].Y      = (REAL)rects[i].Y;
+        rectsF[i].Width  = (REAL)rects[i].Width;
+        rectsF[i].Height = (REAL)rects[i].Height;
+    }
+
+    retstat = GdipAddPathRectangles(path, rectsF, count);
+    GdipFree(rectsF);
+
+    return retstat;
+}
+
+GpStatus WINGDIPAPI GdipSetPathMarker(GpPath* path)
+{
+    INT count;
+
+    TRACE("(%p)\n", path);
+
+    if(!path)
+        return InvalidParameter;
+
+    count = path->pathdata.Count;
+
+    /* set marker flag */
+    if(count > 0)
+        path->pathdata.Types[count-1] |= PathPointTypePathMarker;
+
+    return Ok;
+}
+
+GpStatus WINGDIPAPI GdipClearPathMarkers(GpPath* path)
+{
+    INT count;
+    INT i;
+
+    TRACE("(%p)\n", path);
+
+    if(!path)
+        return InvalidParameter;
+
+    count = path->pathdata.Count;
+
+    for(i = 0; i < count - 1; i++){
+        path->pathdata.Types[i] &= ~PathPointTypePathMarker;
+    }
+
+    return Ok;
+}