From f4d255aec65122007d8c6055e89c29ce5e28ef10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 13 Sep 2015 01:18:50 +0000 Subject: [PATCH] [COMMAND] - Fix the GCC macro for structure declaration, so that referencing an offset to the structure doesn't fail anymore (ie. doing "mov dx, offset MyStruct" doesn't assemble to "mov dx, 0x100"). This fixes NTVDM not being able to start any DOS app. Reported by Aleksander Rechitskiy. CORE-9677 CORE-9679 #resolve CORE-9678 [NTVDM] - Fix newline in DPRINT. svn path=/trunk/; revision=69211 --- reactos/subsystems/mvdm/dos/asmxtras.inc | 2 +- reactos/subsystems/mvdm/ntvdm/dos/dem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/reactos/subsystems/mvdm/dos/asmxtras.inc b/reactos/subsystems/mvdm/dos/asmxtras.inc index 731c1086c8c..fe7812ea1a7 100644 --- a/reactos/subsystems/mvdm/dos/asmxtras.inc +++ b/reactos/subsystems/mvdm/dos/asmxtras.inc @@ -72,7 +72,7 @@ #define ENDS(...) ENDM #define VAR_STRUCT(name, struct) \ - struct name + name: struct name #define FIELD(name, field) \ name##_##field diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dem.c b/reactos/subsystems/mvdm/ntvdm/dos/dem.c index afe3067a277..f766a1ca6cb 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dem.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dem.c @@ -601,7 +601,7 @@ static VOID CmdSetExitCode(VOID) { RemoveComSpecInfo(ComSpecInfo); #endif - DPRINT1("Exit DOS from ExitCode (prologue)!"); + DPRINT1("Exit DOS from ExitCode (prologue)!\n"); setCF(0); goto Quit; #ifndef STANDALONE