[WIN32SS][NTGDI] Extend PATH_FillPath as PATH_FillPathEx (#798)

[reactos.git] / win32ss / gdi / ntgdi / path.h

diff --git a/win32ss/gdi/ntgdi/path.h b/win32ss/gdi/ntgdi/path.h
index 758aede..9c5f63d 100644 (file)
--- a/win32ss/gdi/ntgdi/path.h
+++ b/win32ss/gdi/ntgdi/path.h
@@ -20,48 +20,66 @@ typedef enum tagGdiPathState
    PATH_Closed
 } GdiPathState;
 
+// Path type flags
+#define PATHTYPE_KEEPME 1
+#define PATHTYPE_STACK  2
+
+/* extended PATHDATA */
+typedef struct _EXTPATHDATA
+{
+    PATHDATA pd;
+    struct _EXTPATHDATA *ppdNext;
+} EXTPATHDATA, *PEXTPATHDATA;
+
 typedef struct _PATH
 {
   BASEOBJECT   BaseObject;
-
+  //PVOID        ppachain;
   RECTFX       rcfxBoundBox;
   POINTFX      ptfxSubPathStart;
-
-  // Things to convert from:
-  DWORD        state;
+  FLONG        flType;
+  PEXTPATHDATA ppdFirst;
+  PEXTPATHDATA ppdLast;
+  FLONG        flags;   // PATHDATA flags.
+  PEXTPATHDATA ppdCurrent;
+  // PATHOBJ;
+  FLONG        fl;      // Saved flags.
+  ULONG        cCurves; // Saved number of lines and Bezier.
+
+  struct _EPATHOBJ *epo;
+
+  // Wine/ReactOS Things to convert from:
+  FLONG        state;
   POINT        *pPoints;
   BYTE         *pFlags;
   int          numEntriesUsed;
   int          numEntriesAllocated;
   BOOL         newStroke;
+  POINT        pos;
 } PATH, *PPATH;
 
 typedef struct _EPATHOBJ
 {
-  PATHOBJ po;
-  PPATH   pPath;
+  PATHOBJ  po;
+  PPATH    pPath;
+  CLIPOBJ *pco;
 } EPATHOBJ, *PEPATHOBJ;
 
 #define  PATH_AllocPath() ((PPATH) GDIOBJ_AllocObj(GDIObjType_PATH_TYPE))
 #define  PATH_AllocPathWithHandle() ((PPATH) GDIOBJ_AllocObjWithHandle (GDI_OBJECT_TYPE_PATH, sizeof(PATH)))
-#define  PATH_FreePath(pPath)  GDIOBJ_FreeObj((POBJ)pPath, GDIObjType_PATH_TYPE)
-#define  PATH_FreeExtPathByHandle(hPath) GDIOBJ_FreeObjByHandle((HGDIOBJ) hPath, GDI_OBJECT_TYPE_PATH)
 #define  PATH_LockPath(hPath) ((PPATH)GDIOBJ_ShareLockObj((HGDIOBJ)hPath, GDI_OBJECT_TYPE_PATH))
 #define  PATH_UnlockPath(pPath) GDIOBJ_vDereferenceObject((POBJ)pPath)
 
 
 #define PATH_IsPathOpen(dclevel) ( ((dclevel).hPath) && ((dclevel).flPath & DCPATH_ACTIVE) )
 
-BOOL FASTCALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, INT lines);
+BOOL FASTCALL PATH_Arc (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xStart, INT yStart, INT xEnd, INT yEnd, INT direction, INT lines);
 BOOL FASTCALL PATH_Ellipse (PDC dc, INT x1, INT y1, INT x2, INT y2);
 VOID FASTCALL PATH_EmptyPath (PPATH pPath);
 BOOL FASTCALL PATH_LineTo (PDC dc, INT x, INT y);
-BOOL FASTCALL PATH_MoveTo (PDC dc);
 BOOL FASTCALL PATH_PolyBezier (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolyBezierTo (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolyDraw(PDC dc, const POINT *pts, const BYTE *types, DWORD cbPoints);
-BOOL FASTCALL PATH_Polygon (PDC dc, const POINT *pts, DWORD cbPoints);
-BOOL FASTCALL PATH_Polyline (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolylineTo (PDC dc, const POINT *pts, DWORD cbPoints);
 BOOL FASTCALL PATH_PolyPolygon ( PDC dc, const POINT* pts, const INT* counts, UINT polygons);
 BOOL FASTCALL PATH_PolyPolyline( PDC dc, const POINT* pts, const DWORD* counts, DWORD polylines);
@@ -74,7 +92,8 @@ BOOL FASTCALL PATH_AddEntry (PPATH pPath, const POINT *pPoint, BYTE flags);
 BOOL FASTCALL PATH_AddFlatBezier (PPATH pPath, POINT *pt, BOOL closed);
 BOOL FASTCALL PATH_DoArcPart (PPATH pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BYTE startEntryType);
 BOOL FASTCALL PATH_FillPath( PDC dc, PPATH pPath );
-BOOL FASTCALL PATH_FlattenPath (PPATH pPath);
+BOOL FASTCALL PATH_FillPathEx(PDC dc, PPATH pPath, PBRUSH pbrFill);
+PPATH FASTCALL PATH_FlattenPath (PPATH pPath);
 VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
 
 BOOL FASTCALL PATH_ReserveEntries (PPATH pPath, INT numEntries);
@@ -86,3 +105,7 @@ VOID FASTCALL IntGdiCloseFigure(PPATH pPath);
 BOOL FASTCALL PATH_Delete(HPATH hPath);
 
 VOID FASTCALL IntGetCurrentPositionEx(PDC dc, LPPOINT pt);
+
+BOOL PATH_RestorePath( DC *, DC *);
+BOOL PATH_SavePath( DC *, DC *);
+BOOL IntGdiFillRgn(PDC pdc, PREGION prgn, PBRUSH pbrFill);