1 added + 92 modified, total 93 files
reactos/include/win32k
diff -u -r1.8 -r1.9
--- kapi.h 9 Apr 2004 20:03:11 -0000 1.8
+++ kapi.h 10 May 2004 17:07:16 -0000 1.9
@@ -1,6 +1,5 @@
#ifndef _WIN32K_KAPI_H
#define _WIN32K_KAPI_H
-#include <win32k/ntddraw.h>
#include <win32k/bitmaps.h>
#include <win32k/brush.h>
#include <win32k/cliprgn.h>
reactos/subsys/win32k/dib
diff -u -r1.9 -r1.10
--- dib.c 6 Apr 2004 21:53:48 -0000 1.9
+++ dib.c 10 May 2004 17:07:16 -0000 1.10
@@ -16,14 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib.c,v 1.9 2004/04/06 21:53:48 weiden Exp $ */
-
-#include <windows.h>
-#include <ddk/winddi.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib.c,v 1.10 2004/05/10 17:07:16 weiden Exp $ */
+#include <w32k.h>
/* Static data */
reactos/subsys/win32k/dib
diff -u -r1.20 -r1.21
--- dib.h 9 Apr 2004 22:00:38 -0000 1.20
+++ dib.h 10 May 2004 17:07:17 -0000 1.21
@@ -1,3 +1,6 @@
+#ifndef _W32K_DIB_DIB_H
+#define _W32K_DIB_DIB_H
+
extern unsigned char notmask[2];
extern unsigned char altnotmask[2];
#define MASK1BPP(x) (1<<(7-((x)&7)))
@@ -119,3 +122,5 @@
RECTL* DestRect, POINTL *SourcePoint,
XLATEOBJ *ColorTranslation, ULONG iTransColor);
+#endif /* _W32K_DIB_DIB_H */
+
reactos/subsys/win32k/dib
diff -u -r1.30 -r1.31
--- dib16bpp.c 25 Apr 2004 11:34:12 -0000 1.30
+++ dib16bpp.c 10 May 2004 17:07:17 -0000 1.31
@@ -16,19 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib16bpp.c,v 1.30 2004/04/25 11:34:12 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <math.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <include/object.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib16bpp.c,v 1.31 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
VOID
DIB_16BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
reactos/subsys/win32k/dib
diff -u -r1.26 -r1.27
--- dib1bpp.c 1 May 2004 09:04:37 -0000 1.26
+++ dib1bpp.c 10 May 2004 17:07:17 -0000 1.27
@@ -16,19 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib1bpp.c,v 1.26 2004/05/01 09:04:37 gvg Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <include/object.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib1bpp.c,v 1.27 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
VOID
DIB_1BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
reactos/subsys/win32k/dib
diff -u -r1.25 -r1.26
--- dib24bpp.c 25 Apr 2004 11:34:12 -0000 1.25
+++ dib24bpp.c 10 May 2004 17:07:17 -0000 1.26
@@ -16,18 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib24bpp.c,v 1.25 2004/04/25 11:34:12 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <include/object.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib24bpp.c,v 1.26 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
VOID
DIB_24BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
reactos/subsys/win32k/dib
diff -u -r1.25 -r1.26
--- dib32bpp.c 25 Apr 2004 11:34:12 -0000 1.25
+++ dib32bpp.c 10 May 2004 17:07:17 -0000 1.26
@@ -16,18 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib32bpp.c,v 1.25 2004/04/25 11:34:12 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include <include/object.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib32bpp.c,v 1.26 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
VOID
DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
reactos/subsys/win32k/dib
diff -u -r1.33 -r1.34
--- dib4bpp.c 9 Apr 2004 22:00:38 -0000 1.33
+++ dib4bpp.c 10 May 2004 17:07:17 -0000 1.34
@@ -16,18 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib4bpp.c,v 1.33 2004/04/09 22:00:38 navaraf Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <include/object.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib4bpp.c,v 1.34 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
VOID
DIB_4BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
reactos/subsys/win32k/dib
diff -u -r1.24 -r1.25
--- dib8bpp.c 30 Apr 2004 23:42:20 -0000 1.24
+++ dib8bpp.c 10 May 2004 17:07:17 -0000 1.25
@@ -16,18 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dib8bpp.c,v 1.24 2004/04/30 23:42:20 navaraf Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/debug.h>
-#include <debug.h>
-#include <include/object.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include "dib.h"
+/* $Id: dib8bpp.c,v 1.25 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
VOID
DIB_8BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
reactos/subsys/win32k/eng
diff -u -r1.53 -r1.54
--- bitblt.c 30 Apr 2004 14:22:44 -0000 1.53
+++ bitblt.c 10 May 2004 17:07:17 -0000 1.54
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: bitblt.c,v 1.53 2004/04/30 14:22:44 weiden Exp $
+/* $Id: bitblt.c,v 1.54 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,25 +26,7 @@
* REVISION HISTORY:
* 2/10/1999: Created
*/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ntos/minmax.h>
-#include "brush.h"
-#include "clip.h"
-#include "objects.h"
-#include "../dib/dib.h"
-#include "misc.h"
-#include <include/mouse.h>
-#include <include/object.h>
-#include <include/dib.h>
-#include <include/surface.h>
-#include <include/eng.h>
-#include <include/inteng.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
SURFGDI* OutputGDI,
reactos/subsys/win32k/eng
diff -u -r1.10 -r1.11
--- brush.c 30 Jan 2004 16:36:16 -0000 1.10
+++ brush.c 10 May 2004 17:07:17 -0000 1.11
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: brush.c,v 1.10 2004/01/30 16:36:16 navaraf Exp $
+/* $Id: brush.c,v 1.11 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,8 +26,7 @@
* REVISION HISTORY:
* 3/7/1999: Created
*/
-
-#include <ddk/winddi.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.19 -r1.20
--- clip.c 9 Apr 2004 20:03:16 -0000 1.19
+++ clip.c 10 May 2004 17:07:17 -0000 1.20
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: clip.c,v 1.19 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: clip.c,v 1.20 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,15 +26,7 @@
* REVISION HISTORY:
* 21/8/1999: Created
*/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include "objects.h"
-#include "clip.h"
-#include <include/object.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
VOID STDCALL IntEngDeleteClipRegion(CLIPOBJ *ClipObj)
{
reactos/subsys/win32k/eng
diff -u -r1.23 -r1.24
--- copybits.c 9 Apr 2004 20:03:16 -0000 1.23
+++ copybits.c 10 May 2004 17:07:17 -0000 1.24
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: copybits.c,v 1.23 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: copybits.c,v 1.24 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,15 +26,7 @@
* REVISION HISTORY:
* 8/18/1999: Created
*/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include "objects.h"
-#include "clip.h"
-#include "../dib/dib.h"
-#include <include/mouse.h>
-#include <include/object.h>
-#include <include/eng.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.7 -r1.8
--- debug.c 7 Jan 2004 19:24:37 -0000 1.7
+++ debug.c 10 May 2004 17:07:17 -0000 1.8
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: debug.c,v 1.7 2004/01/07 19:24:37 navaraf Exp $
+/* $Id: debug.c,v 1.8 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,8 +26,7 @@
* REVISION HISTORY:
* 11/7/1999: Created
*/
-
-#include <ddk/ntddk.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.14 -r1.15
--- device.c 14 Mar 2004 18:36:14 -0000 1.14
+++ device.c 10 May 2004 17:07:17 -0000 1.15
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: device.c,v 1.14 2004/03/14 18:36:14 dwelch Exp $
+/* $Id: device.c,v 1.15 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,13 +26,7 @@
* REVISION HISTORY:
* 3/7/1999: Created
*/
-
-#include <ddk/ntddk.h>
-#include <win32k/misc.h>
-#include <windows.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.1 -r1.2
--- error.c 30 Jan 2004 16:36:16 -0000 1.1
+++ error.c 10 May 2004 17:07:17 -0000 1.2
@@ -1,5 +1,4 @@
-#include <ddk/winddi.h>
-#include <include/error.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.2 -r1.3
--- event.c 9 Apr 2004 20:03:16 -0000 1.2
+++ event.c 10 May 2004 17:07:17 -0000 1.3
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: event.c,v 1.2 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: event.c,v 1.3 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,18 +26,7 @@
* REVISION HISTORY:
* 2/10/1999: Created
*/
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <include/eng.h>
-#include <include/inteng.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
BOOL
STDCALL
reactos/subsys/win32k/eng
diff -u -r1.2 -r1.3
--- float.c 9 Apr 2004 20:03:16 -0000 1.2
+++ float.c 10 May 2004 17:07:17 -0000 1.3
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: float.c,v 1.2 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: float.c,v 1.3 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -25,19 +25,7 @@
* PROGRAMER: Jason Filby
* REVISION HISTORY:
*/
-
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/dc.h>
-#include <win32k/gdiobj.h>
-#include <include/dib.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include "handle.h"
-#include "../dib/dib.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
BOOL
STDCALL
reactos/subsys/win32k/eng
diff -u -r1.8 -r1.9
--- gradient.c 9 Apr 2004 20:03:16 -0000 1.8
+++ gradient.c 10 May 2004 17:07:17 -0000 1.9
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: gradient.c,v 1.8 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: gradient.c,v 1.9 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,25 +26,7 @@
* REVISION HISTORY:
* 3/7/1999: Created
*/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include <include/eng.h>
-#include <include/inteng.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include <include/surface.h>
-#include <include/rect.h>
-
-#include "objects.h"
-#include <include/mouse.h>
-#include "../dib/dib.h"
-
-#include "brush.h"
-#include "clip.h"
-
-//#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
/* MACROS *********************************************************************/
reactos/subsys/win32k/eng
diff -u -r1.14 -r1.15
--- handle.c 24 Nov 2003 21:20:34 -0000 1.14
+++ handle.c 10 May 2004 17:07:17 -0000 1.15
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: handle.c,v 1.14 2003/11/24 21:20:34 gvg Exp $
+/* $Id: handle.c,v 1.15 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,12 +26,7 @@
* REVISION HISTORY:
* 29/8/1999: Created
*/
-
-#include <ddk/winddi.h>
-#include "handle.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
static int LastHandle = MAX_GDI_HANDLES;
reactos/subsys/win32k/eng
diff -u -r1.32 -r1.33
--- lineto.c 9 Apr 2004 20:03:16 -0000 1.32
+++ lineto.c 10 May 2004 17:07:17 -0000 1.33
@@ -16,22 +16,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: lineto.c,v 1.32 2004/04/09 20:03:16 navaraf Exp $
+ * $Id: lineto.c,v 1.33 2004/05/10 17:07:17 weiden Exp $
*/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/dib.h>
-#include "clip.h"
-#include "objects.h"
-#include "../dib/dib.h"
-#include "misc.h"
-
-#include <include/mouse.h>
-#include <include/object.h>
-#include <include/surface.h>
+#include <w32k.h>
static void FASTCALL
TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate)
reactos/subsys/win32k/eng
diff -u -r1.15 -r1.16
--- mem.c 15 Mar 2004 22:01:17 -0000 1.15
+++ mem.c 10 May 2004 17:07:17 -0000 1.16
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: mem.c,v 1.15 2004/03/15 22:01:17 gvg Exp $
+/* $Id: mem.c,v 1.16 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -27,16 +27,7 @@
* 3/7/1999: Created
*/
-#ifdef __USE_W32API
-#include <windows.h>
-#include <ddk/ntapi.h>
-#endif
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-#include <debug.h>
+#include <w32k.h>
typedef struct _USERMEMHEADER
{
reactos/subsys/win32k/eng
diff -u -r1.5 -r1.6
--- misc.c 9 Apr 2004 20:03:16 -0000 1.5
+++ misc.c 10 May 2004 17:07:17 -0000 1.6
@@ -16,13 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: misc.c,v 1.5 2004/04/09 20:03:16 navaraf Exp $ */
-#include <ddk/winddi.h>
-#include <include/dib.h>
-#include <include/object.h>
-#include <include/surface.h>
-#include "misc.h"
-#include "objects.h"
+/* $Id: misc.c,v 1.6 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
BOOL STDCALL
IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
reactos/subsys/win32k/eng
diff -u -r1.68 -r1.69
--- mouse.c 1 May 2004 08:55:04 -0000 1.68
+++ mouse.c 10 May 2004 17:07:17 -0000 1.69
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: mouse.c,v 1.68 2004/05/01 08:55:04 weiden Exp $
+/* $Id: mouse.c,v 1.69 2004/05/10 17:07:17 weiden Exp $
*
* PROJECT: ReactOS kernel
* PURPOSE: Mouse
@@ -26,29 +26,7 @@
* 06-06-2001 CSH Created
*/
/* INCLUDES ******************************************************************/
-
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ddk/winddi.h>
-#include <win32k/dc.h>
-#include "objects.h"
-#include "include/msgqueue.h"
-#include "include/object.h"
-#include "include/winsta.h"
-#include "include/desktop.h"
-#include "include/window.h"
-#include "include/cursoricon.h"
-#include "include/callback.h"
-#include "include/palette.h"
-#include "include/inteng.h"
-#include "include/eng.h"
-#include "include/tags.h"
-#include <include/mouse.h>
-#include <include/input.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <w32k.h>
/* FUNCTIONS *****************************************************************/
reactos/subsys/win32k/eng
diff -u -r1.3 -r1.4
--- nls.c 9 Apr 2004 20:03:16 -0000 1.3
+++ nls.c 10 May 2004 17:07:17 -0000 1.4
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: nls.c,v 1.3 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: nls.c,v 1.4 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -28,10 +28,7 @@
*/
/* INCLUDES *****************************************************************/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <ntos.h>
+#include <w32k.h>
/* FUNCTIONS ****************************************************************/
reactos/subsys/win32k/eng
diff -u -r1.18 -r1.19
--- paint.c 24 Feb 2004 13:27:02 -0000 1.18
+++ paint.c 10 May 2004 17:07:17 -0000 1.19
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: paint.c,v 1.18 2004/02/24 13:27:02 weiden Exp $
+/* $Id: paint.c,v 1.19 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -27,22 +27,7 @@
* 3/7/1999: Created
*/
-#include <ddk/winddi.h>
-#include <ddk/ntddmou.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include <include/surface.h>
-#include <include/eng.h>
-
-#include "objects.h"
-#include <include/mouse.h>
-#include "../dib/dib.h"
-
-#include "brush.h"
-#include "clip.h"
-
-//#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
{
reactos/subsys/win32k/eng
diff -u -r1.20 -r1.21
--- palette.c 20 Dec 2003 10:31:32 -0000 1.20
+++ palette.c 10 May 2004 17:07:17 -0000 1.21
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: palette.c,v 1.20 2003/12/20 10:31:32 navaraf Exp $
+/* $Id: palette.c,v 1.21 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,14 +26,7 @@
* REVISION HISTORY:
* 11/7/1999: Created
*/
-
-#include <ddk/winddi.h>
-#include <include/object.h>
-#include <include/palette.h>
-#include "handle.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.3 -r1.4
--- perfcnt.c 11 Jul 2003 15:59:37 -0000 1.3
+++ perfcnt.c 10 May 2004 17:07:17 -0000 1.4
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: perfcnt.c,v 1.3 2003/07/11 15:59:37 royce Exp $
+/* $Id: perfcnt.c,v 1.4 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -24,12 +24,7 @@
* FILE: subsys/win32k/eng/perfcnt.c
* PROGRAMER: Ge van Geldorp
*/
-
-#include <ddk/ntddk.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-#include <debug.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.1 -r1.2
--- semaphor.c 30 Jan 2004 16:36:16 -0000 1.1
+++ semaphor.c 10 May 2004 17:07:17 -0000 1.2
@@ -1,14 +1,4 @@
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/debug.h>
-#include <win32k/debug1.h>
-#include <debug.h>
-#include <ddk/winddi.h>
-#include "../eng/objects.h"
-#include <include/error.h>
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.2 -r1.3
--- sort.c 12 Jul 2003 14:00:05 -0000 1.2
+++ sort.c 10 May 2004 17:07:17 -0000 1.3
@@ -16,10 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: sort.c,v 1.2 2003/07/12 14:00:05 gvg Exp $ */
-
-#include <stdlib.h>
-#include <ddk/winddi.h>
+/* $Id: sort.c,v 1.3 2004/05/10 17:07:17 weiden Exp $ */
+#include <w32k.h>
/*
* @implemented
reactos/subsys/win32k/eng
diff -u -r1.37 -r1.38
--- surface.c 9 Apr 2004 20:03:16 -0000 1.37
+++ surface.c 10 May 2004 17:07:17 -0000 1.38
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: surface.c,v 1.37 2004/04/09 20:03:16 navaraf Exp $
+/* $Id: surface.c,v 1.38 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -30,18 +30,7 @@
* - Create a GDI bitmap with all formats, perform all drawing operations on them, render to VGA surface
* refer to \test\microwin\src\engine\devdraw.c for info on correct pixel plotting for various formats
*/
-
-#include <ddk/winddi.h>
-#include <win32k/dc.h>
-#include <win32k/gdiobj.h>
-#include <include/dib.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include "handle.h"
-#include "../dib/dib.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
enum Rle_EscapeCodes
{
reactos/subsys/win32k/eng
diff -u -r1.17 -r1.18
--- transblt.c 9 Apr 2004 20:03:18 -0000 1.17
+++ transblt.c 10 May 2004 17:07:17 -0000 1.18
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: transblt.c,v 1.17 2004/04/09 20:03:18 navaraf Exp $
+/* $Id: transblt.c,v 1.18 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,24 +26,7 @@
* REVISION HISTORY:
* 4/6/2004: Created
*/
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <ntos/minmax.h>
-#include <include/dib.h>
-#include <include/eng.h>
-#include <include/object.h>
-#include <include/surface.h>
-#include <include/mouse.h>
-#include <include/inteng.h>
-
-#include "brush.h"
-#include "clip.h"
-#include "objects.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
BOOL STDCALL
reactos/subsys/win32k/eng
diff -u -r1.33 -r1.34
--- xlate.c 28 Apr 2004 18:38:07 -0000 1.33
+++ xlate.c 10 May 2004 17:07:17 -0000 1.34
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: xlate.c,v 1.33 2004/04/28 18:38:07 navaraf Exp $
+/* $Id: xlate.c,v 1.34 2004/05/10 17:07:17 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,21 +26,10 @@
* REVISION HISTORY:
* 8/20/1999: Created
*/
+#include <w32k.h>
// TODO: Cache XLATEOBJs that are created by EngCreateXlate by checking if the given palettes match a cached list
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <ddk/ntddvdeo.h>
-
-#include <include/object.h>
-#include <include/palette.h>
-#include "handle.h"
-#include <win32k/color.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
ULONG CCMLastSourceColor = 0, CCMLastColorMatch = 0;
static ULONG FASTCALL ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
reactos/subsys/win32k/include
diff -u -r1.12 -r1.13
--- intgdi.h 25 Apr 2004 20:05:30 -0000 1.12
+++ intgdi.h 10 May 2004 17:07:17 -0000 1.13
@@ -15,13 +15,14 @@
UINT Usage);
BOOL FASTCALL
-IntPatBlt(DC *dc,
- INT XLeft,
- INT YLeft,
- INT Width,
- INT Height,
- DWORD ROP,
- BRUSHOBJ *BrushObj);
+IntPatBlt(
+ PDC dc,
+ INT XLeft,
+ INT YLeft,
+ INT Width,
+ INT Height,
+ DWORD ROP,
+ PGDIBRUSHOBJ BrushObj);
/* Pen functions */
reactos/subsys/win32k/include
diff -u -r1.4 -r1.5
--- path.h 18 Nov 2003 20:49:39 -0000 1.4
+++ path.h 10 May 2004 17:07:17 -0000 1.5
@@ -19,16 +19,5 @@
BOOL FASTCALL PATH_Rectangle (PDC dc, INT x1, INT y1, INT x2, INT y2);
BOOL FASTCALL PATH_RoundRect (PDC dc, INT x1, INT y1, INT x2, INT y2, INT xradius, INT yradius);
BOOL FASTCALL PATH_PathToRegion (const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
-#ifdef _WIN32K_PATH_INTERNAL
-BOOL FASTCALL PATH_AddEntry (GdiPath *pPath, const POINT *pPoint, BYTE flags);
-BOOL FASTCALL PATH_AddFlatBezier (GdiPath *pPath, POINT *pt, BOOL closed);
-BOOL FASTCALL PATH_DoArcPart (GdiPath *pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BOOL addMoveTo);
-BOOL FASTCALL PATH_FlattenPath (GdiPath *pPath);
-VOID FASTCALL PATH_GetPathFromDC (PDC dc, GdiPath **ppPath);
-VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
-BOOL FASTCALL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
-BOOL FASTCALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries);
-VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint);
-#endif
#endif /* _WIN32K_PATH_H */
reactos/subsys/win32k/main
diff -u -r1.71 -r1.72
--- dllmain.c 5 May 2004 22:47:06 -0000 1.71
+++ dllmain.c 10 May 2004 17:07:17 -0000 1.72
@@ -16,42 +16,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dllmain.c,v 1.71 2004/05/05 22:47:06 weiden Exp $
+/* $Id: dllmain.c,v 1.72 2004/05/10 17:07:17 weiden Exp $
*
* Entry Point for win32k.sys
*/
-
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_NO_STATUS
-#include <windows.h>
-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-
-#ifdef __USE_W32API
-#include <ddk/ddrawint.h>
-#endif
-#include <ddk/winddi.h>
-
-#include <win32k/win32k.h>
-
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/class.h>
-#include <include/window.h>
-#include <include/menu.h>
-#include <include/object.h>
-#include <include/input.h>
-#include <include/timer.h>
-#include <include/text.h>
-#include <include/caret.h>
-#include <include/hotkey.h>
-#include <include/accelerator.h>
-#include <include/cursoricon.h>
-#include <include/guicheck.h>
-#include <include/hook.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
#ifdef __USE_W32API
typedef NTSTATUS (STDCALL *PW32_PROCESS_CALLBACK)(
reactos/subsys/win32k/main
diff -u -r1.5 -r1.6
--- svctabm.c 7 Jun 2003 10:14:40 -0000 1.5
+++ svctabm.c 10 May 2004 17:07:18 -0000 1.6
@@ -34,7 +34,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: svctabm.c,v 1.5 2003/06/07 10:14:40 chorns Exp $
+/* $Id: svctabm.c,v 1.6 2004/05/10 17:07:18 weiden Exp $
*
* Entry Point for win32k.sys
*/
@@ -44,6 +44,7 @@
#include <windows.h>
#define NTOS_MODE_KERNEL
#include <ntos.h>
+#include <win32k/ntddraw.h>
#include <win32k/win32k.h>
/*
reactos/subsys/win32k
diff -N w32k.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ w32k.h 10 May 2004 17:07:18 -0000 1.1
@@ -0,0 +1,81 @@
+/*
+ * Precompiled headers for win32k.sys
+ */
+
+#define __WIN32K__
+#define NTOS_MODE_KERNEL
+
+#include <roskrnl.h>
+
+#include <ddk/winddi.h>
+#include <ddk/ntddk.h>
+#include <ddk/ntddmou.h>
+
+#include <win32k/win32k.h>
+#include <csrss/csrss.h>
+
+#include <internal/ob.h>
+#include <internal/safe.h>
+
+#include <napi/win32.h>
+#include <ntos.h>
+#include <math.h>
+#include <float.h>
+#include <windows.h>
+
+#include <rosrtl/string.h>
+#include <user32/callback.h>
+
+#include <include/accelerator.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/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>
+#include <include/hotkey.h>
+#include <include/input.h>
+#include <include/inteng.h>
+#include <include/intgdi.h>
+#include <include/menu.h>
+#include <include/mouse.h>
+#include <include/msgqueue.h>
+#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/winpos.h>
+#include <include/winsta.h>
+
+#include <eng/objects.h>
+#include <eng/misc.h>
+#include <eng/handle.h>
+#include <eng/clip.h>
+#include <eng/brush.h>
+
+#include <dib/dib.h>
+
+#define NDEBUG
+#include <win32k/debug1.h>
+
reactos/subsys/win32k
diff -u -r1.97 -r1.98
--- makefile 9 Apr 2004 20:03:18 -0000 1.97
+++ makefile 10 May 2004 17:07:18 -0000 1.98
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.97 2004/04/09 20:03:18 navaraf Exp $
+# $Id: makefile,v 1.98 2004/05/10 17:07:18 weiden Exp $
PATH_TO_TOP = ../..
@@ -10,6 +10,8 @@
TARGET_ENTRY = _DllMain@8
+TARGET_PCH = w32k.h
+
TARGET_DDKLIBS = freetype.a
FREETYPE_DIR = $(PATH_TO_TOP)/lib/freetype
@@ -24,11 +26,12 @@
TARGET_CFLAGS =\
$(CFLAGS_DBG) \
+ -I. \
-I$(PATH_TO_TOP)/ntoskrnl/include \
-I$(FREETYPE_DIR)/include \
-DUNICODE \
-Wall -Werror \
- -D__USE_W32API -D_WIN32_WINNT=0x0500 \
+ -D__USE_W32API -D_WIN32_WINNT=0x0501 \
-DWINVER=0x600 -D_WIN32K_
TARGET_LFLAGS =\
reactos/subsys/win32k/ntddraw
diff -u -r1.1 -r1.2
--- ddraw.c 28 Oct 2003 19:30:08 -0000 1.1
+++ ddraw.c 10 May 2004 17:07:18 -0000 1.2
@@ -9,6 +9,7 @@
* 25-10-2003 PB Created
*/
#include <ddk/ntddk.h>
+#include <win32k/ntddraw.h>
#include <win32k/win32k.h>
#include <win32k/gdiobj.h>
reactos/subsys/win32k/ntddraw
diff -u -r1.2 -r1.3
--- stubs.c 28 Oct 2003 19:30:08 -0000 1.2
+++ stubs.c 10 May 2004 17:07:18 -0000 1.3
@@ -9,6 +9,7 @@
* 25-10-2003 PB Created
*/
#include <ddk/ntddk.h>
+#include <win32k/ntddraw.h>
#include <win32k/win32k.h>
#define NDEBUG
reactos/subsys/win32k/ntuser
diff -u -r1.9 -r1.10
--- accelerator.c 19 Feb 2004 21:12:09 -0000 1.9
+++ accelerator.c 10 May 2004 17:07:18 -0000 1.10
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: accelerator.c,v 1.9 2004/02/19 21:12:09 weiden Exp $
+/* $Id: accelerator.c,v 1.10 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -48,19 +48,7 @@
*/
/* INCLUDES ******************************************************************/
-
-#include <roskrnl.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <napi/win32.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/focus.h>
-#include <include/tags.h>
-#include <include/accelerator.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.21 -r1.22
--- callback.c 26 Dec 2003 22:52:11 -0000 1.21
+++ callback.c 10 May 2004 17:07:18 -0000 1.22
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: callback.c,v 1.21 2003/12/26 22:52:11 gvg Exp $
+/* $Id: callback.c,v 1.22 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,16 +29,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/window.h>
-#include <include/msgqueue.h>
-#include <user32/callback.h>
-#include <include/callback.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.11 -r1.12
--- caret.c 19 Feb 2004 21:12:09 -0000 1.11
+++ caret.c 10 May 2004 17:07:18 -0000 1.12
@@ -1,4 +1,4 @@
-/* $Id: caret.c,v 1.11 2004/02/19 21:12:09 weiden Exp $
+/* $Id: caret.c,v 1.12 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -9,16 +9,7 @@
* 10/15/2003 Created
*/
-#include <win32k/win32k.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <include/error.h>
-#include <include/window.h>
-#include <include/caret.h>
-#include <include/timer.h>
-#include <include/callback.h>
-#include <include/tags.h>
-#include <rosrtl/string.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.51 -r1.52
--- class.c 9 Apr 2004 20:03:19 -0000 1.51
+++ class.c 10 May 2004 17:07:18 -0000 1.52
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: class.c,v 1.51 2004/04/09 20:03:19 navaraf Exp $
+/* $Id: class.c,v 1.52 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -28,18 +28,7 @@
*/
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <napi/win32.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/color.h>
-#include <include/tags.h>
-#include <internal/safe.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.6 -r1.7
--- clipboard.c 19 Feb 2004 21:12:09 -0000 1.6
+++ clipboard.c 10 May 2004 17:07:18 -0000 1.7
@@ -24,14 +24,7 @@
* PROGRAMER: Filip Navara <xnavara@volny.cz>
*/
-#include <win32k/win32k.h>
-#include <windows.h>
-#include <internal/safe.h>
-#include <include/clipboard.h>
-#include <include/cleanup.h>
-#include <include/error.h>
-#include <include/useratom.h>
-#include <include/tags.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.13 -r1.14
--- desktop.c 8 May 2004 12:42:46 -0000 1.13
+++ desktop.c 10 May 2004 17:07:18 -0000 1.14
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: desktop.c,v 1.13 2004/05/08 12:42:46 weiden Exp $
+ * $Id: desktop.c,v 1.14 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -28,26 +28,7 @@
*/
/* INCLUDES ******************************************************************/
-
-#define __WIN32K__
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <csrss/csrss.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/error.h>
-#include <include/cursoricon.h>
-#include <include/hotkey.h>
-#include <include/color.h>
-#include <include/mouse.h>
-#include <include/callback.h>
-#include <include/guicheck.h>
-#include <include/intgdi.h>
-
-#define NDEBUG
-#include <debug.h>
+#include <w32k.h>
#if 0
/* not yet defined in w32api... */
reactos/subsys/win32k/ntuser
diff -u -r1.21 -r1.22
--- focus.c 15 Apr 2004 23:36:03 -0000 1.21
+++ focus.c 10 May 2004 17:07:18 -0000 1.22
@@ -16,17 +16,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: focus.c,v 1.21 2004/04/15 23:36:03 weiden Exp $
+ * $Id: focus.c,v 1.22 2004/05/10 17:07:18 weiden Exp $
*/
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/desktop.h>
-#include <include/focus.h>
-#include <include/error.h>
-#include <include/winpos.h>
-#include <include/msgqueue.h>
+#include <w32k.h>
+
#define NDEBUG
#include <win32k/debug1.h>
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.17 -r1.18
--- guicheck.c 7 Dec 2003 23:02:57 -0000 1.17
+++ guicheck.c 10 May 2004 17:07:18 -0000 1.18
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: guicheck.c,v 1.17 2003/12/07 23:02:57 gvg Exp $
+/* $Id: guicheck.c,v 1.18 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -33,14 +33,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <napi/teb.h>
-#include <win32k/win32k.h>
-#include <include/guicheck.h>
-#include <include/msgqueue.h>
-#include <include/object.h>
-#include <napi/win32.h>
-#include <include/winsta.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.7 -r1.8
--- hook.c 7 Apr 2004 00:58:05 -0000 1.7
+++ hook.c 10 May 2004 17:07:18 -0000 1.8
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: hook.c,v 1.7 2004/04/07 00:58:05 weiden Exp $
+/* $Id: hook.c,v 1.8 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,17 +29,7 @@
* Copyright (C) 2002 Alexandre Julliard
*/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/callback.h>
-#include <include/error.h>
-#include <include/hook.h>
-#include <include/object.h>
-#include <include/msgqueue.h>
-#include <include/winsta.h>
-#include <include/tags.h>
-#include <internal/ps.h>
-#include <internal/safe.h>
+#include <w32k.h>
#define NDEBUG
#include <win32k/debug1.h>
reactos/subsys/win32k/ntuser
diff -u -r1.8 -r1.9
--- hotkey.c 24 Feb 2004 13:27:03 -0000 1.8
+++ hotkey.c 10 May 2004 17:07:18 -0000 1.9
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: hotkey.c,v 1.8 2004/02/24 13:27:03 weiden Exp $
+/* $Id: hotkey.c,v 1.9 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,14 +29,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/ex.h>
-#include <internal/ps.h>
-#include <include/error.h>
-#include <include/msgqueue.h>
-#include <include/hotkey.h>
-#include <include/tags.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.31 -r1.32
--- input.c 1 May 2004 08:47:14 -0000 1.31
+++ input.c 10 May 2004 17:07:18 -0000 1.32
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: input.c,v 1.31 2004/05/01 08:47:14 weiden Exp $
+/* $Id: input.c,v 1.32 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,19 +29,8 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/msgqueue.h>
-#include <ddk/ntddmou.h>
-#include <include/mouse.h>
-#include <include/input.h>
-#include <include/hotkey.h>
-#include <include/eng.h>
+#include <w32k.h>
+
#include <rosrtl/string.h>
#define NDEBUG
reactos/subsys/win32k/ntuser
diff -u -r1.28 -r1.29
--- keyboard.c 29 Apr 2004 21:13:16 -0000 1.28
+++ keyboard.c 10 May 2004 17:07:18 -0000 1.29
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: keyboard.c,v 1.28 2004/04/29 21:13:16 gvg Exp $
+/* $Id: keyboard.c,v 1.29 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,19 +29,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <internal/kbd.h>
-#include <include/guicheck.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/object.h>
-#include <include/winsta.h>
-#include <include/tags.h>
-#include <rosrtl/string.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.53 -r1.54
--- menu.c 2 May 2004 21:41:18 -0000 1.53
+++ menu.c 10 May 2004 17:07:18 -0000 1.54
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: menu.c,v 1.53 2004/05/02 21:41:18 gvg Exp $
+/* $Id: menu.c,v 1.54 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -28,18 +28,7 @@
*/
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <napi/win32.h>
-#include <include/menu.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/color.h>
-#include <include/tags.h>
-#include <internal/safe.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.62 -r1.63
--- message.c 5 May 2004 22:26:03 -0000 1.62
+++ message.c 10 May 2004 17:07:18 -0000 1.63
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: message.c,v 1.62 2004/05/05 22:26:03 weiden Exp $
+/* $Id: message.c,v 1.63 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,22 +29,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/winpos.h>
-#include <include/focus.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/object.h>
-#include <include/winsta.h>
-#include <include/callback.h>
-#include <include/painting.h>
-#include <include/input.h>
-#include <include/desktop.h>
-#include <include/tags.h>
-#include <internal/safe.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.19 -r1.20
--- metric.c 15 Apr 2004 11:44:03 -0000 1.19
+++ metric.c 10 May 2004 17:07:18 -0000 1.20
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: metric.c,v 1.19 2004/04/15 11:44:03 weiden Exp $
+/* $Id: metric.c,v 1.20 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,14 +29,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/desktop.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.70 -r1.71
--- misc.c 8 May 2004 12:42:46 -0000 1.70
+++ misc.c 10 May 2004 17:07:18 -0000 1.71
@@ -1,4 +1,4 @@
-/* $Id: misc.c,v 1.70 2004/05/08 12:42:46 weiden Exp $
+/* $Id: misc.c,v 1.71 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -8,30 +8,8 @@
* REVISION HISTORY:
* 2003/05/22 Created
*/
-#define __WIN32K__
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <win32k/dc.h>
-#include <internal/safe.h>
-#include <include/error.h>
-#include <include/window.h>
-#include <include/menu.h>
-#include <include/painting.h>
-#include <include/dce.h>
-#include <include/inteng.h>
-#include <include/input.h>
-#include <include/intgdi.h>
-#include <include/mouse.h>
-#include <include/winsta.h>
-#include <include/caret.h>
-#include <include/object.h>
-#include <include/focus.h>
-#include <include/clipboard.h>
-#include <include/msgqueue.h>
-#include <include/desktop.h>
-#include <include/text.h>
-#include <include/tags.h>
+
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.93 -r1.94
--- msgqueue.c 8 May 2004 19:35:32 -0000 1.93
+++ msgqueue.c 10 May 2004 17:07:18 -0000 1.94
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: msgqueue.c,v 1.93 2004/05/08 19:35:32 weiden Exp $
+/* $Id: msgqueue.c,v 1.94 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,21 +29,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <include/msgqueue.h>
-#include <include/callback.h>
-#include <include/window.h>
-#include <include/winpos.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/class.h>
-#include <include/object.h>
-#include <include/input.h>
-#include <include/cursoricon.h>
-#include <include/focus.h>
-#include <include/caret.h>
-#include <include/tags.h>
+#include <w32k.h>
#define NDEBUG
#include <win32k/debug1.h>
reactos/subsys/win32k/ntuser
diff -u -r1.81 -r1.82
--- painting.c 29 Apr 2004 21:13:16 -0000 1.81
+++ painting.c 10 May 2004 17:07:18 -0000 1.82
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: painting.c,v 1.81 2004/04/29 21:13:16 gvg Exp $
+ * $Id: painting.c,v 1.82 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -30,26 +30,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/desktop.h>
-#include <include/winpos.h>
-#include <include/class.h>
-#include <include/caret.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <windows.h>
-#include <include/painting.h>
-#include <user32/wininternal.h>
-#include <include/rect.h>
-#include <win32k/coord.h>
-#include <win32k/region.h>
-#include <include/vis.h>
-#include <include/intgdi.h>
+#include <w32k.h>
#define NDEBUG
#include <win32k/debug1.h>
reactos/subsys/win32k/ntuser
diff -u -r1.10 -r1.11
--- prop.c 16 Apr 2004 21:50:26 -0000 1.10
+++ prop.c 10 May 2004 17:07:18 -0000 1.11
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: prop.c,v 1.10 2004/04/16 21:50:26 weiden Exp $
+/* $Id: prop.c,v 1.11 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -28,20 +28,7 @@
*/
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/winpos.h>
-#include <include/callback.h>
-#include <include/msgqueue.h>
-#include <include/rect.h>
-#include <include/tags.h>
+#include <w32k.h>
//#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.31 -r1.32
--- scrollbar.c 5 May 2004 13:58:59 -0000 1.31
+++ scrollbar.c 10 May 2004 17:07:18 -0000 1.32
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: scrollbar.c,v 1.31 2004/05/05 13:58:59 weiden Exp $
+/* $Id: scrollbar.c,v 1.32 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,19 +29,8 @@
*/
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <internal/safe.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/winpos.h>
-#include <include/rect.h>
-#include <include/scroll.h>
-#include <include/painting.h>
-#include <include/tags.h>
+#include <w32k.h>
+
#ifdef __USE_W32API
#include <oleacc.h>
#endif
reactos/subsys/win32k/ntuser
diff -u -r1.31 -r1.32
--- timer.c 29 Apr 2004 21:13:16 -0000 1.31
+++ timer.c 10 May 2004 17:07:18 -0000 1.32
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: timer.c,v 1.31 2004/04/29 21:13:16 gvg Exp $
+/* $Id: timer.c,v 1.32 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -30,18 +30,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <win32k/ntuser.h>
-#include <internal/ntoskrnl.h>
-#include <internal/ps.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/error.h>
-#include <include/timer.h>
-#include <include/tags.h>
-#include <messages.h>
-#include <napi/win32.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.1 -r1.2
--- useratom.c 14 Dec 2003 17:59:16 -0000 1.1
+++ useratom.c 10 May 2004 17:07:18 -0000 1.2
@@ -24,9 +24,8 @@
* PROGRAMER: Filip Navara <xnavara@volny.cz>
*/
-#include <include/useratom.h>
-#include <include/winsta.h>
-#include <include/error.h>
+#include <w32k.h>
+
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.27 -r1.28
--- vis.c 24 Apr 2004 14:21:36 -0000 1.27
+++ vis.c 10 May 2004 17:07:18 -0000 1.28
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: vis.c,v 1.27 2004/04/24 14:21:36 weiden Exp $
+ * $Id: vis.c,v 1.28 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -25,11 +25,7 @@
* PROGRAMMER: Ge van Geldorp (ge@gse.nl)
*/
-#include <win32k/win32k.h>
-#include <include/painting.h>
-#include <include/rect.h>
-#include <include/vis.h>
-#include <include/intgdi.h>
+#include <w32k.h>
#define NDEBUG
#include <win32k/debug1.h>
reactos/subsys/win32k/ntuser
diff -u -r1.65 -r1.66
--- windc.c 9 Apr 2004 20:03:19 -0000 1.65
+++ windc.c 10 May 2004 17:07:18 -0000 1.66
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: windc.c,v 1.65 2004/04/09 20:03:19 navaraf Exp $
+/* $Id: windc.c,v 1.66 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -29,20 +29,7 @@
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <win32k/win32k.h>
-#include <win32k/region.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/msgqueue.h>
-#include <include/window.h>
-#include <include/desktop.h>
-#include <include/rect.h>
-#include <include/dce.h>
-#include <include/vis.h>
-#include <include/object.h>
-#include <include/intgdi.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.228 -r1.229
--- window.c 8 May 2004 16:06:54 -0000 1.228
+++ window.c 10 May 2004 17:07:18 -0000 1.229
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: window.c,v 1.228 2004/05/08 16:06:54 weiden Exp $
+/* $Id: window.c,v 1.229 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -27,34 +27,7 @@
* 06-06-2001 CSH Created
*/
/* INCLUDES ******************************************************************/
-
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/winpos.h>
-#include <include/callback.h>
-#include <include/msgqueue.h>
-#include <include/rect.h>
-#include <include/dce.h>
-#include <include/paint.h>
-#include <include/painting.h>
-#include <include/scroll.h>
-#include <include/intgdi.h>
-#include <include/menu.h>
-#include <include/hotkey.h>
-#include <include/focus.h>
-#include <include/hook.h>
-#include <include/useratom.h>
-#include <include/tags.h>
-#include <include/timer.h>
-#include <include/cleanup.h>
+#include <w32k.h>
#define NDEBUG
#include <win32k/debug1.h>
reactos/subsys/win32k/ntuser
diff -u -r1.113 -r1.114
--- winpos.c 8 May 2004 12:42:46 -0000 1.113
+++ winpos.c 10 May 2004 17:07:18 -0000 1.114
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: winpos.c,v 1.113 2004/05/08 12:42:46 weiden Exp $
+/* $Id: winpos.c,v 1.114 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -28,25 +28,7 @@
*/
/* INCLUDES ******************************************************************/
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/win32k.h>
-#include <include/object.h>
-#include <include/guicheck.h>
-#include <include/window.h>
-#include <include/class.h>
-#include <include/error.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/winpos.h>
-#include <include/rect.h>
-#include <include/callback.h>
-#include <include/painting.h>
-#include <include/dce.h>
-#include <include/vis.h>
-#include <include/intgdi.h>
-#include <include/focus.h>
-#include <include/tags.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/ntuser
diff -u -r1.58 -r1.59
--- winsta.c 1 May 2004 17:06:55 -0000 1.58
+++ winsta.c 10 May 2004 17:07:18 -0000 1.59
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: winsta.c,v 1.58 2004/05/01 17:06:55 weiden Exp $
+ * $Id: winsta.c,v 1.59 2004/05/10 17:07:18 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -35,26 +35,7 @@
/* INCLUDES ******************************************************************/
-#define __WIN32K__
-#define NTOS_MODE_KERNEL
-#include <ntos.h>
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/object.h>
-#include <include/window.h>
-#include <include/error.h>
-#include <include/cursoricon.h>
-#include <include/hotkey.h>
-#include <include/color.h>
-#include <include/mouse.h>
-#include <include/callback.h>
-#include <include/guicheck.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-/* Needed for DIRECTORY_OBJECT */
-#include <internal/ob.h>
+#include <w32k.h>
#define NDEBUG
#include <debug.h>
reactos/subsys/win32k/objects
diff -u -r1.7 -r1.8
--- bezier.c 10 May 2004 13:35:28 -0000 1.7
+++ bezier.c 10 May 2004 17:07:20 -0000 1.8
@@ -16,11 +16,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: bezier.c,v 1.7 2004/05/10 13:35:28 weiden Exp $ */
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <math.h>
-#include <include/tags.h>
+/* $Id: bezier.c,v 1.8 2004/05/10 17:07:20 weiden Exp $ */
+
+#include <w32k.h>
/******************************************************************
*
reactos/subsys/win32k/objects
diff -u -r1.71 -r1.72
--- bitmaps.c 28 Apr 2004 18:38:07 -0000 1.71
+++ bitmaps.c 10 May 2004 17:07:20 -0000 1.72
@@ -16,28 +16,16 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: bitmaps.c,v 1.71 2004/04/28 18:38:07 navaraf Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/color.h>
-#include <win32k/gdiobj.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/region.h>
-//#include <win32k/debug.h>
-#include "../eng/handle.h"
-#include <include/inteng.h>
-#include <include/intgdi.h>
-#include <include/eng.h>
-#include <include/error.h>
-#include <include/surface.h>
-#include <include/palette.h>
-#include <include/tags.h>
-#include <rosrtl/gdimacro.h>
+/* $Id: bitmaps.c,v 1.72 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#define IN_RECT(r,x,y) \
+( \
+ (x) >= (r).left && \
+ (y) >= (r).top && \
+ (x) < (r).right && \
+ (y) < (r).bottom \
+)
BOOL STDCALL
NtGdiBitBlt(
reactos/subsys/win32k/objects
diff -u -r1.36 -r1.37
--- brush.c 25 Apr 2004 14:46:54 -0000 1.36
+++ brush.c 10 May 2004 17:07:20 -0000 1.37
@@ -17,21 +17,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: brush.c,v 1.36 2004/04/25 14:46:54 weiden Exp $
+ * $Id: brush.c,v 1.37 2004/05/10 17:07:20 weiden Exp $
*/
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <internal/safe.h>
-#include <include/object.h>
-#include <include/inteng.h>
-#include <include/error.h>
-#include <include/tags.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
static const USHORT HatchBrushes[NB_HATCH_STYLES][8] =
{
reactos/subsys/win32k/objects
diff -u -r1.36 -r1.37
--- cliprgn.c 26 Apr 2004 19:58:45 -0000 1.36
+++ cliprgn.c 10 May 2004 17:07:20 -0000 1.37
@@ -16,22 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: cliprgn.c,v 1.36 2004/04/26 19:58:45 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/dc.h>
-#include <win32k/region.h>
-#include <win32k/cliprgn.h>
-#include <win32k/coord.h>
-#include <include/error.h>
-#include <include/intgdi.h>
-#include "../eng/clip.h"
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: cliprgn.c,v 1.37 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
VOID FASTCALL
CLIPPING_UpdateGCRegion(DC* Dc)
reactos/subsys/win32k/objects
diff -u -r1.38 -r1.39
--- color.c 1 May 2004 00:51:51 -0000 1.38
+++ color.c 10 May 2004 17:07:20 -0000 1.39
@@ -16,30 +16,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: color.c,v 1.38 2004/05/01 00:51:51 navaraf Exp $ */
+/* $Id: color.c,v 1.39 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
// FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/color.h>
-#include <win32k/pen.h>
-#include <win32k/ntuser.h>
-#include "../eng/handle.h"
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/color.h>
-#include <include/palette.h>
-#include <include/error.h>
-#include <include/dce.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
int COLOR_gapStart = 256;
int COLOR_gapEnd = -1;
int COLOR_gapFilled = 0;
reactos/subsys/win32k/objects
diff -u -r1.22 -r1.23
--- coord.c 19 Feb 2004 21:12:10 -0000 1.22
+++ coord.c 10 May 2004 17:07:20 -0000 1.23
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: coord.c,v 1.22 2004/02/19 21:12:10 weiden Exp $
+/* $Id: coord.c,v 1.23 2004/05/10 17:07:20 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,16 +26,7 @@
*/
/* INCLUDES ******************************************************************/
-
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/coord.h>
-#include <win32k/dc.h>
-#include <include/error.h>
-#include <include/tags.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
/* FUNCTIONS *****************************************************************/
reactos/subsys/win32k/objects
diff -u -r1.54 -r1.55
--- cursoricon.c 30 Apr 2004 22:18:00 -0000 1.54
+++ cursoricon.c 10 May 2004 17:07:20 -0000 1.55
@@ -16,35 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: cursoricon.c,v 1.54 2004/04/30 22:18:00 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-#include <win32k/win32k.h>
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/dc.h>
-#include <include/winsta.h>
-#include <include/desktop.h>
-#include <include/error.h>
-#include <include/mouse.h>
-#include <include/window.h>
-#include <include/input.h>
-#include <include/cursoricon.h>
-#include <include/inteng.h>
-#include <include/surface.h>
-#include <include/palette.h>
-#include <include/eng.h>
-#include <include/intgdi.h>
-#include <include/callback.h>
-#include "include/object.h"
-#include <internal/safe.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: cursoricon.c,v 1.55 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
PCURICON_OBJECT FASTCALL
IntGetCurIconObject(PWINSTATION_OBJECT WinStaObject, HANDLE Handle)
reactos/subsys/win32k/objects
diff -u -r1.133 -r1.134
--- dc.c 28 Apr 2004 18:38:07 -0000 1.133
+++ dc.c 10 May 2004 17:07:20 -0000 1.134
@@ -16,46 +16,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: dc.c,v 1.133 2004/04/28 18:38:07 navaraf Exp $
+/* $Id: dc.c,v 1.134 2004/05/10 17:07:20 weiden Exp $
*
* DC.C - Device context functions
*
*/
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddvdeo.h>
-#include <internal/safe.h>
-#include <win32k/bitmaps.h>
-#include <win32k/brush.h>
-#include <win32k/cliprgn.h>
-#include <win32k/coord.h>
-#include <win32k/dc.h>
-#include <win32k/misc.h>
-#include <win32k/print.h>
-#include <win32k/region.h>
-#include <win32k/gdiobj.h>
-#include <win32k/paint.h>
-#include <win32k/color.h>
-#include <win32k/pen.h>
-#include <win32k/text.h>
-#include "../eng/clip.h"
-#include "../eng/handle.h"
-#include <include/dce.h>
-#include <include/error.h>
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/palette.h>
-#include <include/guicheck.h>
-#include <include/desktop.h>
-#include <include/intgdi.h>
-#include <include/cleanup.h>
-#include <include/tags.h>
-#include <include/text.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
#ifndef OBJ_COLORSPACE
#define OBJ_COLORSPACE (14)
reactos/subsys/win32k/objects
diff -u -r1.45 -r1.46
--- dib.c 9 Apr 2004 20:03:20 -0000 1.45
+++ dib.c 10 May 2004 17:07:20 -0000 1.46
@@ -1,5 +1,5 @@
/*
- * $Id: dib.c,v 1.45 2004/04/09 20:03:20 navaraf Exp $
+ * $Id: dib.c,v 1.46 2004/05/10 17:07:20 weiden Exp $
*
* ReactOS W32 Subsystem
* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team
@@ -18,26 +18,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <stdlib.h>
-#include <win32k/bitmaps.h>
-#include <win32k/debug.h>
-#include "../eng/handle.h"
-#include <ntos/minmax.h>
-#include <include/error.h>
-#include <include/inteng.h>
-#include <include/eng.h>
-#include <include/dib.h>
-#include <include/color.h>
-#include <internal/safe.h>
-#include <include/surface.h>
-#include <include/palette.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
UINT STDCALL NtGdiSetDIBColorTable(HDC hDC,
UINT StartIndex,
reactos/subsys/win32k/objects
diff -u -r1.47 -r1.48
--- fillshap.c 9 Apr 2004 20:03:20 -0000 1.47
+++ fillshap.c 10 May 2004 17:07:20 -0000 1.48
@@ -16,30 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: fillshap.c,v 1.47 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/fillshap.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/pen.h>
-#include <win32k/region.h>
-#include <include/error.h>
-#include <include/object.h>
-#include <include/inteng.h>
-#include <include/path.h>
-#include <include/paint.h>
-#include <include/palette.h>
-#include <include/eng.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-#include <internal/safe.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: fillshap.c,v 1.48 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
/*
* a couple macros to fill a single pixel or a line
reactos/subsys/win32k/objects
diff -u -r1.66 -r1.67
--- gdiobj.c 9 Apr 2004 20:03:20 -0000 1.66
+++ gdiobj.c 10 May 2004 17:07:20 -0000 1.67
@@ -19,29 +19,10 @@
/*
* GDIOBJ.C - GDI object manipulation routines
*
- * $Id: gdiobj.c,v 1.66 2004/04/09 20:03:20 navaraf Exp $
+ * $Id: gdiobj.c,v 1.67 2004/05/10 17:07:20 weiden Exp $
*
*/
-
-#undef WIN32_LEAN_AND_MEAN
-#define WIN32_NO_STATUS
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <include/dce.h>
-#include <include/object.h>
-#include <win32k/gdiobj.h>
-#include <win32k/brush.h>
-#include <win32k/pen.h>
-#include <win32k/text.h>
-#include <win32k/dc.h>
-#include <win32k/bitmaps.h>
-#include <win32k/region.h>
-#include <win32k/cursoricon.h>
-#include <include/palette.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
/* count all gdi objects */
#define GDI_COUNT_OBJECTS 1
reactos/subsys/win32k/objects
diff -u -r1.9 -r1.10
--- icm.c 19 Aug 2003 11:48:50 -0000 1.9
+++ icm.c 10 May 2004 17:07:20 -0000 1.10
@@ -16,15 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: icm.c,v 1.9 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/icm.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: icm.c,v 1.10 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
BOOL
STDCALL
reactos/subsys/win32k/objects
diff -u -r1.29 -r1.30
--- line.c 9 Apr 2004 20:03:20 -0000 1.29
+++ line.c 10 May 2004 17:07:20 -0000 1.30
@@ -16,29 +16,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: line.c,v 1.29 2004/04/09 20:03:20 navaraf Exp $ */
+/* $Id: line.c,v 1.30 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
// Some code from the WINE project source (www.winehq.com)
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
-#include <win32k/dc.h>
-#include <win32k/line.h>
-#include <win32k/path.h>
-#include <win32k/pen.h>
-#include <win32k/region.h>
-#include <include/error.h>
-#include <include/inteng.h>
-#include <include/object.h>
-#include <include/path.h>
-#include <include/intgdi.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
BOOL FASTCALL
IntGdiMoveToEx(DC *dc,
reactos/subsys/win32k/objects
diff -u -r1.9 -r1.10
--- metafile.c 19 Aug 2003 11:48:50 -0000 1.9
+++ metafile.c 10 May 2004 17:07:20 -0000 1.10
@@ -16,15 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: metafile.c,v 1.9 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/metafile.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: metafile.c,v 1.10 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
HENHMETAFILE
STDCALL
reactos/subsys/win32k/objects
diff -u -r1.17 -r1.18
--- objconv.c 9 Apr 2004 20:03:20 -0000 1.17
+++ objconv.c 10 May 2004 17:07:20 -0000 1.18
@@ -16,27 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: objconv.c,v 1.17 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-
-/* FIXME: Surely we should just have one include file that includes all of these.. */
-#include <win32k/bitmaps.h>
-#include <win32k/coord.h>
-#include <win32k/driver.h>
-#include <win32k/dc.h>
-#include <win32k/print.h>
-#include <win32k/region.h>
-#include <win32k/gdiobj.h>
-#include <win32k/pen.h>
-#include "../eng/objects.h"
-#include <include/object.h>
-#include <include/surface.h>
-
-//#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: objconv.c,v 1.18 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
HBITMAP FASTCALL BitmapToSurf(PBITMAPOBJ BitmapObj, HDEV GDIDevice)
{
reactos/subsys/win32k/objects
diff -u -r1.10 -r1.11
--- paint.c 19 Aug 2003 11:48:50 -0000 1.10
+++ paint.c 10 May 2004 17:07:20 -0000 1.11
@@ -16,16 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: paint.c,v 1.10 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-//#include <win32k/debug.h>
-#include <win32k/paint.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: paint.c,v 1.11 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
BOOL
STDCALL
reactos/subsys/win32k/objects
diff -u -r1.17 -r1.18
--- palette.c 9 Apr 2004 20:03:20 -0000 1.17
+++ palette.c 10 May 2004 17:07:20 -0000 1.18
@@ -16,20 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: palette.c,v 1.17 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <win32k/debug.h>
-#include <win32k/debug1.h>
-#include <win32k/bitmaps.h>
-#include <win32k/color.h>
-#include <win32k/gdiobj.h>
-#include <debug.h>
-#include <include/palette.h>
-#include <include/object.h>
-#include <include/color.h>
-#include <include/tags.h>
+/* $Id: palette.c,v 1.18 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
#ifndef NO_MAPPING
static int PALETTE_firstFree = 0;
reactos/subsys/win32k/objects
diff -u -r1.20 -r1.21
--- path.c 24 Apr 2004 14:21:37 -0000 1.20
+++ path.c 10 May 2004 17:07:20 -0000 1.21
@@ -16,33 +16,24 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: path.c,v 1.20 2004/04/24 14:21:37 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/path.h>
-#include <win32k/math.h>
+/* $Id: path.c,v 1.21 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
#include <win32k/float.h>
-#include <win32k/coord.h>
-#include <win32k/line.h>
-#define _WIN32K_PATH_INTERNAL
-#include <include/object.h>
-#include <include/path.h>
-#include <include/tags.h>
-
-#include <math.h>
-#include <float.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
#define NUM_ENTRIES_INITIAL 16 /* Initial size of points / flags arrays */
#define GROW_FACTOR_NUMER 2 /* Numerator of grow factor for the array */
#define GROW_FACTOR_DENOM 1 /* Denominator of grow factor */
+BOOL FASTCALL PATH_AddEntry (GdiPath *pPath, const POINT *pPoint, BYTE flags);
+BOOL FASTCALL PATH_AddFlatBezier (GdiPath *pPath, POINT *pt, BOOL closed);
+BOOL FASTCALL PATH_DoArcPart (GdiPath *pPath, FLOAT_POINT corners[], double angleStart, double angleEnd, BOOL addMoveTo);
+BOOL FASTCALL PATH_FlattenPath (GdiPath *pPath);
+VOID FASTCALL PATH_GetPathFromDC (PDC dc, GdiPath **ppPath);
+VOID FASTCALL PATH_NormalizePoint (FLOAT_POINT corners[], const FLOAT_POINT *pPoint, double *pX, double *pY);
+BOOL FASTCALL PATH_PathToRegion(const GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn);
+BOOL FASTCALL PATH_ReserveEntries (GdiPath *pPath, INT numEntries);
+VOID FASTCALL PATH_ScaleNormalizedPoint (FLOAT_POINT corners[], double x, double y, POINT *pPoint);
+
INT FASTCALL
IntGdiGetArcDirection(DC *dc);
reactos/subsys/win32k/objects
diff -u -r1.14 -r1.15
--- pen.c 5 Apr 2004 21:26:25 -0000 1.14
+++ pen.c 10 May 2004 17:07:20 -0000 1.15
@@ -17,19 +17,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: pen.c,v 1.14 2004/04/05 21:26:25 navaraf Exp $
+ * $Id: pen.c,v 1.15 2004/05/10 17:07:20 weiden Exp $
*/
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <win32k/pen.h>
-#include <win32k/bitmaps.h>
-#include <include/error.h>
-#include <internal/safe.h>
-#define NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
/* PRIVATE FUNCTIONS **********************************************************/
reactos/subsys/win32k/objects
diff -u -r1.13 -r1.14
--- polyfill.c 9 Apr 2004 20:03:20 -0000 1.13
+++ polyfill.c 10 May 2004 17:07:20 -0000 1.14
@@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: polyfill.c,v 1.13 2004/04/09 20:03:20 navaraf Exp $
+/* $Id: polyfill.c,v 1.14 2004/05/10 17:07:20 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@@ -26,19 +26,7 @@
* REVISION HISTORY:
* 21/2/2003: Created
*/
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/fillshap.h>
-#include <win32k/dc.h>
-#include <win32k/pen.h>
-#include <include/inteng.h>
-#include <include/object.h>
-#include <include/paint.h>
-
-#undef NDEBUG
-#include <win32k/debug1.h>
+#include <w32k.h>
INT abs(INT nm);
reactos/subsys/win32k/objects
diff -u -r1.16 -r1.17
--- print.c 9 Apr 2004 20:03:20 -0000 1.16
+++ print.c 10 May 2004 17:07:20 -0000 1.17
@@ -16,20 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: print.c,v 1.16 2004/04/09 20:03:20 navaraf Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/print.h>
-#include <win32k/dc.h>
-#include <include/error.h>
-#include <include/tags.h>
-#include <include/object.h>
-#include <internal/safe.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: print.c,v 1.17 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
INT
STDCALL
reactos/subsys/win32k/objects
diff -u -r1.6 -r1.7
--- rect.c 19 Aug 2003 11:48:50 -0000 1.6
+++ rect.c 10 May 2004 17:07:20 -0000 1.7
@@ -16,15 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: rect.c,v 1.6 2003/08/19 11:48:50 weiden Exp $ */
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/region.h>
-#include <win32k/gdiobj.h>
-#include <include/rect.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: rect.c,v 1.7 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
/* FUNCTIONS *****************************************************************/
reactos/subsys/win32k/objects
diff -u -r1.50 -r1.51
--- region.c 24 Apr 2004 14:21:37 -0000 1.50
+++ region.c 10 May 2004 17:07:20 -0000 1.51
@@ -16,26 +16,9 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: region.c,v 1.50 2004/04/24 14:21:37 weiden Exp $ */
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <internal/safe.h>
+/* $Id: region.c,v 1.51 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
#include <win32k/float.h>
-#include <win32k/dc.h>
-#include <win32k/bitmaps.h>
-#include <win32k/region.h>
-#include <win32k/cliprgn.h>
-#include <win32k/brush.h>
-#include <include/rect.h>
-#include <include/object.h>
-#include <include/inteng.h>
-#include <include/intgdi.h>
-#include <include/error.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
BOOL STDCALL
IntEngPaint(IN SURFOBJ *Surface,IN CLIPOBJ *ClipRegion,IN BRUSHOBJ *Brush,IN POINTL *BrushOrigin,
reactos/subsys/win32k/objects
diff -u -r1.90 -r1.91
--- text.c 23 Apr 2004 21:35:59 -0000 1.90
+++ text.c 10 May 2004 17:07:20 -0000 1.91
@@ -22,36 +22,13 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: text.c,v 1.90 2004/04/23 21:35:59 weiden Exp $ */
+/* $Id: text.c,v 1.91 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <ddk/winddi.h>
-#include <napi/win32.h>
-#include <internal/safe.h>
-#include <win32k/brush.h>
-#include <win32k/dc.h>
-#include <win32k/text.h>
-#include <win32k/font.h>
-#include <include/error.h>
-#include <include/desktop.h>
#include <ft2build.h>
#include FT_FREETYPE_H
#include <freetype/tttables.h>
-#include "../eng/handle.h"
-
-#include <include/inteng.h>
-#include <include/text.h>
-#include <include/eng.h>
-#include <include/palette.h>
-#include <include/tags.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
-
FT_Library library;
typedef struct _FONT_ENTRY {
reactos/subsys/win32k/objects
diff -u -r1.7 -r1.8
--- wingl.c 19 Aug 2003 11:48:50 -0000 1.7
+++ wingl.c 10 May 2004 17:07:20 -0000 1.8
@@ -16,15 +16,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-/* $Id: wingl.c,v 1.7 2003/08/19 11:48:50 weiden Exp $ */
-
-#undef WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#include <ddk/ntddk.h>
-#include <win32k/wingl.h>
-
-#define NDEBUG
-#include <win32k/debug1.h>
+/* $Id: wingl.c,v 1.8 2004/05/10 17:07:20 weiden Exp $ */
+#include <w32k.h>
INT
STDCALL
CVSspam 0.2.8