Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 19:12:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP] Fix the strings given to the printf-like functions (addendum to a3168373).

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-12-30 15:15:31 +01:00
parent f488102c86
commit 7d6cbea42d
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

12
base/setup/usetup/partlist.c
View file

@ -313,9 +313,9 @@ PrintDiskData(
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
&DiskEntry->DriverName, &DiskEntry->DriverName,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
else else
{ {
@ -327,9 +327,9 @@ PrintDiskData(
DiskEntry->Port, DiskEntry->Port,
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
if (ListUi->Line >= 0 && ListUi->Line <= Height) if (ListUi->Line >= 0 && ListUi->Line <= Height)

60
base/setup/usetup/usetup.c
View file

@ -1983,9 +1983,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
&DiskEntry->DriverName, &DiskEntry->DriverName,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
else else
{ {
@ -1997,9 +1997,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
DiskEntry->Port, DiskEntry->Port,
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@ -2146,9 +2146,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
&DiskEntry->DriverName, &DiskEntry->DriverName,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
else else
{ {
@ -2160,9 +2160,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
DiskEntry->Port, DiskEntry->Port,
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@ -2308,9 +2308,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
&DiskEntry->DriverName, &DiskEntry->DriverName,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
else else
{ {
@ -2322,9 +2322,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
DiskEntry->Port, DiskEntry->Port,
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE)); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@ -2551,9 +2551,9 @@ DeletePartitionPage(PINPUT_RECORD Ir)
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
&DiskEntry->DriverName, &DiskEntry->DriverName,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
else else
{ {
@ -2565,9 +2565,9 @@ DeletePartitionPage(PINPUT_RECORD Ir)
DiskEntry->Port, DiskEntry->Port,
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
while (TRUE) while (TRUE)
@ -2789,9 +2789,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
&DiskEntry->DriverName, &DiskEntry->DriverName,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT)); CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
@ -2852,9 +2852,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
DiskEntry->Bus, DiskEntry->Bus,
DiskEntry->Id, DiskEntry->Id,
&DiskEntry->DriverName, &DiskEntry->DriverName,
DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? L"MBR" : DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? L"GPT" : DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
L"RAW"); "RAW");
} }
if (FileSystemList == NULL) if (FileSystemList == NULL)