Author: tkreuzer Date: Wed Apr 16 16:34:12 2008 New Revision: 32989
URL: http://svn.reactos.org/svn/reactos?rev=32989&view=rev Log: win32k header cleanup/update: - make the headers include headers they depend on, so the inclusion order is irrelevant, not finished - start sorting them alphabetically - remove duplicate include of timer.h - add cliprgn.h - add DCLEVEL struct and make DC struct windows xp compatible (currently + some ros specific entries)
Added: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h (with props) Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h trunk/reactos/subsystems/win32/win32k/include/bitmaps.h trunk/reactos/subsystems/win32/win32k/include/callback.h trunk/reactos/subsystems/win32/win32k/include/caret.h trunk/reactos/subsystems/win32/win32k/include/class.h trunk/reactos/subsystems/win32/win32k/include/clipboard.h trunk/reactos/subsystems/win32/win32k/include/coord.h trunk/reactos/subsystems/win32/win32k/include/dc.h trunk/reactos/subsystems/win32/win32k/include/gdiobj.h trunk/reactos/subsystems/win32/win32k/include/intgdi.h trunk/reactos/subsystems/win32/win32k/include/palette.h trunk/reactos/subsystems/win32/win32k/include/region.h trunk/reactos/subsystems/win32/win32k/include/win32k.h
Modified: trunk/reactos/subsystems/win32/win32k/include/accelerator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/accelerator.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,6 +1,7 @@ #ifndef _WIN32K_ACCELERATOR_H #define _WIN32K_ACCELERATOR_H
+#include <include/win32.h> #include <include/winsta.h> #include <include/window.h>
Modified: trunk/reactos/subsystems/win32/win32k/include/bitmaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/bitmaps.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,6 +1,9 @@
#ifndef __WIN32K_BITMAPS_H #define __WIN32K_BITMAPS_H + +#include <include/win32.h> +#include <include/gdiobj.h>
/* GDI logical bitmap object */ typedef struct _BITMAPOBJ
Modified: trunk/reactos/subsystems/win32/win32k/include/callback.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/callback.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,5 +1,7 @@ #ifndef _WIN32K_CALLBACK_H #define _WIN32K_CALLBACK_H + +#include <include/win32.h>
LRESULT STDCALL co_IntCallWindowProc(WNDPROC Proc,
Modified: trunk/reactos/subsystems/win32/win32k/include/caret.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/caret.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,5 +1,8 @@ #ifndef _WIN32K_CARET_H #define _WIN32K_CARET_H + +#include <include/win32.h> +#include <include/window.h>
#define IDCARETTIMER (0xffff)
Modified: trunk/reactos/subsystems/win32/win32k/include/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/class.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,5 +1,7 @@ #ifndef _WIN32K_CLASS_H #define _WIN32K_CLASS_H + +#include <include/win32.h>
#define IS_ATOM(x) \ (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))
Modified: trunk/reactos/subsystems/win32/win32k/include/clipboard.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/clipboard.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -2,6 +2,7 @@ #define _WIN32K_CLIPBOARD_H
#include "window.h" +#include <include/win32.h>
VOID FASTCALL IntIncrementSequenceNumber(VOID);
Added: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/cliprgn.h (added) +++ trunk/reactos/subsystems/win32/win32k/include/cliprgn.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,0 +1,12 @@ +#ifndef __WIN32K_CLIPRGN_H +#define __WIN32K_CLIPRGN_H + +#include <include/dc.h> +#include <include/region.h> + +INT FASTCALL IntGdiGetClipBox(HDC hDC, LPRECT rc); +INT STDCALL IntGdiSelectVisRgn(HDC hdc, HRGN hrgn); +INT STDCALL IntGdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); + + +#endif /* not __WIN32K_CLIPRGN_H */
Propchange: trunk/reactos/subsystems/win32/win32k/include/cliprgn.h ------------------------------------------------------------------------------ svn:eol-style = native
Modified: trunk/reactos/subsystems/win32/win32k/include/coord.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/coord.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,5 +1,7 @@ #ifndef __WIN32K_COORD_H #define __WIN32K_COORD_H + +#include <include/dc.h>
VOID FASTCALL
Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,7 +1,8 @@ #ifndef __WIN32K_DC_H #define __WIN32K_DC_H
-#include "driver.h" +#include <include/brush.h> +#include <include/bitmaps.h>
/* Constants ******************************************************************/
@@ -32,6 +33,45 @@
/* Type definitions ***********************************************************/
+typedef struct _DCLEVEL +{ + HPALETTE hpal; + struct _PALGDI * ppal; + PVOID pColorSpace; // COLORSPACE* + LONG lIcmMode; + LONG lSaveDepth; + DWORD unk1_00000000; + HGDIOBJ hdcSave; + POINTL ptlBrushOrigin; + PGDIBRUSHOBJ pbrFill; + PGDIBRUSHOBJ pbrLine; + PVOID plfnt; // LFONTOBJ* (TEXTOBJ*) + HGDIOBJ hPath; // HPATH + FLONG flPath; + LINEATTRS laPath; // 0x20 bytes + PVOID prgnClip; // PROSRGNDATA + PVOID prgnMeta; + COLORADJUSTMENT ca; + FLONG flFontState; + UNIVERSAL_FONT_ID ufi; + DWORD unk4_00000000[11]; + FLONG fl; + FLONG flBrush; + MATRIX_S mxWorldToDevice; + MATRIX_S mxDeviceToWorld; + MATRIX_S mxWorldToPage; + EFLOAT_S efM11PtoD; + EFLOAT_S efM22PtoD; + EFLOAT_S efDxPtoD; + EFLOAT_S efDyPtoD; + EFLOAT_S efM11_TWIPS; + EFLOAT_S efM22_TWIPS; + EFLOAT_S efPr11; + EFLOAT_S efPr22; + PBITMAPOBJ pSurface; // SURFACE* + SIZE sizl; +} DCLEVEL, PDCLEVEL; + /* The DC object structure */ typedef struct _DC { @@ -47,16 +87,39 @@ FLONG flGraphics; FLONG flGraphics2; PDC_ATTR pDc_Attr; - WIN_DC_INFO w; + DCLEVEL DcLevel; DC_ATTR Dc_Attr; HDC hNext; HDC hPrev; RECTL erclClip; + POINTL ptlSaveFillOrig; RECTL erclWindow; RECTL erclBounds; - HRGN hprgnAPI; - HRGN hprgnVis; - + RECTL erclBoundsApp; + PVOID prgnAPI; // PROSRGNDATA + PVOID prgnVis; + PVOID prgnRao; + POINTL ptlFillOrigin; + unsigned eboFill_[23]; // EBRUSHOBJ + unsigned eboLine_[23]; + unsigned eboText_[23]; + unsigned eboBackground_[23]; + HFONT hlfntCur; + FLONG flSimulationFlags; + LONG lEscapement; + PVOID prfnt; // RFONT* + unsigned co_[31]; // CLIPOBJ + PVOID pPFFList; // PPFF* + PVOID ClrxFormObj; + INT ipfdDevMax; + ULONG ulCopyCount; + PVOID pSurfInfo; + POINTL ptlDoBanding; + + /* Reactos specific members */ + WIN_DC_INFO w; + HRGN hprgnAPI; // should use prgnAPI + HRGN hprgnVis; // should use prgnVis CLIPOBJ *CombinedClip; XLATEOBJ *XlateBrush; XLATEOBJ *XlatePen;
Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -8,6 +8,7 @@
/* Public GDI Object/Handle definitions */ #include <win32k/ntgdihdl.h> +#include <include/win32.h>
typedef struct _GDI_HANDLE_TABLE {
Modified: trunk/reactos/subsystems/win32/win32k/include/intgdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/intgdi.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -193,8 +193,6 @@ INT FASTCALL IntGdiGetDeviceCaps(PDC dc, INT Index);
-int STDCALL IntGdiExtSelectClipRgn (PDC dc, HRGN hrgn, int fnMode); - INT FASTCALL IntGdiEscape(PDC dc,
Modified: trunk/reactos/subsystems/win32/win32k/include/palette.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/palette.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -1,5 +1,7 @@ #ifndef _WIN32K_PALETTE_H #define _WIN32K_PALETTE_H + +#include <include/dc.h>
#define NO_MAPPING
Modified: trunk/reactos/subsystems/win32/win32k/include/region.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/region.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -37,9 +37,6 @@ INT STDCALL IntGdiGetRgnBox(HRGN, LPRECT); BOOL FASTCALL IntGdiPaintRgn(PDC, HRGN ); HRGN FASTCALL GdiCreatePolyPolygonRgn(CONST PPOINT, CONST PINT, INT, INT ); -int FASTCALL IntGdiGetClipBox(HDC hDC, LPRECT rc); -INT STDCALL IntGdiSelectVisRgn(HDC hdc, HRGN hrgn); -
#define UnsafeIntCreateRectRgnIndirect(prc) \ NtGdiCreateRectRgn((prc)->left, (prc)->top, (prc)->right, (prc)->bottom)
Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Wed Apr 16 16:34:12 2008 @@ -12,21 +12,36 @@ #define INTERNAL_CALL NTAPI
/* Internal Win32k Headers */ -#include <include/ntuser.h> -#include <include/win32.h> +#include <include/driver.h> + #include <include/accelerator.h> +#include <include/clipboard.h> +#include <include/cliprgn.h> +#include <include/bitmaps.h> +#include <include/brush.h> #include <include/callback.h> +#include <include/caret.h> #include <include/class.h> #include <include/cleanup.h> -#include <include/clipboard.h> #include <include/color.h> +#include <include/coord.h> #include <include/csr.h> +#include <include/dc.h> +#include <include/dce.h> +#include <include/dib.h> +#include <include/error.h> +#include <include/gdiobj.h> +#include <include/palette.h> +#include <include/rect.h> +#include <include/win32.h> +#include <include/window.h> +#include <include/winsta.h> + +#include <include/region.h> +#include <include/ntuser.h> #include <include/cursoricon.h> -#include <include/dce.h> #include <include/desktop.h> -#include <include/dib.h> #include <include/eng.h> -#include <include/error.h> #include <include/focus.h> #include <include/guicheck.h> #include <include/hook.h> @@ -42,26 +57,19 @@ #include <include/object.h> #include <include/paint.h> #include <include/painting.h> -#include <include/palette.h> #include <include/path.h> #include <include/prop.h> -#include <include/rect.h> #include <include/scroll.h> #include <include/surface.h> #include <include/tags.h> #include <include/text.h> #include <include/timer.h> -#include <include/timer.h> #include <include/useratom.h> #include <include/vis.h> -#include <include/window.h> -#include <include/caret.h> #include <include/userfuncs.h> #include <include/winpos.h> -#include <include/winsta.h> #include <include/mmcopy.h> #include <include/misc.h> -#include <include/coord.h> #include <include/gdifloat.h> #include <eng/objects.h> #include <eng/misc.h>