Move the inclusion of <debug.h> to individual files and consolidate the inclusion of DDRAW/D3D headers a bit.

svn path=/trunk/; revision=16320
2024-12-28 10:04:49 +00:00 · 2005-06-29 07:09:25 +00:00 · 2005-06-29 07:09:25 +00:00 · db07afe07a
commit db07afe07a
parent 1d02274287
80 changed files with 236 additions and 37 deletions
--- a/reactos/subsys/win32k/dib/dib.c
+++ b/reactos/subsys/win32k/dib/dib.c
@ -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 };
--- a/reactos/subsys/win32k/dib/dib16bpp.c
+++ b/reactos/subsys/win32k/dib/dib16bpp.c
@ -20,6 +20,9 @@

 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 VOID
 DIB_16BPP_PutPixel(SURFOBJ *SurfObj, LONG x, LONG y, ULONG c)
 {
--- a/reactos/subsys/win32k/dib/dib1bpp.c
+++ b/reactos/subsys/win32k/dib/dib1bpp.c
@ -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)
 {
--- a/reactos/subsys/win32k/dib/dib24bpp.c
+++ b/reactos/subsys/win32k/dib/dib24bpp.c
@ -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)
 {
--- a/reactos/subsys/win32k/dib/dib32bpp.c
+++ b/reactos/subsys/win32k/dib/dib32bpp.c
@ -17,10 +17,11 @@
 *  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)
--- a/reactos/subsys/win32k/dib/dib4bpp.c
+++ b/reactos/subsys/win32k/dib/dib4bpp.c
@ -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)
 {
--- a/reactos/subsys/win32k/dib/dib8bpp.c
+++ b/reactos/subsys/win32k/dib/dib8bpp.c
@ -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)
 {
--- a/reactos/subsys/win32k/eng/bitblt.c
+++ b/reactos/subsys/win32k/eng/bitblt.c
@ -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,
--- a/reactos/subsys/win32k/eng/brush.c
+++ b/reactos/subsys/win32k/eng/brush.c
@ -26,8 +26,12 @@
 * REVISION HISTORY:
 *                 3/7/1999: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/clip.c
+++ b/reactos/subsys/win32k/eng/clip.c
@ -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)
 {
--- a/reactos/subsys/win32k/eng/copybits.c
+++ b/reactos/subsys/win32k/eng/copybits.c
@ -25,8 +25,12 @@
 * REVISION HISTORY:
 *        8/18/1999: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/debug.c
+++ b/reactos/subsys/win32k/eng/debug.c
@ -26,8 +26,12 @@
 * REVISION HISTORY:
 *                 11/7/1999: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/device.c
+++ b/reactos/subsys/win32k/eng/device.c
@ -26,8 +26,12 @@
 * REVISION HISTORY:
 *                 3/7/1999: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/driverobj.c
+++ b/reactos/subsys/win32k/eng/driverobj.c
@ -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.
 *
--- a/reactos/subsys/win32k/eng/error.c
+++ b/reactos/subsys/win32k/eng/error.c
@ -1,5 +1,8 @@
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/event.c
+++ b/reactos/subsys/win32k/eng/event.c
@ -26,8 +26,12 @@
 * REVISION HISTORY:
 *        2/10/1999: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 BOOL
 STDCALL
 EngCreateEvent ( OUT PEVENT *Event )
--- a/reactos/subsys/win32k/eng/float.c
+++ b/reactos/subsys/win32k/eng/float.c
@ -25,8 +25,12 @@
 * PROGRAMER:         Jason Filby
 * REVISION HISTORY:
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 BOOL
 STDCALL
 EngRestoreFloatingPointState ( IN VOID *Buffer )
--- a/reactos/subsys/win32k/eng/gradient.c
+++ b/reactos/subsys/win32k/eng/gradient.c
@ -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};
--- a/reactos/subsys/win32k/eng/lineto.c
+++ b/reactos/subsys/win32k/eng/lineto.c
@ -18,8 +18,12 @@
 *
 * $Id$
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 static void FASTCALL
 TranslateRects(RECT_ENUM *RectEnum, POINTL* Translate)
 {
--- a/reactos/subsys/win32k/eng/mem.c
+++ b/reactos/subsys/win32k/eng/mem.c
@ -29,6 +29,9 @@

 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 typedef struct _USERMEMHEADER
  {
  ULONG Tag;
--- a/reactos/subsys/win32k/eng/misc.c
+++ b/reactos/subsys/win32k/eng/misc.c
@ -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,
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.c
@ -26,8 +26,12 @@
 *       06-06-2001  CSH  Created
 */
 /* INCLUDES ******************************************************************/
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/

 INT INTERNAL_CALL
--- a/reactos/subsys/win32k/eng/paint.c
+++ b/reactos/subsys/win32k/eng/paint.c
@ -29,6 +29,9 @@

 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 BOOL STDCALL FillSolid(SURFOBJ *Surface, PRECTL pRect, ULONG iColor)
 {
  LONG y;
--- a/reactos/subsys/win32k/eng/palette.c
+++ b/reactos/subsys/win32k/eng/palette.c
@ -26,8 +26,12 @@
 * REVISION HISTORY:
 *                 11/7/1999: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/perfcnt.c
+++ b/reactos/subsys/win32k/eng/perfcnt.c
@ -24,8 +24,12 @@
 * FILE:              subsys/win32k/eng/perfcnt.c
 * PROGRAMER:         Ge van Geldorp
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/semaphor.c
+++ b/reactos/subsys/win32k/eng/semaphor.c
@ -1,5 +1,8 @@
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/sort.c
+++ b/reactos/subsys/win32k/eng/sort.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * @implemented
 */
--- a/reactos/subsys/win32k/eng/surface.c
+++ b/reactos/subsys/win32k/eng/surface.c
@ -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 */
--- a/reactos/subsys/win32k/eng/transblt.c
+++ b/reactos/subsys/win32k/eng/transblt.c
@ -26,8 +26,11 @@
 * REVISION HISTORY:
 *        4/6/2004: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>

 BOOL STDCALL
 EngTransparentBlt(SURFOBJ *Dest,
--- a/reactos/subsys/win32k/eng/window.c
+++ b/reactos/subsys/win32k/eng/window.c
@ -31,6 +31,9 @@
 
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /*
 * Calls the WNDOBJCHANGEPROC of the given WNDOBJ
 */
--- a/reactos/subsys/win32k/eng/xlate.c
+++ b/reactos/subsys/win32k/eng/xlate.c
@ -29,6 +29,9 @@

 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 static inline ULONG
 ShiftAndMask(XLATEGDI *XlateGDI, ULONG Color)
 {
--- a/reactos/subsys/win32k/include/win32k.h
+++ b/reactos/subsys/win32k/include/win32k.h
@ -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>
--- a/reactos/subsys/win32k/ldr/loader.c
+++ b/reactos/subsys/win32k/ldr/loader.c
@ -19,6 +19,7 @@
 /* $Id$
 *
 */
+
 #include <w32k.h>

 #define NDEBUG
--- a/reactos/subsys/win32k/main/dllmain.c
+++ b/reactos/subsys/win32k/main/dllmain.c
@ -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);
--- a/reactos/subsys/win32k/misc/error.c
+++ b/reactos/subsys/win32k/misc/error.c
@ -26,8 +26,12 @@
 * REVISION HISTORY:
 *       06-06-2001  CSH  Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 VOID FASTCALL
 SetLastNtError(NTSTATUS Status)
 {
--- a/reactos/subsys/win32k/ntddraw/ddraw.c
+++ b/reactos/subsys/win32k/ntddraw/ddraw.c
@ -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>
--- a/reactos/subsys/win32k/ntddraw/stubs.c
+++ b/reactos/subsys/win32k/ntddraw/stubs.c
@ -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>
--- a/reactos/subsys/win32k/ntuser/accelerator.c
+++ b/reactos/subsys/win32k/ntuser/accelerator.c
@ -48,6 +48,7 @@
 */

 /* INCLUDES ******************************************************************/
+
 #include <w32k.h>

 #define NDEBUG
--- a/reactos/subsys/win32k/ntuser/csr.c
+++ b/reactos/subsys/win32k/ntuser/csr.c
@ -9,6 +9,9 @@

 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 static HANDLE WindowsApiPort = NULL;
 PEPROCESS CsrProcess = NULL;
           
--- a/reactos/subsys/win32k/ntuser/cursoricon.c
+++ b/reactos/subsys/win32k/ntuser/cursoricon.c
@ -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;
--- a/reactos/subsys/win32k/ntuser/desktop.c
+++ b/reactos/subsys/win32k/ntuser/desktop.c
@ -28,8 +28,12 @@
 */

 /* INCLUDES ******************************************************************/
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /* GLOBALS *******************************************************************/

 /* Currently active desktop */
--- a/reactos/subsys/win32k/ntuser/focus.c
+++ b/reactos/subsys/win32k/ntuser/focus.c
@ -22,7 +22,6 @@
 #include <w32k.h>

 #define NDEBUG
-#include <win32k/debug1.h>
 #include <debug.h>

 HWND FASTCALL
--- a/reactos/subsys/win32k/ntuser/hook.c
+++ b/reactos/subsys/win32k/ntuser/hook.c
@ -32,7 +32,7 @@
 #include <w32k.h>

 #define NDEBUG
-#include <win32k/debug1.h>
+#include <debug.h>

 #define HOOKID_TO_INDEX(HookId) (HookId - WH_MINHOOK)

--- a/reactos/subsys/win32k/ntuser/hotkey.c
+++ b/reactos/subsys/win32k/ntuser/hotkey.c
@ -34,7 +34,6 @@
 #define NDEBUG
 #include <debug.h>

-
 /* GLOBALS *******************************************************************/

 /* FUNCTIONS *****************************************************************/
--- a/reactos/subsys/win32k/ntuser/input.c
+++ b/reactos/subsys/win32k/ntuser/input.c
@ -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;
--- a/reactos/subsys/win32k/ntuser/message.c
+++ b/reactos/subsys/win32k/ntuser/message.c
@ -30,7 +30,6 @@
 /* INCLUDES ******************************************************************/

 #include <w32k.h>
-#include <pseh.h>

 #define NDEBUG
 #include <debug.h>
--- a/reactos/subsys/win32k/ntuser/monitor.c
+++ b/reactos/subsys/win32k/ntuser/monitor.c
@ -35,7 +35,7 @@
 #define MONITOR_DEFAULTTOPRIMARY  1
 #define MONITOR_DEFAULTTONEAREST  2

-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>

 /* GLOBALS *******************************************************************/
--- a/reactos/subsys/win32k/ntuser/msgqueue.c
+++ b/reactos/subsys/win32k/ntuser/msgqueue.c
@ -32,7 +32,6 @@
 #include <w32k.h>

 #define NDEBUG
-#include <win32k/debug1.h>
 #include <debug.h>

 /* GLOBALS *******************************************************************/
--- a/reactos/subsys/win32k/ntuser/painting.c
+++ b/reactos/subsys/win32k/ntuser/painting.c
@ -33,7 +33,7 @@
 #include <w32k.h>

 #define NDEBUG
-#include <win32k/debug1.h>
+#include <debug.h>

 #define DCX_USESTYLE 0x10000

--- a/reactos/subsys/win32k/ntuser/prop.c
+++ b/reactos/subsys/win32k/ntuser/prop.c
@ -30,7 +30,7 @@

 #include <w32k.h>

-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>

 typedef struct _PROPLISTITEM
--- a/reactos/subsys/win32k/ntuser/timer.c
+++ b/reactos/subsys/win32k/ntuser/timer.c
@ -32,7 +32,7 @@

 #include <w32k.h>

-#undef NDEBUG
+#define NDEBUG
 #include <debug.h>

 /* GLOBALS *******************************************************************/
--- a/reactos/subsys/win32k/ntuser/vis.c
+++ b/reactos/subsys/win32k/ntuser/vis.c
@ -28,7 +28,6 @@
 #include <w32k.h>

 #define NDEBUG
-#include <win32k/debug1.h>
 #include <debug.h>

 HRGN FASTCALL
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@ -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 */
--- a/reactos/subsys/win32k/objects/bezier.c
+++ b/reactos/subsys/win32k/objects/bezier.c
@ -20,6 +20,9 @@

 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /******************************************************************
 *
 *   *Very* simple bezier drawing code,
--- a/reactos/subsys/win32k/objects/bitmaps.c
+++ b/reactos/subsys/win32k/objects/bitmaps.c
@ -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 && \
--- a/reactos/subsys/win32k/objects/brush.c
+++ b/reactos/subsys/win32k/objects/brush.c
@ -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 */
--- a/reactos/subsys/win32k/objects/cliprgn.c
+++ b/reactos/subsys/win32k/objects/cliprgn.c
@ -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)
 {
--- a/reactos/subsys/win32k/objects/color.c
+++ b/reactos/subsys/win32k/objects/color.c
@ -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;
--- a/reactos/subsys/win32k/objects/coord.c
+++ b/reactos/subsys/win32k/objects/coord.c
@ -26,8 +26,12 @@
 */

 /* INCLUDES ******************************************************************/
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/

 BOOL FASTCALL
--- a/reactos/subsys/win32k/objects/dc.c
+++ b/reactos/subsys/win32k/objects/dc.c
@ -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
--- a/reactos/subsys/win32k/objects/dib.c
+++ b/reactos/subsys/win32k/objects/dib.c
@ -18,8 +18,11 @@
 * 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)
--- a/reactos/subsys/win32k/objects/fillshap.c
+++ b/reactos/subsys/win32k/objects/fillshap.c
@ -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
 */
--- a/reactos/subsys/win32k/objects/gdiobj.c
+++ b/reactos/subsys/win32k/objects/gdiobj.c
@ -21,6 +21,7 @@
 *
 * $Id$
 */
+
 #include <w32k.h>

 #define NDEBUG
--- a/reactos/subsys/win32k/objects/icm.c
+++ b/reactos/subsys/win32k/objects/icm.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 BOOL
 STDCALL
 NtGdiCheckColorsInGamut(HDC  hDC,
--- a/reactos/subsys/win32k/objects/line.c
+++ b/reactos/subsys/win32k/objects/line.c
@ -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>
+
 // Some code from the WINE project source (www.winehq.com)


--- a/reactos/subsys/win32k/objects/metafile.c
+++ b/reactos/subsys/win32k/objects/metafile.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 HENHMETAFILE
 STDCALL
 NtGdiCloseEnhMetaFile(HDC  hDC)
--- a/reactos/subsys/win32k/objects/paint.c
+++ b/reactos/subsys/win32k/objects/paint.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 BOOL
 STDCALL
 NtGdiGdiFlush(VOID)
--- a/reactos/subsys/win32k/objects/palette.c
+++ b/reactos/subsys/win32k/objects/palette.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 #ifndef NO_MAPPING
 static int           PALETTE_firstFree = 0;
 static unsigned char PALETTE_freeList[256];
--- a/reactos/subsys/win32k/objects/path.c
+++ b/reactos/subsys/win32k/objects/path.c
@ -17,9 +17,13 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>
 #include <win32k/float.h>

+#define NDEBUG
+#include <debug.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             */
--- a/reactos/subsys/win32k/objects/pen.c
+++ b/reactos/subsys/win32k/objects/pen.c
@ -19,8 +19,12 @@
 *
 * $Id$
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /* PRIVATE FUNCTIONS **********************************************************/

 HPEN FASTCALL
--- a/reactos/subsys/win32k/objects/polyfill.c
+++ b/reactos/subsys/win32k/objects/polyfill.c
@ -26,8 +26,12 @@
 * REVISION HISTORY:
 *                 21/2/2003: Created
 */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 INT abs(INT nm);

 #define FILL_EDGE_ALLOC_TAG 0x45465044
--- a/reactos/subsys/win32k/objects/print.c
+++ b/reactos/subsys/win32k/objects/print.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 INT
 STDCALL
 NtGdiAbortDoc(HDC  hDC)
--- a/reactos/subsys/win32k/objects/rect.c
+++ b/reactos/subsys/win32k/objects/rect.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 /* FUNCTIONS *****************************************************************/

 VOID FASTCALL
--- a/reactos/subsys/win32k/objects/region.c
+++ b/reactos/subsys/win32k/objects/region.c
@ -117,6 +117,9 @@ SOFTWARE.
 #include <w32k.h>
 #include <win32k/float.h>

+#define NDEBUG
+#include <debug.h>
+
 // Internal Functions

 #if 1
--- a/reactos/subsys/win32k/objects/stockobj.c
+++ b/reactos/subsys/win32k/objects/stockobj.c
@ -22,6 +22,7 @@
 * $Id$
 *
 */
+
 #include <w32k.h>

 #define NDEBUG
--- a/reactos/subsys/win32k/objects/text.c
+++ b/reactos/subsys/win32k/objects/text.c
@ -23,12 +23,16 @@
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include <freetype/tttables.h>

+#define NDEBUG
+#include <debug.h>
+
 FT_Library  library;

 typedef struct _FONT_ENTRY {
--- a/reactos/subsys/win32k/objects/wingl.c
+++ b/reactos/subsys/win32k/objects/wingl.c
@ -17,8 +17,12 @@
 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 /* $Id$ */
+
 #include <w32k.h>

+#define NDEBUG
+#include <debug.h>
+
 INT
 STDCALL
 NtGdiChoosePixelFormat(HDC  hDC,
--- a/reactos/subsys/win32k/stubs/stubs.c
+++ b/reactos/subsys/win32k/stubs/stubs.c
@ -5,10 +5,7 @@
 #include <w32k.h>

 #define STUB(x) void x(void) { DbgPrint("WIN32K: Stub for %s\n", #x); }
-
-#ifndef UNIMPLEMENTED
 #define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ )
-#endif//UNIMPLEMENTED

 /*
 * @unimplemented
--- a/reactos/subsys/win32k/stubs/xpstubs.c
+++ b/reactos/subsys/win32k/stubs/xpstubs.c
@ -6,6 +6,7 @@
 #include <w32k.h>

 #define STUB(x) void x(void) { DbgPrint("WIN32K: Stub for %s\n", #x); }
+#define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ )

 BOOL
 STDCALL
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@ -17,6 +17,8 @@
 /* DDK/NDK/SDK Headers */
 #include <ddk/ntddk.h>
 #include <ddk/ntifs.h>
+#include <ddk/ddrawint.h>
+#include <ddk/d3dnthal.h>
 #include <ddk/winddi.h>
 #include <ddk/ntddmou.h>
 #include <windows.h>    /* FIXME ? */
@ -50,7 +52,3 @@ MmCopyToCaller(PVOID Dest, const VOID *Src, ULONG NumberOfBytes);
 /* Internal Win32K Header */
 #include "include/win32k.h"

-/* FIXME: This is totally wrong, why was it like this?? */
-#define NDEBUG
-#include <debug.h>
-