[reactos] 05/06: [USETUP] Fix the strings given to the printf-like functions (addendum to a3168373).
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7d6cbea42da3560956d2cd...
commit 7d6cbea42da3560956d2cdcf86f8a6731c0b756f Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Sun Dec 30 15:15:31 2018 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Sun Dec 30 15:26:44 2018 +0100
[USETUP] Fix the strings given to the printf-like functions (addendum to a3168373). --- base/setup/usetup/partlist.c | 12 ++++----- base/setup/usetup/usetup.c | 60 ++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c index f0b5c9aafa..7ad044c1c6 100644 --- a/base/setup/usetup/partlist.c +++ b/base/setup/usetup/partlist.c @@ -313,9 +313,9 @@ PrintDiskData( DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -327,9 +327,9 @@ PrintDiskData( DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); }
if (ListUi->Line >= 0 && ListUi->Line <= Height) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 6fd68b7542..3199cba9b7 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1983,9 +1983,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -1997,9 +1997,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); }
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2146,9 +2146,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -2160,9 +2160,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); }
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2308,9 +2308,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -2322,9 +2322,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); }
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); @@ -2551,9 +2551,9 @@ DeletePartitionPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); } else { @@ -2565,9 +2565,9 @@ DeletePartitionPage(PINPUT_RECORD Ir) DiskEntry->Port, DiskEntry->Bus, DiskEntry->Id, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); }
while (TRUE) @@ -2789,9 +2789,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW");
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
@@ -2852,9 +2852,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir) DiskEntry->Bus, DiskEntry->Id, &DiskEntry->DriverName, - DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : - DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : - L"RAW"); + DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" : + DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" : + "RAW"); }
if (FileSystemList == NULL)
-
Hermès Bélusca-Maïto