[ros-diffs] [tkreuzer] 32720: Add GDILoObjType enum to ntgdityp.h

Author: tkreuzer
Date: Tue Mar 18 19:33:11 2008
New Revision: 32720

URL: http://svn.reactos.org/svn/reactos?rev=3D32720&view=3Drev
Log:
Add GDILoObjType enum to ntgdityp.h

Modified:
    trunk/reactos/include/reactos/win32k/ntgdityp.h

Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32=
k/ntgdityp.h?rev=3D32720&r1=3D32719&r2=3D32720&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/include/reactos/win32k/ntgdityp.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdityp.h Tue Mar 18 19:33:11 2008
@@ -97,42 +97,61 @@
     GdiLpToDp,
 } TRANSFORMTYPE, *PTRANSFORMTYPE;
 =

-typedef enum _GDIOBJTYPE
-{
-    GDIObjType_DEF_TYPE,
-    GDIObjType_DC_TYPE,
-    GDIObjType_UNUSED1_TYPE,
-    GDIObjType_UNUSED2_TYPE,
-    GDIObjType_RGN_TYPE,
-    GDIObjType_SURF_TYPE,
-    GDIObjType_CLIENTOBJ_TYPE,
-    GDIObjType_PATH_TYPE,
-    GDIObjType_PAL_TYPE,
-    GDIObjType_ICMLCS_TYPE,
-    GDIObjType_LFONT_TYPE,
-    GDIObjType_RFONT_TYPE,
-    GDIObjType_PFE_TYPE,
-    GDIObjType_PFT_TYPE,
-    GDIObjType_ICMCXF_TYPE,
-    GDIObjType_SPRITE_TYPE,
-    GDIObjType_BRUSH_TYPE,
-    GDIObjType_UMPD_TYPE,
-    GDIObjType_UNUSED4_TYPE,
-    GDIObjType_SPACE_TYPE,
-    GDIObjType_UNUSED5_TYPE,
-    GDIObjType_META_TYPE,
-    GDIObjType_EFSTATE_TYPE,
-    GDIObjType_BMFD_TYPE,
-    GDIObjType_VTFD_TYPE,
-    GDIObjType_TTFD_TYPE,
-    GDIObjType_RC_TYPE,
-    GDIObjType_TEMP_TYPE,
-    GDIObjType_DRVOBJ_TYPE,
-    GDIObjType_DCIOBJ_TYPE,
-    GDIObjType_SPOOL_TYPE,
+typedef enum GDIObjType
+{
+    GDIObjType_DEF_TYPE =3D 0x00,
+    GDIObjType_DC_TYPE =3D 0x01,
+    GDIObjType_UNUSED1_TYPE =3D 0x02,
+    GDIObjType_UNUSED2_TYPE =3D 0x03,
+    GDIObjType_RGN_TYPE =3D 0x04,
+    GDIObjType_SURF_TYPE =3D 0x05,
+    GDIObjType_CLIENTOBJ_TYPE =3D 0x06,
+    GDIObjType_PATH_TYPE =3D 0x07,
+    GDIObjType_PAL_TYPE =3D 0x08,
+    GDIObjType_ICMLCS_TYPE =3D 0x09,
+    GDIObjType_LFONT_TYPE =3D 0x0a,
+    GDIObjType_RFONT_TYPE =3D 0x0b,
+    GDIObjType_PFE_TYPE =3D 0x0c,
+    GDIObjType_PFT_TYPE =3D 0x0d,
+    GDIObjType_ICMCXF_TYPE =3D 0x0e,
+    GDIObjType_SPRITE_TYPE =3D 0x0f,
+    GDIObjType_BRUSH_TYPE =3D 0x10,
+    GDIObjType_UMPD_TYPE =3D 0x11,
+    GDIObjType_UNUSED4_TYPE =3D 0x12,
+    GDIObjType_SPACE_TYPE =3D 0x13,
+    GDIObjType_UNUSED5_TYPE =3D 0x14,
+    GDIObjType_META_TYPE =3D 0x15,
+    GDIObjType_EFSTATE_TYPE =3D 0x16,
+    GDIObjType_BMFD_TYPE =3D 0x17,
+    GDIObjType_VTFD_TYPE =3D 0x18,
+    GDIObjType_TTFD_TYPE =3D 0x19,
+    GDIObjType_RC_TYPE =3D 0x1a,
+    GDIObjType_TEMP_TYPE =3D 0x1b,
+    GDIObjType_DRVOBJ_TYPE =3D 0x1c,
+    GDIObjType_DCIOBJ_TYPE =3D 0x1d,
+    GDIObjType_SPOOL_TYPE =3D 0x1e,
+    GDIObjType_MAX_TYPE =3D 0x1e,
+    GDIObjTypeTotal =3D 0x1f,
 } GDIOBJTYPE, *PGDIOBJTYPE;
-
-#define GDIObjType_MAX_TYPE GDIObjType_SPOOL_TYPE
+
+typedef enum GDILoObjType
+{
+    GDILoObjType_LO_BRUSH_TYPE =3D 0x100000,
+    GDILoObjType_LO_DC_TYPE =3D 0x10000,
+    GDILoObjType_LO_BITMAP_TYPE =3D 0x50000,
+    GDILoObjType_LO_PALETTE_TYPE =3D 0x80000,
+    GDILoObjType_LO_FONT_TYPE =3D 0xa0000,
+    GDILoObjType_LO_REGION_TYPE =3D 0x40000,
+    GDILoObjType_LO_ICMLCS_TYPE =3D 0x90000,
+    GDILoObjType_LO_CLIENTOBJ_TYPE =3D 0x60000,
+    GDILoObjType_LO_ALTDC_TYPE =3D 0x210000,
+    GDILoObjType_LO_PEN_TYPE =3D 0x300000,
+    GDILoObjType_LO_EXTPEN_TYPE =3D 0x500000,
+    GDILoObjType_LO_DIBSECTION_TYPE =3D 0x250000,
+    GDILoObjType_LO_METAFILE16_TYPE =3D 0x260000,
+    GDILoObjType_LO_METAFILE_TYPE =3D 0x460000,
+    GDILoObjType_LO_METADC16_TYPE =3D 0x660000
+} GDILOOBJTYPE, *PGDILOOBJTYPE;
 =

 #define GdiWorldSpaceToPageSpace    0x203
 =

@@ -182,7 +201,7 @@
    LONG    lMinWidthD;
 } CHWIDTHINFO, *PCHWIDTHINFO;
 =

-typedef struct _UNIVERSAL_FONT_ID =

+typedef struct _UNIVERSAL_FONT_ID
 {
     DWORD  dwUfid[2];
 } UNIVERSAL_FONT_ID, *PUNIVERSAL_FONT_ID;
@@ -394,7 +413,7 @@
   ULONG ulForegroundClr;
   ULONG ulBackgroundClr;
   int x;
-  int y;  =

+  int y;
   UINT Options;
   RECT Rect;
   DWORD iCS_CP;
@@ -429,7 +448,7 @@
   LONG right;
   LONG bottom;
   LONG left;
-  LONG top;  =

+  LONG top;
 } GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN;
 //
 //   Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn.
@@ -445,36 +464,36 @@
 typedef BOOL (NTAPI *PGD_ENABLEDRIVER)(ULONG, ULONG, PDRVENABLEDATA);
 typedef DHPDEV (NTAPI *PGD_ENABLEPDEV)(DEVMODEW  *, LPWSTR, ULONG, HSURF *=
, ULONG, ULONG  *, ULONG, DEVINFO  *, LPWSTR, LPWSTR, HANDLE);
 typedef VOID (NTAPI *PGD_COMPLETEPDEV)(DHPDEV, HDEV);
-typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV); =

+typedef VOID (NTAPI *PGD_DISABLEPDEV)(DHPDEV);
 typedef HSURF (NTAPI *PGD_ENABLESURFACE)(DHPDEV);
 typedef VOID (NTAPI *PGD_DISABLESURFACE)(DHPDEV);
 typedef BOOL (NTAPI *PGD_ASSERTMODE)(DHPDEV, BOOL);
 typedef BOOL (NTAPI *PGD_OFFSET)(SURFOBJ*, LONG, LONG, FLONG);
 typedef BOOL (NTAPI *PGD_RESETPDEV)(DHPDEV, DHPDEV);
 typedef VOID (NTAPI *PGD_DISABLEDRIVER)(VOID);
-typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG); =

-typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF); =

+typedef HBITMAP (NTAPI *PGD_CREATEDEVICEBITMAP)(DHPDEV, SIZEL, ULONG);
+typedef VOID (NTAPI *PGD_DELETEDEVICEBITMAP)(DHSURF);
 typedef BOOL (NTAPI *PGD_ALPHABLEND)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOB=
J*, RECTL*, RECTL*, BLENDOBJ*);
-typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURF=
OBJ*, XLATEOBJ*, ULONG); =

-typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); =

-typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOB=
J*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX); =

-typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*=
, POINTL*, MIX, ULONG); =

-typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, =
XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG); =

-typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MI=
X); =

-typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, X=
LATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); =

+typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURF=
OBJ*, XLATEOBJ*, ULONG);
+typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG);
+typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOB=
J*, BRUSHOBJ*, POINTL*, PLINEATTRS, MIX);
+typedef BOOL (NTAPI *PGD_FILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, BRUSHOBJ*=
, POINTL*, MIX, ULONG);
+typedef BOOL (NTAPI *PGD_STROKEANDFILLPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, =
XFORMOBJ*, BRUSHOBJ*, PLINEATTRS, BRUSHOBJ*, POINTL*, MIX, ULONG);
+typedef BOOL (NTAPI *PGD_PAINT)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, POINTL*, MI=
X);
+typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, X=
LATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4);
 typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLA=
TEOBJ*, RECTL*, RECTL*, ULONG, ULONG);
-typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*=
, RECTL*, POINTL*); =

+typedef BOOL (NTAPI *PGD_COPYBITS)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*=
, RECTL*, POINTL*);
 typedef BOOL (NTAPI *PGD_STRETCHBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ=
*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG);
 typedef BOOL (NTAPI *PGD_STRETCHBLTROP)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIP=
OBJ*, XLATEOBJ*, COLORADJUSTMENT*, POINTL*, RECTL*, RECTL*, POINTL*, ULONG,=
 BRUSHOBJ*, DWORD);
-typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG)=
; =

-typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, R=
ECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX); =

-typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, =
PVOID *); =

-typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, U=
LONG, PVOID *); =

-typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); =

-typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULO=
NG); =

-typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, G=
LYPHDATA*, PVOID, ULONG); =

-typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, X=
LATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG); =

-typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*); =

+typedef BOOL (NTAPI *PGD_SETPALETTE)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG);
+typedef BOOL (NTAPI *PGD_TEXTOUT)(SURFOBJ*, STROBJ*, FONTOBJ*, CLIPOBJ*, R=
ECTL*, RECTL*, BRUSHOBJ*, BRUSHOBJ*, POINTL*, MIX);
+typedef ULONG (NTAPI *PGD_ESCAPE)(SURFOBJ*, ULONG, ULONG, PVOID *, ULONG, =
PVOID *);
+typedef ULONG (NTAPI *PGD_DRAWESCAPE)(SURFOBJ*, ULONG, CLIPOBJ*, RECTL*, U=
LONG, PVOID *);
+typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG);
+typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULO=
NG);
+typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, G=
LYPHDATA*, PVOID, ULONG);
+typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, X=
LATEOBJ*, LONG, LONG, LONG, LONG, RECTL*, ULONG);
+typedef VOID (NTAPI *PGD_MOVEPOINTER)(SURFOBJ*, LONG, LONG, RECTL*);
 typedef BOOL (NTAPI *PGD_LINETO)(SURFOBJ*, CLIPOBJ*, BRUSHOBJ*, LONG, LONG=
, LONG, LONG, RECTL*, MIX);
 typedef BOOL (NTAPI *PGD_SENDPAGE)(SURFOBJ*);
 typedef BOOL (NTAPI *PGD_STARTPAGE)(SURFOBJ*);
@@ -535,9 +554,9 @@
   PGD_COPYBITS                   CopyBits;
   PGD_STRETCHBLT                 StretchBlt;
   PVOID                          Unknown1;
-  PGD_SETPALETTE                 SetPalette;   =

+  PGD_SETPALETTE                 SetPalette;
   PGD_TEXTOUT                    TextOut;
-  PGD_ESCAPE                     Escape; =

+  PGD_ESCAPE                     Escape;
   PGD_DRAWESCAPE                 DrawEscape;
   PGD_QUERYFONT                  QueryFont;
   PGD_QUERYFONTTREE              QueryFontTree;
@@ -600,7 +619,7 @@
   PVOID                          Reserved6;
   PVOID                          Reserved7;
   PVOID                          Reserved8;
-  PFN_DrvDeriveSurface           DeriveSurface;  =

+  PFN_DrvDeriveSurface           DeriveSurface;
   PFN_DrvQueryGlyphAttrs         QueryGlyphAttrs;
   PFN_DrvNotify                  Notify;
   PGD_SYNCHRONIZESURFACE         SynchronizeSurface;