From 780c2a0375cfc3e328f059cb7ea2a2e2d52a6626 Mon Sep 17 00:00:00 2001 From: Serge Gautherie <32623169+SergeGautherie@users.noreply.github.com> Date: Thu, 16 Nov 2023 23:22:12 +0100 Subject: [PATCH] [SERVICES][SETUPLIB][UMANDLG][USETUP] Add missing \n to DPRINT() calls (#5983) And promote 1 DPRINT() to DPRINT1. --- base/applications/utilman/umandlg/process.c | 4 ++-- base/setup/lib/install.c | 2 +- base/setup/lib/setuplib.c | 4 ++-- base/setup/lib/utils/partlist.c | 2 +- base/setup/usetup/usetup.c | 10 +++++----- base/system/services/database.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/base/applications/utilman/umandlg/process.c b/base/applications/utilman/umandlg/process.c index 33ceeac0b31..c1ff0c191e6 100644 --- a/base/applications/utilman/umandlg/process.c +++ b/base/applications/utilman/umandlg/process.c @@ -84,7 +84,7 @@ BOOL IsProcessRunning(IN LPCWSTR lpszProcessName) hProcess = OpenProcess(SYNCHRONIZE, FALSE, dwProcessID); if (!hProcess) { - DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)", GetLastError()); + DPRINT("IsProcessRunning(): Failed to open the process! (Error: %lu)\n", GetLastError()); return FALSE; } @@ -211,7 +211,7 @@ BOOL CloseProcess(IN LPCWSTR lpszProcessName) hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, dwProcessID); if (!hProcess) { - DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)", GetLastError()); + DPRINT("CloseProcess(): Failed to open the process for termination! (Error: %lu)\n", GetLastError()); return FALSE; } diff --git a/base/setup/lib/install.c b/base/setup/lib/install.c index a9a489bf8ce..46a36d2fa08 100644 --- a/base/setup/lib/install.c +++ b/base/setup/lib/install.c @@ -655,7 +655,7 @@ PrepareCopyInfFile( if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_COLLISION) { INF_FreeData(DirKeyValue); - DPRINT("Creating directory '%S' failed: Status = 0x%08lx", PathBuffer, Status); + DPRINT1("Creating directory '%S' failed: Status = 0x%08lx\n", PathBuffer, Status); pSetupData->LastErrorNumber = ERROR_CREATE_DIR; if (pSetupData->ErrorRoutine) pSetupData->ErrorRoutine(pSetupData, PathBuffer); diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index 1ee70e6216a..40e8c13b36f 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -833,7 +833,7 @@ InitializeSetup( &pSetupData->SourceRootDir); if (!NT_SUCCESS(Status)) { - DPRINT1("GetSourcePaths() failed (Status 0x%08lx)", Status); + DPRINT1("GetSourcePaths() failed (Status 0x%08lx)\n", Status); return ERROR_NO_SOURCE_DRIVE; } /* @@ -850,7 +850,7 @@ InitializeSetup( Error = LoadSetupInf(pSetupData); if (Error != ERROR_SUCCESS) { - DPRINT1("LoadSetupInf() failed (Error 0x%lx)", Error); + DPRINT1("LoadSetupInf() failed (Error 0x%lx)\n", Error); return Error; } DPRINT1("SourcePath (2): '%wZ'\n", &pSetupData->SourcePath); diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 5f1044335ed..49c15e9ffe2 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -1882,7 +1882,7 @@ CreatePartitionList(VOID) &ReturnSize); if (!NT_SUCCESS(Status)) { - DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx", Status); + DPRINT1("NtQuerySystemInformation() failed, Status 0x%08lx\n", Status); RtlFreeHeap(ProcessHeap, 0, List); return NULL; } diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 47d24464977..9c25a1e6fbd 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -2847,7 +2847,7 @@ FormatPartitionPage(PINPUT_RECORD Ir) DiskEntry->DiskNumber, PartEntry->PartitionNumber); - DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); + DPRINT1("DoFormat() failed: Status 0x%08lx\n", Status); MUIDisplayError(ERROR_FORMATTING_PARTITION, Ir, POPUP_WAIT_ANY_KEY, PathBuffer); /* Reset the filesystem list */ @@ -2950,7 +2950,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir) } else if (!NT_SUCCESS(Status)) { - DPRINT1("ChkdskPartition() failed with status 0x%08lx\n", Status); + DPRINT1("DoChkdsk() failed: Status 0x%08lx\n", Status); RtlStringCbPrintfA(Buffer, sizeof(Buffer), @@ -3060,7 +3060,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { - DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status); + DPRINT1("InitDestinationPaths() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3164,7 +3164,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir) Status = InitDestinationPaths(&USetupData, InstallDir, InstallPartition); if (!NT_SUCCESS(Status)) { - DPRINT1("InitDestinationPaths() failed. Status code: 0x%lx", Status); + DPRINT1("InitDestinationPaths() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_NO_BUILD_PATH, Ir, POPUP_WAIT_ENTER); return QUIT_PAGE; } @@ -3825,7 +3825,7 @@ BootLoaderHardDiskPage(PINPUT_RECORD Ir) DestinationDevicePathBuffer); if (!NT_SUCCESS(Status)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); + DPRINT1("InstallMbrBootCodeToDisk() failed: Status 0x%lx\n", Status); MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); return FALSE; } diff --git a/base/system/services/database.c b/base/system/services/database.c index 8dbf148d43a..3ec18104158 100644 --- a/base/system/services/database.c +++ b/base/system/services/database.c @@ -2273,7 +2273,7 @@ ScmAutoStartServices(VOID) } else { - DPRINT1("WARNING: Could not open the associated Safe Boot key"); + DPRINT1("WARNING: Could not open the associated Safe Boot key\n"); CurrentService->ServiceVisited = FALSE; } }