[NtGDI]
authorJames Tabor <james.tabor@reactos.org>
Thu, 8 Sep 2016 22:37:41 +0000 (22:37 +0000)
committerJames Tabor <james.tabor@reactos.org>
Thu, 8 Sep 2016 22:37:41 +0000 (22:37 +0000)
- Fix Path issues, Sync/Port wine. See CORE-4990 (Fill Path painting?), CORE-9612 (Fixed) and CORE-11916 (Fixed). Maybe more.
- Pen width might be related to another issue outside Path. See CORE-2527.

svn path=/trunk/; revision=72625

reactos/win32ss/gdi/ntgdi/arc.c
reactos/win32ss/gdi/ntgdi/dclife.c
reactos/win32ss/gdi/ntgdi/dcobjs.c
reactos/win32ss/gdi/ntgdi/dcstate.c
reactos/win32ss/gdi/ntgdi/path.c
reactos/win32ss/gdi/ntgdi/path.h

index ddbc68b..16e63e5 100644 (file)
@@ -211,6 +211,7 @@ IntGdiArcInternal(
                YStartArc,
                  XEndArc,
                  YEndArc,
+                       0,
                  arctype);
   }
 
index 21e38e5..b1c7d52 100644 (file)
@@ -387,8 +387,13 @@ DC_vCleanup(PVOID ObjectBody)
     /* Free CLIPOBJ resources */
     IntEngFreeClipResources(&pdc->co);
 
-    PATH_Delete(pdc->dclevel.hPath);
-
+    if (pdc->dclevel.hPath)
+    {
+       DPRINT("DC_vCleanup Path\n");
+       PATH_Delete(pdc->dclevel.hPath);
+       pdc->dclevel.hPath = 0;
+       pdc->dclevel.flPath = 0;
+    }
     if(pdc->dclevel.pSurface)
         SURFACE_ShareUnlockSurface(pdc->dclevel.pSurface);
 
index a4c263c..1497485 100644 (file)
@@ -496,7 +496,7 @@ NtGdiSelectClipPath(
     int Mode)
 {
     PREGION  RgnPath;
-    PPATH pPath;
+    PPATH pPath, pNewPath;
     BOOL  success = FALSE;
     PDC_ATTR pdcattr;
     PDC pdc;
@@ -520,8 +520,8 @@ NtGdiSelectClipPath(
     if (pPath->state != PATH_Closed)
     {
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-        DC_UnlockDc(pdc);
-        return FALSE;
+        success = FALSE;
+        goto Exit;
     }
 
     /* Construct a region from the path */
@@ -533,24 +533,23 @@ NtGdiSelectClipPath(
         return FALSE;
     }
 
-    if (!PATH_PathToRegion(pPath, pdcattr->jFillMode, RgnPath))
-    {
-        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-        REGION_Delete(RgnPath);
-        DC_UnlockDc(pdc);
-        return FALSE;
-    }
+    pNewPath = PATH_FlattenPath(pPath);
 
-    success = IntGdiExtSelectClipRgn(pdc, RgnPath, Mode) != ERROR;
-    REGION_Delete(RgnPath);
+    success = PATH_PathToRegion(pNewPath, pdcattr->jFillMode, RgnPath);
 
-    /* Empty the path */
-    if (success)
-        PATH_EmptyPath(pPath);
+    PATH_UnlockPath(pNewPath);
+    PATH_Delete(pNewPath->BaseObject.hHmgr);
 
-    /* FIXME: Should this function delete the path even if it failed? */
+    if (success) success = IntGdiExtSelectClipRgn(pdc, RgnPath, Mode) != ERROR;
 
+    REGION_Delete(RgnPath);
+
+Exit:
     PATH_UnlockPath(pPath);
+    PATH_Delete(pdc->dclevel.hPath);
+    pdc->dclevel.flPath &= ~DCPATH_ACTIVE;
+    pdc->dclevel.hPath = NULL;
+
     DC_UnlockDc(pdc);
 
     return success;
index 5a18c65..8902d95 100644 (file)
@@ -88,6 +88,18 @@ IntGdiCleanDC(HDC hDC)
         DC_vUpdateTextBrush(dc);
     }
 
+    // Remove Path and reset flags.
+    if (dc->dclevel.hPath)
+    {
+        DPRINT("Clean DC Remove Path\n");
+        if (!PATH_Delete(dc->dclevel.hPath))
+        {
+           DPRINT1("Failed to remove Path\n");
+        }
+        dc->dclevel.hPath = 0;
+        dc->dclevel.flPath = 0;
+    }
+
     /* DC_vCopyState frees the Clip rgn and the Meta rgn. Take care of the other ones
      * There is no need to clear prgnVis, as UserGetDC updates it immediately. */
     if (dc->prgnRao)
@@ -175,13 +187,9 @@ DC_vRestoreDC(
             if (pdc->dctype == DCTYPE_MEMORY)
                 DC_vSelectSurface(pdc, pdcSave->dclevel.pSurface);
 
-            // Restore Path by removing it, if the Save flag is set.
-            // BeginPath will takecare of the rest.
-            if (pdc->dclevel.hPath && pdc->dclevel.flPath & DCPATH_SAVE)
+            if (pdcSave->dclevel.hPath)
             {
-                PATH_Delete(pdc->dclevel.hPath);
-                pdc->dclevel.hPath = 0;
-                pdc->dclevel.flPath &= ~DCPATH_SAVE;
+               PATH_RestorePath( pdc, pdcSave );
             }
         }
 
@@ -294,10 +302,11 @@ NtGdiSaveDC(
         DC_vSelectSurface(pdcSave, pdc->dclevel.pSurface);
 
     /* Copy path */
-    /* FIXME: Why this way? */
-    pdcSave->dclevel.hPath = pdc->dclevel.hPath;
+    if (pdc->dclevel.hPath)
+    {
+       PATH_SavePath( pdcSave, pdc );
+    }
     pdcSave->dclevel.flPath = pdc->dclevel.flPath | DCPATH_SAVESTATE;
-    if (pdcSave->dclevel.hPath) pdcSave->dclevel.flPath |= DCPATH_SAVE;
 
     /* Set new dc as save dc */
     pdcSave->dclevel.hdcSave = pdc->dclevel.hdcSave;
index 61de877..68f10ed 100644 (file)
 #endif
 
 #define NUM_ENTRIES_INITIAL 16  /* Initial size of points / flags arrays  */
+
 #define GROW_FACTOR_NUMER    2  /* Numerator of grow factor for the array */
 #define GROW_FACTOR_DENOM    1  /* Denominator of grow factor             */
 
+#if DBG
+static int PathCount = 0;
+#endif
+
 /***********************************************************************
  * Internal functions
  */
 
+PPATH FASTCALL
+PATH_CreatePath(int count)
+{
+    PPATH pPath = PATH_AllocPathWithHandle();
+
+    if (!pPath)
+    {
+        EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return NULL;
+    }
+
+    DPRINT("CreatePath p 0x%p\n", pPath);
+    // Path handles are shared. Also due to recursion with in the same thread.
+    GDIOBJ_vUnlockObject((POBJ)pPath);       // Unlock
+    pPath = PATH_LockPath(pPath->BaseObject.hHmgr); // Share Lock.
+
+    /* Make sure that path is empty */
+    PATH_EmptyPath(pPath);
+
+    count = max( NUM_ENTRIES_INITIAL, count );
+
+    pPath->numEntriesAllocated = count;
+
+    pPath->pPoints = (POINT *)ExAllocatePoolWithTag(PagedPool, count * sizeof(POINT), TAG_PATH);
+    RtlZeroMemory( pPath->pPoints, count * sizeof(POINT));
+    pPath->pFlags  =  (BYTE *)ExAllocatePoolWithTag(PagedPool, count * sizeof(BYTE),  TAG_PATH);
+    RtlZeroMemory( pPath->pFlags, count * sizeof(BYTE));
+
+    /* Initialize variables for new path */
+    pPath->numEntriesUsed = 0;
+    pPath->newStroke = TRUE;
+    pPath->state     = PATH_Open;
+    pPath->pos.x = pPath->pos.y = 0;
+#if DBG
+    PathCount++;
+    DPRINT("Create Path %d\n",PathCount);
+#endif
+    return pPath;
+}
+
 /* PATH_DestroyGdiPath
  *
  * Destroys a GdiPath structure (frees the memory in the arrays).
@@ -50,6 +95,10 @@ PATH_Delete(HPATH hPath)
     if (!pPath) return FALSE;
     PATH_DestroyGdiPath(pPath);
     GDIOBJ_vDeleteObject(&pPath->BaseObject);
+#if DBG
+    PathCount--;
+    DPRINT("Delete Path %d\n",PathCount);
+#endif
     return TRUE;
 }
 
@@ -84,97 +133,6 @@ GdiPathDPtoLP(
     return XFORMOBJ_bApplyXform(&xo, XF_LTOL, count, (PPOINTL)ppt, (PPOINTL)ppt);
 }
 
-/* PATH_FillPath
- *
- *
- */
-BOOL
-FASTCALL
-PATH_FillPath(
-    PDC dc,
-    PPATH pPath)
-{
-    //INT   mapMode, graphicsMode;
-    //SIZE  ptViewportExt, ptWindowExt;
-    //POINTL ptViewportOrg, ptWindowOrg;
-    XFORM xform;
-    PREGION  Rgn;
-    PDC_ATTR pdcattr = dc->pdcattr;
-
-    if (pPath->state != PATH_Closed)
-    {
-        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-        return FALSE;
-    }
-
-    /* Allocate a temporary region */
-    Rgn = IntSysCreateRectpRgn(0, 0, 0, 0);
-    if (!Rgn)
-    {
-        EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        return FALSE;
-    }
-
-    if (!PATH_PathToRegion(pPath, pdcattr->jFillMode, Rgn))
-    {
-        /* EngSetLastError ? */
-        REGION_Delete(Rgn);
-        return FALSE;
-    }
-
-    /* Since PaintRgn interprets the region as being in logical coordinates
-     * but the points we store for the path are already in device
-     * coordinates, we have to set the mapping mode to MM_TEXT temporarily.
-     * Using SaveDC to save information about the mapping mode / world
-     * transform would be easier but would require more overhead, especially
-     * now that SaveDC saves the current path.
-     */
-
-    /* Save the information about the old mapping mode */
-    //mapMode = pdcattr->iMapMode;
-    //ptViewportExt = pdcattr->szlViewportExt;
-    //ptViewportOrg = pdcattr->ptlViewportOrg;
-    //ptWindowExt   = pdcattr->szlWindowExt;
-    //ptWindowOrg   = pdcattr->ptlWindowOrg;
-
-    /* Save world transform
-     * NB: The Windows documentation on world transforms would lead one to
-     * believe that this has to be done only in GM_ADVANCED; however, my
-     * tests show that resetting the graphics mode to GM_COMPATIBLE does
-     * not reset the world transform.
-     */
-    MatrixS2XForm(&xform, &dc->pdcattr->mxWorldToPage);
-
-    /* Set MM_TEXT */
-//    IntGdiSetMapMode(dc, MM_TEXT);
-//    pdcattr->ptlViewportOrg.x = 0;
-//    pdcattr->ptlViewportOrg.y = 0;
-//    pdcattr->ptlWindowOrg.x = 0;
-//    pdcattr->ptlWindowOrg.y = 0;
-
-    // graphicsMode = pdcattr->iGraphicsMode;
-//    pdcattr->iGraphicsMode = GM_ADVANCED;
-//    IntGdiModifyWorldTransform(dc, &xform, MWT_IDENTITY);
-//    pdcattr->iGraphicsMode =  graphicsMode;
-
-    /* Paint the region */
-    IntGdiPaintRgn(dc, Rgn);
-    REGION_Delete(Rgn);
-    /* Restore the old mapping mode */
-//    IntGdiSetMapMode(dc, mapMode);
-//    pdcattr->szlViewportExt = ptViewportExt;
-//    pdcattr->ptlViewportOrg = ptViewportOrg;
-//    pdcattr->szlWindowExt   = ptWindowExt;
-//    pdcattr->ptlWindowOrg   = ptWindowOrg;
-
-    /* Go to GM_ADVANCED temporarily to restore the world transform */
-    //graphicsMode = pdcattr->iGraphicsMode;
-//    pdcattr->iGraphicsMode = GM_ADVANCED;
-//    IntGdiModifyWorldTransform(dc, &xform, MWT_MAX+1);
-//    pdcattr->iGraphicsMode = graphicsMode;
-    return TRUE;
-}
-
 /* PATH_InitGdiPath
  *
  * Initializes the GdiPath structure.
@@ -216,123 +174,242 @@ PATH_AssignGdiPath(
         return FALSE;
 
     /* Perform the copy operation */
-    memcpy(pPathDest->pPoints, pPathSrc->pPoints,
-           sizeof(POINT)*pPathSrc->numEntriesUsed);
-    memcpy(pPathDest->pFlags, pPathSrc->pFlags,
-           sizeof(BYTE)*pPathSrc->numEntriesUsed);
+    memcpy(pPathDest->pPoints, pPathSrc->pPoints, sizeof(POINT)*pPathSrc->numEntriesUsed);
+    memcpy(pPathDest->pFlags,  pPathSrc->pFlags,  sizeof(BYTE)*pPathSrc->numEntriesUsed);
 
+    pPathDest->pos = pPathSrc->pos;
     pPathDest->state = pPathSrc->state;
     pPathDest->numEntriesUsed = pPathSrc->numEntriesUsed;
     pPathDest->newStroke = pPathSrc->newStroke;
     return TRUE;
 }
 
-/* PATH_MoveTo
+BOOL PATH_SavePath( DC *dst, DC *src )
+{
+    PPATH pdstPath, psrcPath = PATH_LockPath(src->dclevel.hPath);
+    DPRINT("PATH_SavePath\n");
+    if (psrcPath)
+    {
+       DPRINT("PATH_SavePath 1\n");
+
+       pdstPath = PATH_CreatePath(psrcPath->numEntriesAllocated);
+
+       dst->dclevel.flPath = src->dclevel.flPath;
+
+       dst->dclevel.hPath = pdstPath->BaseObject.hHmgr;
+
+       PATH_AssignGdiPath(pdstPath, psrcPath);
+
+       PATH_UnlockPath(pdstPath);
+       PATH_UnlockPath(psrcPath);
+    }
+    return TRUE;
+}
+
+BOOL PATH_RestorePath( DC *dst, DC *src )
+{
+    DPRINT("PATH_RestorePath\n");
+
+    if (dst->dclevel.hPath == NULL)
+    {
+       PPATH pdstPath, psrcPath = PATH_LockPath(src->dclevel.hPath);
+       DPRINT("PATH_RestorePath 1\n");
+       pdstPath = PATH_CreatePath(psrcPath->numEntriesAllocated);
+       dst->dclevel.flPath = src->dclevel.flPath;
+       dst->dclevel.hPath = pdstPath->BaseObject.hHmgr;
+
+       PATH_AssignGdiPath(pdstPath, psrcPath);
+
+       PATH_UnlockPath(pdstPath);
+       PATH_UnlockPath(psrcPath);       
+    }
+    else
+    {
+       PPATH pdstPath, psrcPath = PATH_LockPath(src->dclevel.hPath);
+       pdstPath = PATH_LockPath(dst->dclevel.hPath);
+       DPRINT("PATH_RestorePath 2\n");
+       dst->dclevel.flPath = src->dclevel.flPath & (DCPATH_CLOCKWISE|DCPATH_ACTIVE);
+       PATH_AssignGdiPath(pdstPath, psrcPath);
+
+       PATH_UnlockPath(pdstPath);
+       PATH_UnlockPath(psrcPath);
+    }
+    return TRUE;
+}
+
+/* PATH_EmptyPath
  *
- * Should be called when a MoveTo is performed on a DC that has an
- * open path. This starts a new stroke. Returns TRUE if successful, else
- * FALSE.
+ * Removes all entries from the path and sets the path state to PATH_Null.
+ */
+VOID
+FASTCALL
+PATH_EmptyPath(PPATH pPath)
+{
+    ASSERT(pPath != NULL);
+
+    pPath->state = PATH_Null;
+    pPath->numEntriesUsed = 0;
+}
+
+/* PATH_AddEntry
+ *
+ * Adds an entry to the path. For "flags", pass either PT_MOVETO, PT_LINETO
+ * or PT_BEZIERTO, optionally ORed with PT_CLOSEFIGURE. Returns TRUE if
+ * successful, FALSE otherwise (e.g. if not enough memory was available).
  */
 BOOL
 FASTCALL
-PATH_MoveTo(
-    PDC dc)
+PATH_AddEntry(
+    PPATH pPath,
+    const POINT *pPoint,
+    BYTE flags)
 {
-    PPATH pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath) return FALSE;
+    ASSERT(pPath != NULL);
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        /* FIXME: Do we have to call SetLastError? */
+    /* FIXME: If newStroke is true, perhaps we want to check that we're
+     * getting a PT_MOVETO
+     */
+    DPRINT("(%d,%d) - %d\n", pPoint->x, pPoint->y, flags);
+
+    /* Reserve enough memory for an extra path entry */
+    if (!PATH_ReserveEntries(pPath, pPath->numEntriesUsed + 1))
         return FALSE;
-    }
-    /* Start a new stroke */
-    pPath->newStroke = TRUE;
-    PATH_UnlockPath(pPath);
+
+    /* Store information in path entry */
+    pPath->pPoints[pPath->numEntriesUsed] = *pPoint;
+    pPath->pFlags[pPath->numEntriesUsed] = flags;
+
+    /* Increment entry count */
+    pPath->numEntriesUsed++;
+
     return TRUE;
 }
 
-/* PATH_LineTo
+/* PATH_ReserveEntries
  *
- * Should be called when a LineTo is performed on a DC that has an
- * open path. This adds a PT_LINETO entry to the path (and possibly
- * a PT_MOVETO entry, if this is the first LineTo in a stroke).
- * Returns TRUE if successful, else FALSE.
+ * Ensures that at least "numEntries" entries (for points and flags) have
+ * been allocated; allocates larger arrays and copies the existing entries
+ * to those arrays, if necessary. Returns TRUE if successful, else FALSE.
  */
 BOOL
 FASTCALL
-PATH_LineTo(
-    PDC dc,
-    INT x,
-    INT y)
+PATH_ReserveEntries(
+    PPATH pPath,
+    INT numEntries)
 {
-    BOOL Ret;
-    PPATH pPath;
-    POINT point, pointCurPos;
+    INT numEntriesToAllocate;
+    POINT *pPointsNew;
+    BYTE *pFlagsNew;
 
-    pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath) return FALSE;
+    ASSERT(pPath != NULL);
+    ASSERT(numEntries >= 0);
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
+    /* Do we have to allocate more memory? */
+    if (numEntries > pPath->numEntriesAllocated)
     {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
+        /* Find number of entries to allocate. We let the size of the array
+         * grow exponentially, since that will guarantee linear time
+         * complexity. */
+        if (pPath->numEntriesAllocated)
+        {
+            numEntriesToAllocate = pPath->numEntriesAllocated;
+            while (numEntriesToAllocate < numEntries)
+                numEntriesToAllocate = numEntriesToAllocate * GROW_FACTOR_NUMER / GROW_FACTOR_DENOM;
+        }
+        else
+            numEntriesToAllocate = numEntries;
 
-    /* Convert point to device coordinates */
-    point.x = x;
-    point.y = y;
-    CoordLPtoDP(dc, &point);
+        /* Allocate new arrays */
+        pPointsNew = (POINT *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(POINT), TAG_PATH);
+        if (!pPointsNew)
+            return FALSE;
 
-    /* Add a PT_MOVETO if necessary */
-    if (pPath->newStroke)
-    {
-        pPath->newStroke = FALSE;
-        IntGetCurrentPositionEx(dc, &pointCurPos);
-        CoordLPtoDP(dc, &pointCurPos);
-        if (!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO))
+        pFlagsNew = (BYTE *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(BYTE), TAG_PATH);
+        if (!pFlagsNew)
         {
-            PATH_UnlockPath(pPath);
+            ExFreePoolWithTag(pPointsNew, TAG_PATH);
             return FALSE;
         }
+
+        /* Copy old arrays to new arrays and discard old arrays */
+        if (pPath->pPoints)
+        {
+            ASSERT(pPath->pFlags);
+
+            memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
+            memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
+
+            ExFreePoolWithTag(pPath->pPoints, TAG_PATH);
+            ExFreePoolWithTag(pPath->pFlags, TAG_PATH);
+        }
+
+        pPath->pPoints = pPointsNew;
+        pPath->pFlags = pFlagsNew;
+        pPath->numEntriesAllocated = numEntriesToAllocate;
     }
 
-    /* Add a PT_LINETO entry */
-    Ret = PATH_AddEntry(pPath, &point, PT_LINETO);
-    PATH_UnlockPath(pPath);
-    return Ret;
+    return TRUE;
 }
 
-/* PATH_Rectangle
+/* PATH_ScaleNormalizedPoint
  *
- * Should be called when a call to Rectangle is performed on a DC that has
- * an open path. Returns TRUE if successful, else FALSE.
+ * Scales a normalized point (x, y) with respect to the box whose corners are
+ * passed in "corners". The point is stored in "*pPoint". The normalized
+ * coordinates (-1.0, -1.0) correspond to corners[0], the coordinates
+ * (1.0, 1.0) correspond to corners[1].
  */
-BOOL
+VOID
 FASTCALL
-PATH_Rectangle(
-    PDC dc,
+PATH_ScaleNormalizedPoint(
+    FLOAT_POINT corners[],
+    double x,
+    double y,
+    POINT *pPoint)
+{
+    ASSERT(corners);
+    ASSERT(pPoint);
+
+    pPoint->x = GDI_ROUND((double)corners[0].x + (double)(corners[1].x - corners[0].x) * 0.5 * (x + 1.0));
+    pPoint->y = GDI_ROUND((double)corners[0].y + (double)(corners[1].y - corners[0].y) * 0.5 * (y + 1.0));
+}
+
+/* PATH_NormalizePoint
+ *
+ * Normalizes a point with respect to the box whose corners are passed in
+ * corners. The normalized coordinates are stored in *pX and *pY.
+ */
+VOID
+FASTCALL
+PATH_NormalizePoint(
+    FLOAT_POINT corners[],
+    const FLOAT_POINT *pPoint,
+    double *pX,
+    double *pY)
+{
+    ASSERT(corners);
+    ASSERT(pPoint);
+    ASSERT(pX);
+    ASSERT(pY);
+
+    *pX = (double)(pPoint->x - corners[0].x) / (double)(corners[1].x - corners[0].x) * 2.0 - 1.0;
+    *pY = (double)(pPoint->y - corners[0].y) / (double)(corners[1].y - corners[0].y) * 2.0 - 1.0;
+}
+
+/* PATH_CheckCorners
+ *
+ * Helper function for PATH_RoundRect() and PATH_Rectangle()
+ */
+BOOL
+PATH_CheckCorners(
+    DC *dc,
+    POINT corners[],
     INT x1,
     INT y1,
     INT x2,
     INT y2)
 {
-    PPATH pPath;
-    POINT corners[2], pointTemp;
-    INT   temp;
-
-    pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath) return FALSE;
-
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
+    INT temp;
+    PDC_ATTR pdcattr = dc->pdcattr;
 
     /* Convert points to device coordinates */
     corners[0].x = x1;
@@ -348,6 +425,7 @@ PATH_Rectangle(
         corners[0].x = corners[1].x;
         corners[1].x = temp;
     }
+
     if (corners[0].y > corners[1].y)
     {
         temp = corners[0].y;
@@ -356,40 +434,217 @@ PATH_Rectangle(
     }
 
     /* In GM_COMPATIBLE, don't include bottom and right edges */
-    if (dc->pdcattr->iGraphicsMode == GM_COMPATIBLE)
+    if (pdcattr->iGraphicsMode == GM_COMPATIBLE)
     {
+        if (corners[0].x == corners[1].x) {DPRINT1("PATH_CheckCorners GM_COMPATIBLE x\n"); return FALSE;}
+        if (corners[0].y == corners[1].y) {DPRINT1("PATH_CheckCorners GM_COMPATIBLE y\n"); return FALSE;}
         corners[1].x--;
         corners[1].y--;
     }
+    return TRUE;
+}
+
+/* add a number of points, converting them to device coords */
+/* return a pointer to the first type byte so it can be fixed up if necessary */
+static BYTE *add_log_points( DC *dc, PPATH path, const POINT *points,
+                             DWORD count, BYTE type )
+{
+    BYTE *ret;
+
+    if (!PATH_ReserveEntries( path, path->numEntriesUsed + count )) return NULL;
+
+    ret = &path->pFlags[path->numEntriesUsed];
+    memcpy( &path->pPoints[path->numEntriesUsed], points, count * sizeof(*points) );
+    IntLPtoDP( dc, &path->pPoints[path->numEntriesUsed], count );
+    memset( ret, type, count );
+    path->numEntriesUsed += count;
+    return ret;
+}
+
+/* add a number of points that are already in device coords */
+/* return a pointer to the first type byte so it can be fixed up if necessary */
+static BYTE *add_points( PPATH path, const POINT *points, DWORD count, BYTE type )
+{
+    BYTE *ret;
+
+    if (!PATH_ReserveEntries( path, path->numEntriesUsed + count )) return NULL;
+
+    ret = &path->pFlags[path->numEntriesUsed];
+    memcpy( &path->pPoints[path->numEntriesUsed], points, count * sizeof(*points) );
+    memset( ret, type, count );
+    path->numEntriesUsed += count;
+    return ret;
+}
+
+/* reverse the order of an array of points */
+static void reverse_points( POINT *points, UINT count )
+{
+    UINT i;
+    for (i = 0; i < count / 2; i++)
+    {
+        POINT pt = points[i];
+        points[i] = points[count - i - 1];
+        points[count - i - 1] = pt;
+    }
+}
+
+/* start a new path stroke if necessary */
+static BOOL start_new_stroke( PPATH path )
+{
+    if (!path->newStroke && path->numEntriesUsed &&
+        !(path->pFlags[path->numEntriesUsed - 1] & PT_CLOSEFIGURE) &&
+        path->pPoints[path->numEntriesUsed - 1].x == path->pos.x &&
+        path->pPoints[path->numEntriesUsed - 1].y == path->pos.y)
+        return TRUE;
+
+    path->newStroke = FALSE;
+    return add_points( path, &path->pos, 1, PT_MOVETO ) != NULL;
+}
+
+/* set current position to the last point that was added to the path */
+static void update_current_pos( PPATH path )
+{
+    assert( path->numEntriesUsed );
+    path->pos = path->pPoints[path->numEntriesUsed - 1];
+}
+
+/* close the current figure */
+static void close_figure( PPATH path )
+{
+    assert( path->numEntriesUsed );
+    path->pFlags[path->numEntriesUsed - 1] |= PT_CLOSEFIGURE;
+}
+
+/* add a number of points, starting a new stroke if necessary */
+static BOOL add_log_points_new_stroke( DC *dc, PPATH path, const POINT *points,
+                                       DWORD count, BYTE type )
+{
+    if (!start_new_stroke( path )) return FALSE;
+    if (!add_log_points( dc, path, points, count, type )) return FALSE;
+    update_current_pos( path );
+
+    DPRINT("ALPNS : Pos X %d Y %d\n",path->pos.x, path->pos.y);
+    IntGdiMoveToEx(dc, path->pos.x, path->pos.y, NULL);
+
+    return TRUE;
+}
+
+/* PATH_MoveTo
+ *
+ * Should be called when a MoveTo is performed on a DC that has an
+ * open path. This starts a new stroke. Returns TRUE if successful, else
+ * FALSE.
+ */
+BOOL
+FASTCALL
+PATH_MoveTo(
+    PDC dc,
+    PPATH pPath)
+{
+    if (!pPath) return FALSE;
+
+    // GDI32 : Signal from user space of a change in position.
+    if (dc->pdcattr->ulDirty_ & DIRTY_STYLESTATE)
+    {
+       DPRINT("MoveTo has changed\n");
+       pPath->newStroke = TRUE;
+       // Set position and clear the signal flag.
+       IntGetCurrentPositionEx(dc, &pPath->pos);
+       IntLPtoDP( dc, &pPath->pos, 1 );
+       return TRUE;
+    }
+
+    return FALSE;
+}
+
+/* PATH_LineTo
+ *
+ * Should be called when a LineTo is performed on a DC that has an
+ * open path. This adds a PT_LINETO entry to the path (and possibly
+ * a PT_MOVETO entry, if this is the first LineTo in a stroke).
+ * Returns TRUE if successful, else FALSE.
+ */
+BOOL
+FASTCALL
+PATH_LineTo(
+    PDC dc,
+    INT x,
+    INT y)
+{
+    BOOL Ret;
+    PPATH pPath;
+    POINT point, pointCurPos;
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+    point.x = x;
+    point.y = y;
+
+    // Coalesce a MoveTo point.
+    if ( !PATH_MoveTo(dc, pPath) )
+    {
+       /* Add a PT_MOVETO if necessary */
+       if (pPath->newStroke)
+       {
+           DPRINT("Line To : New Stroke\n");
+           pPath->newStroke = FALSE;
+           IntGetCurrentPositionEx(dc, &pointCurPos);
+           CoordLPtoDP(dc, &pointCurPos);
+           if (!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO))
+           {
+               PATH_UnlockPath(pPath);
+               return FALSE;
+           }
+       }
+    }
+    Ret = add_log_points_new_stroke( dc, pPath, &point, 1, PT_LINETO );
+    PATH_UnlockPath(pPath);
+    return Ret;
+}
+
+/* PATH_Rectangle
+ *
+ * Should be called when a call to Rectangle is performed on a DC that has
+ * an open path. Returns TRUE if successful, else FALSE.
+ */
+BOOL
+FASTCALL
+PATH_Rectangle(
+    PDC dc,
+    INT x1,
+    INT y1,
+    INT x2,
+    INT y2)
+{
+    PPATH pPath;
+    POINT corners[2], points[4];
+    BYTE *type;
 
-    /* Close any previous figure */
-    IntGdiCloseFigure(pPath);
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
 
-    /* Add four points to the path */
-    pointTemp.x = corners[1].x;
-    pointTemp.y = corners[0].y;
-    if (!PATH_AddEntry(pPath, &pointTemp, PT_MOVETO))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    if (!PATH_AddEntry(pPath, corners, PT_LINETO))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    pointTemp.x = corners[0].x;
-    pointTemp.y = corners[1].y;
-    if (!PATH_AddEntry(pPath, &pointTemp, PT_LINETO))
+    if (!PATH_CheckCorners(dc, corners, x1, y1, x2, y2))
     {
         PATH_UnlockPath(pPath);
-        return FALSE;
+        return TRUE;
     }
-    if (!PATH_AddEntry(pPath, corners + 1, PT_LINETO))
+
+    points[0].x = corners[1].x;
+    points[0].y = corners[0].y;
+    points[1]   = corners[0];
+    points[2].x = corners[0].x;
+    points[2].y = corners[1].y;
+    points[3]   = corners[1];
+
+    if (dc->dclevel.flPath & DCPATH_CLOCKWISE) reverse_points( points, 4 );
+
+    if (!(type = add_points( pPath, points, 4, PT_LINETO )))
     {
-        PATH_UnlockPath(pPath);
-        return FALSE;
+       PATH_UnlockPath(pPath);
+       return FALSE;
     }
+    type[0] = PT_MOVETO;
 
     /* Close the rectangle figure */
     IntGdiCloseFigure(pPath) ;
@@ -402,9 +657,6 @@ PATH_Rectangle(
  * Should be called when a call to RoundRect is performed on a DC that has
  * an open path. Returns TRUE if successful, else FALSE.
  *
- * FIXME: It adds the same entries to the path as windows does, but there
- * is an error in the bezier drawing code so that there are small pixel-size
- * gaps when the resulting path is drawn by StrokePath()
  */
 BOOL
 FASTCALL
@@ -417,78 +669,81 @@ PATH_RoundRect(
     INT ell_width,
     INT ell_height)
 {
+    const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */
     PPATH pPath;
-    POINT corners[2], pointTemp;
-    FLOAT_POINT ellCorners[2];
+    POINT corners[2], ellipse[2], points[16];
+    BYTE *type;
+    double width, height;
+
+    if (!ell_width || !ell_height) return PATH_Rectangle( dc, x1, y1, x2, y2 );
 
     pPath = PATH_LockPath(dc->dclevel.hPath);
     if (!pPath) return FALSE;
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-
     if (!PATH_CheckCorners(dc, corners, x1, y1, x2, y2))
     {
         PATH_UnlockPath(pPath);
-        return FALSE;
+        return TRUE;
     }
 
-    /* Add points to the roundrect path */
-    ellCorners[0].x = corners[1].x - ell_width;
-    ellCorners[0].y = corners[0].y;
-    ellCorners[1].x = corners[1].x;
-    ellCorners[1].y = corners[0].y + ell_height;
-    if (!PATH_DoArcPart(pPath, ellCorners, 0, -M_PI_2, PT_MOVETO))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    pointTemp.x = corners[0].x + ell_width / 2;
-    pointTemp.y = corners[0].y;
-    if (!PATH_AddEntry(pPath, &pointTemp, PT_LINETO))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    ellCorners[0].x = corners[0].x;
-    ellCorners[1].x = corners[0].x + ell_width;
-    if (!PATH_DoArcPart(pPath, ellCorners, -M_PI_2, -M_PI, FALSE))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    pointTemp.x = corners[0].x;
-    pointTemp.y = corners[1].y - ell_height / 2;
-    if (!PATH_AddEntry(pPath, &pointTemp, PT_LINETO))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    ellCorners[0].y = corners[1].y - ell_height;
-    ellCorners[1].y = corners[1].y;
-    if (!PATH_DoArcPart(pPath, ellCorners, M_PI, M_PI_2, FALSE))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    pointTemp.x = corners[1].x - ell_width / 2;
-    pointTemp.y = corners[1].y;
-    if (!PATH_AddEntry(pPath, &pointTemp, PT_LINETO))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    ellCorners[0].x = corners[1].x - ell_width;
-    ellCorners[1].x = corners[1].x;
-    if (!PATH_DoArcPart(pPath, ellCorners, M_PI_2, 0, FALSE))
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
+    ellipse[0].x = ellipse[0].y = 0;
+    ellipse[1].x = ell_width;
+    ellipse[1].y = ell_height;
+    IntLPtoDP( dc, &ellipse, 2 );
+    ell_width  = min( abs( ellipse[1].x - ellipse[0].x ), corners[1].x - corners[0].x );
+    ell_height = min( abs( ellipse[1].y - ellipse[0].y ), corners[1].y - corners[0].y );
+    width  = ell_width / 2.0;
+    height = ell_height / 2.0;
+
+    /* starting point */
+    points[0].x  = corners[1].x;
+    points[0].y  = corners[0].y + GDI_ROUND( height );
+    /* first curve */
+    points[1].x  = corners[1].x;
+    points[1].y  = corners[0].y + GDI_ROUND( height * (1 - factor) );
+    points[2].x  = corners[1].x - GDI_ROUND( width * (1 - factor) );
+    points[2].y  = corners[0].y;
+    points[3].x  = corners[1].x - GDI_ROUND( width );
+    points[3].y  = corners[0].y;
+    /* horizontal line */
+    points[4].x  = corners[0].x + GDI_ROUND( width );
+    points[4].y  = corners[0].y;
+    /* second curve */
+    points[5].x  = corners[0].x + GDI_ROUND( width * (1 - factor) );
+    points[5].y  = corners[0].y;
+    points[6].x  = corners[0].x;
+    points[6].y  = corners[0].y + GDI_ROUND( height * (1 - factor) );
+    points[7].x  = corners[0].x;
+    points[7].y  = corners[0].y + GDI_ROUND( height );
+    /* vertical line */
+    points[8].x  = corners[0].x;
+    points[8].y  = corners[1].y - GDI_ROUND( height );
+    /* third curve */
+    points[9].x  = corners[0].x;
+    points[9].y  = corners[1].y - GDI_ROUND( height * (1 - factor) );
+    points[10].x = corners[0].x + GDI_ROUND( width * (1 - factor) );
+    points[10].y = corners[1].y;
+    points[11].x = corners[0].x + GDI_ROUND( width );
+    points[11].y = corners[1].y;
+    /* horizontal line */
+    points[12].x = corners[1].x - GDI_ROUND( width );
+    points[12].y = corners[1].y;
+    /* fourth curve */
+    points[13].x = corners[1].x - GDI_ROUND( width * (1 - factor) );
+    points[13].y = corners[1].y;
+    points[14].x = corners[1].x;
+    points[14].y = corners[1].y - GDI_ROUND( height * (1 - factor) );
+    points[15].x = corners[1].x;
+    points[15].y = corners[1].y - GDI_ROUND( height );
+
+    if (dc->dclevel.flPath & DCPATH_CLOCKWISE) reverse_points( points, 16 );
+    if (!(type = add_points( pPath, points, 16, PT_BEZIERTO )))
+    {
+       PATH_UnlockPath(pPath);
+       return FALSE;
+    }
+    type[0] = PT_MOVETO;
+    type[4] = type[8] = type[12] = PT_LINETO;
 
     IntGdiCloseFigure(pPath);
     PATH_UnlockPath(pPath);
@@ -497,9 +752,6 @@ PATH_RoundRect(
 
 /* PATH_Ellipse
  *
- * Should be called when a call to Ellipse is performed on a DC that has
- * an open path. This adds four Bezier splines representing the ellipse
- * to the path. Returns TRUE if successful, else FALSE.
  */
 BOOL
 FASTCALL
@@ -510,18 +762,129 @@ PATH_Ellipse(
     INT x2,
     INT y2)
 {
+    const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */
     PPATH pPath;
-    /* TODO: This should probably be revised to call PATH_AngleArc */
-    /* (once it exists) */
-    BOOL Ret = PATH_Arc(dc, x1, y1, x2, y2, x1, (y1 + y2) / 2, x1, (y1 + y2) / 2, GdiTypeArc);
-    if (Ret)
+    POINT corners[2], points[13];
+    BYTE *type;
+    double width, height;
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+    if (!PATH_CheckCorners(dc, corners, x1, y1, x2, y2))
     {
-        pPath = PATH_LockPath(dc->dclevel.hPath);
-        if (!pPath) return FALSE;
-        IntGdiCloseFigure(pPath);
+        DPRINT1("PATH_Ellipse bad corners\n");
         PATH_UnlockPath(pPath);
+        return TRUE;
     }
-    return Ret;
+
+    width  = (corners[1].x - corners[0].x) / 2.0;
+    height = (corners[1].y - corners[0].y) / 2.0;
+
+    /* starting point */
+    points[0].x = corners[1].x;
+    points[0].y = corners[0].y + GDI_ROUND( height );
+    /* first curve */
+    points[1].x = corners[1].x;
+    points[1].y = corners[0].y + GDI_ROUND( height * (1 - factor) );
+    points[2].x = corners[1].x - GDI_ROUND( width * (1 - factor) );
+    points[2].y = corners[0].y;
+    points[3].x = corners[0].x + GDI_ROUND( width );
+    points[3].y = corners[0].y;
+    /* second curve */
+    points[4].x = corners[0].x + GDI_ROUND( width * (1 - factor) );
+    points[4].y = corners[0].y;
+    points[5].x = corners[0].x;
+    points[5].y = corners[0].y + GDI_ROUND( height * (1 - factor) );
+    points[6].x = corners[0].x;
+    points[6].y = corners[0].y + GDI_ROUND( height );
+    /* third curve */
+    points[7].x = corners[0].x;
+    points[7].y = corners[1].y - GDI_ROUND( height * (1 - factor) );
+    points[8].x = corners[0].x + GDI_ROUND( width * (1 - factor) );
+    points[8].y = corners[1].y;
+    points[9].x = corners[0].x + GDI_ROUND( width );
+    points[9].y = corners[1].y;
+    /* fourth curve */
+    points[10].x = corners[1].x - GDI_ROUND( width * (1 - factor) );
+    points[10].y = corners[1].y;
+    points[11].x = corners[1].x;
+    points[11].y = corners[1].y - GDI_ROUND( height * (1 - factor) );
+    points[12].x = corners[1].x;
+    points[12].y = corners[1].y - GDI_ROUND( height );
+
+    if (dc->dclevel.flPath & DCPATH_CLOCKWISE) reverse_points( points, 13 );
+    if (!(type = add_points( pPath, points, 13, PT_BEZIERTO )))
+    {
+        DPRINT1("PATH_Ellipse No add\n");
+        PATH_UnlockPath(pPath);
+        return FALSE;
+    }
+    type[0] = PT_MOVETO;
+
+    IntGdiCloseFigure(pPath);
+    PATH_UnlockPath(pPath);
+    return TRUE;
+}
+
+/* PATH_DoArcPart
+ *
+ * Creates a Bezier spline that corresponds to part of an arc and appends the
+ * corresponding points to the path. The start and end angles are passed in
+ * "angleStart" and "angleEnd"; these angles should span a quarter circle
+ * at most. If "startEntryType" is non-zero, an entry of that type for the first
+ * control point is added to the path; otherwise, it is assumed that the current
+ * position is equal to the first control point.
+ */
+BOOL
+FASTCALL
+PATH_DoArcPart(
+    PPATH pPath,
+    FLOAT_POINT corners[],
+    double angleStart,
+    double angleEnd,
+    BYTE startEntryType)
+{
+    double  halfAngle, a;
+    double  xNorm[4], yNorm[4];
+    POINT points[4];
+    BYTE *type;
+    int i, start;
+
+    ASSERT(fabs(angleEnd - angleStart) <= M_PI_2);
+
+    /* FIXME: Is there an easier way of computing this? */
+
+    /* Compute control points */
+    halfAngle = (angleEnd - angleStart) / 2.0;
+    if (fabs(halfAngle) > 1e-8)
+    {
+        a = 4.0 / 3.0 * (1 - cos(halfAngle)) / sin(halfAngle);
+        xNorm[0] = cos(angleStart);
+        yNorm[0] = sin(angleStart);
+        xNorm[1] = xNorm[0] - a * yNorm[0];
+        yNorm[1] = yNorm[0] + a * xNorm[0];
+        xNorm[3] = cos(angleEnd);
+        yNorm[3] = sin(angleEnd);
+        xNorm[2] = xNorm[3] + a * yNorm[3];
+        yNorm[2] = yNorm[3] - a * xNorm[3];
+    }
+    else
+        for (i = 0; i < 4; i++)
+        {
+            xNorm[i] = cos(angleStart);
+            yNorm[i] = sin(angleStart);
+        }
+
+    /* Add starting point to path if desired */
+    start = !startEntryType;
+
+    /* Add remaining control points */
+    for (i = start; i < 4; i++) PATH_ScaleNormalizedPoint(corners, xNorm[i], yNorm[i], &points[i]);
+    if (!(type = add_points( pPath, points + start, 4 - start, PT_BEZIERTO ))) return FALSE;
+    if (!start) type[0] = startEntryType;
+
+    return TRUE;
 }
 
 /* PATH_Arc
@@ -546,6 +909,7 @@ PATH_Arc(
     INT yStart,
     INT xEnd,
     INT yEnd,
+    INT direction,
     INT lines)
 {
     double  angleStart, angleEnd, angleStartQuadrant, angleEndQuadrant = 0.0;
@@ -566,14 +930,10 @@ PATH_Arc(
     pPath = PATH_LockPath(dc->dclevel.hPath);
     if (!pPath) return FALSE;
 
-    clockwise = ((dc->dclevel.flPath & DCPATH_CLOCKWISE) != 0);
-
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        Ret = FALSE;
-        goto ArcExit;
-    }
+    if (direction)
+       clockwise = ((direction == AD_CLOCKWISE) !=0 );
+    else
+       clockwise = ((dc->dclevel.flPath & DCPATH_CLOCKWISE) != 0);
 
     /* Check for zero height / width */
     /* FIXME: Only in GM_COMPATIBLE? */
@@ -697,7 +1057,11 @@ PATH_Arc(
     }
     while (!end);
 
-    /* chord: close figure. pie: add line and close figure */
+    if (lines == GdiTypeArcTo)
+    {
+       update_current_pos( pPath );
+    }
+    else /* chord: close figure. pie: add line and close figure */
     if (lines == GdiTypeChord) // 1
     {
         IntGdiCloseFigure(pPath);
@@ -721,9 +1085,8 @@ PATH_PolyBezierTo(
     const POINT *pts,
     DWORD cbPoints)
 {
-    POINT pt;
-    ULONG i;
     PPATH pPath;
+    BOOL ret;
 
     ASSERT(dc);
     ASSERT(pts);
@@ -732,35 +1095,10 @@ PATH_PolyBezierTo(
     pPath = PATH_LockPath(dc->dclevel.hPath);
     if (!pPath) return FALSE;
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-
-    /* Add a PT_MOVETO if necessary */
-    if (pPath->newStroke)
-    {
-        pPath->newStroke = FALSE;
-        IntGetCurrentPositionEx(dc, &pt);
-        CoordLPtoDP(dc, &pt);
-        if (!PATH_AddEntry(pPath, &pt, PT_MOVETO))
-        {
-            PATH_UnlockPath(pPath);
-            return FALSE;
-        }
-    }
-
-    for (i = 0; i < cbPoints; i++)
-    {
-        pt = pts[i];
-        CoordLPtoDP(dc, &pt);
-        PATH_AddEntry(pPath, &pt, PT_BEZIERTO);
-    }
+    ret = add_log_points_new_stroke( dc, pPath, pts, cbPoints, PT_BEZIERTO );
 
     PATH_UnlockPath(pPath);
-    return TRUE;
+    return ret;
 }
 
 BOOL
@@ -770,9 +1108,8 @@ PATH_PolyBezier(
     const POINT *pts,
     DWORD cbPoints)
 {
-    POINT pt;
-    ULONG i;
     PPATH pPath;
+    BYTE *type;
 
     ASSERT(dc);
     ASSERT(pts);
@@ -781,19 +1118,10 @@ PATH_PolyBezier(
     pPath = PATH_LockPath(dc->dclevel.hPath);
     if (!pPath) return FALSE;
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
+    type = add_log_points( dc, pPath, pts, cbPoints, PT_BEZIERTO );
+    if (!type) return FALSE;
 
-    for (i = 0; i < cbPoints; i++)
-    {
-        pt = pts[i];
-        CoordLPtoDP(dc, &pt);
-        PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO : PT_BEZIERTO);
-    }
+    type[0] = PT_MOVETO;
 
     PATH_UnlockPath(pPath);
     return TRUE;
@@ -808,10 +1136,8 @@ PATH_PolyDraw(
     DWORD cbPoints)
 {
     PPATH pPath;
-    POINT lastmove, orig_pos;
-    ULONG i;
-    PDC_ATTR pdcattr;
-    BOOL State = FALSE, Ret = FALSE;
+    POINT orig_pos, cur_pos;
+    ULONG i, lastmove = 0;
 
     pPath = PATH_LockPath(dc->dclevel.hPath);
     if (!pPath) return FALSE;
@@ -822,205 +1148,91 @@ PATH_PolyDraw(
         return FALSE;
     }
 
-    pdcattr = dc->pdcattr;
+    for (i = 0; i < pPath->numEntriesUsed; i++) if (pPath->pFlags[i] == PT_MOVETO) lastmove = i;
+    orig_pos = pPath->pos;
 
-    lastmove.x = orig_pos.x = pdcattr->ptlCurrent.x;
-    lastmove.y = orig_pos.y = pdcattr->ptlCurrent.y;
+    IntGetCurrentPositionEx(dc, &cur_pos);
 
-    i = pPath->numEntriesUsed;
+    DPRINT("PPD : Current pos X %d Y %d\n",pPath->pos.x, pPath->pos.y);
+    DPRINT("PPD : last %d pos X %d Y %d\n",lastmove, pPath->pPoints[lastmove].x, pPath->pPoints[lastmove].y);
 
-    while (i != 0)
+
+    for(i = 0; i < cbPoints; i++)
     {
-        i--;
-        if (pPath->pFlags[i] == PT_MOVETO)
+        switch (types[i])
         {
-            lastmove.x = pPath->pPoints[i].x;
-            lastmove.y = pPath->pPoints[i].y;
-            if (!GdiPathDPtoLP(dc, &lastmove, 1))
+        case PT_MOVETO:
+            pPath->newStroke = TRUE;
+            pPath->pos = pts[i];
+            IntLPtoDP( dc, &pPath->pos, 1);
+            lastmove = pPath->numEntriesUsed;
+            break;
+        case PT_LINETO:
+        case PT_LINETO | PT_CLOSEFIGURE:
+            if (!add_log_points_new_stroke( dc, pPath, &pts[i], 1, PT_LINETO ))
             {
-                PATH_UnlockPath(pPath);
-                return FALSE;
+               PATH_UnlockPath(pPath);
+               return FALSE;
             }
             break;
-        }
-    }
-
-    for (i = 0; i < cbPoints; i++)
-    {
-        if (types[i] == PT_MOVETO)
-        {
-            pPath->newStroke = TRUE;
-            lastmove.x = pts[i].x;
-            lastmove.y = pts[i].y;
-        }
-        else if ((types[i] & ~PT_CLOSEFIGURE) == PT_LINETO)
-        {
-            PATH_LineTo(dc, pts[i].x, pts[i].y);
-        }
-        else if (types[i] == PT_BEZIERTO)
-        {
-            if (!((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO)
-                    && ((types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO)))
-                goto err;
-            PATH_PolyBezierTo(dc, &(pts[i]), 3);
-            i += 2;
-        }
-        else
-            goto err;
-
-        pdcattr->ptlCurrent.x = pts[i].x;
-        pdcattr->ptlCurrent.y = pts[i].y;
-        State = TRUE;
-
-        if (types[i] & PT_CLOSEFIGURE)
-        {
-            pPath->pFlags[pPath->numEntriesUsed - 1] |= PT_CLOSEFIGURE;
-            pPath->newStroke = TRUE;
-            pdcattr->ptlCurrent.x = lastmove.x;
-            pdcattr->ptlCurrent.y = lastmove.y;
-            State = TRUE;
-        }
-    }
-    Ret = TRUE;
-    goto Exit;
-
-err:
-    if ((pdcattr->ptlCurrent.x != orig_pos.x) || (pdcattr->ptlCurrent.y != orig_pos.y))
-    {
-        pPath->newStroke = TRUE;
-        pdcattr->ptlCurrent.x = orig_pos.x;
-        pdcattr->ptlCurrent.y = orig_pos.y;
-        State = TRUE;
-    }
-Exit:
-    if (State) // State change?
-    {
-        pdcattr->ptfxCurrent = pdcattr->ptlCurrent;
-        CoordLPtoDP(dc, &pdcattr->ptfxCurrent); // Update fx
-        pdcattr->ulDirty_ &= ~(DIRTY_PTLCURRENT | DIRTY_PTFXCURRENT | DIRTY_STYLESTATE);
-    }
-    PATH_UnlockPath(pPath);
-    return Ret;
-}
-
-BOOL
-FASTCALL
-PATH_Polyline(
-    PDC dc,
-    const POINT *pts,
-    DWORD cbPoints)
-{
-    POINT pt;
-    ULONG i;
-    PPATH pPath;
-
-    ASSERT(dc);
-    ASSERT(pts);
-    ASSERT(cbPoints);
-
-    pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath) return FALSE;
-
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-    for (i = 0; i < cbPoints; i++)
-    {
-        pt = pts[i];
-        CoordLPtoDP(dc, &pt);
-        PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO : PT_LINETO);
-    }
-    PATH_UnlockPath(pPath);
-    return TRUE;
-}
-
-BOOL
-FASTCALL
-PATH_PolylineTo(
-    PDC dc,
-    const POINT *pts,
-    DWORD cbPoints)
-{
-    POINT pt;
-    ULONG i;
-    PPATH pPath;
-
-    ASSERT(dc);
-    ASSERT(pts);
-    ASSERT(cbPoints);
+        case PT_BEZIERTO:
+            if ((i + 2 < cbPoints) && (types[i + 1] == PT_BEZIERTO) &&
+                (types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO)
+            {
+                if (!add_log_points_new_stroke( dc, pPath, &pts[i], 3, PT_BEZIERTO ))
+                {
+                   PATH_UnlockPath(pPath);
+                   return FALSE;
+                }
+                i += 2;
+                break;
+            }
+            /* fall through */
+        default:
+            /* restore original position */
+            pPath->pos = orig_pos;
 
-    pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath) return FALSE;
+            DPRINT("PPD Bad   : pos X %d Y %d\n",pPath->pos.x, pPath->pos.y);
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
+            IntGdiMoveToEx(dc, cur_pos.x, cur_pos.y, NULL);
 
-    /* Add a PT_MOVETO if necessary */
-    if (pPath->newStroke)
-    {
-        pPath->newStroke = FALSE;
-        IntGetCurrentPositionEx(dc, &pt);
-        CoordLPtoDP(dc, &pt);
-        if (!PATH_AddEntry(pPath, &pt, PT_MOVETO))
-        {
             PATH_UnlockPath(pPath);
             return FALSE;
         }
-    }
 
-    for (i = 0; i < cbPoints; i++)
-    {
-        pt = pts[i];
-        CoordLPtoDP(dc, &pt);
-        PATH_AddEntry(pPath, &pt, PT_LINETO);
+        if (types[i] & PT_CLOSEFIGURE)
+        {
+            close_figure( pPath );
+            pPath->pos = pPath->pPoints[lastmove];
+            DPRINT("PPD close : pos X %d Y %d\n",pPath->pos.x, pPath->pos.y);
+        }
     }
     PATH_UnlockPath(pPath);
     return TRUE;
 }
 
-
 BOOL
 FASTCALL
-PATH_Polygon(
+PATH_PolylineTo(
     PDC dc,
     const POINT *pts,
     DWORD cbPoints)
 {
-    POINT pt;
-    ULONG i;
     PPATH pPath;
+    BOOL ret;
 
     ASSERT(dc);
     ASSERT(pts);
+    ASSERT(cbPoints);
+
+    if (cbPoints < 1) return FALSE;
 
     pPath = PATH_LockPath(dc->dclevel.hPath);
     if (!pPath) return FALSE;
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
-
-    for (i = 0; i < cbPoints; i++)
-    {
-        pt = pts[i];
-        CoordLPtoDP(dc, &pt);
-        PATH_AddEntry(pPath, &pt, (i == 0) ? PT_MOVETO :
-                      ((i == cbPoints - 1) ? PT_LINETO | PT_CLOSEFIGURE :
-                       PT_LINETO));
-    }
-
+    ret = add_log_points_new_stroke( dc, pPath, pts, cbPoints, PT_LINETO );
     PATH_UnlockPath(pPath);
-    return TRUE;
+    return ret;
 }
 
 BOOL
@@ -1031,8 +1243,8 @@ PATH_PolyPolygon(
     const INT* counts,
     UINT polygons)
 {
-    POINT pt, startpt;
-    ULONG poly, point, i;
+    UINT poly, count;
+    BYTE *type;
     PPATH pPath;
 
     ASSERT(dc);
@@ -1040,30 +1252,35 @@ PATH_PolyPolygon(
     ASSERT(counts);
     ASSERT(polygons);
 
+    if (!polygons) return FALSE;
+
     pPath = PATH_LockPath(dc->dclevel.hPath);
     if (!pPath) return FALSE;
 
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-    {
-        PATH_UnlockPath(pPath);
-        return FALSE;
-    }
 
-    for (i = 0, poly = 0; poly < polygons; poly++)
+    for (poly = count = 0; poly < polygons; poly++)
     {
-        for (point = 0; point < (ULONG) counts[poly]; point++, i++)
+        if (counts[poly] < 2)
         {
-            pt = pts[i];
-            CoordLPtoDP(dc, &pt);
-            if (point == 0) startpt = pt;
-            PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO);
+           PATH_UnlockPath(pPath);
+           return FALSE;
         }
+        count += counts[poly];
+    }
 
-        /* Win98 adds an extra line to close the figure for some reason */
-        PATH_AddEntry(pPath, &startpt, PT_LINETO | PT_CLOSEFIGURE);
+    type = add_log_points( dc, pPath, pts, count, PT_LINETO );
+    if (!type)
+    {
+       PATH_UnlockPath(pPath);
+       return FALSE;
     }
 
+    /* make the first point of each polyline a PT_MOVETO, and close the last one */
+    for (poly = 0; poly < polygons; type += counts[poly++])
+    {
+        type[0] = PT_MOVETO;
+        type[counts[poly] - 1] = PT_LINETO | PT_CLOSEFIGURE;
+    }
     PATH_UnlockPath(pPath);
     return TRUE;
 }
@@ -1086,13 +1303,9 @@ PATH_PolyPolyline(
     ASSERT(polylines);
 
     pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath) return FALSE;
-
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
+    if (!pPath)
     {
-        PATH_UnlockPath(pPath);
-        return FALSE;
+       return FALSE;
     }
 
     for (i = 0, poly = 0; poly < polylines; poly++)
@@ -1104,62 +1317,11 @@ PATH_PolyPolyline(
             PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO);
         }
     }
-
+    DPRINT("PATH_PolyPolyline end count %d\n",pPath->numEntriesUsed);
     PATH_UnlockPath(pPath);
     return TRUE;
 }
 
-
-/* PATH_CheckCorners
- *
- * Helper function for PATH_RoundRect() and PATH_Rectangle()
- */
-BOOL
-PATH_CheckCorners(
-    DC *dc,
-    POINT corners[],
-    INT x1,
-    INT y1,
-    INT x2,
-    INT y2)
-{
-    INT temp;
-    PDC_ATTR pdcattr = dc->pdcattr;
-
-    /* Convert points to device coordinates */
-    corners[0].x = x1;
-    corners[0].y = y1;
-    corners[1].x = x2;
-    corners[1].y = y2;
-    CoordLPtoDP(dc, &corners[0]);
-    CoordLPtoDP(dc, &corners[1]);
-
-    /* Make sure first corner is top left and second corner is bottom right */
-    if (corners[0].x > corners[1].x)
-    {
-        temp = corners[0].x;
-        corners[0].x = corners[1].x;
-        corners[1].x = temp;
-    }
-
-    if (corners[0].y > corners[1].y)
-    {
-        temp = corners[0].y;
-        corners[0].y = corners[1].y;
-        corners[1].y = temp;
-    }
-
-    /* In GM_COMPATIBLE, don't include bottom and right edges */
-    if (pdcattr->iGraphicsMode == GM_COMPATIBLE)
-    {
-        corners[1].x--;
-        corners[1].y--;
-    }
-
-    return TRUE;
-}
-
-
 /* PATH_AddFlatBezier
  *
  */
@@ -1171,16 +1333,20 @@ PATH_AddFlatBezier(
     BOOL closed)
 {
     POINT *pts;
+    BOOL ret = FALSE;
     INT no, i;
 
     pts = GDI_Bezier(pt, 4, &no);
     if (!pts) return FALSE;
 
     for (i = 1; i < no; i++)
-        PATH_AddEntry(pPath, &pts[i],  (i == no - 1 && closed) ? PT_LINETO | PT_CLOSEFIGURE : PT_LINETO);
+    {
+        if (!(ret = PATH_AddEntry(pPath, &pts[i],  (i == no - 1 && closed) ? PT_LINETO | PT_CLOSEFIGURE : PT_LINETO)))
+           break;
+    }
 
     ExFreePoolWithTag(pts, TAG_BEZIER);
-    return TRUE;
+    return ret;
 }
 
 /* PATH_FlattenPath
@@ -1188,349 +1354,193 @@ PATH_AddFlatBezier(
  * Replaces Beziers with line segments
  *
  */
-BOOL
+PPATH
 FASTCALL
 PATH_FlattenPath(PPATH pPath)
 {
-    PATH newPath;
+    PPATH newPath;
     INT srcpt;
+    DPRINT("PATH_FlattenPath\n");
+    if (!(newPath = PATH_CreatePath(pPath->numEntriesUsed))) return NULL;
 
-    RtlZeroMemory(&newPath, sizeof(newPath));
-    newPath.state = PATH_Open;
     for (srcpt = 0; srcpt < pPath->numEntriesUsed; srcpt++)
     {
         switch(pPath->pFlags[srcpt] & ~PT_CLOSEFIGURE)
         {
             case PT_MOVETO:
             case PT_LINETO:
-                PATH_AddEntry(&newPath, &pPath->pPoints[srcpt], pPath->pFlags[srcpt]);
+                if (!PATH_AddEntry(newPath, &pPath->pPoints[srcpt], pPath->pFlags[srcpt]))
+                {
+                   PATH_UnlockPath(newPath);
+                   PATH_Delete(newPath->BaseObject.hHmgr);
+                   return NULL;
+                }
                 break;
             case PT_BEZIERTO:
-                PATH_AddFlatBezier(&newPath, &pPath->pPoints[srcpt - 1], pPath->pFlags[srcpt + 2] & PT_CLOSEFIGURE);
+                if(!PATH_AddFlatBezier(newPath, &pPath->pPoints[srcpt - 1], pPath->pFlags[srcpt + 2] & PT_CLOSEFIGURE))
+                {
+                   PATH_UnlockPath(newPath);
+                   PATH_Delete(newPath->BaseObject.hHmgr);
+                   return NULL;
+                }
                 srcpt += 2;
                 break;
         }
     }
-
-    newPath.state = PATH_Closed;
-    PATH_AssignGdiPath(pPath, &newPath);
-    PATH_EmptyPath(&newPath);
-    return TRUE;
+    DPRINT("PATH_FlattenPath good\n");
+    newPath->state = pPath->state;
+    return newPath;
 }
 
-
 /* PATH_PathToRegion
  *
  * Creates a region from the specified path using the specified polygon
  * filling mode. The path is left unchanged. A handle to the region that
- * was created is stored in *pHrgn. If successful, TRUE is returned; if an
- * error occurs, SetLastError is called with the appropriate value and
- * FALSE is returned.
+ * was created is stored in *pHrgn.
  */
 BOOL
 FASTCALL
 PATH_PathToRegion(
     PPATH pPath,
-    INT nPolyFillMode,
+    INT Mode,
     PREGION Rgn)
 {
-    int    numStrokes, iStroke, i;
-    PULONG  pNumPointsInStroke;
-    BOOL Ret;
-
-    ASSERT(pPath != NULL);
-    ASSERT(Rgn != NULL);
-
-    PATH_FlattenPath(pPath);
-
-    /* First pass: Find out how many strokes there are in the path */
-    /* FIXME: We could eliminate this with some bookkeeping in GdiPath */
-    numStrokes = 0;
-    for (i = 0; i < pPath->numEntriesUsed; i++)
-        if ((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO)
-            numStrokes++;
+    int i, pos, polygons; 
+    PULONG counts;
+    int Ret;
 
-    if (numStrokes == 0)
-    {
-        DPRINT1("numStrokes is 0\n");
-        return FALSE;
-    }
+    if (!pPath->numEntriesUsed) return FALSE;
 
-    /* Allocate memory for number-of-points-in-stroke array */
-    pNumPointsInStroke = ExAllocatePoolWithTag(PagedPool, sizeof(ULONG) * numStrokes, TAG_PATH);
-    if (!pNumPointsInStroke)
+    counts = ExAllocatePoolWithTag(PagedPool, (pPath->numEntriesUsed / 2) * sizeof(counts), TAG_PATH);
+    if (!counts)
     {
-        DPRINT1("Failed to allocate %lu strokes\n", numStrokes);
+        DPRINT1("Failed to allocate %lu strokes\n", (pPath->numEntriesUsed / 2) * sizeof(*counts));
         EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
         return FALSE;
     }
 
-    /* Second pass: remember number of points in each polygon */
-    iStroke = -1; /* Will get incremented to 0 at beginning of first stroke */
-    for (i = 0; i < pPath->numEntriesUsed; i++)
+    pos = polygons = 0;
+    ASSERT( pPath->pFlags[0] == PT_MOVETO );
+    for (i = 1; i < pPath->numEntriesUsed; i++)
     {
-        /* Is this the beginning of a new stroke? */
-        if ((pPath->pFlags[i] & ~PT_CLOSEFIGURE) == PT_MOVETO)
-        {
-            iStroke++;
-            _PRAGMA_WARNING_SUPPRESS(__WARNING_WRITE_OVERRUN)
-            pNumPointsInStroke[iStroke] = 0;
-        }
-
-        _PRAGMA_WARNING_SUPPRESS(__WARNING_READ_OVERRUN)
-        pNumPointsInStroke[iStroke]++;
+        if (pPath->pFlags[i] != PT_MOVETO) continue;
+        counts[polygons++] = i - pos;
+        pos = i;
     }
+    if (i > pos + 1) counts[polygons++] = i - pos;
+
+    ASSERT( polygons <= pPath->numEntriesUsed / 2 );
 
     /* Fill the region with the strokes */
     Ret = REGION_SetPolyPolygonRgn(Rgn,
                                    pPath->pPoints,
-                                   pNumPointsInStroke,
-                                   numStrokes,
-                                   nPolyFillMode);
+                                   counts,
+                                   polygons,
+                                   Mode);
     if (!Ret)
     {
         DPRINT1("REGION_SetPolyPolygonRgn failed\n");
     }
 
-    /* Free memory for number-of-points-in-stroke array */
-    ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH);
+    ExFreePoolWithTag(counts, TAG_PATH);
 
     /* Success! */
     return Ret;
 }
 
-/* PATH_EmptyPath
- *
- * Removes all entries from the path and sets the path state to PATH_Null.
- */
-VOID
-FASTCALL
-PATH_EmptyPath(PPATH pPath)
-{
-    ASSERT(pPath != NULL);
-
-    pPath->state = PATH_Null;
-    pPath->numEntriesUsed = 0;
-}
-
-/* PATH_AddEntry
- *
- * Adds an entry to the path. For "flags", pass either PT_MOVETO, PT_LINETO
- * or PT_BEZIERTO, optionally ORed with PT_CLOSEFIGURE. Returns TRUE if
- * successful, FALSE otherwise (e.g. if not enough memory was available).
- */
-BOOL
-FASTCALL
-PATH_AddEntry(
-    PPATH pPath,
-    const POINT *pPoint,
-    BYTE flags)
-{
-    ASSERT(pPath != NULL);
-
-    /* FIXME: If newStroke is true, perhaps we want to check that we're
-     * getting a PT_MOVETO
-     */
-
-    /* Check that path is open */
-    if (pPath->state != PATH_Open)
-        return FALSE;
-
-    /* Reserve enough memory for an extra path entry */
-    if (!PATH_ReserveEntries(pPath, pPath->numEntriesUsed + 1))
-        return FALSE;
-
-    /* Store information in path entry */
-    pPath->pPoints[pPath->numEntriesUsed] = *pPoint;
-    pPath->pFlags[pPath->numEntriesUsed] = flags;
-
-    /* If this is PT_CLOSEFIGURE, we have to start a new stroke next time */
-    if ((flags & PT_CLOSEFIGURE) == PT_CLOSEFIGURE)
-        pPath->newStroke = TRUE;
-
-    /* Increment entry count */
-    pPath->numEntriesUsed++;
-
-    return TRUE;
-}
-
-/* PATH_ReserveEntries
- *
- * Ensures that at least "numEntries" entries (for points and flags) have
- * been allocated; allocates larger arrays and copies the existing entries
- * to those arrays, if necessary. Returns TRUE if successful, else FALSE.
- */
-BOOL
-FASTCALL
-PATH_ReserveEntries(
-    PPATH pPath,
-    INT numEntries)
-{
-    INT numEntriesToAllocate;
-    POINT *pPointsNew;
-    BYTE *pFlagsNew;
-
-    ASSERT(pPath != NULL);
-    ASSERT(numEntries >= 0);
-
-    /* Do we have to allocate more memory? */
-    if (numEntries > pPath->numEntriesAllocated)
-    {
-        /* Find number of entries to allocate. We let the size of the array
-         * grow exponentially, since that will guarantee linear time
-         * complexity. */
-        if (pPath->numEntriesAllocated)
-        {
-            numEntriesToAllocate = pPath->numEntriesAllocated;
-            while (numEntriesToAllocate < numEntries)
-                numEntriesToAllocate = numEntriesToAllocate * GROW_FACTOR_NUMER / GROW_FACTOR_DENOM;
-        }
-        else
-            numEntriesToAllocate = numEntries;
-
-        /* Allocate new arrays */
-        pPointsNew = (POINT *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(POINT), TAG_PATH);
-        if (!pPointsNew)
-            return FALSE;
-
-        pFlagsNew = (BYTE *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(BYTE), TAG_PATH);
-        if (!pFlagsNew)
-        {
-            ExFreePoolWithTag(pPointsNew, TAG_PATH);
-            return FALSE;
-        }
-
-        /* Copy old arrays to new arrays and discard old arrays */
-        if (pPath->pPoints)
-        {
-            ASSERT(pPath->pFlags);
-
-            memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
-            memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
-
-            ExFreePoolWithTag(pPath->pPoints, TAG_PATH);
-            ExFreePoolWithTag(pPath->pFlags, TAG_PATH);
-        }
-
-        pPath->pPoints = pPointsNew;
-        pPath->pFlags = pFlagsNew;
-        pPath->numEntriesAllocated = numEntriesToAllocate;
-    }
-
-    return TRUE;
-}
-
-/* PATH_DoArcPart
+/* PATH_FillPath
+ *
+ * You can play with this as long as you like, but if you break Area.exe the purge will Begain on Path!!!
  *
- * Creates a Bezier spline that corresponds to part of an arc and appends the
- * corresponding points to the path. The start and end angles are passed in
- * "angleStart" and "angleEnd"; these angles should span a quarter circle
- * at most. If "startEntryType" is non-zero, an entry of that type for the first
- * control point is added to the path; otherwise, it is assumed that the current
- * position is equal to the first control point.
  */
 BOOL
 FASTCALL
-PATH_DoArcPart(
-    PPATH pPath,
-    FLOAT_POINT corners[],
-    double angleStart,
-    double angleEnd,
-    BYTE startEntryType)
+PATH_FillPath(
+    PDC dc,
+    PPATH pPath)
 {
-    double  halfAngle, a;
-    double  xNorm[4], yNorm[4];
-    POINT point;
-    int i;
-
-    ASSERT(fabs(angleEnd - angleStart) <= M_PI_2);
-
-    /* FIXME: Is there an easier way of computing this? */
+    INT   mapMode, graphicsMode;
+    SIZE  ptViewportExt, ptWindowExt;
+    POINTL ptViewportOrg, ptWindowOrg;
+    XFORML xform;
+    PREGION  Rgn;
+    PDC_ATTR pdcattr = dc->pdcattr;
 
-    /* Compute control points */
-    halfAngle = (angleEnd - angleStart) / 2.0;
-    if (fabs(halfAngle) > 1e-8)
+    if (pPath->state != PATH_Closed)
     {
-        a = 4.0 / 3.0 * (1 - cos(halfAngle)) / sin(halfAngle);
-        xNorm[0] = cos(angleStart);
-        yNorm[0] = sin(angleStart);
-        xNorm[1] = xNorm[0] - a * yNorm[0];
-        yNorm[1] = yNorm[0] + a * xNorm[0];
-        xNorm[3] = cos(angleEnd);
-        yNorm[3] = sin(angleEnd);
-        xNorm[2] = xNorm[3] + a * yNorm[3];
-        yNorm[2] = yNorm[3] - a * xNorm[3];
+        DPRINT("PFP : path not closed\n");
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+        return FALSE;
     }
-    else
-        for (i = 0; i < 4; i++)
-        {
-            xNorm[i] = cos(angleStart);
-            yNorm[i] = sin(angleStart);
-        }
 
-    /* Add starting point to path if desired */
-    if (startEntryType)
+    /* Allocate a temporary region */
+    Rgn = IntSysCreateRectpRgn(0, 0, 0, 0);
+    if (!Rgn)
     {
-        PATH_ScaleNormalizedPoint(corners, xNorm[0], yNorm[0], &point);
-        if (!PATH_AddEntry(pPath, &point, startEntryType))
-            return FALSE;
+        EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return FALSE;
     }
 
-    /* Add remaining control points */
-    for (i = 1; i < 4; i++)
+    if (!PATH_PathToRegion(pPath, pdcattr->jFillMode, Rgn))
     {
-        PATH_ScaleNormalizedPoint(corners, xNorm[i], yNorm[i], &point);
-        if (!PATH_AddEntry(pPath, &point, PT_BEZIERTO))
-            return FALSE;
+        DPRINT("PFP : Fail P2R\n");
+        /* EngSetLastError ? */
+        REGION_Delete(Rgn);
+        return FALSE;
     }
 
-    return TRUE;
-}
+    /* Since PaintRgn interprets the region as being in logical coordinates
+     * but the points we store for the path are already in device
+     * coordinates, we have to set the mapping mode to MM_TEXT temporarily.
+     * Using SaveDC to save information about the mapping mode / world
+     * transform would be easier but would require more overhead, especially
+     * now that SaveDC saves the current path.
+     */
 
-/* PATH_ScaleNormalizedPoint
- *
- * Scales a normalized point (x, y) with respect to the box whose corners are
- * passed in "corners". The point is stored in "*pPoint". The normalized
- * coordinates (-1.0, -1.0) correspond to corners[0], the coordinates
- * (1.0, 1.0) correspond to corners[1].
- */
-VOID
-FASTCALL
-PATH_ScaleNormalizedPoint(
-    FLOAT_POINT corners[],
-    double x,
-    double y,
-    POINT *pPoint)
-{
-    ASSERT(corners);
-    ASSERT(pPoint);
+    /* Save the information about the old mapping mode */
+    mapMode = pdcattr->iMapMode;
+    ptViewportExt = pdcattr->szlViewportExt;
+    ptViewportOrg = pdcattr->ptlViewportOrg;
+    ptWindowExt   = pdcattr->szlWindowExt;
+    ptWindowOrg   = pdcattr->ptlWindowOrg;
 
-    pPoint->x = GDI_ROUND((double)corners[0].x + (double)(corners[1].x - corners[0].x) * 0.5 * (x + 1.0));
-    pPoint->y = GDI_ROUND((double)corners[0].y + (double)(corners[1].y - corners[0].y) * 0.5 * (y + 1.0));
-}
+    /* Save world transform
+     * NB: The Windows documentation on world transforms would lead one to
+     * believe that this has to be done only in GM_ADVANCED; however, my
+     * tests show that resetting the graphics mode to GM_COMPATIBLE does
+     * not reset the world transform.
+     */
+    MatrixS2XForm(&xform, &dc->pdcattr->mxWorldToPage);
 
-/* PATH_NormalizePoint
- *
- * Normalizes a point with respect to the box whose corners are passed in
- * corners. The normalized coordinates are stored in *pX and *pY.
- */
-VOID
-FASTCALL
-PATH_NormalizePoint(
-    FLOAT_POINT corners[],
-    const FLOAT_POINT *pPoint,
-    double *pX,
-    double *pY)
-{
-    ASSERT(corners);
-    ASSERT(pPoint);
-    ASSERT(pX);
-    ASSERT(pY);
+    /* Set MM_TEXT */
+    IntGdiSetMapMode(dc, MM_TEXT);
+    pdcattr->ptlViewportOrg.x = 0;
+    pdcattr->ptlViewportOrg.y = 0;
+    pdcattr->ptlWindowOrg.x = 0;
+    pdcattr->ptlWindowOrg.y = 0;
 
-    *pX = (double)(pPoint->x - corners[0].x) / (double)(corners[1].x - corners[0].x) * 2.0 - 1.0;
-    *pY = (double)(pPoint->y - corners[0].y) / (double)(corners[1].y - corners[0].y) * 2.0 - 1.0;
-}
+    graphicsMode = pdcattr->iGraphicsMode;
+    pdcattr->iGraphicsMode = GM_ADVANCED;
+    GreModifyWorldTransform(dc, &xform, MWT_IDENTITY);
+    pdcattr->iGraphicsMode =  graphicsMode;
+
+    /* Paint the region */
+    IntGdiPaintRgn(dc, Rgn);
+    REGION_Delete(Rgn);
+    /* Restore the old mapping mode */
+    IntGdiSetMapMode(dc, mapMode);
+    pdcattr->szlViewportExt = ptViewportExt;
+    pdcattr->ptlViewportOrg = ptViewportOrg;
+    pdcattr->szlWindowExt   = ptWindowExt;
+    pdcattr->ptlWindowOrg   = ptWindowOrg;
 
+    /* Go to GM_ADVANCED temporarily to restore the world transform */
+    graphicsMode = pdcattr->iGraphicsMode;
+    pdcattr->iGraphicsMode = GM_ADVANCED;
+    GreModifyWorldTransform(dc, &xform, MWT_MAX+1);
+    pdcattr->iGraphicsMode = graphicsMode;
+    return TRUE;
+}
 
 BOOL
 FASTCALL
@@ -1711,32 +1721,36 @@ end:
 #define round(x) ((int)((x)>0?(x)+0.5:(x)-0.5))
 
 static
-BOOL
+PPATH
 FASTCALL
 PATH_WidenPath(DC *dc)
 {
     INT i, j, numStrokes, numOldStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle;
-    BOOL ret = FALSE;
-    PPATH pPath, pNewPath, *pStrokes = NULL, *pOldStrokes, pUpPath, pDownPath;
+    PPATH pPath, flat_path, pNewPath, *pStrokes = NULL, *pOldStrokes, pUpPath, pDownPath;
     EXTLOGPEN *elp;
+    BYTE *type;
     DWORD obj_type, joint, endcap, penType;
     PDC_ATTR pdcattr = dc->pdcattr;
 
     pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath) return FALSE;
+    if (!pPath)
+    {
+        EngSetLastError( ERROR_CAN_NOT_COMPLETE );
+        return NULL;
+    }
 
-    if (pPath->state == PATH_Open)
+    if (pPath->state != PATH_Closed)
     {
+        DPRINT("PWP 1\n");
         PATH_UnlockPath(pPath);
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-        return FALSE;
+        return NULL;
     }
 
-    PATH_FlattenPath(pPath);
-
     size = GreGetObject(pdcattr->hpen, 0, NULL);
     if (!size)
     {
+        DPRINT("PWP 2\n");
         PATH_UnlockPath(pPath);
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
         return FALSE;
@@ -1745,6 +1759,7 @@ PATH_WidenPath(DC *dc)
     elp = ExAllocatePoolWithTag(PagedPool, size, TAG_PATH);
     if (elp == NULL)
     {
+        DPRINT("PWP 3\n");
         PATH_UnlockPath(pPath);
         EngSetLastError(ERROR_OUTOFMEMORY);
         return FALSE;
@@ -1763,6 +1778,7 @@ PATH_WidenPath(DC *dc)
     }
     else
     {
+        DPRINT("PWP 4\n");
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
         ExFreePoolWithTag(elp, TAG_PATH);
         PATH_UnlockPath(pPath);
@@ -1779,11 +1795,19 @@ PATH_WidenPath(DC *dc)
     /* The function cannot apply to cosmetic pens */
     if (obj_type == GDI_OBJECT_TYPE_EXTPEN && penType == PS_COSMETIC)
     {
+        DPRINT("PWP 5\n");
         PATH_UnlockPath(pPath);
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
         return FALSE;
     }
 
+    if (!(flat_path = PATH_FlattenPath(pPath)))
+    {
+       PATH_UnlockPath(pPath);
+       return NULL;
+    }
+    PATH_UnlockPath(pPath);
+
     penWidthIn = penWidth / 2;
     penWidthOut = penWidth / 2;
     if (penWidthIn + penWidthOut < penWidth)
@@ -1791,18 +1815,20 @@ PATH_WidenPath(DC *dc)
 
     numStrokes = 0;
 
-    for (i = 0, j = 0; i < pPath->numEntriesUsed; i++, j++)
+    for (i = 0, j = 0; i < flat_path->numEntriesUsed; i++, j++)
     {
         POINT point;
-        if ((i == 0 || (pPath->pFlags[i - 1] & PT_CLOSEFIGURE)) &&
-                (pPath->pFlags[i] != PT_MOVETO))
+        if ((i == 0 || (flat_path->pFlags[i - 1] & PT_CLOSEFIGURE)) &&
+                (flat_path->pFlags[i] != PT_MOVETO))
         {
             DPRINT1("Expected PT_MOVETO %s, got path flag %c\n",
                     i == 0 ? "as first point" : "after PT_CLOSEFIGURE",
-                    pPath->pFlags[i]);
+                    flat_path->pFlags[i]);
+            PATH_UnlockPath(flat_path);
+            PATH_Delete(flat_path->BaseObject.hHmgr);
             return FALSE;
         }
-        switch(pPath->pFlags[i])
+        switch(flat_path->pFlags[i])
         {
             case PT_MOVETO:
                 if (numStrokes > 0)
@@ -1813,47 +1839,52 @@ PATH_WidenPath(DC *dc)
                 numStrokes++;
                 j = 0;
                 if (numStrokes == 1)
-                    pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(PPATH), TAG_PATH);
+                    pStrokes = ExAllocatePoolWithTag(PagedPool, sizeof(*pStrokes), TAG_PATH);
                 else
                 {
                     pOldStrokes = pStrokes; // Save old pointer.
-                    pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(PPATH), TAG_PATH);
-                    if (!pStrokes) return FALSE;
+                    pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(*pStrokes), TAG_PATH);
+                    if (!pStrokes)
+                    {
+                       PATH_UnlockPath(flat_path);
+                       PATH_Delete(flat_path->BaseObject.hHmgr);
+                       return FALSE;
+                    }
                     RtlCopyMemory(pStrokes, pOldStrokes, numOldStrokes * sizeof(PPATH));
                     ExFreePoolWithTag(pOldStrokes, TAG_PATH); // Free old pointer.
                 }
-                if (!pStrokes) return FALSE;
+                if (!pStrokes)
+                {
+                   PATH_UnlockPath(flat_path);
+                   PATH_Delete(flat_path->BaseObject.hHmgr);
+                   return FALSE;
+                }
                 pStrokes[numStrokes - 1] = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH);
                 if (!pStrokes[numStrokes - 1])
                 {
                     ASSERT(FALSE); // FIXME
                 }
-
                 PATH_InitGdiPath(pStrokes[numStrokes - 1]);
                 pStrokes[numStrokes - 1]->state = PATH_Open;
             case PT_LINETO:
             case (PT_LINETO | PT_CLOSEFIGURE):
-                point.x = pPath->pPoints[i].x;
-                point.y = pPath->pPoints[i].y;
-                PATH_AddEntry(pStrokes[numStrokes - 1], &point, pPath->pFlags[i]);
+                point.x = flat_path->pPoints[i].x;
+                point.y = flat_path->pPoints[i].y;
+                PATH_AddEntry(pStrokes[numStrokes - 1], &point, flat_path->pFlags[i]);
                 break;
             case PT_BEZIERTO:
                 /* Should never happen because of the FlattenPath call */
                 DPRINT1("Should never happen\n");
                 break;
             default:
-                DPRINT1("Got path flag %c\n", pPath->pFlags[i]);
+                DPRINT1("Got path flag %c\n", flat_path->pFlags[i]);
+                PATH_UnlockPath(flat_path);
+                PATH_Delete(flat_path->BaseObject.hHmgr);
                 return FALSE;
         }
     }
 
-    pNewPath = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH);
-    if (!pNewPath)
-    {
-        ASSERT(FALSE); // FIXME
-    }
-    PATH_InitGdiPath(pNewPath);
-    pNewPath->state = PATH_Open;
+    pNewPath = PATH_CreatePath( flat_path->numEntriesUsed );
 
     for (i = 0; i < numStrokes; i++)
     {
@@ -2059,20 +2090,11 @@ PATH_WidenPath(DC *dc)
                 }
             }
         }
-        for (j = 0; j < pUpPath->numEntriesUsed; j++)
-        {
-            POINT pt;
-            pt.x = pUpPath->pPoints[j].x;
-            pt.y = pUpPath->pPoints[j].y;
-            PATH_AddEntry(pNewPath, &pt, (j == 0 ? PT_MOVETO : PT_LINETO));
-        }
-        for (j = 0; j < pDownPath->numEntriesUsed; j++)
-        {
-            POINT pt;
-            pt.x = pDownPath->pPoints[pDownPath->numEntriesUsed - j - 1].x;
-            pt.y = pDownPath->pPoints[pDownPath->numEntriesUsed - j - 1].y;
-            PATH_AddEntry(pNewPath, &pt, ((j == 0 && (pStrokes[i]->pFlags[pStrokes[i]->numEntriesUsed - 1] & PT_CLOSEFIGURE)) ? PT_MOVETO : PT_LINETO));
-        }
+        type = add_points( pNewPath, pUpPath->pPoints, pUpPath->numEntriesUsed, PT_LINETO );
+        type[0] = PT_MOVETO;
+        reverse_points( pDownPath->pPoints, pDownPath->numEntriesUsed );
+        type = add_points( pNewPath, pDownPath->pPoints, pDownPath->numEntriesUsed, PT_LINETO );
+        if (pStrokes[i]->pFlags[pStrokes[i]->numEntriesUsed - 1] & PT_CLOSEFIGURE) type[0] = PT_MOVETO;
 
         PATH_DestroyGdiPath(pStrokes[i]);
         ExFreePoolWithTag(pStrokes[i], TAG_PATH);
@@ -2083,13 +2105,11 @@ PATH_WidenPath(DC *dc)
     }
     if (pStrokes) ExFreePoolWithTag(pStrokes, TAG_PATH);
 
+    PATH_UnlockPath(flat_path);
+    PATH_Delete(flat_path->BaseObject.hHmgr);
     pNewPath->state = PATH_Closed;
-    if (!(ret = PATH_AssignGdiPath(pPath, pNewPath)))
-        DPRINT1("Assign path failed\n");
-    PATH_DestroyGdiPath(pNewPath);
-    ExFreePoolWithTag(pNewPath, TAG_PATH);
-    PATH_UnlockPath(pPath);
-    return ret;
+    PATH_UnlockPath(pNewPath);
+    return pNewPath;
 }
 
 static inline INT int_from_fixed(FIXED f)
@@ -2118,9 +2138,7 @@ PATH_BezierTo(
     }
     else if (n == 3)
     {
-        PATH_AddEntry(pPath, &lppt[0], PT_BEZIERTO);
-        PATH_AddEntry(pPath, &lppt[1], PT_BEZIERTO);
-        PATH_AddEntry(pPath, &lppt[2], PT_BEZIERTO);
+        add_points( pPath, lppt, 3, PT_BEZIERTO );
     }
     else
     {
@@ -2136,7 +2154,7 @@ PATH_BezierTo(
             pt[1] = lppt[i + 1];
             pt[2].x = (lppt[i + 2].x + lppt[i + 1].x) / 2;
             pt[2].y = (lppt[i + 2].y + lppt[i + 1].y) / 2;
-            PATH_BezierTo(pPath, pt, 3);
+            add_points( pPath, pt, 3, PT_BEZIERTO );
             n--;
             i++;
         }
@@ -2144,7 +2162,7 @@ PATH_BezierTo(
         pt[0] = pt[2];
         pt[1] = lppt[i + 1];
         pt[2] = lppt[i + 2];
-        PATH_BezierTo(pPath, pt, 3);
+        add_points( pPath, pt, 3, PT_BEZIERTO );
     }
 }
 
@@ -2153,24 +2171,18 @@ BOOL
 FASTCALL
 PATH_add_outline(
     PDC dc,
+    PPATH pPath,
     INT x,
     INT y,
     TTPOLYGONHEADER *header,
     DWORD size)
 {
-    PPATH pPath;
     TTPOLYGONHEADER *start;
     POINT pt;
     BOOL bResult = FALSE;
 
     start = header;
 
-    pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath)
-    {
-        return FALSE;
-    }
-
     while ((char *)header < (char *)start + size)
     {
         TTPOLYCURVE *curve;
@@ -2246,7 +2258,6 @@ PATH_add_outline(
 
 cleanup:
     IntGdiCloseFigure(pPath);
-    PATH_UnlockPath(pPath);
     return bResult;
 }
 
@@ -2265,10 +2276,24 @@ PATH_ExtTextOut(
     UINT count,
     const INT *dx)
 {
-    unsigned int idx;
+    PPATH pPath;
+    unsigned int idx, ggo_flags = GGO_NATIVE;
     POINT offset = {0, 0};
 
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath)
+    {
+        return FALSE;
+    }
+
+    if (pPath->state != PATH_Open)
+    {
+        DPRINT1("PATH_ExtTextOut not open\n");
+        return FALSE;
+    }
+
     if (!count) return TRUE;
+    if (flags & ETO_GLYPH_INDEX) ggo_flags |= GGO_GLYPH_INDEX;
 
     for (idx = 0; idx < count; idx++)
     {
@@ -2279,30 +2304,38 @@ PATH_ExtTextOut(
 
         dwSize = ftGdiGetGlyphOutline(dc,
                                       str[idx],
-                                      GGO_GLYPH_INDEX | GGO_NATIVE,
+                                      ggo_flags,
                                       &gm,
                                       0,
                                       NULL,
                                       &identity,
                                       TRUE);
-        if (dwSize == GDI_ERROR) return FALSE;
+        if (dwSize == GDI_ERROR)
+        {
+           PATH_UnlockPath(pPath);
+           return FALSE;
+        }
 
         /* Add outline only if char is printable */
         if (dwSize)
         {
             outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH);
-            if (!outline) return FALSE;
+            if (!outline)
+            {
+               PATH_UnlockPath(pPath);
+               return FALSE;
+            }
 
             ftGdiGetGlyphOutline(dc,
                                  str[idx],
-                                 GGO_GLYPH_INDEX | GGO_NATIVE,
+                                 ggo_flags,
                                  &gm,
                                  dwSize,
                                  outline,
                                  &identity,
                                  TRUE);
 
-            PATH_add_outline(dc, x + offset.x, y + offset.y, outline, dwSize);
+            PATH_add_outline(dc, pPath, x + offset.x, y + offset.y, outline, dwSize);
 
             ExFreePoolWithTag(outline, TAG_PATH);
         }
@@ -2323,6 +2356,7 @@ PATH_ExtTextOut(
             offset.y += gm.gmCellIncY;
         }
     }
+    PATH_UnlockPath(pPath);
     return TRUE;
 }
 
@@ -2335,7 +2369,6 @@ BOOL
 APIENTRY
 NtGdiAbortPath(HDC hDC)
 {
-    PPATH pPath;
     PDC dc = DC_LockDc(hDC);
     if (!dc)
     {
@@ -2343,16 +2376,19 @@ NtGdiAbortPath(HDC hDC)
         return FALSE;
     }
 
-    pPath = PATH_LockPath(dc->dclevel.hPath);
-    if (!pPath)
+    if (!dc->dclevel.hPath)
     {
-        DC_UnlockDc(dc);
-        return FALSE;
+       DC_UnlockDc(dc);
+       return TRUE;
     }
 
-    PATH_EmptyPath(pPath);
+    if (!PATH_Delete(dc->dclevel.hPath))
+    {
+       DC_UnlockDc(dc);
+       return FALSE;
+    }
 
-    PATH_UnlockPath(pPath);
+    dc->dclevel.hPath = 0;
     dc->dclevel.flPath &= ~DCPATH_ACTIVE;
 
     DC_UnlockDc(dc);
@@ -2399,35 +2435,19 @@ NtGdiBeginPath(HDC  hDC)
             dc->dclevel.hPath = NULL;
         }
     }
-    pPath = PATH_AllocPathWithHandle();
-    if (!pPath)
-    {
-        EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
-        return FALSE;
-    }
+    pPath = PATH_CreatePath(NUM_ENTRIES_INITIAL);
     dc->dclevel.flPath |= DCPATH_ACTIVE; // Set active ASAP!
-
     dc->dclevel.hPath = pPath->BaseObject.hHmgr;
-
-    DPRINT("BeginPath 2 h 0x%p p 0x%p\n", dc->dclevel.hPath, pPath);
-    // Path handles are shared. Also due to recursion with in the same thread.
-    GDIOBJ_vUnlockObject((POBJ)pPath);       // Unlock
-    pPath = PATH_LockPath(dc->dclevel.hPath); // Share Lock.
-
-    /* Make sure that path is empty */
-    PATH_EmptyPath(pPath);
-
-    pPath->numEntriesAllocated = NUM_ENTRIES_INITIAL;
-
-    pPath->pPoints = (POINT *)ExAllocatePoolWithTag(PagedPool, NUM_ENTRIES_INITIAL * sizeof(POINT), TAG_PATH);
-    pPath->pFlags  =  (BYTE *)ExAllocatePoolWithTag(PagedPool, NUM_ENTRIES_INITIAL * sizeof(BYTE),  TAG_PATH);
-
-    /* Initialize variables for new path */
-    pPath->newStroke = TRUE;
-    pPath->state = PATH_Open;
-
+    IntGetCurrentPositionEx(dc, &pPath->pos);
+    IntLPtoDP( dc, &pPath->pos, 1 );
+    DPRINT("BP : Current pos X %d Y %d\n",pPath->pos.x, pPath->pos.y);
     PATH_UnlockPath(pPath);
     DC_UnlockDc(dc);
+
+    if (!pPath)
+    {
+        return FALSE;
+    }
     return TRUE;
 }
 
@@ -2462,7 +2482,6 @@ NtGdiCloseFigure(HDC hDC)
     }
     else
     {
-        // FIXME: Check if lasterror is set correctly
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
     }
 
@@ -2496,7 +2515,7 @@ NtGdiEndPath(HDC  hDC)
     /* Check that path is currently being constructed */
     if ((pPath->state != PATH_Open) || !(dc->dclevel.flPath & DCPATH_ACTIVE))
     {
-        DPRINT1("EndPath ERROR! 0x%p\n", dc->dclevel.hPath);
+        DPRINT("EndPath ERROR! 0x%p\n", dc->dclevel.hPath);
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
         ret = FALSE;
     }
@@ -2518,7 +2537,7 @@ APIENTRY
 NtGdiFillPath(HDC  hDC)
 {
     BOOL ret = FALSE;
-    PPATH pPath;
+    PPATH pPath, pNewPath;
     PDC_ATTR pdcattr;
     PDC dc;
 
@@ -2546,15 +2565,18 @@ NtGdiFillPath(HDC  hDC)
     if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
         DC_vUpdateFillBrush(dc);
 
-    ret = PATH_FillPath(dc, pPath);
-    if (ret)
-    {
-        /* FIXME: Should the path be emptied even if conversion
-           failed? */
-        PATH_EmptyPath(pPath);
-    }
+    pNewPath = PATH_FlattenPath(pPath);
+
+    ret = PATH_FillPath(dc, pNewPath);
+
+    PATH_UnlockPath(pNewPath);
+    PATH_Delete(pNewPath->BaseObject.hHmgr);
 
     PATH_UnlockPath(pPath);
+    PATH_Delete(pPath->BaseObject.hHmgr);
+    dc->dclevel.hPath = 0;
+    dc->dclevel.flPath &= ~DCPATH_ACTIVE;
+
     DC_vFinishBlit(dc, NULL);
     DC_UnlockDc(dc);
     return ret;
@@ -2566,7 +2588,7 @@ NtGdiFlattenPath(HDC hDC)
 {
     BOOL Ret = FALSE;
     DC *pDc;
-    PPATH pPath;
+    PPATH pPath, pNewPath = NULL;
 
     DPRINT("Enter %s\n", __FUNCTION__);
 
@@ -2580,13 +2602,26 @@ NtGdiFlattenPath(HDC hDC)
     pPath = PATH_LockPath(pDc->dclevel.hPath);
     if (!pPath)
     {
+        EngSetLastError( ERROR_CAN_NOT_COMPLETE );
         DC_UnlockDc(pDc);
         return FALSE;
     }
-    if (pPath->state == PATH_Open)
-        Ret = PATH_FlattenPath(pPath);
+
+    if (pPath->state == PATH_Closed)
+    {
+        pNewPath = PATH_FlattenPath(pPath);
+    }
 
     PATH_UnlockPath(pPath);
+
+    if (pNewPath)
+    {
+       PATH_Delete(pDc->dclevel.hPath);
+       pDc->dclevel.hPath = pNewPath->BaseObject.hHmgr;
+       PATH_UnlockPath(pNewPath);
+       Ret = TRUE;
+    }
+
     DC_UnlockDc(pDc);
     return Ret;
 }
@@ -2636,6 +2671,7 @@ NtGdiGetPath(
     PPATH pPath;
 
     DC *dc = DC_LockDc(hDC);
+    DPRINT("NtGdiGetPath start\n");
     if (!dc)
     {
         DPRINT1("Can't lock dc!\n");
@@ -2689,6 +2725,7 @@ NtGdiGetPath(
     }
 
 done:
+    DPRINT("NtGdiGetPath exit %d\n",ret);
     PATH_UnlockPath(pPath);
     DC_UnlockDc(dc);
     return ret;
@@ -2698,8 +2735,9 @@ HRGN
 APIENTRY
 NtGdiPathToRegion(HDC  hDC)
 {
-    PPATH pPath;
+    PPATH pPath, pNewPath;
     HRGN  hrgnRval = 0;
+    int Ret;
     PREGION Rgn;
     DC *pDc;
     PDC_ATTR pdcattr;
@@ -2709,7 +2747,7 @@ NtGdiPathToRegion(HDC  hDC)
     pDc = DC_LockDc(hDC);
     if (!pDc)
     {
-        DPRINT1("Failed to lock DC %p\n", hDC);
+        DPRINT("Failed to lock DC %p\n", hDC);
         EngSetLastError(ERROR_INVALID_PARAMETER);
         return NULL;
     }
@@ -2719,7 +2757,7 @@ NtGdiPathToRegion(HDC  hDC)
     pPath = PATH_LockPath(pDc->dclevel.hPath);
     if (!pPath)
     {
-        DPRINT1("Failed to lock DC path %p\n", pDc->dclevel.hPath);
+        DPRINT("Failed to lock DC path %p\n", pDc->dclevel.hPath);
         DC_UnlockDc(pDc);
         return NULL;
     }
@@ -2727,7 +2765,7 @@ NtGdiPathToRegion(HDC  hDC)
     if (pPath->state != PATH_Closed)
     {
         // FIXME: Check that setlasterror is being called correctly
-        DPRINT1("Path is not closed!\n");
+        DPRINT("Path is not closed!\n");
         EngSetLastError(ERROR_CAN_NOT_COMPLETE);
     }
     else
@@ -2736,27 +2774,35 @@ NtGdiPathToRegion(HDC  hDC)
         Rgn = REGION_AllocUserRgnWithHandle(1);
         if (!Rgn)
         {
-            DPRINT1("Failed to allocate a region\n");
+            DPRINT("Failed to allocate a region\n");
             PATH_UnlockPath(pPath);
             DC_UnlockDc(pDc);
             return NULL;
         }
         hrgnRval = Rgn->BaseObject.hHmgr;
-        /* FIXME: Should we empty the path even if conversion failed? */
-        if (PATH_PathToRegion(pPath, pdcattr->jFillMode, Rgn))
-        {
-            PATH_EmptyPath(pPath);
-            REGION_UnlockRgn(Rgn);
-        }
-        else
+
+        pNewPath = PATH_FlattenPath(pPath);
+
+        Ret = PATH_PathToRegion(pNewPath, pdcattr->jFillMode, Rgn);
+
+        PATH_UnlockPath(pNewPath);
+        PATH_Delete(pNewPath->BaseObject.hHmgr);
+
+        if (!Ret)
         {
-            DPRINT1("PATH_PathToRegion failed\n");
+            DPRINT("PATH_PathToRegion failed\n");
             REGION_Delete(Rgn);
             hrgnRval = NULL;
         }
+        else
+            REGION_UnlockRgn(Rgn);
     }
 
     PATH_UnlockPath(pPath);
+    PATH_Delete(pDc->dclevel.hPath);
+    pDc->dclevel.hPath = NULL;
+    pDc->dclevel.flPath &= ~DCPATH_ACTIVE;
+
     DC_UnlockDc(pDc);
     return hrgnRval;
 }
@@ -2807,10 +2853,10 @@ NtGdiStrokeAndFillPath(HDC hDC)
 {
     DC *pDc;
     PDC_ATTR pdcattr;
-    PPATH pPath;
+    PPATH pPath, pNewPath;
     BOOL bRet = FALSE;
 
-    DPRINT1("Enter %s\n", __FUNCTION__);
+    DPRINT("Enter %s\n", __FUNCTION__);
 
     if (!(pDc = DC_LockDc(hDC)))
     {
@@ -2834,11 +2880,19 @@ NtGdiStrokeAndFillPath(HDC hDC)
     if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
         DC_vUpdateLineBrush(pDc);
 
-    bRet = PATH_FillPath(pDc, pPath);
-    if (bRet) bRet = PATH_StrokePath(pDc, pPath);
-    if (bRet) PATH_EmptyPath(pPath);
+    pNewPath = PATH_FlattenPath(pPath);
+
+    bRet = PATH_FillPath(pDc, pNewPath);
+    if (bRet) bRet = PATH_StrokePath(pDc, pNewPath);
+
+    PATH_UnlockPath(pNewPath);
+    PATH_Delete(pNewPath->BaseObject.hHmgr);
 
     PATH_UnlockPath(pPath);
+    PATH_Delete(pPath->BaseObject.hHmgr);
+    pDc->dclevel.hPath = 0;
+    pDc->dclevel.flPath &= ~DCPATH_ACTIVE;
+
     DC_vFinishBlit(pDc, NULL);
     DC_UnlockDc(pDc);
     return bRet;
@@ -2878,9 +2932,12 @@ NtGdiStrokePath(HDC hDC)
     bRet = PATH_StrokePath(pDc, pPath);
 
     DC_vFinishBlit(pDc, NULL);
-    PATH_EmptyPath(pPath);
 
     PATH_UnlockPath(pPath);
+    PATH_Delete(pPath->BaseObject.hHmgr);
+    pDc->dclevel.hPath = 0;
+    pDc->dclevel.flPath &= ~DCPATH_ACTIVE;
+
     DC_UnlockDc(pDc);
     return bRet;
 }
@@ -2889,16 +2946,26 @@ BOOL
 APIENTRY
 NtGdiWidenPath(HDC  hDC)
 {
-    BOOL Ret;
+    PPATH pPath;
+    BOOL Ret = FALSE;
     PDC pdc = DC_LockDc(hDC);
+    DPRINT("NtGdiWidenPat Enter\n");
     if (!pdc)
     {
         EngSetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;
     }
 
-    Ret = PATH_WidenPath(pdc);
+    pPath = PATH_WidenPath(pdc);
+    if (pPath)
+    {
+       DPRINT("WindenPath New Path\n");
+       PATH_Delete(pdc->dclevel.hPath);
+       pdc->dclevel.hPath = pPath->BaseObject.hHmgr;
+       Ret = TRUE;
+    }
     DC_UnlockDc(pdc);
+    DPRINT("NtGdiWidenPat Ret %d\n",Ret);
     return Ret;
 }
 
index 9b03e65..7d0f816 100644 (file)
@@ -34,6 +34,7 @@ typedef struct _PATH
   int          numEntriesUsed;
   int          numEntriesAllocated;
   BOOL         newStroke;
+  POINT        pos;
 } PATH, *PPATH;
 
 typedef struct _EPATHOBJ
@@ -50,15 +51,13 @@ typedef struct _EPATHOBJ
 
 #define PATH_IsPathOpen(dclevel) ( ((dclevel).hPath) && ((dclevel).flPath & DCPATH_ACTIVE) )
 
-BOOL FASTCALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines);
+BOOL FASTCALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, INT direction, INT lines);
 BOOL FASTCALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2);
 VOID FASTCALL PATH_EmptyPath (PPATH pPath);
 BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y);
 BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints);
-BOOL FASTCALL PATH_Polygon (PDC dc, const POINT *pts, DWORD cbPoints);
-BOOL FASTCALL PATH_Polyline (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolylineTo (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons);
 BOOL FASTCALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines);
@@ -71,7 +70,7 @@ BOOL FASTCALL PATH_AddEntry (PPATH pPath, const POINT *pPoint, BYTE flags);
 BOOL FASTCALL PATH_AddFlatBezier (PPATH pPath, POINT *pt, BOOL closed);
 BOOL FASTCALL PATH_DoArcPart (PPATH pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BYTE startEntryType);
 BOOL FASTCALL PATH_FillPath( PDC dc, PPATH pPath );
-BOOL FASTCALL PATH_FlattenPath (PPATH pPath);
+PPATH FASTCALL PATH_FlattenPath (PPATH pPath);
 VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
 
 BOOL FASTCALL PATH_ReserveEntries (PPATH pPath, INT numEntries);
@@ -83,3 +82,6 @@ VOID FASTCALL IntGdiCloseFigure(PPATH pPath);
 BOOL FASTCALL PATH_Delete(HPATH hPath);
 
 VOID FASTCALL IntGetCurrentPositionEx(PDC dc, LPPOINT pt);
+
+BOOL PATH_RestorePath( DC *, DC *);
+BOOL PATH_SavePath( DC *, DC *);