Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 09:25:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move W structure back into dc.h and added the clip object for dcobj.

Browse source 
svn path=/trunk/; revision=33655
This commit is contained in:
James Tabor 2008-05-23 01:11:25 +00:00
parent 62413f7a09
commit f5aa4b5c0c
2 changed files with 57 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

44
reactos/include/reactos/win32k/ntgdihdl.h
View file

@ -318,49 +318,5 @@ typedef struct _FONT_ATTR
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

59
reactos/subsystems/win32/win32k/include/dc.h
View file

@ -38,6 +38,61 @@
/* 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
{
HPALETTE hpal;
@ -112,8 +167,8 @@ typedef struct _DC
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;