From 7015fd7b5078312fd3495465e7bc400042dae698 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 3 Oct 2015 19:17:55 +0000 Subject: [PATCH] [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. svn path=/trunk/; revision=69433 --- reactos/subsystems/mvdm/ntvdm/bios/bios.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c | 6 ++++-- reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c | 5 +++-- reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/rom.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/umamgr.c | 4 +++- reactos/subsystems/mvdm/ntvdm/bios/vidbios.c | 4 +++- reactos/subsystems/mvdm/ntvdm/clock.c | 4 +++- reactos/subsystems/mvdm/ntvdm/cpu/bop.c | 4 +++- reactos/subsystems/mvdm/ntvdm/cpu/callback.c | 6 ++++-- reactos/subsystems/mvdm/ntvdm/cpu/cpu.c | 4 +++- reactos/subsystems/mvdm/ntvdm/cpu/registers.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dem.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c | 4 +++- reactos/subsystems/mvdm/ntvdm/dos/mouse32.c | 4 +++- reactos/subsystems/mvdm/ntvdm/emulator.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/cmos.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/disk.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/dma.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/mouse.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/pic.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/pit.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/ppi.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/ps2.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c | 4 +++- reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c | 4 +++- reactos/subsystems/mvdm/ntvdm/int32.c | 4 +++- reactos/subsystems/mvdm/ntvdm/io.c | 4 +++- reactos/subsystems/mvdm/ntvdm/memory.c | 4 +++- reactos/subsystems/mvdm/ntvdm/ntvdm.c | 4 +++- reactos/subsystems/mvdm/ntvdm/ntvdm.h | 2 -- reactos/subsystems/mvdm/ntvdm/utils.c | 5 +++-- reactos/subsystems/mvdm/ntvdm/vddsup.c | 4 +++- 48 files changed, 143 insertions(+), 53 deletions(-) diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios.c b/reactos/subsystems/mvdm/ntvdm/bios/bios.c index fe6c1df8529..9ee04e264d7 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/bios.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/bios.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/callback.h" #include "cpu/bop.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c index 74a6de7bfd6..436ac2122b3 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/bios32.c @@ -9,13 +9,15 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG +#include "ntvdm.h" /* BIOS Version number and Copyright */ #include #include -#include "ntvdm.h" +#define NDEBUG +#include + #include "emulator.h" #include "cpu/cpu.h" // for EMULATOR_FLAG_CF #include "cpu/bop.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c index f2a1533af0f..9bc83c08801 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/dskbios32.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" // #include "../../memory.h" // #include "cpu/bop.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c index 3567e2f15d8..af4c57c288b 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c @@ -8,10 +8,11 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG - #include "ntvdm.h" +#define NDEBUG +#include + #include "kbdbios32.h" #include #include "bios32p.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c index 25ff3f610b9..559101e4667 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" // for EMULATOR_FLAG_CF diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c index 21c632bc986..a7d656ce351 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vbe.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c index 2f316bb883c..f9405d484f1 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/bios32/vidbios32.c @@ -10,9 +10,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" #include "int32.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c index 0ff8eadab64..504984a15de 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/kbdbios.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" #include "int32.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/rom.c b/reactos/subsystems/mvdm/ntvdm/bios/rom.c index 3fdc0779c9d..6fbf272d142 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/rom.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/rom.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "memory.h" #include "cpu/callback.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c index 08e67f11c94..06d0a17e1ed 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/umamgr.c @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "memory.h" diff --git a/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c index 5d67fdcb623..e4cdc370c8b 100644 --- a/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c +++ b/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c @@ -9,13 +9,15 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include /* BIOS Version number and Copyright */ #include #include -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" #include "cpu/bop.h" diff --git a/reactos/subsystems/mvdm/ntvdm/clock.c b/reactos/subsystems/mvdm/ntvdm/clock.c index bf242423f00..84d63915e90 100644 --- a/reactos/subsystems/mvdm/ntvdm/clock.c +++ b/reactos/subsystems/mvdm/ntvdm/clock.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "clock.h" diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/bop.c b/reactos/subsystems/mvdm/ntvdm/cpu/bop.c index a632c83125f..dc64f9b519c 100644 --- a/reactos/subsystems/mvdm/ntvdm/cpu/bop.c +++ b/reactos/subsystems/mvdm/ntvdm/cpu/bop.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "bop.h" diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/callback.c b/reactos/subsystems/mvdm/ntvdm/cpu/callback.c index e8f7654fdbe..00c89799897 100644 --- a/reactos/subsystems/mvdm/ntvdm/cpu/callback.c +++ b/reactos/subsystems/mvdm/ntvdm/cpu/callback.c @@ -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 -#include "ntvdm.h" #include "emulator.h" #include "callback.h" diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c index 4eec403fc09..212f522d0a4 100644 --- a/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c +++ b/reactos/subsystems/mvdm/ntvdm/cpu/cpu.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu.h" diff --git a/reactos/subsystems/mvdm/ntvdm/cpu/registers.c b/reactos/subsystems/mvdm/ntvdm/cpu/registers.c index d19888c0e21..88c7183edc3 100644 --- a/reactos/subsystems/mvdm/ntvdm/cpu/registers.c +++ b/reactos/subsystems/mvdm/ntvdm/cpu/registers.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu.h" #include "x86context.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dem.c b/reactos/subsystems/mvdm/ntvdm/dos/dem.c index 1af10697aef..0ed51c292ba 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dem.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dem.c @@ -12,9 +12,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c index c1e51894ab1..bf28310e784 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/bios.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "int32.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c index 5c0b286f9e1..ae8d419ab84 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/condrv.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "dos.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c index 23075c13750..334c04c20f4 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/country.c @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "country.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c index 4a4bc76b085..71fbdcef1aa 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/device.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" #include "device.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c index ace165e6e69..d5b01ce7fbf 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" #include "int32.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c index 2d5b940ea54..1dda966210a 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "../../memory.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c index be8a0b3918a..bc22ce8eb0f 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c @@ -11,9 +11,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "../../memory.h" #include "bios/umamgr.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c index 842188d791b..45ca0bc7769 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/handle.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "dos.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c index 204c409ea13..19216eda0cd 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c @@ -46,9 +46,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" #include "../../memory.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c index 4018f60d4de..b7cf0a5b95f 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "bios/umamgr.h" // HACK until we correctly call XMS services for UMBs. diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c index a2af1f55bb2..f15b24f1f0f 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" diff --git a/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c index 85daf337737..f704ed2d0c1 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c @@ -8,13 +8,15 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include /* Driver Version number and Copyright */ #include #include -#include "ntvdm.h" #include "emulator.h" #include "cpu/cpu.h" diff --git a/reactos/subsystems/mvdm/ntvdm/emulator.c b/reactos/subsystems/mvdm/ntvdm/emulator.c index 2f8d98e0bb6..dd92213a698 100644 --- a/reactos/subsystems/mvdm/ntvdm/emulator.c +++ b/reactos/subsystems/mvdm/ntvdm/emulator.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "memory.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c index 15d62504c62..8482553c08e 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/cmos.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "cmos.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/disk.c b/reactos/subsystems/mvdm/ntvdm/hardware/disk.c index 581efae88fb..0b230480248 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/disk.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/disk.c @@ -20,9 +20,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "disk.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/dma.c b/reactos/subsystems/mvdm/ntvdm/hardware/dma.c index 726e9073ca3..c2816adcc6e 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/dma.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/dma.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "dma.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c index e28c3368b2b..6d18b9da897 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/keyboard.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "keyboard.h" #include "ps2.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c index 52483c42ea1..624cdbba203 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/mouse.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "mouse.h" #include "ps2.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/pic.c b/reactos/subsystems/mvdm/ntvdm/hardware/pic.c index 1191c8cb11b..63ac9d60fe9 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/pic.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/pic.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "pic.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/pit.c b/reactos/subsystems/mvdm/ntvdm/hardware/pit.c index 551e5b4d8eb..540ecec14a5 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/pit.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/pit.c @@ -10,9 +10,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "pit.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c index dac5cce91b7..fbab101931a 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/ppi.c @@ -13,9 +13,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "ppi.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c index 921fe89abbb..4222cc5ed8a 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c @@ -13,9 +13,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "ps2.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c index b5a33a18c27..f99918b0a0d 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/sound/speaker.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "speaker.h" #include "hardware/pit.h" diff --git a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c index 5b01c2d58da..f5b06ca7988 100644 --- a/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c +++ b/reactos/subsystems/mvdm/ntvdm/hardware/video/svga.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "svga.h" #include diff --git a/reactos/subsystems/mvdm/ntvdm/int32.c b/reactos/subsystems/mvdm/ntvdm/int32.c index b6695aa1da1..0081765a669 100644 --- a/reactos/subsystems/mvdm/ntvdm/int32.c +++ b/reactos/subsystems/mvdm/ntvdm/int32.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "int32.h" diff --git a/reactos/subsystems/mvdm/ntvdm/io.c b/reactos/subsystems/mvdm/ntvdm/io.c index 47f572f8842..4eb20c28c8b 100644 --- a/reactos/subsystems/mvdm/ntvdm/io.c +++ b/reactos/subsystems/mvdm/ntvdm/io.c @@ -9,9 +9,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "io.h" diff --git a/reactos/subsystems/mvdm/ntvdm/memory.c b/reactos/subsystems/mvdm/ntvdm/memory.c index a622513e132..3b53374afc2 100644 --- a/reactos/subsystems/mvdm/ntvdm/memory.c +++ b/reactos/subsystems/mvdm/ntvdm/memory.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "memory.h" diff --git a/reactos/subsystems/mvdm/ntvdm/ntvdm.c b/reactos/subsystems/mvdm/ntvdm/ntvdm.c index 967de94e4db..7d9a825e293 100644 --- a/reactos/subsystems/mvdm/ntvdm/ntvdm.c +++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "bios/bios.h" diff --git a/reactos/subsystems/mvdm/ntvdm/ntvdm.h b/reactos/subsystems/mvdm/ntvdm/ntvdm.h index 11006eb9f0f..77b58fdd108 100644 --- a/reactos/subsystems/mvdm/ntvdm/ntvdm.h +++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.h @@ -45,8 +45,6 @@ DWORD WINAPI SetLastConsoleEventActive(VOID); /* PSEH for SEH Support */ #include -#include - /* * Activate this line if you want to run NTVDM in standalone mode with: * ntvdm.exe diff --git a/reactos/subsystems/mvdm/ntvdm/utils.c b/reactos/subsystems/mvdm/ntvdm/utils.c index 7b8d70825fa..d46a2841a31 100644 --- a/reactos/subsystems/mvdm/ntvdm/utils.c +++ b/reactos/subsystems/mvdm/ntvdm/utils.c @@ -8,10 +8,11 @@ /* INCLUDES *******************************************************************/ -#define NDEBUG - #include "ntvdm.h" +#define NDEBUG +#include + /* PRIVATE FUNCTIONS **********************************************************/ /* PUBLIC FUNCTIONS ***********************************************************/ diff --git a/reactos/subsystems/mvdm/ntvdm/vddsup.c b/reactos/subsystems/mvdm/ntvdm/vddsup.c index a185eba10e3..f6a6fa9afa5 100644 --- a/reactos/subsystems/mvdm/ntvdm/vddsup.c +++ b/reactos/subsystems/mvdm/ntvdm/vddsup.c @@ -8,9 +8,11 @@ /* INCLUDES *******************************************************************/ +#include "ntvdm.h" + #define NDEBUG +#include -#include "ntvdm.h" #include "emulator.h" #include "vddsup.h" -- 2.17.1