From f7d612f3e3148ff6b1dd62cfa5d262ac2cb5c92e Mon Sep 17 00:00:00 2001
From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com>
Date: Sat, 16 Dec 2023 23:57:35 +0100
Subject: [PATCH] [BASESRV][CSRLIB][NTVDM] Add missing \n to DPRINT() calls
 (#5951)

and promote 1 DPRINT().
---
 subsystems/csr/csrlib/connect.c         | 4 ++--
 subsystems/mvdm/ntvdm/bios/bios32/vbe.c | 2 +-
 subsystems/mvdm/ntvdm/bios/rom.c        | 4 ++--
 subsystems/mvdm/ntvdm/vddsup.c          | 3 +--
 subsystems/win/basesrv/vdm.c            | 3 +--
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/subsystems/csr/csrlib/connect.c b/subsystems/csr/csrlib/connect.c
index 5b7c84c3e13..1d6a9165b24 100644
--- a/subsystems/csr/csrlib/connect.c
+++ b/subsystems/csr/csrlib/connect.c
@@ -63,7 +63,7 @@ CsrpConnectToServer(
                      sizeof(CSR_PORT_NAME);
     if (PortNameLength > UNICODE_STRING_MAX_BYTES)
     {
-        DPRINT1("PortNameLength too big: %Iu", PortNameLength);
+        DPRINT1("PortNameLength too big: %Iu\n", PortNameLength);
         return STATUS_NAME_TOO_LONG;
     }
 
@@ -374,7 +374,7 @@ CsrClientCallServer(
     /* Make sure the length is valid */
     if (DataLength > (MAXSHORT - sizeof(CSR_API_MESSAGE)))
     {
-        DPRINT1("DataLength too big: %lu", DataLength);
+        DPRINT1("DataLength too big: %lu\n", DataLength);
         return STATUS_INVALID_PARAMETER;
     }
 
diff --git a/subsystems/mvdm/ntvdm/bios/bios32/vbe.c b/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
index f7399709017..a58c0a1124a 100644
--- a/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
+++ b/subsystems/mvdm/ntvdm/bios/bios32/vbe.c
@@ -646,7 +646,7 @@ VOID WINAPI VbeService(LPWORD Stack)
 
                 default:
                 {
-                    DPRINT("VESA INT 0x10, AL = 0x05, Unknown subfunction: %02X", getBH());
+                    DPRINT1("VESA INT 0x10, AL = 0x05, Unknown subfunction: 0x%02X\n", getBH());
                 }
             }
 
diff --git a/subsystems/mvdm/ntvdm/bios/rom.c b/subsystems/mvdm/ntvdm/bios/rom.c
index 6fbf272d142..83214858543 100644
--- a/subsystems/mvdm/ntvdm/bios/rom.c
+++ b/subsystems/mvdm/ntvdm/bios/rom.c
@@ -49,7 +49,7 @@ OpenRomFile(IN  PCSTR  RomFileName,
     if (ulRomSize > 0x40000)
     {
         /* We failed, bail out */
-        DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)", ulRomSize);
+        DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)\n", ulRomSize);
         FileClose(hRomFile);
         return NULL;
     }
@@ -72,7 +72,7 @@ LoadRomFileByHandle(IN  HANDLE RomFileHandle,
      */
     if (RomSize > 0x40000)
     {
-        DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)", RomSize);
+        DPRINT1("ROM image size 0x%lx too large, expected at most 0x40000 (256kB)\n", RomSize);
         return FALSE;
     }
 
diff --git a/subsystems/mvdm/ntvdm/vddsup.c b/subsystems/mvdm/ntvdm/vddsup.c
index accc241ff2e..6b9526cadf7 100644
--- a/subsystems/mvdm/ntvdm/vddsup.c
+++ b/subsystems/mvdm/ntvdm/vddsup.c
@@ -341,7 +341,7 @@ static BOOL LoadInstallableVDD(VOID)
     VDDValueName = VDDList;
     while (*VDDList)
     {
-        DPRINT1("Loading VDD '%S'...", VDDList);
+        DPRINT1("Loading VDD '%S'... ", VDDList);
         hVDD = LoadLibraryW(VDDList);
         if (hVDD == NULL)
         {
@@ -503,7 +503,6 @@ VOID VDDResumeUserHook(VOID)
 }
 
 
-
 VOID VDDSupInitialize(VOID)
 {
     /* Register the 3rd-party VDD BOP Handler */
diff --git a/subsystems/win/basesrv/vdm.c b/subsystems/win/basesrv/vdm.c
index ca9c33e7e7e..fce165c72da 100644
--- a/subsystems/win/basesrv/vdm.c
+++ b/subsystems/win/basesrv/vdm.c
@@ -89,7 +89,6 @@ VOID BaseSrvDestroyConsoleRecord(PVDM_CONSOLE_RECORD ConsoleRecord)
     /* Remove the console record */
     // RemoveEntryList(&ConsoleRecord->Entry);
     RtlFreeHeap(BaseSrvHeap, 0, ConsoleRecord);
-
 }
 
 NTSTATUS GetConsoleRecordBySessionId(ULONG TaskId, PVDM_CONSOLE_RECORD *Record)
@@ -904,7 +903,7 @@ CSR_API(BaseSrvUpdateVDMEntry)
             case VdmEntryUpdateControlCHandler:
             {
                 // TODO: NOT IMPLEMENTED
-                DPRINT1("BaseSrvUpdateVDMEntry: VdmEntryUpdateControlCHandler not implemented!");
+                DPRINT1("BaseSrvUpdateVDMEntry: VdmEntryUpdateControlCHandler not implemented\n");
                 Status = STATUS_NOT_IMPLEMENTED;
 
                 break;