[navaraf] 16320: Move the inclusion of <debug.h> to individual files and consolidate the inclusion of DDRAW/D3D headers a bit.
29 Jun
2005
29 Jun
'05
7:09 a.m.
Move the inclusion of <debug.h> to individual files and consolidate the
inclusion of DDRAW/D3D headers a bit.
Modified: trunk/reactos/subsys/win32k/dib/dib.c
Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c
Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c
Modified: trunk/reactos/subsys/win32k/eng/bitblt.c
Modified: trunk/reactos/subsys/win32k/eng/brush.c
Modified: trunk/reactos/subsys/win32k/eng/clip.c
Modified: trunk/reactos/subsys/win32k/eng/copybits.c
Modified: trunk/reactos/subsys/win32k/eng/debug.c
Modified: trunk/reactos/subsys/win32k/eng/device.c
Modified: trunk/reactos/subsys/win32k/eng/driverobj.c
Modified: trunk/reactos/subsys/win32k/eng/error.c
Modified: trunk/reactos/subsys/win32k/eng/event.c
Modified: trunk/reactos/subsys/win32k/eng/float.c
Modified: trunk/reactos/subsys/win32k/eng/gradient.c
Modified: trunk/reactos/subsys/win32k/eng/lineto.c
Modified: trunk/reactos/subsys/win32k/eng/mem.c
Modified: trunk/reactos/subsys/win32k/eng/misc.c
Modified: trunk/reactos/subsys/win32k/eng/mouse.c
Modified: trunk/reactos/subsys/win32k/eng/paint.c
Modified: trunk/reactos/subsys/win32k/eng/palette.c
Modified: trunk/reactos/subsys/win32k/eng/perfcnt.c
Modified: trunk/reactos/subsys/win32k/eng/semaphor.c
Modified: trunk/reactos/subsys/win32k/eng/sort.c
Modified: trunk/reactos/subsys/win32k/eng/surface.c
Modified: trunk/reactos/subsys/win32k/eng/transblt.c
Modified: trunk/reactos/subsys/win32k/eng/window.c
Modified: trunk/reactos/subsys/win32k/eng/xlate.c
Modified: trunk/reactos/subsys/win32k/include/win32k.h
Modified: trunk/reactos/subsys/win32k/ldr/loader.c
Modified: trunk/reactos/subsys/win32k/main/dllmain.c
Modified: trunk/reactos/subsys/win32k/misc/error.c
Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c
Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c
Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c
Modified: trunk/reactos/subsys/win32k/ntuser/csr.c
Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c
Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c
Modified: trunk/reactos/subsys/win32k/ntuser/focus.c
Modified: trunk/reactos/subsys/win32k/ntuser/hook.c
Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c
Modified: trunk/reactos/subsys/win32k/ntuser/input.c
Modified: trunk/reactos/subsys/win32k/ntuser/message.c
Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c
Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c
Modified: trunk/reactos/subsys/win32k/ntuser/painting.c
Modified: trunk/reactos/subsys/win32k/ntuser/prop.c
Modified: trunk/reactos/subsys/win32k/ntuser/timer.c
Modified: trunk/reactos/subsys/win32k/ntuser/vis.c
Modified: trunk/reactos/subsys/win32k/ntuser/window.c
Modified: trunk/reactos/subsys/win32k/objects/bezier.c
Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c
Modified: trunk/reactos/subsys/win32k/objects/brush.c
Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c
Modified: trunk/reactos/subsys/win32k/objects/color.c
Modified: trunk/reactos/subsys/win32k/objects/coord.c
Modified: trunk/reactos/subsys/win32k/objects/dc.c
Modified: trunk/reactos/subsys/win32k/objects/dib.c
Modified: trunk/reactos/subsys/win32k/objects/fillshap.c
Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c
Modified: trunk/reactos/subsys/win32k/objects/icm.c
Modified: trunk/reactos/subsys/win32k/objects/line.c
Modified: trunk/reactos/subsys/win32k/objects/metafile.c
Modified: trunk/reactos/subsys/win32k/objects/paint.c
Modified: trunk/reactos/subsys/win32k/objects/palette.c
Modified: trunk/reactos/subsys/win32k/objects/path.c
Modified: trunk/reactos/subsys/win32k/objects/pen.c
Modified: trunk/reactos/subsys/win32k/objects/polyfill.c
Modified: trunk/reactos/subsys/win32k/objects/print.c
Modified: trunk/reactos/subsys/win32k/objects/rect.c
Modified: trunk/reactos/subsys/win32k/objects/region.c
Modified: trunk/reactos/subsys/win32k/objects/stockobj.c
Modified: trunk/reactos/subsys/win32k/objects/text.c
Modified: trunk/reactos/subsys/win32k/objects/wingl.c
Modified: trunk/reactos/subsys/win32k/stubs/stubs.c
Modified: trunk/reactos/subsys/win32k/stubs/xpstubs.c
Modified: trunk/reactos/subsys/win32k/w32k.h
_____
Modified: trunk/reactos/subsys/win32k/dib/dib.c
--- trunk/reactos/subsys/win32k/dib/dib.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/dib/dib.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/* Static data */
unsigned char notmask[2] = { 0x0f, 0xf0 };
_____
Modified: trunk/reactos/subsys/win32k/dib/dib16bpp.c
--- trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/dib/dib16bpp.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -20,6 +20,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
VOID
DIB_16BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
_____
Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c
--- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -19,6 +19,9 @@
/* $Id$ */
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
VOID
DIB_1BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
_____
Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c
--- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
VOID
DIB_24BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
_____
Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c
--- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,11 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
-
-
VOID
DIB_32BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
_____
Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c
--- trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/dib/dib4bpp.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
VOID
DIB_4BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
_____
Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c
--- trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/dib/dib8bpp.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
VOID
DIB_8BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
{
_____
Modified: trunk/reactos/subsys/win32k/eng/bitblt.c
--- trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/bitblt.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 2/10/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
typedef BOOLEAN STDCALL (*PBLTRECTFUNC)(SURFOBJ* OutputObj,
SURFOBJ* InputObj,
SURFOBJ* Mask,
_____
Modified: trunk/reactos/subsys/win32k/eng/brush.c
--- trunk/reactos/subsys/win32k/eng/brush.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/brush.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 3/7/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/clip.c
--- trunk/reactos/subsys/win32k/eng/clip.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/clip.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 21/8/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
static inline int
CompareRightDown(const PRECT r1, const PRECT r2)
{
_____
Modified: trunk/reactos/subsys/win32k/eng/copybits.c
--- trunk/reactos/subsys/win32k/eng/copybits.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/copybits.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -25,8 +25,12 @@
* REVISION HISTORY:
* 8/18/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/debug.c
--- trunk/reactos/subsys/win32k/eng/debug.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/debug.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 11/7/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/device.c
--- trunk/reactos/subsys/win32k/eng/device.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/device.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 3/7/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/driverobj.c
--- trunk/reactos/subsys/win32k/eng/driverobj.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/driverobj.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -25,8 +25,11 @@
* REVISION HISTORY:
* 04/01/2005: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
/*!\brief Called when the process is terminated.
*
_____
Modified: trunk/reactos/subsys/win32k/eng/error.c
--- trunk/reactos/subsys/win32k/eng/error.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/error.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -1,5 +1,8 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/event.c
--- trunk/reactos/subsys/win32k/eng/event.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/event.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 2/10/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
BOOL
STDCALL
EngCreateEvent ( OUT PEVENT *Event )
_____
Modified: trunk/reactos/subsys/win32k/eng/float.c
--- trunk/reactos/subsys/win32k/eng/float.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/float.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -25,8 +25,12 @@
* PROGRAMER: Jason Filby
* REVISION HISTORY:
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
BOOL
STDCALL
EngRestoreFloatingPointState ( IN VOID *Buffer )
_____
Modified: trunk/reactos/subsys/win32k/eng/gradient.c
--- trunk/reactos/subsys/win32k/eng/gradient.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/gradient.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 3/7/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/* MACROS
*********************************************************************/
const LONG LINC[2] = {-1, 1};
_____
Modified: trunk/reactos/subsys/win32k/eng/lineto.c
--- trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/lineto.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -18,8 +18,12 @@
*
* $Id$
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
static void FASTCALL
TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate)
{
_____
Modified: trunk/reactos/subsys/win32k/eng/mem.c
--- trunk/reactos/subsys/win32k/eng/mem.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/mem.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -29,6 +29,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
typedef struct _USERMEMHEADER
{
ULONG Tag;
_____
Modified: trunk/reactos/subsys/win32k/eng/misc.c
--- trunk/reactos/subsys/win32k/eng/misc.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/misc.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
BOOL STDCALL
IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
SURFOBJ *DestObj,
_____
Modified: trunk/reactos/subsys/win32k/eng/mouse.c
--- trunk/reactos/subsys/win32k/eng/mouse.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/mouse.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* 06-06-2001 CSH Created
*/
/* INCLUDES
******************************************************************/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/* FUNCTIONS
*****************************************************************/
INT INTERNAL_CALL
_____
Modified: trunk/reactos/subsys/win32k/eng/paint.c
--- trunk/reactos/subsys/win32k/eng/paint.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/paint.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -29,6 +29,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
{
LONG y;
_____
Modified: trunk/reactos/subsys/win32k/eng/palette.c
--- trunk/reactos/subsys/win32k/eng/palette.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/palette.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 11/7/1999: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/perfcnt.c
--- trunk/reactos/subsys/win32k/eng/perfcnt.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/perfcnt.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -24,8 +24,12 @@
* FILE: subsys/win32k/eng/perfcnt.c
* PROGRAMER: Ge van Geldorp
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/semaphor.c
--- trunk/reactos/subsys/win32k/eng/semaphor.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/semaphor.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -1,5 +1,8 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/sort.c
--- trunk/reactos/subsys/win32k/eng/sort.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/sort.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* @implemented
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/surface.c
--- trunk/reactos/subsys/win32k/eng/surface.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/surface.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -30,8 +30,12 @@
* - 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 <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
enum Rle_EscapeCodes
{
RLE_EOL = 0, /* End of line */
_____
Modified: trunk/reactos/subsys/win32k/eng/transblt.c
--- trunk/reactos/subsys/win32k/eng/transblt.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/transblt.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,11 @@
* REVISION HISTORY:
* 4/6/2004: Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
BOOL STDCALL
EngTransparentBlt(SURFOBJ *Dest,
_____
Modified: trunk/reactos/subsys/win32k/eng/window.c
--- trunk/reactos/subsys/win32k/eng/window.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/window.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -31,6 +31,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* Calls the WNDOBJCHANGEPROC of the given WNDOBJ
*/
_____
Modified: trunk/reactos/subsys/win32k/eng/xlate.c
--- trunk/reactos/subsys/win32k/eng/xlate.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/eng/xlate.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -29,6 +29,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
static inline ULONG
ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
{
_____
Modified: trunk/reactos/subsys/win32k/include/win32k.h
--- trunk/reactos/subsys/win32k/include/win32k.h 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/include/win32k.h 2005-06-29
07:09:25 UTC (rev 16320)
@@ -31,6 +31,7 @@
#include <include/input.h>
#include <include/inteng.h>
#include <include/intgdi.h>
+#include <include/intddraw.h>
#include <include/menu.h>
#include <include/monitor.h>
#include <include/mouse.h>
_____
Modified: trunk/reactos/subsys/win32k/ldr/loader.c
--- trunk/reactos/subsys/win32k/ldr/loader.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ldr/loader.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -19,6 +19,7 @@
/* $Id$
*
*/
+
#include <w32k.h>
#define NDEBUG
_____
Modified: trunk/reactos/subsys/win32k/main/dllmain.c
--- trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/main/dllmain.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -20,12 +20,12 @@
*
* Entry Point for win32k.sys
*/
-#include <win32k/ntddraw.h> /* FIXME: FIX THIS! */
+
#include <w32k.h>
+#include <win32k/ntddraw.h>
#include <include/napi.h>
#define NDEBUG
-#include <win32k/debug1.h>
#include <debug.h>
BOOL INTERNAL_CALL GDI_CleanupForProcess (struct _EPROCESS *Process);
_____
Modified: trunk/reactos/subsys/win32k/misc/error.c
--- trunk/reactos/subsys/win32k/misc/error.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/misc/error.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
* REVISION HISTORY:
* 06-06-2001 CSH Created
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
VOID FASTCALL
SetLastNtError(NTSTATUS Status)
{
_____
Modified: trunk/reactos/subsys/win32k/ntddraw/ddraw.c
--- trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntddraw/ddraw.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -1,5 +1,4 @@
/*
- *
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: Native DirectDraw implementation
@@ -8,14 +7,8 @@
* REVISION HISTORY:
* 25-10-2003 PB Created
*/
-/* FIXME: FOR THE LOVE OF GOD SOMEONE PLEASE FIX THIS FUCKFEST */
-#include <ddk/ntddk.h>
-#include <win32k/ntddraw.h>
-#include <ddk/winddi.h>
+
#include <w32k.h>
-#include <win32k/win32k.h>
-#include <include/intddraw.h>
-#include <win32k/gdiobj.h>
#define NDEBUG
#include <debug.h>
_____
Modified: trunk/reactos/subsys/win32k/ntddraw/stubs.c
--- trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntddraw/stubs.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -1,5 +1,4 @@
/*
- *
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: Native DirectDraw stubs
@@ -8,12 +7,8 @@
* REVISION HISTORY:
* 25-10-2003 PB Created
*/
-/* FIXME: FOR THE LOVE OF GOD SOMEONE PLEASE FIX THIS FUCKFEST */
-#include <ddk/ntddk.h>
-#include <win32k/ntddraw.h>
-#include <ddk/winddi.h>
+
#include <w32k.h>
-#include <win32k/win32k.h>
#define NDEBUG
#include <debug.h>
_____
Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c
--- trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/accelerator.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -48,6 +48,7 @@
*/
/* INCLUDES
******************************************************************/
+
#include <w32k.h>
#define NDEBUG
_____
Modified: trunk/reactos/subsys/win32k/ntuser/csr.c
--- trunk/reactos/subsys/win32k/ntuser/csr.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/csr.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -9,6 +9,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
static HANDLE WindowsApiPort = NULL;
PEPROCESS CsrProcess = NULL;
_____
Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c
--- trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/cursoricon.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -38,6 +38,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
static PAGED_LOOKASIDE_LIST ProcessLookasideList;
static LIST_ENTRY CurIconList;
static FAST_MUTEX CurIconListLock;
_____
Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c
--- trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/desktop.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -28,8 +28,12 @@
*/
/* INCLUDES
******************************************************************/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/* GLOBALS
*******************************************************************/
/* Currently active desktop */
_____
Modified: trunk/reactos/subsys/win32k/ntuser/focus.c
--- trunk/reactos/subsys/win32k/ntuser/focus.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/focus.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -22,7 +22,6 @@
#include <w32k.h>
#define NDEBUG
-#include <win32k/debug1.h>
#include <debug.h>
HWND FASTCALL
_____
Modified: trunk/reactos/subsys/win32k/ntuser/hook.c
--- trunk/reactos/subsys/win32k/ntuser/hook.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/hook.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -32,7 +32,7 @@
#include <w32k.h>
#define NDEBUG
-#include <win32k/debug1.h>
+#include <debug.h>
#define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK)
_____
Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c
--- trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/hotkey.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -34,7 +34,6 @@
#define NDEBUG
#include <debug.h>
-
/* GLOBALS
*******************************************************************/
/* FUNCTIONS
*****************************************************************/
_____
Modified: trunk/reactos/subsys/win32k/ntuser/input.c
--- trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -30,9 +30,11 @@
/* INCLUDES
******************************************************************/
#include <w32k.h>
-#include <rosrtl/string.h>
#include <ddk/ntddkbd.h>
+#define NDEBUG
+#include <debug.h>
+
/* GLOBALS
*******************************************************************/
static HANDLE MouseDeviceHandle;
_____
Modified: trunk/reactos/subsys/win32k/ntuser/message.c
--- trunk/reactos/subsys/win32k/ntuser/message.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -30,7 +30,6 @@
/* INCLUDES
******************************************************************/
#include <w32k.h>
-#include <pseh.h>
#define NDEBUG
#include <debug.h>
_____
Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c
--- trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/monitor.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -35,7 +35,7 @@
#define MONITOR_DEFAULTTOPRIMARY 1
#define MONITOR_DEFAULTTONEAREST 2
-//#define NDEBUG
+#define NDEBUG
#include <debug.h>
/* GLOBALS
*******************************************************************/
_____
Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c
--- trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/msgqueue.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -32,7 +32,6 @@
#include <w32k.h>
#define NDEBUG
-#include <win32k/debug1.h>
#include <debug.h>
/* GLOBALS
*******************************************************************/
_____
Modified: trunk/reactos/subsys/win32k/ntuser/painting.c
--- trunk/reactos/subsys/win32k/ntuser/painting.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/painting.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -33,7 +33,7 @@
#include <w32k.h>
#define NDEBUG
-#include <win32k/debug1.h>
+#include <debug.h>
#define DCX_USESTYLE 0x10000
_____
Modified: trunk/reactos/subsys/win32k/ntuser/prop.c
--- trunk/reactos/subsys/win32k/ntuser/prop.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/prop.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -30,7 +30,7 @@
#include <w32k.h>
-//#define NDEBUG
+#define NDEBUG
#include <debug.h>
typedef struct _PROPLISTITEM
_____
Modified: trunk/reactos/subsys/win32k/ntuser/timer.c
--- trunk/reactos/subsys/win32k/ntuser/timer.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/timer.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -32,7 +32,7 @@
#include <w32k.h>
-#undef NDEBUG
+#define NDEBUG
#include <debug.h>
/* GLOBALS
*******************************************************************/
_____
Modified: trunk/reactos/subsys/win32k/ntuser/vis.c
--- trunk/reactos/subsys/win32k/ntuser/vis.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/vis.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -28,7 +28,6 @@
#include <w32k.h>
#define NDEBUG
-#include <win32k/debug1.h>
#include <debug.h>
HRGN FASTCALL
_____
Modified: trunk/reactos/subsys/win32k/ntuser/window.c
--- trunk/reactos/subsys/win32k/ntuser/window.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -30,6 +30,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
static WndProcHandle *WndProcHandlesArray = 0;
static WORD WndProcHandlesArraySize = 0;
#define WPH_SIZE 0x40 /* the size to add to the WndProcHandle array
each time */
_____
Modified: trunk/reactos/subsys/win32k/objects/bezier.c
--- trunk/reactos/subsys/win32k/objects/bezier.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/objects/bezier.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -20,6 +20,9 @@
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/******************************************************************
*
* *Very* simple bezier drawing code,
_____
Modified: trunk/reactos/subsys/win32k/objects/bitmaps.c
--- trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/objects/bitmaps.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
#define IN_RECT(r,x,y) \
( \
(x) >= (r).left && \
_____
Modified: trunk/reactos/subsys/win32k/objects/brush.c
--- trunk/reactos/subsys/win32k/objects/brush.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/objects/brush.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -19,8 +19,12 @@
*
* $Id$
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
static const USHORT HatchBrushes[NB_HATCH_STYLES][8] =
{
{0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00}, /* HS_HORIZONTAL */
_____
Modified: trunk/reactos/subsys/win32k/objects/cliprgn.c
--- trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/objects/cliprgn.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
int FASTCALL
CLIPPING_UpdateGCRegion(DC* Dc)
{
_____
Modified: trunk/reactos/subsys/win32k/objects/color.c
--- trunk/reactos/subsys/win32k/objects/color.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/objects/color.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
// FIXME: Use PXLATEOBJ logicalToSystem instead of int *mapping
int COLOR_gapStart = 256;
_____
Modified: trunk/reactos/subsys/win32k/objects/coord.c
--- trunk/reactos/subsys/win32k/objects/coord.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/objects/coord.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -26,8 +26,12 @@
*/
/* INCLUDES
******************************************************************/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/* FUNCTIONS
*****************************************************************/
BOOL FASTCALL
_____
Modified: trunk/reactos/subsys/win32k/objects/dc.c
--- trunk/reactos/subsys/win32k/objects/dc.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/objects/dc.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -21,8 +21,12 @@
* DC.C - Device context functions
*
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
#ifndef OBJ_COLORSPACE
#define OBJ_COLORSPACE (14)
#endif
_____
Modified: trunk/reactos/subsys/win32k/objects/dib.c
--- trunk/reactos/subsys/win32k/objects/dib.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/objects/dib.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -18,9 +18,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <w32k.h>
-#include <pseh.h>
+#define NDEBUG
+#include <debug.h>
+
UINT STDCALL
NtGdiSetDIBColorTable(HDC hDC, UINT StartIndex, UINT Entries, CONST
RGBQUAD *Colors)
{
_____
Modified: trunk/reactos/subsys/win32k/objects/fillshap.c
--- trunk/reactos/subsys/win32k/objects/fillshap.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/objects/fillshap.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -16,8 +16,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
+
/*
* a couple macros to fill a single pixel or a line
*/
_____
Modified: trunk/reactos/subsys/win32k/objects/gdiobj.c
--- trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-29
00:11:39 UTC (rev 16319)
+++ trunk/reactos/subsys/win32k/objects/gdiobj.c 2005-06-29
07:09:25 UTC (rev 16320)
@@ -21,6 +21,7 @@
*
* $Id$
*/
+
#include <w32k.h>
#define NDEBUG
_____
Modified: trunk/reactos/subsys/win32k/objects/icm.c
--- trunk/reactos/subsys/win32k/objects/icm.c 2005-06-29 00:11:39 UTC
(rev 16319)
+++ trunk/reactos/subsys/win32k/objects/icm.c 2005-06-29 07:09:25 UTC
(rev 16320)
@@ -17,8 +17,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$ */
+
#include <w32k.h>
+#define NDEBUG
+#include <debug.h>
[truncated at 1000 lines; 270 more skipped]
7119
days inactive
7119
days old
0 comments
1 participants
participants (1)
-
navaraf＠svn.reactos.com