[ros-diffs] [akhaldi] 69433: [NTVDM] Fix PCH w.r.t. using the debug routines. The PCH use here in itself could use *a lot* of improvements but that's another story.

Author: akhaldi
Date: Sat Oct  3 19:17:55 2015
New Revision: 69433

URL: http://svn.reactos.org/svn/reactos?rev=69433&view=rev
Log:
[NTVDM] Fix PCH w.r.t. using the debug routines. The PCH use here in itself could use *a
lot* of improvements but that's another story.

Modified:
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
    trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
    trunk/reactos/subsystems/mvdm/ntvdm/clock.c
    trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
    trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
    trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
    trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
    trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
    trunk/reactos/subsystems/mvdm/ntvdm/emulator.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
    trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
    trunk/reactos/subsystems/mvdm/ntvdm/int32.c
    trunk/reactos/subsystems/mvdm/ntvdm/io.c
    trunk/reactos/subsystems/mvdm/ntvdm/memory.c
    trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c
    trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h
    trunk/reactos/subsystems/mvdm/ntvdm/utils.c
    trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "cpu/callback.h"
 #include "cpu/bop.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -9,13 +9,15 @@
 
 /* INCLUDES *******************************************************************/
 
-#define NDEBUG
+#include "ntvdm.h"
 
 /* BIOS Version number and Copyright */
 #include <reactos/buildno.h>
 #include <reactos/version.h>
 
-#include "ntvdm.h"
+#define NDEBUG
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu/cpu.h" // for EMULATOR_FLAG_CF
 #include "cpu/bop.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 // #include "../../memory.h"
 // #include "cpu/bop.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,10 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
 
 #include "kbdbios32.h"
 #include <bios/kbdbios.h>

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -11,9 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu/cpu.h" // for EMULATOR_FLAG_CF
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "cpu/cpu.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -10,9 +10,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "cpu/bop.h"
 #include "int32.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "cpu/bop.h"
 #include "int32.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/rom.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "memory.h"
 #include "cpu/callback.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -11,9 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "memory.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -9,13 +9,15 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
 /* BIOS Version number and Copyright */
 #include <reactos/buildno.h>
 #include <reactos/version.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "cpu/cpu.h"
 #include "cpu/bop.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/clock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cloc…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/clock.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/clock.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "clock.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "bop.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/callback.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -10,16 +10,18 @@
 /******************************************************************************\
 |   WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING! WARNING!
 |
-|   Callbacks support supposes implicitely that the callbacks are used
+|   Callbacks support supposes implicitly that the callbacks are used
 |   in the SAME thread as the CPU thread, otherwise messing in parallel
 |   with the CPU registers is 100% prone to bugs!!
 \******************************************************************************/
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "callback.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/registers.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu.h"
 #include "x86context.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -12,9 +12,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include <isvbop.h>
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "int32.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 
 #include "dos.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -11,9 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 
 #include "country.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu/bop.h"
 #include "device.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu/cpu.h"
 #include "int32.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "../../memory.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -11,9 +11,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "../../memory.h"
 #include "bios/umamgr.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 
 #include "dos.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -46,9 +46,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu/bop.h"
 #include "../../memory.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 
 #include "bios/umamgr.h" // HACK until we correctly call XMS services for
UMBs.

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cpu/cpu.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -8,13 +8,15 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
 /* Driver Version number and Copyright */
 #include <reactos/buildno.h>
 #include <reactos/version.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 
 #include "cpu/cpu.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "memory.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "cmos.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/disk.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -20,9 +20,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "disk.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "dma.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "keyboard.h"
 #include "ps2.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "mouse.h"
 #include "ps2.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pic.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "pic.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/pit.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -10,9 +10,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "pit.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -13,9 +13,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
+#include <debug.h>
 
-#include "ntvdm.h"
 #include "emulator.h"
 #include "ppi.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c	[iso-8859-1] Sat Oct  3 19:17:55
2015
@@ -13,9 +13,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "ps2.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "speaker.h"
 #include "hardware/pit.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c	[iso-8859-1] Sat Oct  3
19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "svga.h"
 #include <bios/vidbios.h>

Modified: trunk/reactos/subsystems/mvdm/ntvdm/int32.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/int3…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/int32.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/int32.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "int32.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/io.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.c…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/io.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/io.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -9,9 +9,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "io.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/memory.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "memory.h"
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 
 #include "bios/bios.h"

Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -44,8 +44,6 @@
 
 /* PSEH for SEH Support */
 #include <pseh/pseh2.h>
-
-#include <debug.h>
 
 /*
  * Activate this line if you want to run NTVDM in standalone mode with:

Modified: trunk/reactos/subsystems/mvdm/ntvdm/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/util…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/utils.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/utils.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,10 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
 
 /* PRIVATE FUNCTIONS **********************************************************/
 

Modified: trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/vdds…
==============================================================================
--- trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c	[iso-8859-1] (original)
+++ trunk/reactos/subsystems/mvdm/ntvdm/vddsup.c	[iso-8859-1] Sat Oct  3 19:17:55 2015
@@ -8,9 +8,11 @@
 
 /* INCLUDES *******************************************************************/
 
+#include "ntvdm.h"
+
 #define NDEBUG
-
-#include "ntvdm.h"
+#include <debug.h>
+
 #include "emulator.h"
 #include "vddsup.h"