From 835306e6f49826cfc9d7fb5cd5adbdc830878d5b Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 19 Mar 2008 00:33:11 +0000 Subject: [PATCH] Add GDILoObjType enum to ntgdityp.h svn path=/trunk/; revision=32720 --- reactos/include/reactos/win32k/ntgdityp.h | 139 ++++++++++++---------- 1 file changed, 79 insertions(+), 60 deletions(-) diff --git a/reactos/include/reactos/win32k/ntgdityp.h b/reactos/include/reactos/win32k/ntgdityp.h index a0db30d156f..faf616a045a 100644 --- a/reactos/include/reactos/win32k/ntgdityp.h +++ b/reactos/include/reactos/win32k/ntgdityp.h @@ -97,42 +97,61 @@ typedef enum _TRANSFORMTYPE GdiLpToDp, } TRANSFORMTYPE, *PTRANSFORMTYPE; -typedef enum _GDIOBJTYPE +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, + GDIObjType_DEF_TYPE = 0x00, + GDIObjType_DC_TYPE = 0x01, + GDIObjType_UNUSED1_TYPE = 0x02, + GDIObjType_UNUSED2_TYPE = 0x03, + GDIObjType_RGN_TYPE = 0x04, + GDIObjType_SURF_TYPE = 0x05, + GDIObjType_CLIENTOBJ_TYPE = 0x06, + GDIObjType_PATH_TYPE = 0x07, + GDIObjType_PAL_TYPE = 0x08, + GDIObjType_ICMLCS_TYPE = 0x09, + GDIObjType_LFONT_TYPE = 0x0a, + GDIObjType_RFONT_TYPE = 0x0b, + GDIObjType_PFE_TYPE = 0x0c, + GDIObjType_PFT_TYPE = 0x0d, + GDIObjType_ICMCXF_TYPE = 0x0e, + GDIObjType_SPRITE_TYPE = 0x0f, + GDIObjType_BRUSH_TYPE = 0x10, + GDIObjType_UMPD_TYPE = 0x11, + GDIObjType_UNUSED4_TYPE = 0x12, + GDIObjType_SPACE_TYPE = 0x13, + GDIObjType_UNUSED5_TYPE = 0x14, + GDIObjType_META_TYPE = 0x15, + GDIObjType_EFSTATE_TYPE = 0x16, + GDIObjType_BMFD_TYPE = 0x17, + GDIObjType_VTFD_TYPE = 0x18, + GDIObjType_TTFD_TYPE = 0x19, + GDIObjType_RC_TYPE = 0x1a, + GDIObjType_TEMP_TYPE = 0x1b, + GDIObjType_DRVOBJ_TYPE = 0x1c, + GDIObjType_DCIOBJ_TYPE = 0x1d, + GDIObjType_SPOOL_TYPE = 0x1e, + GDIObjType_MAX_TYPE = 0x1e, + GDIObjTypeTotal = 0x1f, } GDIOBJTYPE, *PGDIOBJTYPE; - -#define GDIObjType_MAX_TYPE GDIObjType_SPOOL_TYPE + +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE = 0x100000, + GDILoObjType_LO_DC_TYPE = 0x10000, + GDILoObjType_LO_BITMAP_TYPE = 0x50000, + GDILoObjType_LO_PALETTE_TYPE = 0x80000, + GDILoObjType_LO_FONT_TYPE = 0xa0000, + GDILoObjType_LO_REGION_TYPE = 0x40000, + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, + GDILoObjType_LO_ALTDC_TYPE = 0x210000, + GDILoObjType_LO_PEN_TYPE = 0x300000, + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, + GDILoObjType_LO_METAFILE_TYPE = 0x460000, + GDILoObjType_LO_METADC16_TYPE = 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; #define GdiWorldSpaceToPageSpace 0x203 @@ -182,7 +201,7 @@ typedef struct _CHWIDTHINFO 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 @@ typedef struct _GDIBSTEXTOUT ULONG ulForegroundClr; ULONG ulBackgroundClr; int x; - int y; + int y; UINT Options; RECT Rect; DWORD iCS_CP; @@ -429,7 +448,7 @@ typedef struct _GDIBSEXTSELCLPRGN LONG right; LONG bottom; LONG left; - LONG top; + LONG top; } GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN; // // Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn. @@ -445,36 +464,36 @@ typedef struct _GDIBSOBJECT 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*, XLATEOBJ*, RECTL*, RECTL*, BLENDOBJ*); -typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); -typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); -typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, 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*, MIX); -typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); +typedef BOOL (NTAPI *PGD_REALIZEBRUSH)(BRUSHOBJ*, SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, ULONG); +typedef ULONG (NTAPI *PGD_DITHERCOLOR)(DHPDEV, ULONG, ULONG, PULONG); +typedef BOOL (NTAPI *PGD_STROKEPATH)(SURFOBJ*, PATHOBJ*, CLIPOBJ*, XFORMOBJ*, 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*, MIX); +typedef BOOL (NTAPI *PGD_BITBLT)(SURFOBJ*, SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, RECTL*, POINTL*, POINTL*, BRUSHOBJ*, POINTL*, ROP4); typedef BOOL (NTAPI *PGD_TRANSPARENTBLT)(SURFOBJ*, SURFOBJ*, CLIPOBJ*, XLATEOBJ*, 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*, CLIPOBJ*, 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*, RECTL*, 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*, ULONG, PVOID *); -typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); -typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); -typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); -typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, 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*, RECTL*, 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*, ULONG, PVOID *); +typedef PIFIMETRICS (NTAPI *PGD_QUERYFONT)(DHPDEV, ULONG, ULONG, PULONG); +typedef PVOID (NTAPI *PGD_QUERYFONTTREE)(DHPDEV, ULONG, ULONG, ULONG, PULONG); +typedef LONG (NTAPI *PGD_QUERYFONTDATA)(DHPDEV, FONTOBJ*, ULONG, HGLYPH, GLYPHDATA*, PVOID, ULONG); +typedef ULONG (NTAPI *PGD_SETPOINTERSHAPE)(SURFOBJ*, SURFOBJ*, SURFOBJ*, XLATEOBJ*, 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 @@ typedef struct _DRIVER_FUNCTIONS 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 @@ typedef struct _DRIVER_FUNCTIONS PVOID Reserved6; PVOID Reserved7; PVOID Reserved8; - PFN_DrvDeriveSurface DeriveSurface; + PFN_DrvDeriveSurface DeriveSurface; PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; PFN_DrvNotify Notify; PGD_SYNCHRONIZESURFACE SynchronizeSurface;