[ros-diffs] [ion] 20367: - Major Win32k Header Cleanup: Add ntgdi.h based on latest Platform SDK Public header. It contains the official definitions for NtGdi APIs.

- Major Win32k Header Cleanup: Add ntgdi.h based on latest Platform SDK
Public header. It contains the official definitions for NtGdi APIs.
- Added ntgdityps.h for structures needed to use the header (which were
sadly not publically shipped).
- Removed internal win32k header data from public headers and put it to
internal win32k headers.
- Fixed ntuser.h STDCALL->WINAPI.
- Added ntgdihdl.h for shared GDI Handle information between
gdi32/win32k
- Added ntusrtyp.h for some shared NtUser types.
- Added ntgdibad.h which contains all non-compatible NtGdi prototypes,
along with a detailed comment for each, and information on how to fix
it. I had a 20 000+ line patch fixing all these issues, but it contained
many bugs and I scrapped it in place for this approach, which while
dirtier at first, simplifies the number of changes needed so that others
can work on it as well.
- Fixed some gdi32/win32k/user32 header issues.
Deleted: trunk/reactos/include/win32k/bitmaps.h
Deleted: trunk/reactos/include/win32k/brush.h
Deleted: trunk/reactos/include/win32k/caret.h
Deleted: trunk/reactos/include/win32k/cliprgn.h
Deleted: trunk/reactos/include/win32k/color.h
Deleted: trunk/reactos/include/win32k/coord.h
Deleted: trunk/reactos/include/win32k/cursoricon.h
Deleted: trunk/reactos/include/win32k/dc.h
Deleted: trunk/reactos/include/win32k/driver.h
Deleted: trunk/reactos/include/win32k/fillshap.h
Deleted: trunk/reactos/include/win32k/float.h
Deleted: trunk/reactos/include/win32k/font.h
Deleted: trunk/reactos/include/win32k/gdiobj.h
Deleted: trunk/reactos/include/win32k/icm.h
Deleted: trunk/reactos/include/win32k/kapi.h
Deleted: trunk/reactos/include/win32k/line.h
Deleted: trunk/reactos/include/win32k/math.h
Deleted: trunk/reactos/include/win32k/menu.h
Deleted: trunk/reactos/include/win32k/metafile.h
Deleted: trunk/reactos/include/win32k/misc.h
Deleted: trunk/reactos/include/win32k/ntddraw.h
Added: trunk/reactos/include/win32k/ntgdibad.h
Added: trunk/reactos/include/win32k/ntgdihdl.h
Added: trunk/reactos/include/win32k/ntgdityp.h
Modified: trunk/reactos/include/win32k/ntuser.h
Added: trunk/reactos/include/win32k/ntusrtyp.h
Deleted: trunk/reactos/include/win32k/paint.h
Deleted: trunk/reactos/include/win32k/path.h
Deleted: trunk/reactos/include/win32k/pen.h
Deleted: trunk/reactos/include/win32k/print.h
Deleted: trunk/reactos/include/win32k/region.h
Deleted: trunk/reactos/include/win32k/text.h
Deleted: trunk/reactos/include/win32k/win32k.h
Deleted: trunk/reactos/include/win32k/wingl.h
Modified: trunk/reactos/lib/gdi32/gdi32.def
Added: trunk/reactos/lib/gdi32/include/gdi32p.h
Modified: trunk/reactos/lib/gdi32/include/precomp.h
Modified: trunk/reactos/lib/gdi32/misc/gdientry.c
Modified: trunk/reactos/lib/gdi32/misc/stubs.c
Modified: trunk/reactos/lib/gdi32/misc/stubsa.c
Modified: trunk/reactos/lib/gdi32/misc/stubsw.c
Modified: trunk/reactos/lib/gdi32/misc/wingl.c
Modified: trunk/reactos/lib/gdi32/objects/bitmap.c
Modified: trunk/reactos/lib/gdi32/objects/brush.c
Modified: trunk/reactos/lib/gdi32/objects/dc.c
Modified: trunk/reactos/lib/gdi32/objects/font.c
Modified: trunk/reactos/lib/gdi32/objects/path.c
Modified: trunk/reactos/lib/user32/include/user32.h
Modified: trunk/reactos/subsys/win32k/eng/objects.h
Added: trunk/reactos/subsys/win32k/include/bitmaps.h
Added: trunk/reactos/subsys/win32k/include/brush.h
Modified: trunk/reactos/subsys/win32k/include/color.h
Added: trunk/reactos/subsys/win32k/include/coord.h
Added: trunk/reactos/subsys/win32k/include/dc.h
Modified: trunk/reactos/subsys/win32k/include/dib.h
Added: trunk/reactos/subsys/win32k/include/driver.h
Added: trunk/reactos/subsys/win32k/include/gdifloat.h
Added: trunk/reactos/subsys/win32k/include/gdiobj.h
Modified: trunk/reactos/subsys/win32k/include/intgdi.h
Modified: trunk/reactos/subsys/win32k/include/menu.h
Added: trunk/reactos/subsys/win32k/include/misc.h
Modified: trunk/reactos/subsys/win32k/include/object.h
Modified: trunk/reactos/subsys/win32k/include/path.h
Added: trunk/reactos/subsys/win32k/include/pen.h
Added: trunk/reactos/subsys/win32k/include/region.h
Modified: trunk/reactos/subsys/win32k/include/text.h
Modified: trunk/reactos/subsys/win32k/include/win32k.h
Modified: trunk/reactos/subsys/win32k/main/dllmain.c
Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c
Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c
Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c
Modified: trunk/reactos/subsys/win32k/ntuser/menu.c
Modified: trunk/reactos/subsys/win32k/ntuser/painting.c
Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c
Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c
Modified: trunk/reactos/subsys/win32k/objects/brush.c
Modified: trunk/reactos/subsys/win32k/objects/dc.c
Modified: trunk/reactos/subsys/win32k/objects/dib.c
Modified: trunk/reactos/subsys/win32k/objects/icm.c
Modified: trunk/reactos/subsys/win32k/objects/line.c
Modified: trunk/reactos/subsys/win32k/objects/paint.c
Modified: trunk/reactos/subsys/win32k/objects/path.c
Modified: trunk/reactos/subsys/win32k/objects/pen.c
Modified: trunk/reactos/subsys/win32k/objects/print.c
Modified: trunk/reactos/subsys/win32k/objects/region.c
Modified: trunk/reactos/subsys/win32k/objects/text.c
Modified: trunk/reactos/subsys/win32k/objects/wingl.c
Modified: trunk/reactos/subsys/win32k/w32k.h
Modified: trunk/reactos/tools/nci/w32ksvc.db
Added: trunk/reactos/w32api/include/ntgdi.h
Modified: trunk/reactos/w32api/include/wingdi.h
  _____  

Deleted: trunk/reactos/include/win32k/bitmaps.h
--- trunk/reactos/include/win32k/bitmaps.h	2005-12-27 03:12:00 UTC
(rev 20366)
+++ trunk/reactos/include/win32k/bitmaps.h	2005-12-27 03:41:13 UTC
(rev 20367)
@@ -1,343 +0,0 @@

-#ifndef __WIN32K_BITMAPS_H
-#define __WIN32K_BITMAPS_H
-
-/* GDI logical bitmap object */
-typedef struct _BITMAPOBJ
-{
-  SURFOBJ     SurfObj;
-  FLONG	      flHooks;
-  FLONG       flFlags;
-  SIZE        dimension;    /* For SetBitmapDimension(), do NOT use
-                               to get width/height of bitmap, use
-                               bitmap.bmWidth/bitmap.bmHeight for
-                               that */
-#ifdef NTOS_MODE_USER
-  PVOID BitsLock;
-#else
-  PFAST_MUTEX BitsLock;     /* You need to hold this lock before you
touch
-                               the actual bits in the bitmap */
-#endif
-
-  /* For device-independent bitmaps: */
-  DIBSECTION *dib;
-  HPALETTE hDIBPalette;
-} BITMAPOBJ, *PBITMAPOBJ;
-
-#define BITMAPOBJ_IS_APIBITMAP		0x1
-
-/*  Internal interface  */
-
-#define  BITMAPOBJ_AllocBitmap()  \
-  ((HBITMAP) GDIOBJ_AllocObj (GDI_OBJECT_TYPE_BITMAP))
-#define  BITMAPOBJ_FreeBitmap(hBMObj)  \
-  GDIOBJ_FreeObj((HGDIOBJ) hBMObj, GDI_OBJECT_TYPE_BITMAP)
-/* NOTE: Use shared locks! */
-#define  BITMAPOBJ_LockBitmap(hBMObj)
(PBITMAPOBJ)EngLockSurface((HSURF)hBMObj)
-#define  BITMAPOBJ_UnlockBitmap(pBMObj)
EngUnlockSurface(&pBMObj->SurfObj)
-BOOL INTERNAL_CALL BITMAP_Cleanup(PVOID ObjectBody);
-
-BOOL INTERNAL_CALL BITMAPOBJ_InitBitsLock(BITMAPOBJ *pBMObj);
-#define BITMAPOBJ_LockBitmapBits(pBMObj)
ExEnterCriticalRegionAndAcquireFastMutexUnsafe((pBMObj)->BitsLock)
-#define BITMAPOBJ_UnlockBitmapBits(pBMObj)
ExReleaseFastMutexUnsafeAndLeaveCriticalRegion((pBMObj)->BitsLock)
-void INTERNAL_CALL BITMAPOBJ_CleanupBitsLock(BITMAPOBJ *pBMObj);
-
-INT     FASTCALL BITMAPOBJ_GetWidthBytes (INT bmWidth, INT bpp);
-HBITMAP FASTCALL BITMAPOBJ_CopyBitmap (HBITMAP  hBitmap);
-INT     FASTCALL DIB_GetDIBWidthBytes (INT  width, INT  depth);
-int     STDCALL  DIB_GetDIBImageBytes (INT  width, INT  height, INT
depth);
-INT     FASTCALL DIB_BitmapInfoSize (const BITMAPINFO * info, WORD
coloruse);
-INT     STDCALL  BITMAP_GetObject(BITMAPOBJ * bmp, INT count, LPVOID
buffer);
-HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice);
-
-HBITMAP FASTCALL IntCreateCompatibleBitmap(PDC Dc, INT Width, INT
Height);
-
-/*  User Entry Points  */
-BOOL
-STDCALL
-NtGdiAlphaBlend(
-	HDC  hDCDest,
-	INT  XOriginDest,
-	INT  YOriginDest,
-	INT  WidthDest,
-	INT  HeightDest,
-	HDC  hDCSrc,
-	INT  XOriginSrc,
-	INT  YOriginSrc,
-	INT  WidthSrc,
-	INT  HeightSrc,
-	BLENDFUNCTION  BlendFunc);
-
-BOOL
-STDCALL
-NtGdiBitBlt (
-	HDC	hDCDest,
-	INT	XDest,
-	INT	YDest,
-	INT	Width,
-	INT	Height,
-	HDC	hDCSrc,
-	INT	XSrc,
-	INT	YSrc,
-	DWORD	ROP
-	);
-HBITMAP
-STDCALL
-NtGdiCreateBitmap (
-	INT		Width,
-	INT		Height,
-	UINT		Planes,
-	UINT		BitsPerPel,
-	CONST VOID	* Bits
-	);
-HBITMAP
-STDCALL
-NtGdiCreateCompatibleBitmap (
-	HDC	hDC,
-	INT	Width,
-	INT	Height
-	);
-HBITMAP
-STDCALL
-NtGdiCreateBitmapIndirect (
-	CONST BITMAP	* BM
-	);
-HBITMAP
-STDCALL
-NtGdiCreateDIBitmap (
-	HDC			hDC,
-	CONST BITMAPINFOHEADER	* bmih,
-	DWORD			Init,
-	CONST VOID		* bInit,
-	CONST BITMAPINFO	* bmi,
-	UINT			Usage
-	);
-HBITMAP
-STDCALL
-NtGdiCreateDIBSection (
-	HDC			hDC,
-	CONST BITMAPINFO	* bmi,
-	UINT			Usage,
-	VOID			* Bits,
-	HANDLE			hSection,
-	DWORD			dwOffset
-	);
-HBITMAP
-STDCALL
-NtGdiCreateDiscardableBitmap (
-	HDC	hDC,
-	INT	Width,
-	INT	Height
-	);
-BOOL
-STDCALL
-NtGdiExtFloodFill (
-	HDC		hDC,
-	INT		XStart,
-	INT		YStart,
-	COLORREF	Color,
-	UINT		FillType
-	);
-BOOL
-STDCALL
-NtGdiFloodFill (
-	HDC		hDC,
-	INT		XStart,
-	INT		YStart,
-	COLORREF	Fill
-	);
-LONG
-STDCALL
-NtGdiGetBitmapBits (
-	HBITMAP	hBitmap,
-	LONG	Buffer,
-	LPVOID	Bits
-	);
-BOOL
-STDCALL
-NtGdiGetBitmapDimensionEx (
-	HBITMAP	hBitmap,
-	LPSIZE	Dimension
-	);
-UINT
-STDCALL
-NtGdiGetDIBColorTable (
-	HDC	hDC,
-	UINT	StartIndex,
-	UINT	Entries,
-	RGBQUAD	* Colors
-	);
-INT
-STDCALL
-NtGdiGetDIBits (
-	HDC		hDC,
-	HBITMAP		hBitmap,
-	UINT		StartScan,
-	UINT		ScanLines,
-	LPVOID		Bits,
-	LPBITMAPINFO	bi,
-	UINT		Usage
-	);
-COLORREF
-STDCALL
-NtGdiGetPixel (
-	HDC	hDC,
-	INT	XPos,
-	INT	YPos
-	);
-BOOL
-STDCALL
-NtGdiGradientFill (
-	HDC hdc,
-	PTRIVERTEX pVertex,
-	ULONG uVertex,
-	PVOID pMesh,
-	ULONG uMesh,
-	ULONG ulMode
-	);
-BOOL
-STDCALL
-NtGdiMaskBlt (
-	HDC	hDCDest,
-	INT	XDest,
-	INT	YDest,
-	INT	Width,
-	INT	Height,
-	HDC	hDCSrc,
-	INT	XSrc,
-	INT	YSrc,
-	HBITMAP	hMaskBitmap,
-	INT	xMask,
-	INT	yMask,
-	DWORD	ROP
-	);
-BOOL
-STDCALL
-NtGdiPlgBlt (
-	HDC		hDCDest,
-	CONST POINT	* Point,
-	HDC		hDCSrc,
-	INT		XSrc,
-	INT		YSrc,
-	INT		Width,
-	INT		Height,
-	HBITMAP		hMaskBitmap,
-	INT		xMask,
-	INT		yMask
-	);
-LONG
-STDCALL
-NtGdiSetBitmapBits (
-	HBITMAP		hBitmap,
-	DWORD		Bytes,
-	CONST VOID	* Bits
-	);
-BOOL
-STDCALL
-NtGdiSetBitmapDimensionEx (
-	HBITMAP	hBitmap,
-	INT	Width,
-	INT	Height,
-	LPSIZE	Size
-	);
-UINT
-STDCALL
-NtGdiSetDIBColorTable (
-	HDC		hDC,
-	UINT		StartIndex,
-	UINT		Entries,
-	CONST RGBQUAD	* Colors
-	);
-INT
-STDCALL
-NtGdiSetDIBits (
-	HDC			hDC,
-	HBITMAP			hBitmap,
-	UINT			StartScan,
-	UINT			ScanLines,
-	CONST VOID		* Bits,
-	CONST BITMAPINFO	* bmi,
-	UINT			ColorUse
-	);
-INT
-STDCALL
-NtGdiSetDIBitsToDevice (
-	HDC			hDC,
-	INT			XDest,
-	INT			YDest,
-	DWORD			Width,
-	DWORD			Height,
-	INT			XSrc,
-	INT			YSrc,
-	UINT			StartScan,
-	UINT			ScanLines,
-	CONST VOID		* Bits,
-	CONST BITMAPINFO	* bmi,
-	UINT			ColorUse
-	);
-COLORREF
-STDCALL
-NtGdiSetPixel (
-	HDC		hDC,
-	INT		X,
-	INT		Y,
-	COLORREF	Color
-	);
-BOOL
-STDCALL
-NtGdiSetPixelV (
-	HDC		hDC,
-	INT		X,
-	INT		Y,
-	COLORREF	Color
-	);
-BOOL
-STDCALL
-NtGdiStretchBlt (
-	HDC	hDCDest,
-	INT	XOriginDest,
-	INT	YOriginDest,
-	INT	WidthDest,
-	INT	HeightDest,
-	HDC	hDCSrc,
-	INT	XOriginSrc,
-	INT	YOriginSrc,
-	INT	WidthSrc,
-	INT	HeightSrc,
-	DWORD	ROP
-	);
-INT
-STDCALL
-NtGdiStretchDIBits (
-	HDC			hDC,
-	INT			XDest,
-	INT			YDest,
-	INT			DestWidth,
-	INT			DestHeight,
-	INT			XSrc,
-	INT			YSrc,
-	INT			SrcWidth,
-	INT			SrcHeight,
-	CONST VOID		* Bits,
-	CONST BITMAPINFO	* BitsInfo,
-	UINT			Usage,
-	DWORD			ROP
-	);
-
-BOOL
-STDCALL
-NtGdiTransparentBlt(
-	HDC			hdcDst,
-	INT			xDst,
-	INT			yDst,
-	INT			cxDst,
-	INT			cyDst,
-	HDC			hdcSrc,
-	INT			xSrc,
-	INT			ySrc,
-	INT			cxSrc,
-	INT			cySrc,
-	COLORREF	TransColor
-	);
-
-#endif
-
  _____  

Deleted: trunk/reactos/include/win32k/brush.h
--- trunk/reactos/include/win32k/brush.h	2005-12-27 03:12:00 UTC
(rev 20366)
+++ trunk/reactos/include/win32k/brush.h	2005-12-27 03:41:13 UTC
(rev 20367)
@@ -1,112 +0,0 @@

-#ifndef __WIN32K_BRUSH_H
-#define __WIN32K_BRUSH_H
-
-#include <win32k/gdiobj.h>
-
-/* Internal interface */
-
-#define NB_HATCH_STYLES  6
-
-/*
- * The layout of this structure is taken from "Windows Graphics
Programming"
- * book written by Feng Yuan.
- *
- * DON'T MODIFY THIS STRUCTURE UNLESS REALLY NEEDED AND EVEN THEN ASK
ON
- * A MAILING LIST FIRST.
- */
-
-typedef struct
-{
-   ULONG AttrFlags;
-   COLORREF lbColor;
-} BRUSHATTR, *PBRUSHATTR;
-
-typedef struct
-{
-   ULONG ulStyle;
-   HBITMAP hbmPattern;
-   HANDLE hbmClient;
-   ULONG flAttrs;
-
-   ULONG ulBrushUnique;
-   BRUSHATTR *pBrushAttr;
-   BRUSHATTR BrushAttr;
-   POINT ptOrigin;
-   ULONG bCacheGrabbed;
-   COLORREF crBack;
-   COLORREF crFore;
-   ULONG ulPalTime;
-   ULONG ulSurfTime;
-   PVOID ulRealization;
-   ULONG Unknown4C[3];
-   POINT ptPenWidth;
-   ULONG ulPenStyle;
-   DWORD *pStyle;
-   ULONG dwStyleCount;
-   ULONG Unknown6C;
-} GDIBRUSHOBJ, *PGDIBRUSHOBJ;
-
-typedef struct
-{
-   BRUSHOBJ BrushObject;
-   PGDIBRUSHOBJ GdiBrushObject;
-   XLATEOBJ *XlateObject;
-} GDIBRUSHINST, *PGDIBRUSHINST;
-
-/* GDI Brush Attributes */
-
-#define GDIBRUSH_NEED_BK_CLR		0x0002 /* Background color is
needed */
-#define GDIBRUSH_DITHER_OK		0x0004 /* Allow color dithering
*/
-#define GDIBRUSH_IS_SOLID		0x0010 /* Solid brush */
-#define GDIBRUSH_IS_HATCH		0x0020 /* Hatch brush */
-#define GDIBRUSH_IS_BITMAP		0x0040 /* DDB pattern brush */
-#define GDIBRUSH_IS_DIB			0x0080 /* DIB pattern
brush */ 
-#define GDIBRUSH_IS_NULL		0x0100 /* Null/hollow brush */
-#define GDIBRUSH_IS_GLOBAL		0x0200 /* Stock objects */
-#define GDIBRUSH_IS_PEN			0x0400 /* Pen */
-#define GDIBRUSH_IS_OLDSTYLEPEN		0x0800 /* Geometric pen
*/
-#define GDIBRUSH_IS_MASKING		0x8000 /* Pattern bitmap is used
as transparent mask (?) */
-#define GDIBRUSH_CACHED_IS_SOLID	0x80000000 
-
-#define  BRUSHOBJ_AllocBrush() ((HBRUSH) GDIOBJ_AllocObj
(GDI_OBJECT_TYPE_BRUSH))
-#define  BRUSHOBJ_FreeBrush(hBrush) GDIOBJ_FreeObj((HGDIOBJ)hBrush,
GDI_OBJECT_TYPE_BRUSH)
-#define  BRUSHOBJ_LockBrush(hBrush)
((PGDIBRUSHOBJ)GDIOBJ_LockObj((HGDIOBJ)hBrush, GDI_OBJECT_TYPE_BRUSH))
-#define  BRUSHOBJ_UnlockBrush(pBrush) GDIOBJ_UnlockObjByPtr(pBrush)
-BOOL INTERNAL_CALL BRUSH_Cleanup(PVOID ObjectBody);
-
-HBRUSH STDCALL
-NtGdiCreateBrushIndirect(
-   CONST LOGBRUSH *LogBrush);
-
-HBRUSH STDCALL
-NtGdiCreateDIBBrush(
-   CONST BITMAPINFO *BitmapInfoAndData,
-   UINT ColorSpec,
-   UINT BitmapInfoSize,
-   CONST VOID *PackedDIB);
-
-HBRUSH STDCALL
-NtGdiCreateHatchBrush(
-   INT Style,
-   COLORREF Color);
-
-HBRUSH STDCALL
-NtGdiCreatePatternBrush(
-   HBITMAP hBitmap);
-
-HBRUSH STDCALL
-NtGdiCreateSolidBrush(
-   COLORREF Color);
-
-BOOL STDCALL
-NtGdiFixBrushOrgEx(
-   VOID);
-
-BOOL STDCALL
-NtGdiSetBrushOrgEx(
-   HDC hDC,
-   INT XOrg,
-   INT YOrg,
-   LPPOINT Point);
-
-#endif
  _____  

Deleted: trunk/reactos/include/win32k/caret.h
--- trunk/reactos/include/win32k/caret.h	2005-12-27 03:12:00 UTC
(rev 20366)
+++ trunk/reactos/include/win32k/caret.h	2005-12-27 03:41:13 UTC
(rev 20367)
@@ -1,23 +0,0 @@

-/*
- * COPYRIGHT:       See COPYING in the top level directory
- * PROJECT:         ReactOS system libraries
- * FILE:            include/win32k/caret.h
- * PURPOSE:         GDI32/Win32k Caret interface
- * PROGRAMMER:
- *
- */
-
-#ifndef WIN32K_CARET_H_INCLUDED
-#define WIN32K_CARET_H_INCLUDED
-
-typedef struct _THRDCARETINFO
-{
-  HWND hWnd;
-  HBITMAP Bitmap;
-  POINT Pos;
-  SIZE Size;
-  BYTE Visible;
-  BYTE Showing;
-} THRDCARETINFO, *PTHRDCARETINFO;
-
-#endif /* WIN32K_FONT_H_INCLUDED */
  _____  

Deleted: trunk/reactos/include/win32k/cliprgn.h
--- trunk/reactos/include/win32k/cliprgn.h	2005-12-27 03:12:00 UTC
(rev 20366)
+++ trunk/reactos/include/win32k/cliprgn.h	2005-12-27 03:41:13 UTC
(rev 20367)
@@ -1,81 +0,0 @@

-#ifndef _WIN32K_CLIPRGN_H
-#define _WIN32K_CLIPRGN_H
-
-HRGN WINAPI SaveVisRgn(HDC hdc);
-INT WINAPI SelectVisRgn(HDC hdc, HRGN hrgn);
-
-int
-STDCALL
-NtGdiExcludeClipRect (
-	HDC	hDC,
-	int	LeftRect,
-	int	TopRect,
-	int	RightRect,
-	int	BottomRect
-	);
-int
-STDCALL
-NtGdiExtSelectClipRgn (
-	HDC	hDC,
-	HRGN	hrgn,
-	int	fnMode
-	);
-int
-STDCALL
-NtGdiGetClipBox (
-	HDC	hDC,
-	LPRECT	rc
-	);
-int
-STDCALL
-NtGdiGetMetaRgn (
-	HDC	hDC,
-	HRGN	hrgn
-	);
-int
-STDCALL
-NtGdiIntersectClipRect (
-	HDC	hDC,
-	int	LeftRect,
-	int	TopRect,
-	int	RightRect,
-	int	BottomRect
-	);
-int
-STDCALL
-NtGdiOffsetClipRgn (
-	HDC	hDC,
-	int	XOffset,
-	int	YOffset
-	);
-BOOL
-STDCALL
-NtGdiPtVisible (
-	HDC	hDC,
-	int	X,
-	int	Y
-	);
-BOOL
-STDCALL
-NtGdiRectVisible (
-	HDC		hDC,
-	CONST PRECT	rc
-	);
-BOOL
-STDCALL
-NtGdiSelectClipPath (
-	HDC	hDC,
-	int	Mode
-	);
-int
-STDCALL
-NtGdiSelectClipRgn (
-	HDC	hDC,
-	HRGN	hrgn
-	);
-int
-STDCALL
-NtGdiSetMetaRgn (
-	HDC	hDC
-	);
-#endif
  _____  

Deleted: trunk/reactos/include/win32k/color.h
--- trunk/reactos/include/win32k/color.h	2005-12-27 03:12:00 UTC
(rev 20366)
+++ trunk/reactos/include/win32k/color.h	2005-12-27 03:41:13 UTC
(rev 20367)
@@ -1,116 +0,0 @@

-#ifndef __WIN32K_COLOR_H
-#define __WIN32K_COLOR_H
-
-#ifndef CLR_INVALID
-#define CLR_INVALID         0xffffffff
-#endif
-#define PC_SYS_USED     0x80		/* palentry is used (both system
and logical) */
-#define PC_SYS_RESERVED 0x40		/* system palentry is not to be
mapped to */
-#define PC_SYS_MAPPED   0x10		/* logical palentry is a direct
alias for system palentry */
-
-BOOL
-STDCALL
-NtGdiAnimatePalette (
-	HPALETTE		hpal,
-	UINT			StartIndex,
-	UINT			Entries,
-	CONST PPALETTEENTRY	ppe
-	);
-HPALETTE
-STDCALL
-NtGdiCreateHalftonePalette (
-	HDC	hDC
-	);
-HPALETTE
-STDCALL
-NtGdiCreatePalette (
-	CONST PLOGPALETTE	lgpl
-	);
-BOOL
-STDCALL
-NtGdiGetColorAdjustment (
-	HDC			hDC,
-	LPCOLORADJUSTMENT	ca
-	);
-COLORREF
-STDCALL
-NtGdiGetNearestColor (
-	HDC		hDC,
-	COLORREF	Color
-	);
-UINT
-STDCALL
-NtGdiGetNearestPaletteIndex (
-	HPALETTE	hpal,
-	COLORREF	Color
-	);
-UINT
-STDCALL
-NtGdiGetPaletteEntries (
-	HPALETTE	hpal,
-	UINT		StartIndex,
-	UINT		Entries,
-	LPPALETTEENTRY	pe
-	);
-UINT
-STDCALL
-NtGdiGetSystemPaletteEntries (
-	HDC		hDC,
-	UINT		StartIndex,
-	UINT		Entries,
-	LPPALETTEENTRY	pe
-	);
-UINT
-STDCALL
-NtGdiGetSystemPaletteUse (
-	HDC	hDC
-	);
-UINT
-STDCALL
-NtGdiRealizePalette (
-	HDC	hDC
-	);
-BOOL
-STDCALL
-NtGdiResizePalette (
-	HPALETTE	hpal,
-	UINT		Entries
-	);
-HPALETTE
-STDCALL
-NtGdiSelectPalette (
-	HDC		hDC,
-	HPALETTE	hpal,
-	BOOL		ForceBackground
-	);
-BOOL
-STDCALL
-NtGdiSetColorAdjustment (
-	HDC			hDC,
-	CONST LPCOLORADJUSTMENT	ca
-	);
-UINT
-STDCALL
-NtGdiSetPaletteEntries (
-	HPALETTE		hpal,
-	UINT			Start,
-	UINT			Entries,
-	CONST LPPALETTEENTRY	pe
-	);
-UINT
-STDCALL
-NtGdiSetSystemPaletteUse (
-	HDC	hDC,
-	UINT	Usage
-	);
-BOOL
-STDCALL
-NtGdiUnrealizeObject (
-	HGDIOBJ	hgdiobj
-	);
-BOOL
-STDCALL
-NtGdiUpdateColors (
-	HDC	hDC
-	);
-#endif
  _____  

Deleted: trunk/reactos/include/win32k/coord.h
--- trunk/reactos/include/win32k/coord.h	2005-12-27 03:12:00 UTC
(rev 20366)
+++ trunk/reactos/include/win32k/coord.h	2005-12-27 03:41:13 UTC
(rev 20367)
@@ -1,151 +0,0 @@

-#ifndef __WIN32K_COORD_H
-#define __WIN32K_COORD_H
-
-BOOL
-STDCALL
-NtGdiCombineTransform (
-	LPXFORM		XformResult,
-	CONST LPXFORM	xform1,
-	CONST LPXFORM	xform2
-	);
-
-VOID
-FASTCALL
-IntDPtoLP ( PDC dc, LPPOINT Points, INT Count );
-
-VOID
-FASTCALL
-CoordDPtoLP ( PDC Dc, LPPOINT Point );
-
-BOOL
-STDCALL
-NtGdiDPtoLP (
-	HDC	hDC,
-	LPPOINT	Points,
-	int	Count
-	);
-
-int
-FASTCALL
-IntGetGraphicsMode ( PDC dc );
-
-int
-STDCALL
-NtGdiGetGraphicsMode ( HDC hDC );
-
-BOOL
-STDCALL
-NtGdiGetWorldTransform (
-	HDC	hDC,
-	LPXFORM	Xform
-	);
-
-VOID
-FASTCALL
-CoordLPtoDP ( PDC Dc, LPPOINT Point );
-
-VOID
-FASTCALL
-IntLPtoDP ( PDC dc, LPPOINT Points, INT Count );
-
-BOOL
-STDCALL
-NtGdiLPtoDP (
-	HDC	hDC,
-	LPPOINT	Points,
-	int	Count
-	);
-BOOL
-STDCALL
-NtGdiModifyWorldTransform (
-	HDC		hDC,
-	CONST LPXFORM	Xform,
-	DWORD		Mode
-	);
-BOOL
-STDCALL
-NtGdiOffsetViewportOrgEx (
-	HDC	hDC,
-	int	XOffset,
-	int	YOffset,
-	LPPOINT	Point
-	);
-BOOL
-STDCALL
-NtGdiOffsetWindowOrgEx (
-	HDC	hDC,
-	int	XOffset,
-	int	YOffset,
-	LPPOINT	Point
-	);
-BOOL
-STDCALL
-NtGdiScaleViewportExtEx (
-	HDC	hDC,
-	int	Xnum,
-	int	Xdenom,
-	int	Ynum,
-	int	Ydenom,
-	LPSIZE	Size
-	);
-BOOL
-STDCALL
-NtGdiScaleWindowExtEx (
-	HDC	hDC,
-	int	Xnum,
-	int	Xdenom,
-	int	Ynum,
-	int	Ydenom,
-	LPSIZE  Size
-	);
-int
-STDCALL
-NtGdiSetGraphicsMode (
-	HDC	hDC,
-	int	Mode
-	);
-int
-STDCALL
-NtGdiSetMapMode (
-	HDC	hDC,
-	int	MapMode
-	);
-BOOL
-STDCALL
-NtGdiSetViewportExtEx (
-	HDC	hDC,
-	int	XExtent,
-	int	YExtent,
-	LPSIZE	Size
-	);
-BOOL
-STDCALL
-NtGdiSetViewportOrgEx (
-	HDC	hDC,
-	int	X,
-	int	Y,
-	LPPOINT	Point
-	);
-BOOL
-STDCALL
-NtGdiSetWindowExtEx (
-	HDC	hDC,
-	int	XExtent,
-	int	YExtent,
-	LPSIZE	Size
-	);
-BOOL
-STDCALL
-NtGdiSetWindowOrgEx (
-	HDC	hDC,
-	int	X,
-	int	Y,
-	LPPOINT	Point
-	);
-BOOL
-STDCALL
-NtGdiSetWorldTransform (
-	HDC		hDC,
-	CONST LPXFORM	Xform
-	);
-#endif
  _____  

Deleted: trunk/reactos/include/win32k/cursoricon.h
--- trunk/reactos/include/win32k/cursoricon.h	2005-12-27 03:12:00 UTC
(rev 20366)
+++ trunk/reactos/include/win32k/cursoricon.h	2005-12-27 03:41:13 UTC
(rev 20367)
@@ -1,95 +0,0 @@

-
-#ifndef __WIN32K_CURSORICON_H
-#define __WIN32K_CURSORICON_H
-
-#include <pshpack1.h>
-
-/* Structures for reading icon/cursor files and resources */
-// Structures for reading icon files and resources 
-typedef struct _ICONIMAGE
-{
-   BITMAPINFOHEADER   icHeader;      // DIB header
-   RGBQUAD         icColors[1];   // Color table
-   BYTE            icXOR[1];      // DIB bits for XOR mask
-   BYTE            icAND[1];      // DIB bits for AND mask
-} ICONIMAGE, *LPICONIMAGE;
-
-typedef struct _CURSORIMAGE
-{
-   BITMAPINFOHEADER   icHeader;      // DIB header
-   RGBQUAD         icColors[1];   // Color table
-   BYTE            icXOR[1];      // DIB bits for XOR mask
-   BYTE            icAND[1];      // DIB bits for AND mask
-} CURSORIMAGE, *LPCURSORIMAGE;
-
-typedef struct
-{
-    BYTE   bWidth;
-    BYTE   bHeight;
-    BYTE   bColorCount;
-    BYTE   bReserved;
-} ICONRESDIR;
-
-typedef struct
-{
-    WORD   wWidth;
-    WORD   wHeight;
-} CURSORRESDIR;
-
-typedef struct
-{
-    WORD   wPlanes;				// Number of Color
Planes in the XOR image
-    WORD   wBitCount;			// Bits per pixel in the XOR
image
-} ICONDIR;
-
-typedef struct
-{
-    WORD   wXHotspot;				// Number of Color
Planes in the XOR image
-    WORD   wYHotspot;			// Bits per pixel in the XOR
image
-} CURSORDIR;
-
-typedef struct
-{
-    BYTE   bWidth;				// Width, in pixels, of
the icon image
-    BYTE   bHeight;				// Height, in pixels, of
the icon image
-    BYTE   bColorCount;			// Number of colors in
image (0 if >=8bpp)
-    BYTE   bReserved;			// Reserved ( must be 0)
-	union
-    { ICONDIR icon;
-      CURSORDIR  cursor;
-    } Info;
-    DWORD  dwBytesInRes;		// How many bytes in this
resource?
-    DWORD  dwImageOffset;		// Where in the file is this
image?
-} CURSORICONDIRENTRY;
-
-typedef struct
-{
-    WORD				idReserved;		//
Reserved (must be 0)
-    WORD				idType;			//
Resource Type (1 for icons, 0 for cursors)
-    WORD				idCount;		// How
many images?
-    CURSORICONDIRENTRY  idEntries[1];   // An entry for idCount number
of images
-} CURSORICONDIR;
-
-typedef struct
-{  
-	union
-    { ICONRESDIR icon;
-      CURSORRESDIR  cursor;
-    } ResInfo;
-	WORD   wPlanes;              // Color Planes
-	WORD   wBitCount;            // Bits per pixel
-	DWORD  dwBytesInRes;         // how many bytes in this resource?
-	WORD   nID;                  // the ID
-} GRPCURSORICONDIRENTRY;
-
-typedef struct 
-{
-   WORD            idReserved;   // Reserved (must be 0)
-   WORD            idType;       // Resource type (1 for icons)
-   WORD            idCount;      // How many images?
-   GRPCURSORICONDIRENTRY   idEntries[1]; // The entries for each image
-} GRPCURSORICONDIR;
-
-#include <poppack.h>
-
-#endif
  _____  

Deleted: trunk/reactos/include/win32k/dc.h
--- trunk/reactos/include/win32k/dc.h	2005-12-27 03:12:00 UTC (rev
20366)
+++ trunk/reactos/include/win32k/dc.h	2005-12-27 03:41:13 UTC (rev
20367)
@@ -1,238 +0,0 @@

-
-#ifndef __WIN32K_DC_H
-#define __WIN32K_DC_H
-
-typedef struct _WIN_DC_INFO
-{
-  int  flags;
-  HRGN  hClipRgn;     /* Clip region (may be 0) */
-  HRGN  hVisRgn;      /* Visible region (must never be 0) */
-  HRGN  hGCClipRgn;   /* GC clip region (ClipRgn AND VisRgn) */
-  HPEN  hPen;
-  HBRUSH  hBrush;
-  HFONT  hFont;
-  HBITMAP  hBitmap;
-  HBITMAP  hFirstBitmap; /* Bitmap selected at creation of the DC */
-
-/* #if 0 */
-    HANDLE      hDevice;
-    HPALETTE    hPalette;
-
-    GdiPath       path;
-/* #endif */
-
-  WORD  ROPmode;
-  WORD  polyFillMode;
-  WORD  stretchBltMode;
-  WORD  relAbsMode;
-  WORD  backgroundMode;
-  COLORREF  backgroundColor;
-  COLORREF  textColor;
-
-  short  brushOrgX;
-  short  brushOrgY;
-
-  WORD  textAlign;         /* Text alignment from SetTextAlign() */
-  short  charExtra;         /* Spacing from SetTextCharacterExtra() */
-  short  breakTotalExtra;   /* Total extra space for justification */
-  short  breakCount;        /* Break char. count */
-  short  breakExtra;        /* breakTotalExtra / breakCount */
[truncated at 1000 lines; 12716 more skipped]