[WIN32SS][NTGDI] Refactoring PATH_WidenPath (#888)
[reactos.git] / win32ss / gdi / ntgdi / path.c
index c318bea..a3e2ea0 100644 (file)
@@ -1,11 +1,12 @@
 /*
  * PROJECT:         ReactOS win32 kernel mode subsystem
  * LICENSE:         GPL - See COPYING in the top level directory
- * FILE:            subsystems/win32/win32k/objects/path.c
+ * FILE:            win32ss/gdi/ntgdi/path.c
  * PURPOSE:         Graphics paths (BeginPath, EndPath etc.)
  * PROGRAMMER:      Copyright 1997, 1998 Martin Boehme
  *                            1999 Huw D M Davies
  *                            2005 Dmitry Timoshkov
+ *                            2018 Katayama Hirofumi MZ
  */
 
 #include <win32k.h>
 #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).
  */
 VOID
 FASTCALL
-PATH_DestroyGdiPath ( PPATH pPath )
+PATH_DestroyGdiPath(PPATH pPath)
 {
-  ASSERT(pPath!=NULL);
+    ASSERT(pPath != NULL);
 
-  if (pPath->pPoints) ExFreePoolWithTag(pPath->pPoints, TAG_PATH);
-  if (pPath->pFlags) ExFreePoolWithTag(pPath->pFlags, TAG_PATH);
+    if (pPath->pPoints) ExFreePoolWithTag(pPath->pPoints, TAG_PATH);
+    if (pPath->pFlags) ExFreePoolWithTag(pPath->pFlags, TAG_PATH);
 }
 
 BOOL
 FASTCALL
 PATH_Delete(HPATH hPath)
 {
-  PPATH pPath;
-  if (!hPath) return FALSE;
-  pPath = PATH_LockPath( hPath );
-  if (!pPath) return FALSE;
-  PATH_DestroyGdiPath( pPath );
-  GDIOBJ_vDeleteObject(&pPath->BaseObject);
-  return TRUE;
+    PPATH pPath;
+    if (!hPath) return FALSE;
+    pPath = PATH_LockPath(hPath);
+    if (!pPath) return FALSE;
+    PATH_DestroyGdiPath(pPath);
+    GDIOBJ_vDeleteObject(&pPath->BaseObject);
+#if DBG
+    PathCount--;
+    DPRINT("Delete Path %d\n",PathCount);
+#endif
+    return TRUE;
 }
 
 
@@ -58,105 +108,30 @@ VOID
 FASTCALL
 IntGdiCloseFigure(PPATH pPath)
 {
-   ASSERT(pPath->state == PATH_Open);
-
-   // FIXME: Shouldn't we draw a line to the beginning of the figure?
-   // Set PT_CLOSEFIGURE on the last entry and start a new stroke
-   if(pPath->numEntriesUsed)
-   {
-      pPath->pFlags[pPath->numEntriesUsed-1]|=PT_CLOSEFIGURE;
-      pPath->newStroke=TRUE;
-   }
+    ASSERT(pPath->state == PATH_Open);
+
+    // FIXME: Shouldn't we draw a line to the beginning of the figure?
+    // Set PT_CLOSEFIGURE on the last entry and start a new stroke
+    if (pPath->numEntriesUsed)
+    {
+        pPath->pFlags[pPath->numEntriesUsed - 1] |= PT_CLOSEFIGURE;
+        pPath->newStroke = TRUE;
+    }
 }
 
 /* MSDN: This fails if the device coordinates exceed 27 bits, or if the converted
          logical coordinates exceed 32 bits. */
 BOOL
 FASTCALL
-GdiPathDPtoLP(PDC pdc, PPOINT ppt, INT count)
-{
-  XFORMOBJ xo;
-
-  XFORMOBJ_vInit(&xo, &pdc->pdcattr->mxDeviceToWorld);
-  return XFORMOBJ_bApplyXform(&xo, XF_LTOL, count, (PPOINTL)ppt, (PPOINTL)ppt);
-}
-
-/* PATH_FillPath
- *
- *
- */
-BOOL
-FASTCALL
-PATH_FillPath( PDC dc, PPATH pPath )
+GdiPathDPtoLP(
+    PDC pdc,
+    PPOINT ppt,
+    INT count)
 {
-  //INT   mapMode, graphicsMode;
-  //SIZE  ptViewportExt, ptWindowExt;
-  //POINTL ptViewportOrg, ptWindowOrg;
-  XFORM xform;
-  HRGN  hrgn;
-  PDC_ATTR pdcattr = dc->pdcattr;
-
-  if( pPath->state != PATH_Closed )
-  {
-    EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-    return FALSE;
-  }
-
-  if( PATH_PathToRegion( pPath, pdcattr->jFillMode, &hrgn ))
-  {
-    /* 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;
+    XFORMOBJ xo;
 
-    /* Paint the region */
-    IntGdiPaintRgn( dc, hrgn );
-    GreDeleteObject( hrgn );
-    /* 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;
-  }
-  return FALSE;
+    XFORMOBJ_vInit(&xo, &pdc->pdcattr->mxDeviceToWorld);
+    return XFORMOBJ_bApplyXform(&xo, XF_LTOL, count, (PPOINTL)ppt, (PPOINTL)ppt);
 }
 
 /* PATH_InitGdiPath
@@ -165,15 +140,16 @@ PATH_FillPath( PDC dc, PPATH pPath )
  */
 VOID
 FASTCALL
-PATH_InitGdiPath ( PPATH pPath )
+PATH_InitGdiPath(
+    PPATH pPath)
 {
-  ASSERT(pPath!=NULL);
+    ASSERT(pPath != NULL);
 
-  pPath->state=PATH_Null;
-  pPath->pPoints=NULL;
-  pPath->pFlags=NULL;
-  pPath->numEntriesUsed=0;
-  pPath->numEntriesAllocated=0;
+    pPath->state = PATH_Null;
+    pPath->pPoints = NULL;
+    pPath->pFlags = NULL;
+    pPath->numEntriesUsed = 0;
+    pPath->numEntriesAllocated = 0;
 }
 
 /* PATH_AssignGdiPath
@@ -188,1229 +164,1395 @@ PATH_InitGdiPath ( PPATH pPath )
  */
 BOOL
 FASTCALL
-PATH_AssignGdiPath ( PPATH pPathDest, const PPATH pPathSrc )
+PATH_AssignGdiPath(
+    PPATH pPathDest,
+    const PPATH pPathSrc)
 {
-  ASSERT(pPathDest!=NULL && pPathSrc!=NULL);
+    ASSERT(pPathDest != NULL && pPathSrc != NULL);
 
-  /* Make sure destination arrays are big enough */
-  if ( !PATH_ReserveEntries(pPathDest, pPathSrc->numEntriesUsed) )
-    return FALSE;
+    /* Make sure destination arrays are big enough */
+    if (!PATH_ReserveEntries(pPathDest, pPathSrc->numEntriesUsed))
+        return FALSE;
 
-  /* Perform the copy operation */
-  memcpy(pPathDest->pPoints, pPathSrc->pPoints,
-    sizeof(POINT)*pPathSrc->numEntriesUsed);
-  memcpy(pPathDest->pFlags, pPathSrc->pFlags,
-    sizeof(BYTE)*pPathSrc->numEntriesUsed);
+    /* Perform the copy operation */
+    memcpy(pPathDest->pPoints, pPathSrc->pPoints, sizeof(POINT)*pPathSrc->numEntriesUsed);
+    memcpy(pPathDest->pFlags,  pPathSrc->pFlags,  sizeof(BYTE)*pPathSrc->numEntriesUsed);
 
-  pPathDest->state=pPathSrc->state;
-  pPathDest->numEntriesUsed=pPathSrc->numEntriesUsed;
-  pPathDest->newStroke=pPathSrc->newStroke;
-  return TRUE;
+    pPathDest->pos = pPathSrc->pos;
+    pPathDest->state = pPathSrc->state;
+    pPathDest->numEntriesUsed = pPathSrc->numEntriesUsed;
+    pPathDest->newStroke = pPathSrc->newStroke;
+    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 )
+BOOL PATH_SavePath( DC *dst, DC *src )
 {
-  PPATH pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath) return FALSE;
-
-  /* Check that path is open */
-  if ( pPath->state != PATH_Open )
-  {
-    PATH_UnlockPath( pPath );
-    /* FIXME: Do we have to call SetLastError? */
-    return FALSE;
-  }
-  /* Start a new stroke */
-  pPath->newStroke = TRUE;
-  PATH_UnlockPath( pPath );
-  return TRUE;
-}
+    PPATH pdstPath, psrcPath = PATH_LockPath(src->dclevel.hPath);
+    DPRINT("PATH_SavePath\n");
+    if (psrcPath)
+    {
+       DPRINT("PATH_SavePath 1\n");
 
-/* 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;
+       pdstPath = PATH_CreatePath(psrcPath->numEntriesAllocated);
 
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath) return FALSE;
+       dst->dclevel.flPath = src->dclevel.flPath;
 
-  /* Check that path is open */
-  if ( pPath->state != PATH_Open )
-  {
-    PATH_UnlockPath( pPath );
-    return FALSE;
-  }
-
-  /* Convert point to device coordinates */
-  point.x=x;
-  point.y=y;
-  CoordLPtoDP ( dc, &point );
-
-  /* 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) )
-    {
-      PATH_UnlockPath( pPath );
-      return FALSE;
-    }
-  }
-
-  /* Add a PT_LINETO entry */
-  Ret = PATH_AddEntry(pPath, &point, PT_LINETO);
-  PATH_UnlockPath( pPath );
-  return Ret;
+       dst->dclevel.hPath = pdstPath->BaseObject.hHmgr;
+
+       PATH_AssignGdiPath(pdstPath, psrcPath);
+
+       PATH_UnlockPath(pdstPath);
+       PATH_UnlockPath(psrcPath);
+    }
+    return TRUE;
 }
 
-/* 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 )
+BOOL PATH_RestorePath( DC *dst, DC *src )
 {
-  PPATH pPath;
-  POINT corners[2], pointTemp;
-  INT   temp;
+    DPRINT("PATH_RestorePath\n");
 
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath) return FALSE;
+    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;
 
-  /* Check that path is open */
-  if ( pPath->state != PATH_Open )
-  {
-    PATH_UnlockPath( pPath );
-    return FALSE;
-  }
-
-  /* Convert points to device coordinates */
-  corners[0].x=x1;
-  corners[0].y=y1;
-  corners[1].x=x2;
-  corners[1].y=y2;
-  IntLPtoDP ( dc, corners, 2 );
-
-  /* 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 (dc->pdcattr->iGraphicsMode == GM_COMPATIBLE)
-  {
-    corners[1].x--;
-    corners[1].y--;
-  }
-
-  /* Close any previous figure */
-  IntGdiCloseFigure(pPath);
-
-  /* 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) )
-  {
-    PATH_UnlockPath( pPath );
-    return FALSE;
-  }
-  if ( !PATH_AddEntry(pPath, corners+1, PT_LINETO) )
-  {
-    PATH_UnlockPath( pPath );
-    return FALSE;
-  }
+       PATH_AssignGdiPath(pdstPath, psrcPath);
 
-  /* Close the rectangle figure */
-  IntGdiCloseFigure(pPath) ;
-  PATH_UnlockPath( pPath );
-  return TRUE;
+       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_RoundRect
- *
- * Should be called when a call to RoundRect is performed on a DC that has
- * an open path. Returns TRUE if successful, else FALSE.
+/* PATH_EmptyPath
  *
- * 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()
+ * Removes all entries from the path and sets the path state to PATH_Null.
  */
-BOOL FASTCALL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height)
+VOID
+FASTCALL
+PATH_EmptyPath(PPATH pPath)
 {
-   PPATH pPath;
-   POINT corners[2], pointTemp;
-   FLOAT_POINT ellCorners[2];
-
-   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;
-   }
-
-   /* 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;
-   }
-
-   IntGdiCloseFigure(pPath);
-   PATH_UnlockPath( pPath );
-   return TRUE;
+    ASSERT(pPath != NULL);
+
+    pPath->state = PATH_Null;
+    pPath->numEntriesUsed = 0;
 }
 
-/* PATH_Ellipse
+/* PATH_AddEntry
  *
- * 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.
+ * 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_Ellipse ( PDC dc, INT x1, INT y1, INT x2, INT y2 )
+PATH_AddEntry(
+    PPATH pPath,
+    const POINT *pPoint,
+    BYTE flags)
 {
-  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)
-  {
-     pPath = PATH_LockPath( dc->dclevel.hPath );
-     if (!pPath) return FALSE;
-     IntGdiCloseFigure(pPath);
-     PATH_UnlockPath( pPath );
-  }
-  return Ret;
+    ASSERT(pPath != NULL);
+
+    /* 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;
+
+    /* Store information in path entry */
+    pPath->pPoints[pPath->numEntriesUsed] = *pPoint;
+    pPath->pFlags[pPath->numEntriesUsed] = flags;
+
+    /* Increment entry count */
+    pPath->numEntriesUsed++;
+
+    return TRUE;
 }
 
-/* PATH_Arc
+/* PATH_ReserveEntries
  *
- * Should be called when a call to Arc is performed on a DC that has
- * an open path. This adds up to five Bezier splines representing the arc
- * to the path. When 'lines' is 1, we add 1 extra line to get a chord,
- * when 'lines' is 2, we add 2 extra lines to get a pie, and when 'lines' is
- * -1 we add 1 extra line from the current DC position to the starting position
- * of the arc before drawing the arc itself (arcto). 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_Arc ( PDC dc, INT x1, INT y1, INT x2, INT y2,
-   INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines)
+PATH_ReserveEntries(
+    PPATH pPath,
+    INT numEntries)
 {
-  double  angleStart, angleEnd, angleStartQuadrant, angleEndQuadrant=0.0;
-          /* Initialize angleEndQuadrant to silence gcc's warning */
-  double  x, y;
-  FLOAT_POINT corners[2], pointStart, pointEnd;
-  POINT   centre, pointCurPos;
-  BOOL    start, end, Ret = TRUE;
-  INT     temp;
-  BOOL    clockwise;
-  PPATH   pPath;
-
-  /* FIXME: This function should check for all possible error returns */
-  /* FIXME: Do we have to respect newStroke? */
-
-  ASSERT ( dc );
-
-  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;
-  }
-
-  /* Check for zero height / width */
-  /* FIXME: Only in GM_COMPATIBLE? */
-  if ( x1==x2 || y1==y2 )
-  {
-    Ret = TRUE;
-    goto ArcExit;
-  }
-  /* Convert points to device coordinates */
-  corners[0].x=(FLOAT)x1;
-  corners[0].y=(FLOAT)y1;
-  corners[1].x=(FLOAT)x2;
-  corners[1].y=(FLOAT)y2;
-  pointStart.x=(FLOAT)xStart;
-  pointStart.y=(FLOAT)yStart;
-  pointEnd.x=(FLOAT)xEnd;
-  pointEnd.y=(FLOAT)yEnd;
-  INTERNAL_LPTODP_FLOAT(dc, corners);
-  INTERNAL_LPTODP_FLOAT(dc, corners+1);
-  INTERNAL_LPTODP_FLOAT(dc, &pointStart);
-  INTERNAL_LPTODP_FLOAT(dc, &pointEnd);
-
-  /* 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;
-  }
-
-  /* Compute start and end angle */
-  PATH_NormalizePoint(corners, &pointStart, &x, &y);
-  angleStart=atan2(y, x);
-  PATH_NormalizePoint(corners, &pointEnd, &x, &y);
-  angleEnd=atan2(y, x);
-
-  /* Make sure the end angle is "on the right side" of the start angle */
-  if ( clockwise )
-  {
-    if ( angleEnd <= angleStart )
-    {
-      angleEnd+=2*M_PI;
-      ASSERT(angleEnd>=angleStart);
-    }
-  }
-  else
-  {
-    if(angleEnd>=angleStart)
-    {
-      angleEnd-=2*M_PI;
-      ASSERT(angleEnd<=angleStart);
-    }
-  }
-
-  /* In GM_COMPATIBLE, don't include bottom and right edges */
-  if (dc->pdcattr->iGraphicsMode == GM_COMPATIBLE )
-  {
-    corners[1].x--;
-    corners[1].y--;
-  }
-
-  /* arcto: Add a PT_MOVETO only if this is the first entry in a stroke */
-  if(lines==GdiTypeArcTo && pPath->newStroke) // -1
-  {
-     pPath->newStroke=FALSE;
-     IntGetCurrentPositionEx ( dc, &pointCurPos );
-     CoordLPtoDP(dc, &pointCurPos);
-     if(!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO))
-     {
-       Ret = FALSE;
-       goto ArcExit;
-     }
-  }
-
-  /* Add the arc to the path with one Bezier spline per quadrant that the
-   * arc spans */
-  start=TRUE;
-  end=FALSE;
-  do
-  {
-    /* Determine the start and end angles for this quadrant */
-    if(start)
-    {
-      angleStartQuadrant=angleStart;
-      if ( clockwise )
-        angleEndQuadrant=(floor(angleStart/M_PI_2)+1.0)*M_PI_2;
-      else
-        angleEndQuadrant=(ceil(angleStart/M_PI_2)-1.0)*M_PI_2;
-    }
-    else
+    INT numEntriesToAllocate;
+    POINT *pPointsNew;
+    BYTE *pFlagsNew;
+
+    ASSERT(pPath != NULL);
+    ASSERT(numEntries >= 0);
+
+    /* Do we have to allocate more memory? */
+    if (numEntries > pPath->numEntriesAllocated)
     {
-      angleStartQuadrant=angleEndQuadrant;
-      if ( clockwise )
-        angleEndQuadrant+=M_PI_2;
-      else
-        angleEndQuadrant-=M_PI_2;
-    }
-
-    /* Have we reached the last part of the arc? */
-    if ( (clockwise && angleEnd<angleEndQuadrant)
-      || (!clockwise && angleEnd>angleEndQuadrant)
-      )
-    {
-      /* Adjust the end angle for this quadrant */
-     angleEndQuadrant = angleEnd;
-     end = TRUE;
-    }
-
-    /* Add the Bezier spline to the path */
-    PATH_DoArcPart ( pPath, corners, angleStartQuadrant, angleEndQuadrant,
-       start ? (lines==GdiTypeArcTo ? PT_LINETO : PT_MOVETO) : FALSE ); // -1
-    start = FALSE;
-  } while(!end);
-
-  /* chord: close figure. pie: add line and close figure */
-  if (lines==GdiTypeChord) // 1
-  {
-      IntGdiCloseFigure(pPath);
-  }
-  else if (lines==GdiTypePie) // 2
-  {
-      centre.x = (corners[0].x+corners[1].x)/2;
-      centre.y = (corners[0].y+corners[1].y)/2;
-      if(!PATH_AddEntry(pPath, &centre, PT_LINETO | PT_CLOSEFIGURE))
-         Ret = FALSE;
-  }
-ArcExit:
-  PATH_UnlockPath( pPath );
-  return Ret;
-}
+        /* 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;
 
-BOOL
-FASTCALL
-PATH_PolyBezierTo ( PDC dc, const POINT *pts, DWORD cbPoints )
-{
-  POINT pt;
-  ULONG i;
-  PPATH pPath;
+        /* Allocate new arrays */
+        pPointsNew = (POINT *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(POINT), TAG_PATH);
+        if (!pPointsNew)
+            return FALSE;
 
-  ASSERT ( dc );
-  ASSERT ( pts );
-  ASSERT ( cbPoints );
+        pFlagsNew = (BYTE *)ExAllocatePoolWithTag(PagedPool, numEntriesToAllocate * sizeof(BYTE), TAG_PATH);
+        if (!pFlagsNew)
+        {
+            ExFreePoolWithTag(pPointsNew, TAG_PATH);
+            return FALSE;
+        }
 
-   pPath = PATH_LockPath( dc->dclevel.hPath );
-   if (!pPath) return FALSE;
+        /* Copy old arrays to new arrays and discard old arrays */
+        if (pPath->pPoints)
+        {
+            ASSERT(pPath->pFlags);
 
-  /* Check that path is open */
-  if ( pPath->state != PATH_Open )
-  {
-    PATH_UnlockPath( pPath );
-    return FALSE;
-  }
+            memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
+            memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
 
-  /* 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;
+            ExFreePoolWithTag(pPath->pPoints, TAG_PATH);
+            ExFreePoolWithTag(pPath->pFlags, TAG_PATH);
+        }
+
+        pPath->pPoints = pPointsNew;
+        pPath->pFlags = pFlagsNew;
+        pPath->numEntriesAllocated = numEntriesToAllocate;
     }
-  }
 
-  for(i = 0; i < cbPoints; i++)
-  {
-    pt = pts[i];
-    CoordLPtoDP ( dc, &pt );
-    PATH_AddEntry(pPath, &pt, PT_BEZIERTO);
-  }
-  PATH_UnlockPath( pPath );
-  return TRUE;
+    return TRUE;
 }
 
-BOOL
+/* 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_PolyBezier ( PDC dc, const POINT *pts, DWORD cbPoints )
+PATH_ScaleNormalizedPoint(
+    FLOAT_POINT corners[],
+    double x,
+    double y,
+    POINT *pPoint)
 {
-  POINT   pt;
-  ULONG   i;
-  PPATH   pPath;
+    ASSERT(corners);
+    ASSERT(pPoint);
 
-  ASSERT ( dc );
-  ASSERT ( pts );
-  ASSERT ( cbPoints );
+    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));
+}
 
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath) return FALSE;
+/* 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);
 
-   /* 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_BEZIERTO );
-  }
-  PATH_UnlockPath( pPath );
-  return TRUE;
+    *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
-FASTCALL
-PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints)
+PATH_CheckCorners(
+    DC *dc,
+    POINT corners[],
+    INT x1,
+    INT y1,
+    INT x2,
+    INT y2)
 {
-  PPATH pPath;
-  POINT lastmove, orig_pos;
-  ULONG i;
-  PDC_ATTR pdcattr;
-  BOOL State = FALSE, Ret = FALSE;
-
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath) return FALSE;
-
-  if ( pPath->state != PATH_Open )
-  {
-    PATH_UnlockPath( pPath );
-    return FALSE;
-  }
+    INT temp;
+    PDC_ATTR pdcattr = dc->pdcattr;
 
-  pdcattr = dc->pdcattr;
+    /* Convert points to device coordinates */
+    corners[0].x = x1;
+    corners[0].y = y1;
+    corners[1].x = x2;
+    corners[1].y = y2;
+    IntLPtoDP(dc, corners, 2);
 
-  lastmove.x = orig_pos.x = pdcattr->ptlCurrent.x;
-  lastmove.y = orig_pos.y = pdcattr->ptlCurrent.y;
+    /* 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;
+    }
 
-  i = pPath->numEntriesUsed;
+    if (corners[0].y > corners[1].y)
+    {
+        temp = corners[0].y;
+        corners[0].y = corners[1].y;
+        corners[1].y = temp;
+    }
 
-  while (i != 0)
-  {
-      i--;
-      if (pPath->pFlags[i] == PT_MOVETO)
-      {
-         lastmove.x = pPath->pPoints[i].x;
-         lastmove.y = pPath->pPoints[i].y;
-         if (!GdiPathDPtoLP(dc, &lastmove, 1))
-         {
-            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;
+    /* In GM_COMPATIBLE, don't include bottom and right edges */
+    if (pdcattr->iGraphicsMode == GM_COMPATIBLE)
+    {
+        if (corners[0].x == corners[1].x) return FALSE;
+        if (corners[0].y == corners[1].y) return FALSE;
+        corners[1].x--;
+        corners[1].y--;
+    }
+    return TRUE;
 }
 
-BOOL
-FASTCALL
-PATH_Polyline ( PDC dc, const POINT *pts, DWORD cbPoints )
+/* 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 )
 {
-  POINT   pt;
-  ULONG   i;
-  PPATH   pPath;
-
-  ASSERT ( dc );
-  ASSERT ( pts );
-  ASSERT ( cbPoints );
+    BYTE *ret;
 
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath) return FALSE;
+    if (!PATH_ReserveEntries( path, path->numEntriesUsed + count )) return NULL;
 
-  /* 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;
+    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;
 }
 
-BOOL
-FASTCALL
-PATH_PolylineTo ( PDC dc, const POINT *pts, DWORD cbPoints )
+/* 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 )
 {
-  POINT   pt;
-  ULONG   i;
-  PPATH   pPath;
+    BYTE *ret;
 
-  ASSERT ( dc );
-  ASSERT ( pts );
-  ASSERT ( cbPoints );
+    if (!PATH_ReserveEntries( path, path->numEntriesUsed + count )) return NULL;
 
-  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_LINETO);
-  }
-  PATH_UnlockPath( pPath );
-  return TRUE;
+    ret = &path->pFlags[path->numEntriesUsed];
+    memcpy( &path->pPoints[path->numEntriesUsed], points, count * sizeof(*points) );
+    memset( ret, type, count );
+    path->numEntriesUsed += count;
+    return ret;
 }
 
-
-BOOL
-FASTCALL
-PATH_Polygon ( PDC dc, const POINT *pts, DWORD cbPoints )
+/* reverse the order of an array of points */
+static void reverse_points( POINT *points, UINT count )
 {
-  POINT   pt;
-  ULONG   i;
-  PPATH   pPath;
+    UINT i;
+    for (i = 0; i < count / 2; i++)
+    {
+        POINT pt = points[i];
+        points[i] = points[count - i - 1];
+        points[count - i - 1] = pt;
+    }
+}
 
-  ASSERT ( dc );
-  ASSERT ( pts );
+/* 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;
+}
 
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath) return FALSE;
+/* 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];
+}
 
-  /* 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));
-  }
-  PATH_UnlockPath( pPath );
-  return TRUE;
+/* close the current figure */
+static void close_figure( PPATH path )
+{
+    assert( path->numEntriesUsed );
+    path->pFlags[path->numEntriesUsed - 1] |= PT_CLOSEFIGURE;
 }
 
-BOOL
-FASTCALL
-PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons )
+/* 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 )
 {
-  POINT   pt, startpt;
-  ULONG   poly, point, i;
-  PPATH   pPath;
-
-  ASSERT ( dc );
-  ASSERT ( pts );
-  ASSERT ( counts );
-  ASSERT ( polygons );
-
-  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(point = 0; point < (ULONG) counts[poly]; point++, i++)
-    {
-      pt = pts[i];
-      CoordLPtoDP ( dc, &pt );
-      if(point == 0) startpt = pt;
-        PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO);
-    }
-    /* Win98 adds an extra line to close the figure for some reason */
-    PATH_AddEntry(pPath, &startpt, PT_LINETO | PT_CLOSEFIGURE);
-  }
-  PATH_UnlockPath( pPath );
-  return TRUE;
+    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_PolyPolyline ( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines )
+PATH_MoveTo(
+    PDC dc,
+    PPATH pPath)
 {
-  POINT   pt;
-  ULONG   poly, point, i;
-  PPATH   pPath;
-
-  ASSERT ( dc );
-  ASSERT ( pts );
-  ASSERT ( counts );
-  ASSERT ( polylines );
-
-  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 (!pPath) return FALSE;
 
-  for(i = 0, poly = 0; poly < polylines; poly++)
-  {
-    for(point = 0; point < counts[poly]; point++, i++)
+    // GDI32 : Signal from user space of a change in position.
+    if (dc->pdcattr->ulDirty_ & DIRTY_STYLESTATE)
     {
-      pt = pts[i];
-      CoordLPtoDP ( dc, &pt );
-      PATH_AddEntry(pPath, &pt, (point == 0) ? PT_MOVETO : PT_LINETO);
+       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;
     }
-  }
-  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;
+    return FALSE;
 }
 
-
-/* PATH_AddFlatBezier
+/* 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_AddFlatBezier ( PPATH pPath, POINT *pt, BOOL closed )
+PATH_LineTo(
+    PDC dc,
+    INT x,
+    INT y)
 {
-  POINT *pts;
-  INT no, i;
+    BOOL Ret;
+    PPATH pPath;
+    POINT point, pointCurPos;
 
-  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);
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
 
-  ExFreePoolWithTag(pts, TAG_BEZIER);
-  return TRUE;
-}
+    point.x = x;
+    point.y = y;
 
-/* PATH_FlattenPath
- *
- * Replaces Beziers with line segments
+    // 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_FlattenPath(PPATH pPath)
+PATH_Rectangle(
+    PDC dc,
+    INT x1,
+    INT y1,
+    INT x2,
+    INT y2)
 {
-  PATH newPath;
-  INT srcpt;
-
-  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]);
-        break;
-      case PT_BEZIERTO:
-        PATH_AddFlatBezier(&newPath, &pPath->pPoints[srcpt-1], pPath->pFlags[srcpt+2] & PT_CLOSEFIGURE);
-        srcpt += 2;
-        break;
-    }
-  }
-  newPath.state = PATH_Closed;
-  PATH_AssignGdiPath(pPath, &newPath);
-  PATH_EmptyPath(&newPath);
-  return TRUE;
+    PPATH pPath;
+    POINT corners[2], points[4];
+    BYTE *type;
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+    if (!PATH_CheckCorners(dc, corners, x1, y1, x2, y2))
+    {
+        PATH_UnlockPath(pPath);
+        return TRUE;
+    }
+
+    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;
+    }
+    type[0] = PT_MOVETO;
+
+    /* Close the rectangle figure */
+    IntGdiCloseFigure(pPath) ;
+    PATH_UnlockPath(pPath);
+    return TRUE;
 }
 
+/* PATH_RoundRect
+ *
+ * Should be called when a call to RoundRect is performed on a DC that has
+ * an open path. Returns TRUE if successful, else FALSE.
+ *
+ */
+BOOL
+FASTCALL
+PATH_RoundRect(
+    DC *dc,
+    INT x1,
+    INT y1,
+    INT x2,
+    INT y2,
+    INT ell_width,
+    INT ell_height)
+{
+    const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */
+    PPATH pPath;
+    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 );
 
-/* PATH_PathToRegion
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+    if (!PATH_CheckCorners(dc, corners, x1, y1, x2, y2))
+    {
+        PATH_UnlockPath(pPath);
+        return TRUE;
+    }
+
+    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);
+    return TRUE;
+}
+
+/* PATH_Ellipse
  *
- * 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.
  */
 BOOL
 FASTCALL
-PATH_PathToRegion ( PPATH pPath, INT nPolyFillMode, HRGN *pHrgn )
+PATH_Ellipse(
+    PDC dc,
+    INT x1,
+    INT y1,
+    INT x2,
+    INT y2)
 {
-  int    numStrokes, iStroke, i;
-  PULONG  pNumPointsInStroke;
-  HRGN hrgn = 0;
-
-  ASSERT(pPath!=NULL);
-  ASSERT(pHrgn!=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++;
-
-  if(numStrokes == 0)
-  {
-      return FALSE;
-  }
-
-  /* Allocate memory for number-of-points-in-stroke array */
-  pNumPointsInStroke = ExAllocatePoolWithTag(PagedPool, sizeof(ULONG) * numStrokes, TAG_PATH);
-  if(!pNumPointsInStroke)
-  {
-    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++)
-  {
-    /* 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]++;
-  }
-
-  /* Create a region from the strokes */
-  hrgn = IntCreatePolyPolygonRgn( pPath->pPoints,
-                              pNumPointsInStroke,
-                                      numStrokes,
-                                   nPolyFillMode);
-  if(hrgn==(HRGN)0)
-  {
-    EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
-    return FALSE;
-  }
+    const double factor = 0.55428475; /* 4 / 3 * (sqrt(2) - 1) */
+    PPATH pPath;
+    POINT corners[2], points[13];
+    BYTE *type;
+    double width, height;
 
-  /* Free memory for number-of-points-in-stroke array */
-  ExFreePoolWithTag(pNumPointsInStroke, TAG_PATH);
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
 
-  /* Success! */
-  *pHrgn=hrgn;
-  return TRUE;
+    if (!PATH_CheckCorners(dc, corners, x1, y1, x2, y2))
+    {
+        PATH_UnlockPath(pPath);
+        return TRUE;
+    }
+
+    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_EmptyPath
+/* PATH_DoArcPart
  *
- * Removes all entries from the path and sets the path state to PATH_Null.
+ * 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.
  */
-VOID
+BOOL
 FASTCALL
-PATH_EmptyPath ( PPATH pPath )
+PATH_DoArcPart(
+    PPATH pPath,
+    FLOAT_POINT corners[],
+    double angleStart,
+    double angleEnd,
+    BYTE startEntryType)
 {
-  ASSERT(pPath!=NULL);
+    double  halfAngle, a;
+    double  xNorm[4], yNorm[4];
+    POINT points[4];
+    BYTE *type;
+    int i, start;
+
+    ASSERT(fabs(angleEnd - angleStart) <= M_PI_2);
 
-  pPath->state=PATH_Null;
-  pPath->numEntriesUsed=0;
+    /* 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_AddEntry
+/* PATH_Arc
  *
- * 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).
+ * Should be called when a call to Arc is performed on a DC that has
+ * an open path. This adds up to five Bezier splines representing the arc
+ * to the path. When 'lines' is 1, we add 1 extra line to get a chord,
+ * when 'lines' is 2, we add 2 extra lines to get a pie, and when 'lines' is
+ * -1 we add 1 extra line from the current DC position to the starting position
+ * of the arc before drawing the arc itself (arcto). Returns TRUE if successful,
+ * else FALSE.
  */
 BOOL
 FASTCALL
-PATH_AddEntry ( PPATH pPath, const POINT *pPoint, BYTE flags )
+PATH_Arc(
+    PDC dc,
+    INT x1,
+    INT y1,
+    INT x2,
+    INT y2,
+    INT xStart,
+    INT yStart,
+    INT xEnd,
+    INT yEnd,
+    INT direction,
+    INT lines)
 {
-  ASSERT(pPath!=NULL);
+    double  angleStart, angleEnd, angleStartQuadrant, angleEndQuadrant = 0.0;
+    /* Initialize angleEndQuadrant to silence gcc's warning */
+    double  x, y;
+    FLOAT_POINT corners[2], pointStart, pointEnd;
+    POINT   centre, pointCurPos;
+    BOOL    start, end, Ret = TRUE;
+    INT     temp;
+    BOOL    clockwise;
+    PPATH   pPath;
+
+    /* FIXME: This function should check for all possible error returns */
+    /* FIXME: Do we have to respect newStroke? */
+
+    ASSERT(dc);
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
 
-  /* FIXME: If newStroke is true, perhaps we want to check that we're
-   * getting a PT_MOVETO
-   */
+    if (direction)
+       clockwise = ((direction == AD_CLOCKWISE) !=0 );
+    else
+       clockwise = ((dc->dclevel.flPath & DCPATH_CLOCKWISE) != 0);
 
-  /* Check that path is open */
-  if ( pPath->state != PATH_Open )
-    return FALSE;
+    /* Check for zero height / width */
+    /* FIXME: Only in GM_COMPATIBLE? */
+    if (x1 == x2 || y1 == y2)
+    {
+        Ret = TRUE;
+        goto ArcExit;
+    }
+    /* Convert points to device coordinates */
+    corners[0].x = (FLOAT)x1;
+    corners[0].y = (FLOAT)y1;
+    corners[1].x = (FLOAT)x2;
+    corners[1].y = (FLOAT)y2;
+    pointStart.x = (FLOAT)xStart;
+    pointStart.y = (FLOAT)yStart;
+    pointEnd.x = (FLOAT)xEnd;
+    pointEnd.y = (FLOAT)yEnd;
+    INTERNAL_LPTODP_FLOAT(dc, corners);
+    INTERNAL_LPTODP_FLOAT(dc, corners + 1);
+    INTERNAL_LPTODP_FLOAT(dc, &pointStart);
+    INTERNAL_LPTODP_FLOAT(dc, &pointEnd);
+
+    /* 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;
+    }
 
-  /* Reserve enough memory for an extra path entry */
-  if ( !PATH_ReserveEntries(pPath, pPath->numEntriesUsed+1) )
-    return FALSE;
+    /* Compute start and end angle */
+    PATH_NormalizePoint(corners, &pointStart, &x, &y);
+    angleStart = atan2(y, x);
+    PATH_NormalizePoint(corners, &pointEnd, &x, &y);
+    angleEnd = atan2(y, x);
+
+    /* Make sure the end angle is "on the right side" of the start angle */
+    if (clockwise)
+    {
+        if (angleEnd <= angleStart)
+        {
+            angleEnd += 2 * M_PI;
+            ASSERT(angleEnd >= angleStart);
+        }
+    }
+    else
+    {
+        if (angleEnd >= angleStart)
+        {
+            angleEnd -= 2 * M_PI;
+            ASSERT(angleEnd <= angleStart);
+        }
+    }
+
+    /* In GM_COMPATIBLE, don't include bottom and right edges */
+    if (dc->pdcattr->iGraphicsMode == GM_COMPATIBLE)
+    {
+        corners[1].x--;
+        corners[1].y--;
+    }
 
-  /* Store information in path entry */
-  pPath->pPoints[pPath->numEntriesUsed]=*pPoint;
-  pPath->pFlags[pPath->numEntriesUsed]=flags;
+    /* arcto: Add a PT_MOVETO only if this is the first entry in a stroke */
+    if (lines == GdiTypeArcTo && pPath->newStroke) // -1
+    {
+        pPath->newStroke = FALSE;
+        IntGetCurrentPositionEx(dc, &pointCurPos);
+        CoordLPtoDP(dc, &pointCurPos);
+        if (!PATH_AddEntry(pPath, &pointCurPos, PT_MOVETO))
+        {
+            Ret = FALSE;
+            goto ArcExit;
+        }
+    }
 
-  /* If this is PT_CLOSEFIGURE, we have to start a new stroke next time */
-  if((flags & PT_CLOSEFIGURE) == PT_CLOSEFIGURE)
-    pPath->newStroke=TRUE;
+    /* Add the arc to the path with one Bezier spline per quadrant that the
+     * arc spans */
+    start = TRUE;
+    end = FALSE;
+    do
+    {
+        /* Determine the start and end angles for this quadrant */
+        if (start)
+        {
+            angleStartQuadrant = angleStart;
+            if (clockwise)
+                angleEndQuadrant = (floor(angleStart / M_PI_2) + 1.0) * M_PI_2;
+            else
+                angleEndQuadrant = (ceil(angleStart / M_PI_2) - 1.0) * M_PI_2;
+        }
+        else
+        {
+            angleStartQuadrant = angleEndQuadrant;
+            if (clockwise)
+                angleEndQuadrant += M_PI_2;
+            else
+                angleEndQuadrant -= M_PI_2;
+        }
 
-  /* Increment entry count */
-  pPath->numEntriesUsed++;
+        /* Have we reached the last part of the arc? */
+        if ((clockwise && angleEnd < angleEndQuadrant) ||
+            (!clockwise && angleEnd > angleEndQuadrant))
+        {
+            /* Adjust the end angle for this quadrant */
+            angleEndQuadrant = angleEnd;
+            end = TRUE;
+        }
 
-  return TRUE;
+        /* Add the Bezier spline to the path */
+        PATH_DoArcPart(pPath,
+                       corners,
+                       angleStartQuadrant,
+                       angleEndQuadrant,
+                       start ? (lines == GdiTypeArcTo ? PT_LINETO : PT_MOVETO) : FALSE); // -1
+        start = FALSE;
+    }
+    while (!end);
+
+    if (lines == GdiTypeArcTo)
+    {
+       update_current_pos( pPath );
+    }
+    else /* chord: close figure. pie: add line and close figure */
+    if (lines == GdiTypeChord) // 1
+    {
+        IntGdiCloseFigure(pPath);
+    }
+    else if (lines == GdiTypePie) // 2
+    {
+        centre.x = (corners[0].x + corners[1].x) / 2;
+        centre.y = (corners[0].y + corners[1].y) / 2;
+        if (!PATH_AddEntry(pPath, &centre, PT_LINETO | PT_CLOSEFIGURE))
+            Ret = FALSE;
+    }
+ArcExit:
+    PATH_UnlockPath(pPath);
+    return Ret;
 }
 
-/* PATH_ReserveEntries
+BOOL
+FASTCALL
+PATH_PolyBezierTo(
+    PDC dc,
+    const POINT *pts,
+    DWORD cbPoints)
+{
+    PPATH pPath;
+    BOOL ret;
+
+    ASSERT(dc);
+    ASSERT(pts);
+    ASSERT(cbPoints);
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+    ret = add_log_points_new_stroke( dc, pPath, pts, cbPoints, PT_BEZIERTO );
+
+    PATH_UnlockPath(pPath);
+    return ret;
+}
+
+BOOL
+FASTCALL
+PATH_PolyBezier(
+    PDC dc,
+    const POINT *pts,
+    DWORD cbPoints)
+{
+    PPATH pPath;
+    BYTE *type;
+
+    ASSERT(dc);
+    ASSERT(pts);
+    ASSERT(cbPoints);
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+    type = add_log_points( dc, pPath, pts, cbPoints, PT_BEZIERTO );
+    if (!type) return FALSE;
+
+    type[0] = PT_MOVETO;
+
+    PATH_UnlockPath(pPath);
+    return TRUE;
+}
+
+BOOL
+FASTCALL
+PATH_PolyDraw(
+    PDC dc,
+    const POINT *pts,
+    const BYTE *types,
+    DWORD cbPoints)
+{
+    PPATH pPath;
+    POINT orig_pos, cur_pos;
+    ULONG i, lastmove = 0;
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+    if (pPath->state != PATH_Open)
+    {
+        PATH_UnlockPath(pPath);
+        return FALSE;
+    }
+
+    for (i = 0; i < pPath->numEntriesUsed; i++) if (pPath->pFlags[i] == PT_MOVETO) lastmove = i;
+    orig_pos = pPath->pos;
+
+    IntGetCurrentPositionEx(dc, &cur_pos);
+
+    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);
+
+
+    for(i = 0; i < cbPoints; i++)
+    {
+        switch (types[i])
+        {
+        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;
+            }
+            break;
+        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;
+
+            DPRINT("PPD Bad   : pos X %d Y %d\n",pPath->pos.x, pPath->pos.y);
+
+            IntGdiMoveToEx(dc, cur_pos.x, cur_pos.y, NULL);
+
+            PATH_UnlockPath(pPath);
+            return FALSE;
+        }
+
+        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_PolylineTo(
+    PDC dc,
+    const POINT *pts,
+    DWORD cbPoints)
+{
+    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;
+
+    ret = add_log_points_new_stroke( dc, pPath, pts, cbPoints, PT_LINETO );
+    PATH_UnlockPath(pPath);
+    return ret;
+}
+
+BOOL
+FASTCALL
+PATH_PolyPolygon(
+    PDC dc,
+    const POINT* pts,
+    const INT* counts,
+    UINT polygons)
+{
+    UINT poly, count;
+    BYTE *type;
+    PPATH pPath;
+
+    ASSERT(dc);
+    ASSERT(pts);
+    ASSERT(counts);
+    ASSERT(polygons);
+
+    if (!polygons) return FALSE;
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath) return FALSE;
+
+
+    for (poly = count = 0; poly < polygons; poly++)
+    {
+        if (counts[poly] < 2)
+        {
+           PATH_UnlockPath(pPath);
+           return FALSE;
+        }
+        count += counts[poly];
+    }
+
+    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;
+}
+
+BOOL
+FASTCALL
+PATH_PolyPolyline(
+    PDC dc,
+    const POINT* pts,
+    const DWORD* counts,
+    DWORD polylines)
+{
+    POINT pt;
+    ULONG poly, point, i;
+    PPATH pPath;
+
+    ASSERT(dc);
+    ASSERT(pts);
+    ASSERT(counts);
+    ASSERT(polylines);
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath)
+    {
+       return FALSE;
+    }
+
+    for (i = 0, poly = 0; poly < polylines; poly++)
+    {
+        for (point = 0; point < counts[poly]; point++, i++)
+        {
+            pt = pts[i];
+            CoordLPtoDP(dc, &pt);
+            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_AddFlatBezier
  *
- * 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 )
+PATH_AddFlatBezier(
+    PPATH pPath,
+    POINT *pt,
+    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++)
+    {
+        if (!(ret = PATH_AddEntry(pPath, &pts[i],  (i == no - 1 && closed) ? PT_LINETO | PT_CLOSEFIGURE : PT_LINETO)))
+           break;
+    }
+
+    ExFreePoolWithTag(pts, TAG_BEZIER);
+    return ret;
+}
+
+/* PATH_FlattenPath
+ *
+ * Replaces Beziers with line segments
+ *
+ */
+PPATH
+FASTCALL
+PATH_FlattenPath(PPATH pPath)
+{
+    PPATH newPath;
+    INT srcpt;
+    DPRINT("PATH_FlattenPath\n");
+    if (!(newPath = PATH_CreatePath(pPath->numEntriesUsed))) return NULL;
+
+    for (srcpt = 0; srcpt < pPath->numEntriesUsed; srcpt++)
+    {
+        switch(pPath->pFlags[srcpt] & ~PT_CLOSEFIGURE)
+        {
+            case PT_MOVETO:
+            case PT_LINETO:
+                if (!PATH_AddEntry(newPath, &pPath->pPoints[srcpt], pPath->pFlags[srcpt]))
+                {
+                   PATH_UnlockPath(newPath);
+                   PATH_Delete(newPath->BaseObject.hHmgr);
+                   return NULL;
+                }
+                break;
+            case PT_BEZIERTO:
+                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;
+        }
+    }
+    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.
+ */
+BOOL
+FASTCALL
+PATH_PathToRegion(
+    PPATH pPath,
+    INT Mode,
+    PREGION Rgn)
 {
-  INT   numEntriesToAllocate;
-  POINT *pPointsNew;
-  BYTE    *pFlagsNew;
+    int i, pos, polygons; 
+    PULONG counts;
+    int Ret;
 
-  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;
+    if (!pPath->numEntriesUsed) return FALSE;
 
-    /* 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)
+    counts = ExAllocatePoolWithTag(PagedPool, (pPath->numEntriesUsed / 2) * sizeof(counts), TAG_PATH);
+    if (!counts)
     {
-      ExFreePoolWithTag(pPointsNew, TAG_PATH);
-      return FALSE;
+        DPRINT1("Failed to allocate %lu strokes\n", (pPath->numEntriesUsed / 2) * sizeof(*counts));
+        EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
+        return FALSE;
     }
 
-    /* Copy old arrays to new arrays and discard old arrays */
-    if(pPath->pPoints)
+    pos = polygons = 0;
+    ASSERT( pPath->pFlags[0] == PT_MOVETO );
+    for (i = 1; i < pPath->numEntriesUsed; i++)
     {
-      ASSERT(pPath->pFlags);
+        if (pPath->pFlags[i] != PT_MOVETO) continue;
+        counts[polygons++] = i - pos;
+        pos = i;
+    }
+    if (i > pos + 1) counts[polygons++] = i - pos;
 
-      memcpy(pPointsNew, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
-      memcpy(pFlagsNew, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
+    ASSERT( polygons <= pPath->numEntriesUsed / 2 );
 
-      ExFreePoolWithTag(pPath->pPoints, TAG_PATH);
-      ExFreePoolWithTag(pPath->pFlags, TAG_PATH);
+    /* Fill the region with the strokes */
+    Ret = REGION_SetPolyPolygonRgn(Rgn,
+                                   pPath->pPoints,
+                                   counts,
+                                   polygons,
+                                   Mode);
+    if (!Ret)
+    {
+        DPRINT1("REGION_SetPolyPolygonRgn failed\n");
     }
-    pPath->pPoints=pPointsNew;
-    pPath->pFlags=pFlagsNew;
-    pPath->numEntriesAllocated=numEntriesToAllocate;
-  }
 
-  return TRUE;
+    ExFreePoolWithTag(counts, TAG_PATH);
+
+    /* Success! */
+    return Ret;
 }
 
-/* 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? */
-
-  /* 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 */
-  if(startEntryType)
-  {
-    PATH_ScaleNormalizedPoint(corners, xNorm[0], yNorm[0], &point);
-    if(!PATH_AddEntry(pPath, &point, startEntryType))
-      return FALSE;
-  }
-
-  /* Add remaining control points */
-  for(i=1; i<4; i++)
-  {
-    PATH_ScaleNormalizedPoint(corners, xNorm[i], yNorm[i], &point);
-    if(!PATH_AddEntry(pPath, &point, PT_BEZIERTO))
-      return FALSE;
-  }
-
-  return TRUE;
+    return PATH_FillPathEx(dc, pPath, NULL);
 }
 
-/* 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
+BOOL
 FASTCALL
-PATH_ScaleNormalizedPoint ( FLOAT_POINT corners[], double x,
-   double y, POINT *pPoint )
+PATH_FillPathEx(
+    PDC dc,
+    PPATH pPath,
+    PBRUSH pbrFill)
 {
-  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) );
-}
+    INT   mapMode, graphicsMode;
+    SIZE  ptViewportExt, ptWindowExt;
+    POINTL ptViewportOrg, ptWindowOrg;
+    XFORML xform;
+    PREGION  Rgn;
+    PDC_ATTR pdcattr = dc->pdcattr;
 
-/* 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;
-}
+    /* 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))
+    {
+        DPRINT("PFP : Fail P2R\n");
+        /* 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;
+    GreModifyWorldTransform(dc, &xform, MWT_IDENTITY);
+    pdcattr->iGraphicsMode =  graphicsMode;
+
+    /* Paint the region */
+    IntGdiFillRgn(dc, Rgn, pbrFill);
+    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_SET);
+    pdcattr->iGraphicsMode = graphicsMode;
+    return TRUE;
+}
 
-BOOL FASTCALL PATH_StrokePath(DC *dc, PPATH pPath)
+BOOL
+FASTCALL
+PATH_StrokePath(
+    DC *dc,
+    PPATH pPath)
 {
     BOOL ret = FALSE;
-    INT i=0;
+    INT i = 0;
     INT nLinePts, nAlloc;
     POINT *pLinePts = NULL;
     POINT ptViewportOrg, ptWindowOrg;
@@ -1421,9 +1563,6 @@ BOOL FASTCALL PATH_StrokePath(DC *dc, PPATH pPath)
 
     DPRINT("Enter %s\n", __FUNCTION__);
 
-    if (pPath->state != PATH_Closed)
-        return FALSE;
-
     /* Save the mapping mode info */
     mapMode = pdcattr->iMapMode;
 
@@ -1450,7 +1589,7 @@ BOOL FASTCALL PATH_StrokePath(DC *dc, PPATH pPath)
      * space in case we get one to keep the number of reallocations small. */
     nAlloc = pPath->numEntriesUsed + 1 + 300;
     pLinePts = ExAllocatePoolWithTag(PagedPool, nAlloc * sizeof(POINT), TAG_PATH);
-    if(!pLinePts)
+    if (!pLinePts)
     {
         DPRINT1("Can't allocate pool!\n");
         EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
@@ -1458,93 +1597,94 @@ BOOL FASTCALL PATH_StrokePath(DC *dc, PPATH pPath)
     }
     nLinePts = 0;
 
-    for(i = 0; i < pPath->numEntriesUsed; i++)
+    for (i = 0; i < pPath->numEntriesUsed; i++)
     {
-        if((i == 0 || (pPath->pFlags[i-1] & PT_CLOSEFIGURE))
+        if ((i == 0 || (pPath->pFlags[i - 1] & PT_CLOSEFIGURE))
                 && (pPath->pFlags[i] != PT_MOVETO))
         {
             DPRINT1("Expected PT_MOVETO %s, got path flag %d\n",
-                i == 0 ? "as first point" : "after PT_CLOSEFIGURE",
-                (INT)pPath->pFlags[i]);
-                goto end;
+                    i == 0 ? "as first point" : "after PT_CLOSEFIGURE",
+                    (INT)pPath->pFlags[i]);
+            goto end;
         }
 
         switch(pPath->pFlags[i])
         {
-        case PT_MOVETO:
-            DPRINT("Got PT_MOVETO (%ld, %ld)\n",
-                pPath->pPoints[i].x, pPath->pPoints[i].y);
-            if(nLinePts >= 2) IntGdiPolyline(dc, pLinePts, nLinePts);
-            nLinePts = 0;
-            pLinePts[nLinePts++] = pPath->pPoints[i];
-            break;
-        case PT_LINETO:
-        case (PT_LINETO | PT_CLOSEFIGURE):
-            DPRINT("Got PT_LINETO (%ld, %ld)\n",
-              pPath->pPoints[i].x, pPath->pPoints[i].y);
-            pLinePts[nLinePts++] = pPath->pPoints[i];
-            break;
-        case PT_BEZIERTO:
-            DPRINT("Got PT_BEZIERTO\n");
-            if(pPath->pFlags[i+1] != PT_BEZIERTO ||
-               (pPath->pFlags[i+2] & ~PT_CLOSEFIGURE) != PT_BEZIERTO)
-            {
-                DPRINT1("Path didn't contain 3 successive PT_BEZIERTOs\n");
-                ret = FALSE;
-                goto end;
-            }
-            else
-            {
-                INT nBzrPts, nMinAlloc;
-                POINT *pBzrPts = GDI_Bezier(&pPath->pPoints[i-1], 4, &nBzrPts);
-                /* Make sure we have allocated enough memory for the lines of
-                 * this bezier and the rest of the path, assuming we won't get
-                 * another one (since we won't reallocate again then). */
-                nMinAlloc = nLinePts + (pPath->numEntriesUsed - i) + nBzrPts;
-                if(nAlloc < nMinAlloc)
+            case PT_MOVETO:
+                DPRINT("Got PT_MOVETO (%ld, %ld)\n",
+                       pPath->pPoints[i].x, pPath->pPoints[i].y);
+                if (nLinePts >= 2) IntGdiPolyline(dc, pLinePts, nLinePts);
+                nLinePts = 0;
+                pLinePts[nLinePts++] = pPath->pPoints[i];
+                break;
+            case PT_LINETO:
+            case (PT_LINETO | PT_CLOSEFIGURE):
+                DPRINT("Got PT_LINETO (%ld, %ld)\n",
+                       pPath->pPoints[i].x, pPath->pPoints[i].y);
+                pLinePts[nLinePts++] = pPath->pPoints[i];
+                break;
+            case PT_BEZIERTO:
+                DPRINT("Got PT_BEZIERTO\n");
+                if (pPath->pFlags[i + 1] != PT_BEZIERTO ||
+                        (pPath->pFlags[i + 2] & ~PT_CLOSEFIGURE) != PT_BEZIERTO)
+                {
+                    DPRINT1("Path didn't contain 3 successive PT_BEZIERTOs\n");
+                    ret = FALSE;
+                    goto end;
+                }
+                else
                 {
-                    // Reallocate memory
+                    INT nBzrPts, nMinAlloc;
+                    POINT *pBzrPts = GDI_Bezier(&pPath->pPoints[i - 1], 4, &nBzrPts);
+                    /* Make sure we have allocated enough memory for the lines of
+                     * this bezier and the rest of the path, assuming we won't get
+                     * another one (since we won't reallocate again then). */
+                    nMinAlloc = nLinePts + (pPath->numEntriesUsed - i) + nBzrPts;
+                    if (nAlloc < nMinAlloc)
+                    {
+                        // Reallocate memory
 
-                    POINT *Realloc = NULL;
-                    nAlloc = nMinAlloc * 2;
+                        POINT *Realloc = NULL;
+                        nAlloc = nMinAlloc * 2;
 
-                    Realloc = ExAllocatePoolWithTag(PagedPool,
-                        nAlloc * sizeof(POINT),
-                        TAG_PATH);
+                        Realloc = ExAllocatePoolWithTag(PagedPool,
+                                                        nAlloc * sizeof(POINT),
+                                                        TAG_PATH);
 
-                    if(!Realloc)
-                    {
-                        DPRINT1("Can't allocate pool!\n");
-                        goto end;
-                    }
+                        if (!Realloc)
+                        {
+                            DPRINT1("Can't allocate pool!\n");
+                            ExFreePoolWithTag(pBzrPts, TAG_BEZIER);
+                            goto end;
+                        }
 
-                    memcpy(Realloc, pLinePts, nLinePts*sizeof(POINT));
-                    ExFreePoolWithTag(pLinePts, TAG_PATH);
-                    pLinePts = Realloc;
+                        memcpy(Realloc, pLinePts, nLinePts * sizeof(POINT));
+                        ExFreePoolWithTag(pLinePts, TAG_PATH);
+                        pLinePts = Realloc;
+                    }
+                    memcpy(&pLinePts[nLinePts], &pBzrPts[1], (nBzrPts - 1) * sizeof(POINT));
+                    nLinePts += nBzrPts - 1;
+                    ExFreePoolWithTag(pBzrPts, TAG_BEZIER);
+                    i += 2;
                 }
-                memcpy(&pLinePts[nLinePts], &pBzrPts[1], (nBzrPts - 1) * sizeof(POINT));
-                nLinePts += nBzrPts - 1;
-                ExFreePoolWithTag(pBzrPts, TAG_BEZIER);
-                i += 2;
-            }
-            break;
-        default:
-            DPRINT1("Got path flag %d (not supported)\n", (INT)pPath->pFlags[i]);
-            goto end;
+                break;
+            default:
+                DPRINT1("Got path flag %d (not supported)\n", (INT)pPath->pFlags[i]);
+                goto end;
         }
 
-        if(pPath->pFlags[i] & PT_CLOSEFIGURE)
+        if (pPath->pFlags[i] & PT_CLOSEFIGURE)
         {
             pLinePts[nLinePts++] = pLinePts[0];
         }
     }
-    if(nLinePts >= 2)
+    if (nLinePts >= 2)
         IntGdiPolyline(dc, pLinePts, nLinePts);
 
     ret = TRUE;
 
 end:
-    if(pLinePts) ExFreePoolWithTag(pLinePts, TAG_PATH);
+    if (pLinePts) ExFreePoolWithTag(pLinePts, TAG_PATH);
 
     /* Restore the old mapping mode */
     pdcattr->iMapMode =  mapMode;
@@ -1567,12 +1707,12 @@ end:
        dc->CurPosX|Y so that their values are in the correct mapping
        mode.
     */
-    if(i > 0)
+    if (i > 0)
     {
         POINT pt;
         IntGetCurrentPositionEx(dc, &pt);
         IntDPtoLP(dc, &pt, 1);
-        IntGdiMoveToEx(dc, pt.x, pt.y, NULL, FALSE);
+        IntGdiMoveToEx(dc, pt.x, pt.y, NULL);
     }
     DPRINT("Leave %s, ret=%d\n", __FUNCTION__, ret);
     return ret;
@@ -1580,95 +1720,49 @@ end:
 
 #define round(x) ((int)((x)>0?(x)+0.5:(x)-0.5))
 
-static
-BOOL
-FASTCALL
-PATH_WidenPath(DC *dc)
+PPATH FASTCALL
+IntGdiWidenPath(PPATH pPath, UINT penWidth, UINT penStyle, FLOAT eMiterLimit)
 {
-    INT i, j, numStrokes, numOldStrokes, penWidth, penWidthIn, penWidthOut, size, penStyle;
-    BOOL ret = FALSE;
-    PPATH pPath, pNewPath, *pStrokes = NULL, *pOldStrokes, pUpPath, pDownPath;
-    EXTLOGPEN *elp;
-    DWORD obj_type, joint, endcap, penType;
-    PDC_ATTR pdcattr = dc->pdcattr;
-
-    pPath = PATH_LockPath( dc->dclevel.hPath );
-    if (!pPath) return FALSE;
-
-    if(pPath->state == PATH_Open)
-    {
-       PATH_UnlockPath( pPath );
-       EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-       return FALSE;
-    }
-
-    PATH_FlattenPath(pPath);
-
-    size = GreGetObject( pdcattr->hpen, 0, NULL);
-    if (!size)
-    {
-        PATH_UnlockPath( pPath );
-        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-        return FALSE;
-    }
-
-    elp = ExAllocatePoolWithTag(PagedPool, size, TAG_PATH);
-    GreGetObject(pdcattr->hpen, size, elp);
-
-    obj_type = GDI_HANDLE_GET_TYPE(pdcattr->hpen);
-    if(obj_type == GDI_OBJECT_TYPE_PEN)
-    {
-        penStyle = ((LOGPEN*)elp)->lopnStyle;
-    }
-    else if(obj_type == GDI_OBJECT_TYPE_EXTPEN)
-    {
-        penStyle = elp->elpPenStyle;
-    }
-    else
-    {
-        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-        ExFreePoolWithTag(elp, TAG_PATH);
-        PATH_UnlockPath( pPath );
-        return FALSE;
-    }
-
-    penWidth = elp->elpWidth;
-    ExFreePoolWithTag(elp, TAG_PATH);
+    INT i, j, numStrokes, numOldStrokes, penWidthIn, penWidthOut;
+    PPATH flat_path, pNewPath, *pStrokes = NULL, *pOldStrokes, pUpPath, pDownPath;
+    BYTE *type;
+    DWORD joint, endcap;
 
     endcap = (PS_ENDCAP_MASK & penStyle);
     joint = (PS_JOIN_MASK & penStyle);
-    penType = (PS_TYPE_MASK & penStyle);
 
-    /* The function cannot apply to cosmetic pens */
-    if(obj_type == GDI_OBJECT_TYPE_EXTPEN && penType == PS_COSMETIC)
+    if (!(flat_path = PATH_FlattenPath(pPath)))
     {
-        PATH_UnlockPath( pPath );
-        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-        return FALSE;
+        DPRINT1("PATH_FlattenPath\n");
+        return NULL;
     }
 
     penWidthIn = penWidth / 2;
     penWidthOut = penWidth / 2;
-    if(penWidthIn + penWidthOut < penWidth)
+    if (penWidthIn + penWidthOut < penWidth)
         penWidthOut++;
 
     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]);
-            return FALSE;
+                    i == 0 ? "as first point" : "after PT_CLOSEFIGURE",
+                    flat_path->pFlags[i]);
+            if (pStrokes)
+                ExFreePoolWithTag(pStrokes, TAG_PATH);
+            PATH_UnlockPath(flat_path);
+            PATH_Delete(flat_path->BaseObject.hHmgr);
+            return NULL;
         }
-        switch(pPath->pFlags[i])
+        switch(flat_path->pFlags[i])
         {
             case PT_MOVETO:
-                if(numStrokes > 0)
+                if (numStrokes > 0)
                 {
                     pStrokes[numStrokes - 1]->state = PATH_Closed;
                 }
@@ -1676,49 +1770,56 @@ 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;
-                   RtlCopyMemory(pStrokes, pOldStrokes, numOldStrokes * sizeof(PPATH));
-                   ExFreePoolWithTag(pOldStrokes, TAG_PATH); // Free old pointer.
+                    pOldStrokes = pStrokes; // Save old pointer.
+                    pStrokes = ExAllocatePoolWithTag(PagedPool, numStrokes * sizeof(*pStrokes), TAG_PATH);
+                    if (!pStrokes)
+                    {
+                       PATH_UnlockPath(flat_path);
+                       PATH_Delete(flat_path->BaseObject.hHmgr);
+                       return NULL;
+                    }
+                    RtlCopyMemory(pStrokes, pOldStrokes, numOldStrokes * sizeof(PPATH));
+                    ExFreePoolWithTag(pOldStrokes, TAG_PATH); // Free old pointer.
+                }
+                if (!pStrokes)
+                {
+                   PATH_UnlockPath(flat_path);
+                   PATH_Delete(flat_path->BaseObject.hHmgr);
+                   return NULL;
                 }
-                if (!pStrokes) 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]);
-                return FALSE;
+                DPRINT1("Got path flag %c\n", flat_path->pFlags[i]);
+                if (pStrokes)
+                    ExFreePoolWithTag(pStrokes, TAG_PATH);
+                PATH_UnlockPath(flat_path);
+                PATH_Delete(flat_path->BaseObject.hHmgr);
+                return NULL;
         }
     }
 
-    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++)
+    for (i = 0; i < numStrokes; i++)
     {
         pUpPath = ExAllocatePoolWithTag(PagedPool, sizeof(PATH), TAG_PATH);
         PATH_InitGdiPath(pUpPath);
@@ -1727,16 +1828,16 @@ PATH_WidenPath(DC *dc)
         PATH_InitGdiPath(pDownPath);
         pDownPath->state = PATH_Open;
 
-        for(j = 0; j < pStrokes[i]->numEntriesUsed; j++)
+        for (j = 0; j < pStrokes[i]->numEntriesUsed; j++)
         {
             /* Beginning or end of the path if not closed */
-            if((!(pStrokes[i]->pFlags[pStrokes[i]->numEntriesUsed - 1] & PT_CLOSEFIGURE)) && (j == 0 || j == pStrokes[i]->numEntriesUsed - 1) )
+            if ((!(pStrokes[i]->pFlags[pStrokes[i]->numEntriesUsed - 1] & PT_CLOSEFIGURE)) && (j == 0 || j == pStrokes[i]->numEntriesUsed - 1))
             {
                 /* Compute segment angle */
                 double xo, yo, xa, ya, theta;
                 POINT pt;
                 FLOAT_POINT corners[2];
-                if(j == 0)
+                if (j == 0)
                 {
                     xo = pStrokes[i]->pPoints[j].x;
                     yo = pStrokes[i]->pPoints[j].y;
@@ -1750,23 +1851,23 @@ PATH_WidenPath(DC *dc)
                     xo = pStrokes[i]->pPoints[j].x;
                     yo = pStrokes[i]->pPoints[j].y;
                 }
-                theta = atan2( ya - yo, xa - xo );
+                theta = atan2(ya - yo, xa - xo);
                 switch(endcap)
                 {
                     case PS_ENDCAP_SQUARE :
                         pt.x = xo + round(sqrt(2) * penWidthOut * cos(M_PI_4 + theta));
                         pt.y = yo + round(sqrt(2) * penWidthOut * sin(M_PI_4 + theta));
-                        PATH_AddEntry(pUpPath, &pt, (j == 0 ? PT_MOVETO : PT_LINETO) );
+                        PATH_AddEntry(pUpPath, &pt, (j == 0 ? PT_MOVETO : PT_LINETO));
                         pt.x = xo + round(sqrt(2) * penWidthIn * cos(- M_PI_4 + theta));
                         pt.y = yo + round(sqrt(2) * penWidthIn * sin(- M_PI_4 + theta));
                         PATH_AddEntry(pUpPath, &pt, PT_LINETO);
                         break;
                     case PS_ENDCAP_FLAT :
-                        pt.x = xo + round( penWidthOut * cos(theta + M_PI_2) );
-                        pt.y = yo + round( penWidthOut * sin(theta + M_PI_2) );
+                        pt.x = xo + round(penWidthOut * cos(theta + M_PI_2));
+                        pt.y = yo + round(penWidthOut * sin(theta + M_PI_2));
                         PATH_AddEntry(pUpPath, &pt, (j == 0 ? PT_MOVETO : PT_LINETO));
-                        pt.x = xo - round( penWidthIn * cos(theta + M_PI_2) );
-                        pt.y = yo - round( penWidthIn * sin(theta + M_PI_2) );
+                        pt.x = xo - round(penWidthIn * cos(theta + M_PI_2));
+                        pt.y = yo - round(penWidthIn * sin(theta + M_PI_2));
                         PATH_AddEntry(pUpPath, &pt, PT_LINETO);
                         break;
                     case PS_ENDCAP_ROUND :
@@ -1775,10 +1876,10 @@ PATH_WidenPath(DC *dc)
                         corners[0].y = yo - penWidthIn;
                         corners[1].x = xo + penWidthOut;
                         corners[1].y = yo + penWidthOut;
-                        PATH_DoArcPart(pUpPath ,corners, theta + M_PI_2 , theta + 3 * M_PI_4, (j == 0 ? PT_MOVETO : FALSE));
-                        PATH_DoArcPart(pUpPath ,corners, theta + 3 * M_PI_4 , theta + M_PI, FALSE);
-                        PATH_DoArcPart(pUpPath ,corners, theta + M_PI, theta +  5 * M_PI_4, FALSE);
-                        PATH_DoArcPart(pUpPath ,corners, theta + 5 * M_PI_4 , theta + 3 * M_PI_2, FALSE);
+                        PATH_DoArcPart(pUpPath , corners, theta + M_PI_2 , theta + 3 * M_PI_4, (j == 0 ? PT_MOVETO : FALSE));
+                        PATH_DoArcPart(pUpPath , corners, theta + 3 * M_PI_4 , theta + M_PI, FALSE);
+                        PATH_DoArcPart(pUpPath , corners, theta + M_PI, theta +  5 * M_PI_4, FALSE);
+                        PATH_DoArcPart(pUpPath , corners, theta + 5 * M_PI_4 , theta + 3 * M_PI_2, FALSE);
                         break;
                 }
             }
@@ -1791,8 +1892,8 @@ PATH_WidenPath(DC *dc)
                 double alpha, theta, miterWidth;
                 DWORD _joint = joint;
                 POINT pt;
-               PPATH pInsidePath, pOutsidePath;
-                if(j > 0 && j < pStrokes[i]->numEntriesUsed - 1)
+                PPATH pInsidePath, pOutsidePath;
+                if (j > 0 && j < pStrokes[i]->numEntriesUsed - 1)
                 {
                     previous = j - 1;
                     next = j + 1;
@@ -1813,20 +1914,20 @@ PATH_WidenPath(DC *dc)
                 ya = pStrokes[i]->pPoints[previous].y;
                 xb = pStrokes[i]->pPoints[next].x;
                 yb = pStrokes[i]->pPoints[next].y;
-                theta = atan2( yo - ya, xo - xa );
-                alpha = atan2( yb - yo, xb - xo ) - theta;
+                theta = atan2(yo - ya, xo - xa);
+                alpha = atan2(yb - yo, xb - xo) - theta;
                 if (alpha > 0) alpha -= M_PI;
                 else alpha += M_PI;
-                if(_joint == PS_JOIN_MITER && dc->dclevel.laPath.eMiterLimit < fabs(1 / sin(alpha/2)))
+                if (_joint == PS_JOIN_MITER && eMiterLimit < fabs(1 / sin(alpha / 2)))
                 {
                     _joint = PS_JOIN_BEVEL;
                 }
-                if(alpha > 0)
+                if (alpha > 0)
                 {
                     pInsidePath = pUpPath;
                     pOutsidePath = pDownPath;
                 }
-                else if(alpha < 0)
+                else if (alpha < 0)
                 {
                     pInsidePath = pDownPath;
                     pOutsidePath = pUpPath;
@@ -1836,106 +1937,97 @@ PATH_WidenPath(DC *dc)
                     continue;
                 }
                 /* Inside angle points */
-                if(alpha > 0)
+                if (alpha > 0)
                 {
-                    pt.x = xo - round( penWidthIn * cos(theta + M_PI_2) );
-                    pt.y = yo - round( penWidthIn * sin(theta + M_PI_2) );
+                    pt.x = xo - round(penWidthIn * cos(theta + M_PI_2));
+                    pt.y = yo - round(penWidthIn * sin(theta + M_PI_2));
                 }
                 else
                 {
-                    pt.x = xo + round( penWidthIn * cos(theta + M_PI_2) );
-                    pt.y = yo + round( penWidthIn * sin(theta + M_PI_2) );
+                    pt.x = xo + round(penWidthIn * cos(theta + M_PI_2));
+                    pt.y = yo + round(penWidthIn * sin(theta + M_PI_2));
                 }
                 PATH_AddEntry(pInsidePath, &pt, PT_LINETO);
-                if(alpha > 0)
+                if (alpha > 0)
                 {
-                    pt.x = xo + round( penWidthIn * cos(M_PI_2 + alpha + theta) );
-                    pt.y = yo + round( penWidthIn * sin(M_PI_2 + alpha + theta) );
+                    pt.x = xo + round(penWidthIn * cos(M_PI_2 + alpha + theta));
+                    pt.y = yo + round(penWidthIn * sin(M_PI_2 + alpha + theta));
                 }
                 else
                 {
-                    pt.x = xo - round( penWidthIn * cos(M_PI_2 + alpha + theta) );
-                    pt.y = yo - round( penWidthIn * sin(M_PI_2 + alpha + theta) );
+                    pt.x = xo - round(penWidthIn * cos(M_PI_2 + alpha + theta));
+                    pt.y = yo - round(penWidthIn * sin(M_PI_2 + alpha + theta));
                 }
                 PATH_AddEntry(pInsidePath, &pt, PT_LINETO);
                 /* Outside angle point */
                 switch(_joint)
                 {
-                     case PS_JOIN_MITER :
+                    case PS_JOIN_MITER :
                         miterWidth = fabs(penWidthOut / cos(M_PI_2 - fabs(alpha) / 2));
-                        pt.x = xo + round( miterWidth * cos(theta + alpha / 2) );
-                        pt.y = yo + round( miterWidth * sin(theta + alpha / 2) );
+                        pt.x = xo + round(miterWidth * cos(theta + alpha / 2));
+                        pt.y = yo + round(miterWidth * sin(theta + alpha / 2));
                         PATH_AddEntry(pOutsidePath, &pt, PT_LINETO);
                         break;
                     case PS_JOIN_BEVEL :
-                        if(alpha > 0)
+                        if (alpha > 0)
                         {
-                            pt.x = xo + round( penWidthOut * cos(theta + M_PI_2) );
-                            pt.y = yo + round( penWidthOut * sin(theta + M_PI_2) );
+                            pt.x = xo + round(penWidthOut * cos(theta + M_PI_2));
+                            pt.y = yo + round(penWidthOut * sin(theta + M_PI_2));
                         }
                         else
                         {
-                            pt.x = xo - round( penWidthOut * cos(theta + M_PI_2) );
-                            pt.y = yo - round( penWidthOut * sin(theta + M_PI_2) );
+                            pt.x = xo - round(penWidthOut * cos(theta + M_PI_2));
+                            pt.y = yo - round(penWidthOut * sin(theta + M_PI_2));
                         }
                         PATH_AddEntry(pOutsidePath, &pt, PT_LINETO);
-                        if(alpha > 0)
+                        if (alpha > 0)
                         {
-                            pt.x = xo - round( penWidthOut * cos(M_PI_2 + alpha + theta) );
-                            pt.y = yo - round( penWidthOut * sin(M_PI_2 + alpha + theta) );
+                            pt.x = xo - round(penWidthOut * cos(M_PI_2 + alpha + theta));
+                            pt.y = yo - round(penWidthOut * sin(M_PI_2 + alpha + theta));
                         }
                         else
                         {
-                            pt.x = xo + round( penWidthOut * cos(M_PI_2 + alpha + theta) );
-                            pt.y = yo + round( penWidthOut * sin(M_PI_2 + alpha + theta) );
+                            pt.x = xo + round(penWidthOut * cos(M_PI_2 + alpha + theta));
+                            pt.y = yo + round(penWidthOut * sin(M_PI_2 + alpha + theta));
                         }
                         PATH_AddEntry(pOutsidePath, &pt, PT_LINETO);
                         break;
                     case PS_JOIN_ROUND :
                     default :
-                        if(alpha > 0)
+                        if (alpha > 0)
                         {
-                            pt.x = xo + round( penWidthOut * cos(theta + M_PI_2) );
-                            pt.y = yo + round( penWidthOut * sin(theta + M_PI_2) );
+                            pt.x = xo + round(penWidthOut * cos(theta + M_PI_2));
+                            pt.y = yo + round(penWidthOut * sin(theta + M_PI_2));
                         }
                         else
                         {
-                            pt.x = xo - round( penWidthOut * cos(theta + M_PI_2) );
-                            pt.y = yo - round( penWidthOut * sin(theta + M_PI_2) );
+                            pt.x = xo - round(penWidthOut * cos(theta + M_PI_2));
+                            pt.y = yo - round(penWidthOut * sin(theta + M_PI_2));
                         }
                         PATH_AddEntry(pOutsidePath, &pt, PT_BEZIERTO);
-                        pt.x = xo + round( penWidthOut * cos(theta + alpha / 2) );
-                        pt.y = yo + round( penWidthOut * sin(theta + alpha / 2) );
+                        pt.x = xo + round(penWidthOut * cos(theta + alpha / 2));
+                        pt.y = yo + round(penWidthOut * sin(theta + alpha / 2));
                         PATH_AddEntry(pOutsidePath, &pt, PT_BEZIERTO);
-                        if(alpha > 0)
+                        if (alpha > 0)
                         {
-                            pt.x = xo - round( penWidthOut * cos(M_PI_2 + alpha + theta) );
-                            pt.y = yo - round( penWidthOut * sin(M_PI_2 + alpha + theta) );
+                            pt.x = xo - round(penWidthOut * cos(M_PI_2 + alpha + theta));
+                            pt.y = yo - round(penWidthOut * sin(M_PI_2 + alpha + theta));
                         }
                         else
                         {
-                            pt.x = xo + round( penWidthOut * cos(M_PI_2 + alpha + theta) );
-                            pt.y = yo + round( penWidthOut * sin(M_PI_2 + alpha + theta) );
+                            pt.x = xo + round(penWidthOut * cos(M_PI_2 + alpha + theta));
+                            pt.y = yo + round(penWidthOut * sin(M_PI_2 + alpha + theta));
                         }
                         PATH_AddEntry(pOutsidePath, &pt, PT_BEZIERTO);
                         break;
                 }
             }
         }
-        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);
@@ -1946,13 +2038,94 @@ 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(pNewPath);
+    return pNewPath;
+}
+
+static
+PPATH
+FASTCALL
+PATH_WidenPath(DC *dc)
+{
+    INT size;
+    UINT penWidth, penStyle;
+    DWORD obj_type;
+    PPATH pPath, pNewPath;
+    LPEXTLOGPEN elp;
+    PDC_ATTR pdcattr = dc->pdcattr;
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath)
+    {
+        EngSetLastError( ERROR_CAN_NOT_COMPLETE );
+        return NULL;
+    }
+
+    if (pPath->state != PATH_Closed)
+    {
+        DPRINT("PWP 1\n");
+        PATH_UnlockPath(pPath);
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+        return NULL;
+    }
+
+    size = GreGetObject(pdcattr->hpen, 0, NULL);
+    if (!size)
+    {
+        DPRINT("PWP 2\n");
+        PATH_UnlockPath(pPath);
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+        return NULL;
+    }
+
+    elp = ExAllocatePoolWithTag(PagedPool, size, TAG_PATH);
+    if (elp == NULL)
+    {
+        DPRINT("PWP 3\n");
+        PATH_UnlockPath(pPath);
+        EngSetLastError(ERROR_OUTOFMEMORY);
+        return NULL;
+    }
+
+    GreGetObject(pdcattr->hpen, size, elp);
+
+    obj_type = GDI_HANDLE_GET_TYPE(pdcattr->hpen);
+    if (obj_type == GDI_OBJECT_TYPE_PEN)
+    {
+        penStyle = ((LOGPEN*)elp)->lopnStyle;
+    }
+    else if (obj_type == GDI_OBJECT_TYPE_EXTPEN)
+    {
+        penStyle = elp->elpPenStyle;
+    }
+    else
+    {
+        DPRINT("PWP 4\n");
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+        ExFreePoolWithTag(elp, TAG_PATH);
+        PATH_UnlockPath(pPath);
+        return NULL;
+    }
+
+    penWidth = elp->elpWidth;
+    ExFreePoolWithTag(elp, TAG_PATH);
+
+    /* The function cannot apply to cosmetic pens */
+    if (obj_type == GDI_OBJECT_TYPE_EXTPEN &&
+        (PS_TYPE_MASK & penStyle) == PS_COSMETIC)
+    {
+        DPRINT("PWP 5\n");
+        PATH_UnlockPath(pPath);
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+        return FALSE;
+    }
+
+    pNewPath = IntGdiWidenPath(pPath, penWidth, penStyle, dc->dclevel.laPath.eMiterLimit);
     PATH_UnlockPath(pPath);
-    return ret;
+    return pNewPath;
 }
 
 static inline INT int_from_fixed(FIXED f)
@@ -1968,7 +2141,10 @@ static inline INT int_from_fixed(FIXED f)
 static
 VOID
 FASTCALL
-PATH_BezierTo(PPATH pPath, POINT *lppt, INT n)
+PATH_BezierTo(
+    PPATH pPath,
+    POINT *lppt,
+    INT n)
 {
     if (n < 2) return;
 
@@ -1978,9 +2154,7 @@ PATH_BezierTo(PPATH pPath, POINT *lppt, INT n)
     }
     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
     {
@@ -1993,116 +2167,114 @@ PATH_BezierTo(PPATH pPath, POINT *lppt, INT n)
         while (n > 2)
         {
             pt[0] = pt[2];
-            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);
+            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;
+            add_points( pPath, pt, 3, PT_BEZIERTO );
             n--;
             i++;
         }
 
         pt[0] = pt[2];
-        pt[1] = lppt[i+1];
-        pt[2] = lppt[i+2];
-        PATH_BezierTo(pPath, pt, 3);
+        pt[1] = lppt[i + 1];
+        pt[2] = lppt[i + 2];
+        add_points( pPath, pt, 3, PT_BEZIERTO );
     }
 }
 
 static
 BOOL
 FASTCALL
-PATH_add_outline(PDC dc, INT x, INT y, TTPOLYGONHEADER *header, DWORD size)
+PATH_add_outline(
+    PDC dc,
+    PPATH pPath,
+    INT x,
+    INT y,
+    TTPOLYGONHEADER *header,
+    DWORD size)
 {
-  PPATH pPath;
-  TTPOLYGONHEADER *start;
-  POINT pt;
-  BOOL bResult = FALSE;
+    TTPOLYGONHEADER *start;
+    POINT pt;
+    BOOL bResult = FALSE;
 
-  start = header;
+    start = header;
 
-  pPath = PATH_LockPath(dc->dclevel.hPath);
-  if (!pPath)
-  {
-     return FALSE;
-  }
+    while ((char *)header < (char *)start + size)
+    {
+        TTPOLYCURVE *curve;
 
-  while ((char *)header < (char *)start + size)
-  {
-     TTPOLYCURVE *curve;
+        if (header->dwType != TT_POLYGON_TYPE)
+        {
+            DPRINT1("Unknown header type %lu\n", header->dwType);
+            goto cleanup;
+        }
 
-     if (header->dwType != TT_POLYGON_TYPE)
-     {
-        DPRINT1("Unknown header type %lu\n", header->dwType);
-        goto cleanup;
-     }
+        pt.x = x + int_from_fixed(header->pfxStart.x);
+        pt.y = y - int_from_fixed(header->pfxStart.y);
+        PATH_AddEntry(pPath, &pt, PT_MOVETO);
 
-     pt.x = x + int_from_fixed(header->pfxStart.x);
-     pt.y = y - int_from_fixed(header->pfxStart.y);
-     PATH_AddEntry(pPath, &pt, PT_MOVETO);
+        curve = (TTPOLYCURVE *)(header + 1);
 
-     curve = (TTPOLYCURVE *)(header + 1);
+        while ((char *)curve < (char *)header + header->cb)
+        {
+            /*DPRINT1("curve->wType %d\n", curve->wType);*/
 
-     while ((char *)curve < (char *)header + header->cb)
-     {
-        /*DPRINT1("curve->wType %d\n", curve->wType);*/
+            switch(curve->wType)
+            {
+                case TT_PRIM_LINE:
+                {
+                    WORD i;
 
-        switch(curve->wType)
-        {
-           case TT_PRIM_LINE:
-           {
-              WORD i;
-
-              for (i = 0; i < curve->cpfx; i++)
-              {
-                 pt.x = x + int_from_fixed(curve->apfx[i].x);
-                 pt.y = y - int_from_fixed(curve->apfx[i].y);
-                 PATH_AddEntry(pPath, &pt, PT_LINETO);
-              }
-              break;
-           }
+                    for (i = 0; i < curve->cpfx; i++)
+                    {
+                        pt.x = x + int_from_fixed(curve->apfx[i].x);
+                        pt.y = y - int_from_fixed(curve->apfx[i].y);
+                        PATH_AddEntry(pPath, &pt, PT_LINETO);
+                    }
+                    break;
+                }
 
-           case TT_PRIM_QSPLINE:
-           case TT_PRIM_CSPLINE:
-           {
-              WORD i;
-              POINTFX ptfx;
-              POINT *pts = ExAllocatePoolWithTag(PagedPool, (curve->cpfx + 1) * sizeof(POINT), TAG_PATH);
+                case TT_PRIM_QSPLINE:
+                case TT_PRIM_CSPLINE:
+                {
+                    WORD i;
+                    POINTFX ptfx;
+                    POINT *pts = ExAllocatePoolWithTag(PagedPool, (curve->cpfx + 1) * sizeof(POINT), TAG_PATH);
 
-              if (!pts) goto cleanup;
+                    if (!pts) goto cleanup;
 
-              ptfx = *(POINTFX *)((char *)curve - sizeof(POINTFX));
+                    ptfx = *(POINTFX *)((char *)curve - sizeof(POINTFX));
 
-              pts[0].x = x + int_from_fixed(ptfx.x);
-              pts[0].y = y - int_from_fixed(ptfx.y);
+                    pts[0].x = x + int_from_fixed(ptfx.x);
+                    pts[0].y = y - int_from_fixed(ptfx.y);
 
-              for (i = 0; i < curve->cpfx; i++)
-              {
-                  pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x);
-                  pts[i + 1].y = y - int_from_fixed(curve->apfx[i].y);
-              }
+                    for (i = 0; i < curve->cpfx; i++)
+                    {
+                        pts[i + 1].x = x + int_from_fixed(curve->apfx[i].x);
+                        pts[i + 1].y = y - int_from_fixed(curve->apfx[i].y);
+                    }
 
-              PATH_BezierTo(pPath, pts, curve->cpfx + 1);
+                    PATH_BezierTo(pPath, pts, curve->cpfx + 1);
 
-              ExFreePoolWithTag(pts, TAG_PATH);
-              break;
-           }
+                    ExFreePoolWithTag(pts, TAG_PATH);
+                    break;
+                }
 
-           default:
-              DPRINT1("Unknown curve type %04x\n", curve->wType);
-              goto cleanup;
-        }
+                default:
+                    DPRINT1("Unknown curve type %04x\n", curve->wType);
+                    goto cleanup;
+            }
 
-        curve = (TTPOLYCURVE *)&curve->apfx[curve->cpfx];
-     }
-     header = (TTPOLYGONHEADER *)((char *)header + header->cb);
-  }
+            curve = (TTPOLYCURVE *)&curve->apfx[curve->cpfx];
+        }
+        header = (TTPOLYGONHEADER *)((char *)header + header->cb);
+    }
 
-  bResult = TRUE;
+    bResult = TRUE;
 
 cleanup:
-  IntGdiCloseFigure( pPath );
-  PATH_UnlockPath( pPath );
-  return bResult;
+    IntGdiCloseFigure(pPath);
+    return bResult;
 }
 
 /**********************************************************************
@@ -2110,67 +2282,97 @@ cleanup:
  */
 BOOL
 FASTCALL
-PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECTL *lprc,
-                     LPCWSTR str, UINT count, const INT *dx)
+PATH_ExtTextOut(
+    PDC dc,
+    INT x,
+    INT y,
+    UINT flags,
+    const RECTL *lprc,
+    LPCWSTR str,
+    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++)
     {
-        MAT2 identity = { {0,1},{0,0},{0,0},{0,1} };
+        MAT2 identity = { {0, 1}, {0, 0}, {0, 0}, {0, 1} };
         GLYPHMETRICS gm;
         DWORD dwSize;
         void *outline;
 
-        dwSize = ftGdiGetGlyphOutline( dc,
-                                       str[idx],
-                                       GGO_GLYPH_INDEX | GGO_NATIVE,
-                                       &gm,
-                                       0,
-                                       NULL,
-                                       &identity,
-                                       TRUE);
-        if (dwSize == GDI_ERROR) return FALSE;
+        dwSize = ftGdiGetGlyphOutline(dc,
+                                      str[idx],
+                                      ggo_flags,
+                                      &gm,
+                                      0,
+                                      NULL,
+                                      &identity,
+                                      TRUE);
+        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;
+            outline = ExAllocatePoolWithTag(PagedPool, dwSize, TAG_PATH);
+            if (!outline)
+            {
+               PATH_UnlockPath(pPath);
+               return FALSE;
+            }
 
-           ftGdiGetGlyphOutline( dc,
+            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);
+            ExFreePoolWithTag(outline, TAG_PATH);
         }
 
         if (dx)
         {
-           if (flags & ETO_PDY)
-           {
-              offset.x += dx[idx * 2];
-              offset.y += dx[idx * 2 + 1];
-           }
-           else
-              offset.x += dx[idx];
+            if (flags & ETO_PDY)
+            {
+                offset.x += dx[idx * 2];
+                offset.y += dx[idx * 2 + 1];
+            }
+            else
+                offset.x += dx[idx];
         }
         else
         {
-           offset.x += gm.gmCellIncX;
-           offset.y += gm.gmCellIncY;
+            offset.x += gm.gmCellIncX;
+            offset.y += gm.gmCellIncY;
         }
     }
+    PATH_UnlockPath(pPath);
     return TRUE;
 }
 
@@ -2181,252 +2383,271 @@ PATH_ExtTextOut(PDC dc, INT x, INT y, UINT flags, const RECTL *lprc,
 
 BOOL
 APIENTRY
-NtGdiAbortPath(HDC  hDC)
+NtGdiAbortPath(HDC hDC)
 {
-  PPATH pPath;
-  PDC dc = DC_LockDc ( hDC );
-  if ( !dc )
-  {
-     EngSetLastError(ERROR_INVALID_HANDLE);
-     return FALSE;
-  }
-
-  pPath = PATH_LockPath(dc->dclevel.hPath);
-  if (!pPath)
-  {
-      DC_UnlockDc(dc);
-      return FALSE;
-  }
-
-  PATH_EmptyPath(pPath);
-
-  PATH_UnlockPath(pPath);
-  dc->dclevel.flPath &= ~DCPATH_ACTIVE;
-
-  DC_UnlockDc ( dc );
-  return TRUE;
+    PDC dc = DC_LockDc(hDC);
+    if (!dc)
+    {
+        EngSetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
+    }
+
+    if (!dc->dclevel.hPath)
+    {
+       DC_UnlockDc(dc);
+       return TRUE;
+    }
+
+    if (!PATH_Delete(dc->dclevel.hPath))
+    {
+       DC_UnlockDc(dc);
+       return FALSE;
+    }
+
+    dc->dclevel.hPath = 0;
+    dc->dclevel.flPath &= ~DCPATH_ACTIVE;
+
+    DC_UnlockDc(dc);
+    return TRUE;
 }
 
 BOOL
 APIENTRY
-NtGdiBeginPath( HDC  hDC )
+NtGdiBeginPath(HDC  hDC)
 {
-  PPATH pPath;
-  PDC dc;
+    PPATH pPath;
+    PDC dc;
 
-  dc = DC_LockDc ( hDC );
-  if ( !dc )
-  {
-     EngSetLastError(ERROR_INVALID_HANDLE);
-     return FALSE;
-  }
+    dc = DC_LockDc(hDC);
+    if (!dc)
+    {
+        EngSetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
+    }
 
-  /* If path is already open, do nothing. Check if not Save DC state */
+    /* If path is already open, do nothing. Check if not Save DC state */
     if ((dc->dclevel.flPath & DCPATH_ACTIVE) && !(dc->dclevel.flPath & DCPATH_SAVE))
-  {
-     DC_UnlockDc ( dc );
-     return TRUE;
-  }
-
-  if ( dc->dclevel.hPath )
-  {
-     DPRINT("BeginPath 1 0x%p\n", dc->dclevel.hPath);
-     if ( !(dc->dclevel.flPath & DCPATH_SAVE) )
-     {  // Remove previous handle.
-        if (!PATH_Delete(dc->dclevel.hPath))
+    {
+        DC_UnlockDc(dc);
+        return TRUE;
+    }
+
+    if (dc->dclevel.hPath)
+    {
+        DPRINT("BeginPath 1 0x%p\n", dc->dclevel.hPath);
+        if (!(dc->dclevel.flPath & DCPATH_SAVE))
         {
-           DC_UnlockDc ( dc );
-           return FALSE;
+            // Remove previous handle.
+            if (!PATH_Delete(dc->dclevel.hPath))
+            {
+                DC_UnlockDc(dc);
+                return FALSE;
+            }
+        }
+        else
+        {
+            // Clear flags and Handle.
+            dc->dclevel.flPath &= ~(DCPATH_SAVE | DCPATH_ACTIVE);
+            dc->dclevel.hPath = NULL;
         }
-     }
-     else
-     {  // Clear flags and Handle.
-        dc->dclevel.flPath &= ~(DCPATH_SAVE|DCPATH_ACTIVE);
-        dc->dclevel.hPath = NULL;
-     }
-  }
-  pPath = PATH_AllocPathWithHandle();
-  if (!pPath)
-  {
-     EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
-     return FALSE;
-  }
-  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 );
-
-  /* Initialize variables for new path */
-  pPath->newStroke = TRUE;
-  pPath->state = PATH_Open;
-
-  PATH_UnlockPath(pPath);
-  DC_UnlockDc ( dc );
-  return TRUE;
+    }
+    pPath = PATH_CreatePath(NUM_ENTRIES_INITIAL);
+    dc->dclevel.flPath |= DCPATH_ACTIVE; // Set active ASAP!
+    dc->dclevel.hPath = pPath->BaseObject.hHmgr;
+    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;
 }
 
 BOOL
 APIENTRY
 NtGdiCloseFigure(HDC hDC)
 {
-  BOOL Ret = FALSE; // Default to failure
-  PDC pDc;
-  PPATH pPath;
-
-  DPRINT("Enter %s\n", __FUNCTION__);
-
-  pDc = DC_LockDc(hDC);
-  if (!pDc)
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-  }
-  pPath = PATH_LockPath( pDc->dclevel.hPath );
-  if (!pPath)
-  {
-     DC_UnlockDc(pDc);
-     return FALSE;
-  }
-
-  if (pPath->state==PATH_Open)
-  {
-     IntGdiCloseFigure(pPath);
-     Ret = TRUE;
-  }
-  else
-  {
-     // FIXME: Check if lasterror is set correctly
-     EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-  }
-
-  PATH_UnlockPath( pPath );
-  DC_UnlockDc(pDc);
-  return Ret;
+    BOOL Ret = FALSE; // Default to failure
+    PDC pDc;
+    PPATH pPath;
+
+    DPRINT("Enter %s\n", __FUNCTION__);
+
+    pDc = DC_LockDc(hDC);
+    if (!pDc)
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    pPath = PATH_LockPath(pDc->dclevel.hPath);
+    if (!pPath)
+    {
+        DC_UnlockDc(pDc);
+        return FALSE;
+    }
+
+    if (pPath->state == PATH_Open)
+    {
+        IntGdiCloseFigure(pPath);
+        Ret = TRUE;
+    }
+    else
+    {
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+    }
+
+    PATH_UnlockPath(pPath);
+    DC_UnlockDc(pDc);
+    return Ret;
 }
 
 BOOL
 APIENTRY
 NtGdiEndPath(HDC  hDC)
 {
-  BOOL ret = TRUE;
-  PPATH pPath;
-  PDC dc = DC_LockDc ( hDC );
-
-  if ( !dc )
-  {
-     EngSetLastError(ERROR_INVALID_HANDLE);
-     return FALSE;
-  }
-
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath)
-  {
-     DC_UnlockDc ( dc );
-     return FALSE;
-  }
-  /* 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);
-    EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-    ret = FALSE;
-  }
-  /* Set flag to indicate that path is finished */
-  else
-  {
-     DPRINT("EndPath 0x%p\n", dc->dclevel.hPath);
-     pPath->state = PATH_Closed;
-     dc->dclevel.flPath &= ~DCPATH_ACTIVE;
-  }
-  PATH_UnlockPath( pPath );
-  DC_UnlockDc ( dc );
-  return ret;
+    BOOL ret = TRUE;
+    PPATH pPath;
+    PDC dc;
+
+    dc = DC_LockDc(hDC);
+    if (!dc)
+    {
+        EngSetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
+    }
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath)
+    {
+        DC_UnlockDc(dc);
+        return FALSE;
+    }
+
+    /* Check that path is currently being constructed */
+    if ((pPath->state != PATH_Open) || !(dc->dclevel.flPath & DCPATH_ACTIVE))
+    {
+        DPRINT("EndPath ERROR! 0x%p\n", dc->dclevel.hPath);
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+        ret = FALSE;
+    }
+    /* Set flag to indicate that path is finished */
+    else
+    {
+        DPRINT("EndPath 0x%p\n", dc->dclevel.hPath);
+        pPath->state = PATH_Closed;
+        dc->dclevel.flPath &= ~DCPATH_ACTIVE;
+    }
+
+    PATH_UnlockPath(pPath);
+    DC_UnlockDc(dc);
+    return ret;
 }
 
 BOOL
 APIENTRY
 NtGdiFillPath(HDC  hDC)
 {
-  BOOL ret = FALSE;
-  PPATH pPath;
-  PDC_ATTR pdcattr;
-  PDC dc;
-
-  dc = DC_LockDc(hDC);
-  if (!dc)
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-  }
-
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath)
-  {
-     DC_UnlockDc ( dc );
-     return FALSE;
-  }
-
-  DC_vPrepareDCsForBlit(dc, dc->rosdc.CombinedClip->rclBounds,
-                            NULL, dc->rosdc.CombinedClip->rclBounds);
-
-  pdcattr = dc->pdcattr;
-
-  if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
-      DC_vUpdateLineBrush(dc);
-
-  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 );
-  }
-
-  PATH_UnlockPath( pPath );
-  DC_vFinishBlit(dc, NULL);
-  DC_UnlockDc ( dc );
-  return ret;
+    BOOL ret = FALSE;
+    PPATH pPath, pNewPath;
+    PDC_ATTR pdcattr;
+    PDC dc;
+
+    dc = DC_LockDc(hDC);
+    if (!dc)
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath)
+    {
+        DC_UnlockDc(dc);
+        return FALSE;
+    }
+
+    DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);
+
+    pdcattr = dc->pdcattr;
+
+    if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
+        DC_vUpdateLineBrush(dc);
+
+    if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
+        DC_vUpdateFillBrush(dc);
+
+    pNewPath = PATH_FlattenPath(pPath);
+
+    if (pNewPath->state != PATH_Closed)
+    {
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+    }
+    else if (pNewPath->numEntriesUsed)
+    {
+       ret = PATH_FillPath(dc, pNewPath);
+    }
+    else ret = TRUE;
+
+    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;
 }
 
 BOOL
 APIENTRY
-NtGdiFlattenPath(HDC  hDC)
+NtGdiFlattenPath(HDC hDC)
 {
-   BOOL Ret = FALSE;
-   DC *pDc;
-   PPATH pPath;
-
-   DPRINT("Enter %s\n", __FUNCTION__);
-
-   pDc = DC_LockDc(hDC);
-   if (!pDc)
-   {
-      EngSetLastError(ERROR_INVALID_HANDLE);
-      return FALSE;
-   }
-
-   pPath = PATH_LockPath( pDc->dclevel.hPath );
-   if (!pPath)
-   {
-      DC_UnlockDc ( pDc );
-      return FALSE;
-   }
-   if (pPath->state == PATH_Open)
-      Ret = PATH_FlattenPath(pPath);
-
-   PATH_UnlockPath( pPath );
-   DC_UnlockDc(pDc);
-   return Ret;
+    BOOL Ret = FALSE;
+    DC *pDc;
+    PPATH pPath, pNewPath = NULL;
+
+    DPRINT("Enter %s\n", __FUNCTION__);
+
+    pDc = DC_LockDc(hDC);
+    if (!pDc)
+    {
+        EngSetLastError(ERROR_INVALID_HANDLE);
+        return FALSE;
+    }
+
+    pPath = PATH_LockPath(pDc->dclevel.hPath);
+    if (!pPath)
+    {
+        EngSetLastError( ERROR_CAN_NOT_COMPLETE );
+        DC_UnlockDc(pDc);
+        return FALSE;
+    }
+
+    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;
 }
 
 _Success_(return != FALSE)
@@ -2436,144 +2657,178 @@ NtGdiGetMiterLimit(
     _In_ HDC hdc,
     _Out_ PDWORD pdwOut)
 {
-  DC *pDc;
-  BOOL bResult = TRUE;
-
-  if (!(pDc = DC_LockDc(hdc)))
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-  }
-
-  _SEH2_TRY
-  {
-      ProbeForWrite(pdwOut, sizeof(DWORD), 1);
-      *pdwOut = pDc->dclevel.laPath.eMiterLimit;
-  }
-  _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-  {
-      SetLastNtError(_SEH2_GetExceptionCode());
-      bResult = FALSE;
-  }
-   _SEH2_END;
-
-  DC_UnlockDc(pDc);
-  return bResult;
+    DC *pDc;
+    BOOL bResult = TRUE;
+
+    if (!(pDc = DC_LockDc(hdc)))
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    _SEH2_TRY
+    {
+        ProbeForWrite(pdwOut, sizeof(DWORD), 1);
+        *pdwOut = pDc->dclevel.laPath.eMiterLimit;
+    }
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        SetLastNtError(_SEH2_GetExceptionCode());
+        bResult = FALSE;
+    }
+    _SEH2_END;
+
+    DC_UnlockDc(pDc);
+    return bResult;
 
 }
 
 INT
 APIENTRY
 NtGdiGetPath(
-   HDC hDC,
-   LPPOINT Points,
-   LPBYTE Types,
-   INT nSize)
+    HDC hDC,
+    LPPOINT Points,
+    LPBYTE Types,
+    INT nSize)
 {
-  INT ret = -1;
-  PPATH pPath;
-
-  DC *dc = DC_LockDc(hDC);
-  if (!dc)
-  {
-     DPRINT1("Can't lock dc!\n");
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return -1;
-  }
-
-  pPath = PATH_LockPath( dc->dclevel.hPath );
-  if (!pPath)
-  {
-     DC_UnlockDc ( dc );
-     return -1;
-  }
-
-  if (pPath->state != PATH_Closed)
-  {
-     EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-     goto done;
-  }
-
-  if (nSize==0)
-  {
-     ret = pPath->numEntriesUsed;
-  }
-  else if(nSize<pPath->numEntriesUsed)
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     goto done;
-  }
-  else
-  {
-      _SEH2_TRY
-      {
-         memcpy(Points, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
-         memcpy(Types, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
-
-         /* Convert the points to logical coordinates */
-         if (!GdiPathDPtoLP(dc, Points, pPath->numEntriesUsed))
-         {
-            EngSetLastError(ERROR_ARITHMETIC_OVERFLOW);
-            _SEH2_LEAVE;
-         }
-
-         ret = pPath->numEntriesUsed;
-      }
-      _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-      {
-         SetLastNtError(_SEH2_GetExceptionCode());
-      }
-      _SEH2_END
-  }
+    INT ret = -1;
+    PPATH pPath;
+
+    DC *dc = DC_LockDc(hDC);
+    DPRINT("NtGdiGetPath start\n");
+    if (!dc)
+    {
+        DPRINT1("Can't lock dc!\n");
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return -1;
+    }
+
+    pPath = PATH_LockPath(dc->dclevel.hPath);
+    if (!pPath)
+    {
+        DC_UnlockDc(dc);
+        return -1;
+    }
+
+    if (pPath->state != PATH_Closed)
+    {
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+        goto done;
+    }
+
+    if (nSize == 0)
+    {
+        ret = pPath->numEntriesUsed;
+    }
+    else if (nSize < pPath->numEntriesUsed)
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        goto done;
+    }
+    else
+    {
+        _SEH2_TRY
+        {
+            memcpy(Points, pPath->pPoints, sizeof(POINT)*pPath->numEntriesUsed);
+            memcpy(Types, pPath->pFlags, sizeof(BYTE)*pPath->numEntriesUsed);
+
+            /* Convert the points to logical coordinates */
+            if (!GdiPathDPtoLP(dc, Points, pPath->numEntriesUsed))
+            {
+                EngSetLastError(ERROR_ARITHMETIC_OVERFLOW);
+                _SEH2_LEAVE;
+            }
+
+            ret = pPath->numEntriesUsed;
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            SetLastNtError(_SEH2_GetExceptionCode());
+        }
+        _SEH2_END
+    }
 
 done:
-  PATH_UnlockPath( pPath );
-  DC_UnlockDc(dc);
-  return ret;
+    DPRINT("NtGdiGetPath exit %d\n",ret);
+    PATH_UnlockPath(pPath);
+    DC_UnlockDc(dc);
+    return ret;
 }
 
 HRGN
 APIENTRY
 NtGdiPathToRegion(HDC  hDC)
 {
-  PPATH pPath;
-  HRGN  hrgnRval = 0;
-  DC *pDc;
-  PDC_ATTR pdcattr;
-
-  DPRINT("Enter %s\n", __FUNCTION__);
-
-  pDc = DC_LockDc(hDC);
-  if (!pDc)
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return NULL;
-  }
-
-  pdcattr = pDc->pdcattr;
-
-  pPath = PATH_LockPath( pDc->dclevel.hPath );
-  if (!pPath)
-  {
-     DC_UnlockDc ( pDc );
-     return NULL;
-  }
-
-  if (pPath->state!=PATH_Closed)
-  {
-     // FIXME: Check that setlasterror is being called correctly
-     EngSetLastError(ERROR_CAN_NOT_COMPLETE);
-  }
-  else
-  {
-     /* FIXME: Should we empty the path even if conversion failed? */
-     if(PATH_PathToRegion(pPath, pdcattr->jFillMode, &hrgnRval))
-          PATH_EmptyPath(pPath);
-  }
-
-  PATH_UnlockPath( pPath );
-  DC_UnlockDc(pDc);
-  return hrgnRval;
+    PPATH pPath, pNewPath;
+    HRGN  hrgnRval = 0;
+    int Ret;
+    PREGION Rgn;
+    DC *pDc;
+    PDC_ATTR pdcattr;
+
+    DPRINT("Enter %s\n", __FUNCTION__);
+
+    pDc = DC_LockDc(hDC);
+    if (!pDc)
+    {
+        DPRINT("Failed to lock DC %p\n", hDC);
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return NULL;
+    }
+
+    pdcattr = pDc->pdcattr;
+
+    pPath = PATH_LockPath(pDc->dclevel.hPath);
+    if (!pPath)
+    {
+        DPRINT("Failed to lock DC path %p\n", pDc->dclevel.hPath);
+        DC_UnlockDc(pDc);
+        return NULL;
+    }
+
+    if (pPath->state != PATH_Closed)
+    {
+        // FIXME: Check that setlasterror is being called correctly
+        DPRINT("Path is not closed!\n");
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+    }
+    else
+    {
+        /* Create the region and fill it with the path strokes */
+        Rgn = REGION_AllocUserRgnWithHandle(1);
+        if (!Rgn)
+        {
+            DPRINT("Failed to allocate a region\n");
+            PATH_UnlockPath(pPath);
+            DC_UnlockDc(pDc);
+            return NULL;
+        }
+        hrgnRval = Rgn->BaseObject.hHmgr;
+
+        pNewPath = PATH_FlattenPath(pPath);
+
+        Ret = PATH_PathToRegion(pNewPath, pdcattr->jFillMode, Rgn);
+
+        PATH_UnlockPath(pNewPath);
+        PATH_Delete(pNewPath->BaseObject.hHmgr);
+
+        if (!Ret)
+        {
+            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;
 }
 
 BOOL
@@ -2583,138 +2838,176 @@ NtGdiSetMiterLimit(
     IN DWORD dwNew,
     IN OUT OPTIONAL PDWORD pdwOut)
 {
-  DC *pDc;
-  gxf_long worker, worker1;
-  BOOL bResult = TRUE;
-
-  if (!(pDc = DC_LockDc(hdc)))
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-  }
-
-  worker.l  = dwNew;
-  worker1.f = pDc->dclevel.laPath.eMiterLimit;
-  pDc->dclevel.laPath.eMiterLimit = worker.f;
-
-  if (pdwOut)
-  {
-      _SEH2_TRY
-      {
-          ProbeForWrite(pdwOut, sizeof(DWORD), 1);
-          *pdwOut = worker1.l;
-      }
-      _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
-      {
-          SetLastNtError(_SEH2_GetExceptionCode());
-          bResult = FALSE;
-      }
-       _SEH2_END;
-  }
-
-  DC_UnlockDc(pDc);
-  return bResult;
+    DC *pDc;
+    gxf_long worker, worker1;
+    BOOL bResult = TRUE;
+
+    if (!(pDc = DC_LockDc(hdc)))
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    worker.l  = dwNew;
+    worker1.f = pDc->dclevel.laPath.eMiterLimit;
+    pDc->dclevel.laPath.eMiterLimit = worker.f;
+
+    if (pdwOut)
+    {
+        _SEH2_TRY
+        {
+            ProbeForWrite(pdwOut, sizeof(DWORD), 1);
+            *pdwOut = worker1.l;
+        }
+        _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+        {
+            SetLastNtError(_SEH2_GetExceptionCode());
+            bResult = FALSE;
+        }
+        _SEH2_END;
+    }
+
+    DC_UnlockDc(pDc);
+    return bResult;
 }
 
 BOOL
 APIENTRY
 NtGdiStrokeAndFillPath(HDC hDC)
 {
-  DC *pDc;
-  PDC_ATTR pdcattr;
-  PPATH pPath;
-  BOOL bRet = FALSE;
-
-  DPRINT1("Enter %s\n", __FUNCTION__);
-
-  if (!(pDc = DC_LockDc(hDC)))
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-  }
-  pPath = PATH_LockPath( pDc->dclevel.hPath );
-  if (!pPath)
-  {
-     DC_UnlockDc ( pDc );
-     return FALSE;
-  }
-
-  DC_vPrepareDCsForBlit(pDc, pDc->rosdc.CombinedClip->rclBounds,
-                            NULL, pDc->rosdc.CombinedClip->rclBounds);
-
-  pdcattr = pDc->pdcattr;
-
-  if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
-    DC_vUpdateFillBrush(pDc);
-
-  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);
-
-  PATH_UnlockPath( pPath );
-  DC_vFinishBlit(pDc, NULL);
-  DC_UnlockDc(pDc);
-  return bRet;
+    DC *pDc;
+    PDC_ATTR pdcattr;
+    PPATH pPath, pNewPath;
+    BOOL bRet = FALSE;
+
+    DPRINT("Enter %s\n", __FUNCTION__);
+
+    if (!(pDc = DC_LockDc(hDC)))
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+    pPath = PATH_LockPath(pDc->dclevel.hPath);
+    if (!pPath)
+    {
+        DC_UnlockDc(pDc);
+        return FALSE;
+    }
+
+    DC_vPrepareDCsForBlit(pDc, NULL, NULL, NULL);
+
+    pdcattr = pDc->pdcattr;
+
+    if (pdcattr->ulDirty_ & (DIRTY_FILL | DC_BRUSH_DIRTY))
+        DC_vUpdateFillBrush(pDc);
+
+    if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
+        DC_vUpdateLineBrush(pDc);
+
+    pNewPath = PATH_FlattenPath(pPath);
+
+    if (pNewPath->state != PATH_Closed)
+    {
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+    }
+    else if (pNewPath->numEntriesUsed)
+    {
+       bRet = PATH_FillPath(pDc, pNewPath);
+       if (bRet) bRet = PATH_StrokePath(pDc, pNewPath);
+    }
+    else bRet = TRUE;
+
+    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;
 }
 
 BOOL
 APIENTRY
 NtGdiStrokePath(HDC hDC)
 {
-  DC *pDc;
-  PDC_ATTR pdcattr;
-  PPATH pPath;
-  BOOL bRet = FALSE;
+    DC *pDc;
+    PDC_ATTR pdcattr;
+    PPATH pPath, pNewPath;
+    BOOL bRet = FALSE;
+
+    DPRINT("Enter %s\n", __FUNCTION__);
+
+    if (!(pDc = DC_LockDc(hDC)))
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    pPath = PATH_LockPath(pDc->dclevel.hPath);
+    if (!pPath)
+    {
+        DC_UnlockDc(pDc);
+        return FALSE;
+    }
+
+    DC_vPrepareDCsForBlit(pDc, NULL, NULL, NULL);
 
-  DPRINT("Enter %s\n", __FUNCTION__);
+    pdcattr = pDc->pdcattr;
 
-  if (!(pDc = DC_LockDc(hDC)))
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-  }
-  pPath = PATH_LockPath( pDc->dclevel.hPath );
-  if (!pPath)
-  {
-     DC_UnlockDc ( pDc );
-     return FALSE;
-  }
+    if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
+        DC_vUpdateLineBrush(pDc);
 
-  DC_vPrepareDCsForBlit(pDc, pDc->rosdc.CombinedClip->rclBounds,
-                            NULL, pDc->rosdc.CombinedClip->rclBounds);
+    pNewPath = PATH_FlattenPath(pPath);
 
-  pdcattr = pDc->pdcattr;
+    if (pNewPath->state != PATH_Closed)
+    {
+        EngSetLastError(ERROR_CAN_NOT_COMPLETE);
+    }
+    else bRet = PATH_StrokePath(pDc, pNewPath);
 
-  if (pdcattr->ulDirty_ & (DIRTY_LINE | DC_PEN_DIRTY))
-     DC_vUpdateLineBrush(pDc);
+    PATH_UnlockPath(pNewPath);
+    PATH_Delete(pNewPath->BaseObject.hHmgr);
 
-  bRet = PATH_StrokePath(pDc, pPath);
+    DC_vFinishBlit(pDc, NULL);
 
-  DC_vFinishBlit(pDc, NULL);
-  PATH_EmptyPath(pPath);
+    PATH_UnlockPath(pPath);
+    PATH_Delete(pPath->BaseObject.hHmgr);
+    pDc->dclevel.hPath = 0;
+    pDc->dclevel.flPath &= ~DCPATH_ACTIVE;
 
-  PATH_UnlockPath( pPath );
-  DC_UnlockDc(pDc);
-  return bRet;
+    DC_UnlockDc(pDc);
+    return bRet;
 }
 
 BOOL
 APIENTRY
 NtGdiWidenPath(HDC  hDC)
 {
-  BOOL Ret;
-  PDC pdc = DC_LockDc ( hDC );
-  if ( !pdc )
-  {
-     EngSetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-  }
-  Ret = PATH_WidenPath(pdc);
-  DC_UnlockDc ( pdc );
-  return Ret;
+    PPATH pPath;
+    BOOL Ret = FALSE;
+    PDC pdc = DC_LockDc(hDC);
+    DPRINT("NtGdiWidenPat Enter\n");
+    if (!pdc)
+    {
+        EngSetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
+    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;
 }
 
 /* EOF */