Author: jimtabor
Date: Wed Oct 31 04:47:54 2007
New Revision: 29992
URL:
http://svn.reactos.org/svn/reactos?rev=29992&view=rev
Log:
- Add gdi batching command structures.
- Add additional region clipping data types to Dc_Attr.
Modified:
trunk/reactos/include/reactos/win32k/ntgdihdl.h
trunk/reactos/include/reactos/win32k/ntgdityp.h
Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdihdl.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdihdl.h Wed Oct 31 04:47:54 2007
@@ -281,6 +281,11 @@
SIZEL szlVirtualDeviceSize;
POINTL ptlBrushOrigin;
RGNATTR VisRectRegion;
+ FLONG RgnFlags;
+ COLORREF crRgnBgndClr;
+ ULONG ulRgnBgndClr;
+ HANDLE hRgnbrush;
+ HANDLE hRgnpen;
} DC_ATTR, *PDC_ATTR;
#endif
Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg…
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdityp.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdityp.h Wed Oct 31 04:47:54 2007
@@ -176,5 +176,110 @@
ULONG l;
} gxf_long;
-
+//
+// GDI Batch structures.
+//
+typedef struct _GDIBATCHHDR
+{
+ SHORT Size;
+ SHORT Cmd;
+} GDIBATCHHDR, *PGDIBATCHHDR;
+
+typedef struct _GDIBSPATBLT
+{
+ GDIBATCHHDR gbHdr;
+ int nXLeft;
+ int nYLeft;
+ int nWidth;
+ int nHeight;
+ HANDLE hbrush;
+ DWORD dwRop;
+ COLORREF crForegroundClr;
+ COLORREF crBackgroundClr;
+ COLORREF crBrushClr;
+ INT IcmBrushColor;
+ POINTL ptlViewportOrg;
+ ULONG ulForegroundClr;
+ ULONG ulBackgroundClr;
+ ULONG ulBrushClr;
+} GDIBSPATBLT, *PGDIBSPATBLT;
+
+#ifndef _NTUSRTYP_
+typedef struct _PATRECT
+{
+ RECT r;
+ HBRUSH hBrush;
+} PATRECT, * PPATRECT;
#endif
+
+typedef struct _GDIBSPPATBLT
+{
+ GDIBATCHHDR gbHdr;
+ DWORD rop4;
+ DWORD Mode;
+ DWORD Count;
+ COLORREF crForegroundClr;
+ COLORREF crBackgroundClr;
+ COLORREF crBrushClr;
+ ULONG ulForegroundClr;
+ ULONG ulBackgroundClr;
+ ULONG ulBrushClr;
+ POINTL ptlViewportOrg;
+ PATRECT pRect; // POLYPATBLT
+} GDIBSPPATBLT, *PGDIBSPPATBLT;
+
+typedef struct _GDIBSTEXTOUT
+{
+ GDIBATCHHDR gbHdr;
+ COLORREF crForegroundClr;
+ COLORREF crBackgroundClr;
+ LONG lmBkMode;
+ ULONG ulForegroundClr;
+ ULONG ulBackgroundClr;
+ int x;
+ int y;
+ UINT Options;
+ RECT Rect;
+ DWORD iCS_CP;
+ UINT cbCount;
+ UINT Size;
+ HANDLE hlfntNew;
+ FLONG flTextAlign;
+ POINTL ptlViewportOrg;
+ CHAR String[1];
+} GDIBSTEXTOUT, *PGDIBSTEXTOUT;
+
+typedef struct _GDIBSEXTTEXTOUT
+{
+ GDIBATCHHDR gbHdr;
+ UINT Count;
+ UINT Options;
+ RECT Rect;
+ POINTL ptlViewportOrg;
+ ULONG ulBackgroundClr;
+} GDIBSEXTTEXTOUT, *PGDIBSEXTTEXTOUT;
+
+typedef struct _GDIBSSETBRHORG
+{
+ GDIBATCHHDR gbHdr;
+ POINTL ptlBrushOrigin;
+} GDIBSSETBRHORG, *PGDIBSSETBRHORG;
+
+typedef struct _GDIBSEXTSELCLPRGN
+{
+ GDIBATCHHDR gbHdr;
+ int fnMode;
+ HANDLE hbrush;
+ HANDLE hpen;
+ COLORREF crBackgroundClr;
+ ULONG ulBackgroundClr;
+} GDIBSEXTSELCLPRGN, *PGDIBSEXTSELCLPRGN;
+//
+// Use with GdiBCSelObj, GdiBCDelObj and GdiBCDelRgn.
+typedef struct _GDIBSOBJECT
+{
+ GDIBATCHHDR gbHdr;
+ HGDIOBJ hgdiobj;
+} GDIBSOBJJECT, *PGDIBSOBJECT;
+
+#endif