[ros-diffs] [jimtabor] 33655: Move W structure back into dc.h and added the clip object for dcobj.

[jimtabor at svn.reactos.org]

Author: jimtabor
Date: Thu May 22 20:11:25 2008
New Revision: 33655

URL: http://svn.reactos.org/svn/reactos?rev=33655&view=rev
Log:
Move W structure back into dc.h and added the clip object for dcobj.

Modified:
    trunk/reactos/include/reactos/win32k/ntgdihdl.h
    trunk/reactos/subsystems/win32/win32k/include/dc.h

Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgdihdl.h?rev=33655&r1=33654&r2=33655&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Thu May 22 20:11:25 2008
@@ -318,49 +318,5 @@
     void *pCharWidthData;
 } FONT_ATTR, *PFONT_ATTR;
 
-typedef enum tagGdiPathState
-{
-   PATH_Null,
-   PATH_Open,
-   PATH_Closed
-} GdiPathState;
-
-typedef struct tagGdiPath
-{
-   GdiPathState state;
-   POINT      *pPoints;
-   BYTE         *pFlags;
-   int          numEntriesUsed, numEntriesAllocated;
-   BOOL       newStroke;
-} GdiPath;
-
-typedef struct _WIN_DC_INFO
-{
-  int      flags;
-
-  HRGN     hClipRgn;     /* Clip region (may be 0) */
-  HRGN     hrgnMeta;     /* Meta region (may be 0) */
-  HRGN     hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */
-  HRGN     hVisRgn;      /* Should me to DC. Visible region (must never be 0) */
-
-  HRGN     hGCClipRgn;   /* GC clip region (ClipRgn AND VisRgn) */
-  HBITMAP  hBitmap;
-  HBITMAP  hFirstBitmap; /* Bitmap selected at creation of the DC */
-
-/* #if 0 */
-    GdiPath       path;
-/* #endif */
-
-  RECT   totalExtent;
-  BYTE   bitsPerPixel;
-
-  INT  DCOrgX;            /* DC origin */
-  INT  DCOrgY;
-
-  XFORM  xformWorld2Wnd;    /* World-to-window transformation */
-  XFORM  xformWorld2Vport;  /* World-to-viewport transformation */
-  XFORM  xformVport2World;  /* Inverse of the above transformation */
-  BOOL  vport2WorldValid;  /* Is xformVport2World valid? */
-} WIN_DC_INFO;
 
 #endif

Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/include/dc.h?rev=33655&r1=33654&r2=33655&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Thu May 22 20:11:25 2008
@@ -37,6 +37,61 @@
 #define PDEV_CLONE_DEVICE        0x00080000
 
 /* Type definitions ***********************************************************/
+
+typedef enum tagGdiPathState
+{
+   PATH_Null,
+   PATH_Open,
+   PATH_Closed
+} GdiPathState;
+
+typedef struct tagGdiPath
+{
+   GdiPathState state;
+   POINT        *pPoints;
+   BYTE         *pFlags;
+   int          numEntriesUsed, numEntriesAllocated;
+   BOOL         newStroke;
+} GdiPath;
+
+typedef struct _WIN_DC_INFO
+{
+  int      flags;
+
+  HRGN     hClipRgn;     /* Clip region (may be 0) */
+  HRGN     hrgnMeta;     /* Meta region (may be 0) */
+  HRGN     hMetaClipRgn; /* Intersection of meta and clip regions (may be 0) */
+  HRGN     hVisRgn;      /* Should me to DC. Visible region (must never be 0) */
+
+  HRGN     hGCClipRgn;   /* GC clip region (ClipRgn AND VisRgn) */
+  HBITMAP  hBitmap;
+  HBITMAP  hFirstBitmap; /* Bitmap selected at creation of the DC */
+
+/* #if 0 */
+    GdiPath       path;
+/* #endif */
+
+  RECT   totalExtent;
+  BYTE   bitsPerPixel;
+
+  INT  DCOrgX;            /* DC origin */
+  INT  DCOrgY;
+
+  XFORM  xformWorld2Wnd;    /* World-to-window transformation */
+  XFORM  xformWorld2Vport;  /* World-to-viewport transformation */
+  XFORM  xformVport2World;  /* Inverse of the above transformation */
+  BOOL   vport2WorldValid;  /* Is xformVport2World valid? */
+} WIN_DC_INFO;
+
+typedef struct _XCLIPOBJ
+{
+  CLIPOBJ co;          // Std Clip object.
+  DWORD   Unknown[6];
+  PVOID   pClipRgn;    // prgnRao_ or (prgnVis_ if (prgnRao_ == z))
+  DWORD   Unknown1[16];
+  DWORD   nComplexity; // count/mode based on # of rect in regions scan.
+  DWORD   Unknown2;
+} XCLIPOBJ, *PXCLIPOBJ;
 
 typedef struct _DCLEVEL
 {
@@ -112,8 +167,8 @@
   HFONT       hlfntCur;
   FLONG       flSimulationFlags;
   LONG        lEscapement;
-  PVOID       prfnt; // RFONT*
-  unsigned    co_[31]; // CLIPOBJ
+  PVOID       prfnt;    // RFONT*
+  XCLIPOBJ    co;       // CLIPOBJ
   PVOID       pPFFList; // PPFF*
   PVOID       ClrxFormLnk;
   INT         ipfdDevMax;