1 Feb
2021
1 Feb
'21
12:48 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8f61f5c0047e956a26b89…
commit 8f61f5c0047e956a26b89866c6b8c127a73e4a8d
Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Sat Jan 23 19:49:25 2021 +0100
Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Feb 1 01:48:10 2021 +0100
[USETUP] Add partition and disk description helpers to get standardized description
strings. Replace and simplify USETUP code.
---
base/setup/reactos/drivepage.c | 66 +++---
base/setup/usetup/lang/bg-BG.h | 32 +--
base/setup/usetup/lang/bn-BD.h | 36 +---
base/setup/usetup/lang/cs-CZ.h | 32 +--
base/setup/usetup/lang/da-DK.h | 32 +--
base/setup/usetup/lang/de-DE.h | 32 +--
base/setup/usetup/lang/el-GR.h | 32 +--
base/setup/usetup/lang/en-US.h | 36 +---
base/setup/usetup/lang/es-ES.h | 32 +--
base/setup/usetup/lang/et-EE.h | 32 +--
base/setup/usetup/lang/eu-ES.h | 36 +---
base/setup/usetup/lang/fr-FR.h | 32 +--
base/setup/usetup/lang/he-IL.h | 36 +---
base/setup/usetup/lang/hu-HU.h | 32 +--
base/setup/usetup/lang/id-ID.h | 36 +---
base/setup/usetup/lang/it-IT.h | 32 +--
base/setup/usetup/lang/ja-JP.h | 32 +--
base/setup/usetup/lang/lt-LT.h | 32 +--
base/setup/usetup/lang/ms-MY.h | 32 +--
base/setup/usetup/lang/nl-NL.h | 32 +--
base/setup/usetup/lang/pl-PL.h | 32 +--
base/setup/usetup/lang/pt-BR.h | 32 +--
base/setup/usetup/lang/pt-PT.h | 32 +--
base/setup/usetup/lang/ro-RO.h | 32 +--
base/setup/usetup/lang/ru-RU.h | 32 +--
base/setup/usetup/lang/sk-SK.h | 32 +--
base/setup/usetup/lang/sq-AL.h | 32 +--
base/setup/usetup/lang/sv-SE.h | 32 +--
base/setup/usetup/lang/tr-TR.h | 32 +--
base/setup/usetup/lang/uk-UA.h | 32 +--
base/setup/usetup/mui.h | 12 +-
base/setup/usetup/partlist.c | 422 +++++++++++++++++++++++++-------------
base/setup/usetup/partlist.h | 20 +-
base/setup/usetup/usetup.c | 451 ++++-------------------------------------
34 files changed, 692 insertions(+), 1227 deletions(-)
diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c
index 65ad2b927ba..ef26d2af38a 100644
--- a/base/setup/reactos/drivepage.c
+++ b/base/setup/reactos/drivepage.c
@@ -234,20 +234,20 @@ TreeListAddItem(IN HWND hTreeList,
VOID
-GetPartTypeStringFromPartitionType(
- IN UCHAR partitionType,
- OUT PCHAR strPartType,
- IN ULONG cchPartType)
+GetPartitionTypeString(
+ IN PPARTENTRY PartEntry,
+ OUT PSTR strBuffer,
+ IN ULONG cchBuffer)
{
- /* Determine partition type */
-
- if (IsContainerPartition(partitionType))
+ if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED)
{
- StringCchCopyA(strPartType, cchPartType, "Extended Partition" /*
MUIGetString(STRING_EXTENDED_PARTITION) */);
+ StringCchCopyA(strBuffer, cchBuffer,
+ "Unused" /* MUIGetString(STRING_FORMATUNUSED) */);
}
- else if (partitionType == PARTITION_ENTRY_UNUSED)
+ else if (IsContainerPartition(PartEntry->PartitionType))
{
- StringCchCopyA(strPartType, cchPartType, "Unused" /*
MUIGetString(STRING_FORMATUNUSED) */);
+ StringCchCopyA(strBuffer, cchBuffer,
+ "Extended Partition" /*
MUIGetString(STRING_EXTENDED_PARTITION) */);
}
else
{
@@ -256,15 +256,23 @@ GetPartTypeStringFromPartitionType(
/* Do the table lookup */
for (i = 0; i < ARRAYSIZE(PartitionTypes); i++)
{
- if (partitionType == PartitionTypes[i].Type)
+ if (PartEntry->PartitionType == PartitionTypes[i].Type)
{
- StringCchCopyA(strPartType, cchPartType, PartitionTypes[i].Description);
+ StringCchCopyA(strBuffer, cchBuffer, PartitionTypes[i].Description);
return;
}
}
/* We are here because the partition type is unknown */
- StringCchCopyA(strPartType, cchPartType, "Unknown" /*
MUIGetString(STRING_FORMATUNKNOWN) */);
+ if (cchBuffer > 0) *strBuffer = '\0';
+ }
+
+ if ((cchBuffer > 0) && (*strBuffer == '\0'))
+ {
+ StringCchPrintfA(strBuffer, cchBuffer,
+ // MUIGetString(STRING_PARTTYPE),
+ "Type 0x%02x",
+ PartEntry->PartitionType);
}
}
@@ -315,25 +323,15 @@ PrintPartitionData(
}
else if (PartEntry->IsPartitioned == TRUE)
{
- GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
- PartTypeString,
- ARRAYSIZE(PartTypeString));
- PartType = PartTypeString;
+ GetPartitionTypeString(PartEntry,
+ PartTypeString,
+ ARRAYSIZE(PartTypeString));
+ PartType = PartTypeString;
}
- if (strcmp(PartType, "Unknown" /* MUIGetString(STRING_FORMATUNKNOWN)
*/) == 0)
- {
- StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- // MUIGetString(STRING_HDDINFOUNK5),
- L"Type 0x%02x",
- PartEntry->PartitionType);
- }
- else
- {
- StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- L"%S",
- PartType);
- }
+ StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
+ L"%S",
+ PartType);
}
TreeList_SetItemText(hWndList, htiPart, 1, LineBuffer);
@@ -453,7 +451,7 @@ PrintDiskData(
if (DiskEntry->DriverName.Length > 0)
{
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- // MUIGetString(STRING_HDINFOPARTSELECT_1),
+ // MUIGetString(STRING_HDDINFO_1),
L"Harddisk %lu (%S) (Port=%hu, Bus=%hu, Id=%hu) on
%wZ",
DiskEntry->DiskNumber,
DiskName,
@@ -465,7 +463,7 @@ PrintDiskData(
else
{
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- // MUIGetString(STRING_HDINFOPARTSELECT_2),
+ // MUIGetString(STRING_HDDINFO_2),
L"Harddisk %lu (%S) (Port=%hu, Bus=%hu, Id=%hu)",
DiskEntry->DiskNumber,
DiskName,
@@ -479,7 +477,7 @@ PrintDiskData(
if (DiskEntry->DriverName.Length > 0)
{
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- // MUIGetString(STRING_HDINFOPARTSELECT_1),
+ // MUIGetString(STRING_HDDINFO_1),
L"Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on
%wZ",
DiskEntry->DiskNumber,
DiskEntry->Port,
@@ -490,7 +488,7 @@ PrintDiskData(
else
{
StringCchPrintfW(LineBuffer, ARRAYSIZE(LineBuffer),
- // MUIGetString(STRING_HDINFOPARTSELECT_2),
+ // MUIGetString(STRING_HDDINFO_2),
L"Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)",
DiskEntry->DiskNumber,
DiskEntry->Port,
diff --git a/base/setup/usetup/lang/bg-BG.h b/base/setup/usetup/lang/bg-BG.h
index 3b9f0bab118..06fe37aecf8 100644
--- a/base/setup/usetup/lang/bg-BG.h
+++ b/base/setup/usetup/lang/bg-BG.h
@@ -2252,31 +2252,21 @@ MUI_STRING bgBGStrings[] =
{STRING_KEEPFORMAT,
" \207\240\257\240\247\242\240\255\245 \255\240
\344\240\251\253\256\242\240\342\240 \343\340\245\244\241\240 (\241\245\247
\257\340\256\254\245\255\250) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu,
\230\250\255\240=%hu, \216\223=%hu) \255\240 %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu,
\230\250\255\240=%hu, \216\223=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c \242\250\244 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "\255\240 %I64u %s \342\242\352\340\244 \244\250\341\252 %lu
(\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu) \255\240 %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "\255\240 %I64u %s \342\242\352\340\244 \244\250\341\252 %lu
(\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "\342\242\352\340\244 \244\250\341\252 %lu (%I64u %s), \210\247\242\256\244=%hu,
\230\250\255\240=%hu, \216\223=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c \242\250\244 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "\255\240 \342\242\352\340\244 \244\250\341\252 %lu (%I64u %s),
\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %s\242\250\244 %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu,
\230\250\255\240=%hu, \216\223=%hu) \255\240 %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu,
\230\250\255\240=%hu, \216\223=%hu) [%s]"},
+ "\255\240: %s."},
+ {STRING_PARTTYPE,
+ "\242\250\244 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "\342\242\352\340\244 \244\250\341\252 %lu (%I64u %s),
\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu (%wZ) [%s]"
+ "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu,
\230\250\255\240=%hu, \216\223=%hu) \255\240 %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "\342\242\352\340\244 \244\250\341\252 %lu (%I64u %s),
\210\247\242\256\244=%hu, \230\250\255\240=%hu, \216\223=%hu [%s]"
+ "%I64u %s \342\242\352\340\244 \244\250\341\252 %lu (\210\247\242\256\244=%hu,
\230\250\255\240=%hu, \216\223=%hu) [%s]"},
{STRING_NEWPARTITION,
"\201\245 \341\352\247\244\240\244\245\255 \255\256\242 \244\357\253
\255\240"},
{STRING_UNPSPACE,
- " %s\215\245\340\240\247\257\340\245\244\245\253\245\255\256
\254\357\341\342\256%s %6lu %s"},
+ "\215\245\340\240\247\257\340\245\244\245\253\245\255\256
\254\357\341\342\256"},
{STRING_MAXSIZE,
"\214\201 (\244\256 %lu \214\201)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/bn-BD.h b/base/setup/usetup/lang/bn-BD.h
index a59d8577fec..fd2632e75dd 100644
--- a/base/setup/usetup/lang/bn-BD.h
+++ b/base/setup/usetup/lang/bn-BD.h
@@ -2237,35 +2237,21 @@ MUI_STRING bnBDStrings[] =
{STRING_KEEPFORMAT,
" Keep current file system (no changes) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTZEROED_2,
- // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTEXISTS_2,
- // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "on %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " %sUnpartitioned space%s %6lu %s"},
+ "Unpartitioned space"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/cs-CZ.h b/base/setup/usetup/lang/cs-CZ.h
index 73ae0058045..f4d6193b360 100644
--- a/base/setup/usetup/lang/cs-CZ.h
+++ b/base/setup/usetup/lang/cs-CZ.h
@@ -2245,31 +2245,21 @@ MUI_STRING csCZStrings[] =
{STRING_KEEPFORMAT,
" Ponechat sou\237asn\354 souborov\354 syst\202m (bez zm\330ny) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Typ 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Typ 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "na harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTyp %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "na: %s."},
+ {STRING_PARTTYPE,
+ "Typ 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Instalace vytvo\375ila nov\354 odd\241l na"},
{STRING_UNPSPACE,
- " %sM\241sto bez odd\241l\205%s %6lu %s"},
+ "M\241sto bez odd\241l\205"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/da-DK.h b/base/setup/usetup/lang/da-DK.h
index 9640b2e7815..364b65fdf2a 100644
--- a/base/setup/usetup/lang/da-DK.h
+++ b/base/setup/usetup/lang/da-DK.h
@@ -2240,31 +2240,21 @@ MUI_STRING daDKStrings[] =
{STRING_KEEPFORMAT,
" Behold nuv\221rende filsystem (ingen \221ndringer) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "p\206 %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "p\206 %I64u %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "p\206 harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %stype %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "p\206 %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Installationen har lavet en ny partition p\206"},
{STRING_UNPSPACE,
- " %sUpartitioneret plads%s %6lu %s"},
+ "Upartitioneret plads"},
{STRING_MAXSIZE,
"MB (maks %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/de-DE.h b/base/setup/usetup/lang/de-DE.h
index c5a83d18def..3bcf9f53356 100644
--- a/base/setup/usetup/lang/de-DE.h
+++ b/base/setup/usetup/lang/de-DE.h
@@ -2242,31 +2242,21 @@ MUI_STRING deDEStrings[] =
{STRING_KEEPFORMAT,
" Dateisystem beibehalten (Keine Ver\204nderungen) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Typ 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "auf %I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Typ 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "auf Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTyp %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "auf %s."},
+ {STRING_PARTTYPE,
+ "Typ 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) auf %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Festplatte %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Festplatte %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup erstellte eine neue Partition auf"},
{STRING_UNPSPACE,
- " %sUnpartitionierter Speicher%s %6lu %s"},
+ "Unpartitionierter Speicher"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/el-GR.h b/base/setup/usetup/lang/el-GR.h
index 2a63ff6691f..53d1310a000 100644
--- a/base/setup/usetup/lang/el-GR.h
+++ b/base/setup/usetup/lang/el-GR.h
@@ -2255,31 +2255,21 @@ MUI_STRING elGRStrings[] =
{STRING_KEEPFORMAT,
" \214\230 \247\230\250\230\243\234\345\244\234\240 \253\246
\251\347\251\253\236\243\230 \230\250\256\234\345\340\244 \340\252 \342\256\234\240
(\241\230\243\345\230 \230\242\242\230\232\343) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu,
Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu,
Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s), Port=%hu,
Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "\251\253\246 \251\241\242\236\250\346 \233\345\251\241\246 %lu (%I64u %s),
Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu,
Bus=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu,
Bus=%hu, Id=%hu) [%s]"},
+ "\251\253\246: %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s),
Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu,
Bus=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "\221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (%I64u %s),
Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s \221\241\242\236\250\346\252 \233\345\251\241\246\252 %lu (Port=%hu,
Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"\206 \234\232\241\230\253\341\251\253\230\251\236
\233\236\243\240\246\347\250\232\236\251\234 \342\244\230 \244\342\246 partition
\251\253\246"},
{STRING_UNPSPACE,
- " %sUnpartitioned space%s %6lu %s"},
+ "Unpartitioned space"},
{STRING_MAXSIZE,
"MB (\243\234\232. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/en-US.h b/base/setup/usetup/lang/en-US.h
index 84e5d047b90..5c86e6b9951 100644
--- a/base/setup/usetup/lang/en-US.h
+++ b/base/setup/usetup/lang/en-US.h
@@ -2237,35 +2237,21 @@ MUI_STRING enUSStrings[] =
{STRING_KEEPFORMAT,
" Keep current file system (no changes) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTZEROED_2,
- // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTEXISTS_2,
- // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "on %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " %sUnpartitioned space%s %6lu %s"},
+ "Unpartitioned space"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/es-ES.h b/base/setup/usetup/lang/es-ES.h
index f8577625af2..414acb71579 100644
--- a/base/setup/usetup/lang/es-ES.h
+++ b/base/setup/usetup/lang/es-ES.h
@@ -2243,31 +2243,21 @@ MUI_STRING esESStrings[] =
{STRING_KEEPFORMAT,
" Mantener el sistema de archivos actual (sin cambios) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Tipo 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "en %I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "en %I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Tipo 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "en Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTipo %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "en %s."},
+ {STRING_PARTTYPE,
+ "Tipo 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) en %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Disco duro %lu (%I64u %s), Puerto=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Disco duro %lu (Puerto=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"El instalador ha creado una nueva Partici\242n en"},
{STRING_UNPSPACE,
- " %sEspacio sin particionar%s %6lu %s"},
+ "Espacio sin particionar"},
{STRING_MAXSIZE,
"MB (m\240x. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/et-EE.h b/base/setup/usetup/lang/et-EE.h
index e0ba53ed4ab..835c3411137 100644
--- a/base/setup/usetup/lang/et-EE.h
+++ b/base/setup/usetup/lang/et-EE.h
@@ -2239,31 +2239,21 @@ MUI_STRING etEEStrings[] =
{STRING_KEEPFORMAT,
" \216ra muuda praegust failis\201steemi "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sT\201\201p %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]"},
+ "%s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) - %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "K\344vaketas %lu (%I64u %s), Port=%hu, Siin=%hu, Id=%hu [%s]"
+ "%I64u %s K\344vaketas %lu (Port=%hu, Siin=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Loodi uus partitsioon"},
{STRING_UNPSPACE,
- " %sKasutamata kettaruum%s %6lu %s"},
+ "Kasutamata kettaruum"},
{STRING_MAXSIZE,
"MB (maks. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/eu-ES.h b/base/setup/usetup/lang/eu-ES.h
index 735f2ce5104..7c9c1e29f31 100644
--- a/base/setup/usetup/lang/eu-ES.h
+++ b/base/setup/usetup/lang/eu-ES.h
@@ -2238,35 +2238,21 @@ MUI_STRING euESStrings[] =
{STRING_KEEPFORMAT,
" Mantendu sistemaren fitxategia (aldaketarik ez) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Disko gogorra %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Disko gogorra %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Mota 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "%I64u %s Disko gogorran %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "%I64u %s Disko gogorran %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTZEROED_2,
- // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Mota 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "Disko gogorran %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTEXISTS_2,
- // "Disko gogor-an %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sMota %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "%s."},
+ {STRING_PARTTYPE,
+ "Mota 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) %wZn [%s]"},
+ {STRING_HDDINFO_2,
+ // "Disko gogor %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Disko gogor %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Instalazioa sortu du partizio berria barruan"},
{STRING_UNPSPACE,
- " %sEzpartizionatu espazio%s %6lu %s"},
+ "Ezpartizionatu espazio"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/fr-FR.h b/base/setup/usetup/lang/fr-FR.h
index 263e73a62f6..5e3a8711387 100644
--- a/base/setup/usetup/lang/fr-FR.h
+++ b/base/setup/usetup/lang/fr-FR.h
@@ -2274,31 +2274,21 @@ MUI_STRING frFRStrings[] =
{STRING_KEEPFORMAT,
" Garder le syst\212me de fichiers courant (pas de changements) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "sur %I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "sur Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "sur le %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) sur %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Disque dur %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Disque dur %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup a cr\202\202 une nouvelle partition sur"},
{STRING_UNPSPACE,
- " %sEspace non partitionn\202%s %6lu %s"},
+ "Espace non partitionn\202"},
{STRING_MAXSIZE,
"Mo (max. %lu Mo)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/he-IL.h b/base/setup/usetup/lang/he-IL.h
index 2c305dd1cbe..a12dcc5edb2 100644
--- a/base/setup/usetup/lang/he-IL.h
+++ b/base/setup/usetup/lang/he-IL.h
@@ -2239,35 +2239,21 @@ MUI_STRING heILStrings[] =
{STRING_KEEPFORMAT,
" (\211\205\220\211\231 \200\214\214( \232\211\207\213\205\220
\215\211\226\201\227 \232\213\230\222\216 \232\230\200\231\204 "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTZEROED_2,
- // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTEXISTS_2,
- // "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "on %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"\214\222 \204\231\203\207 \204\226\211\207\216 \204\230\226\211
\204\220\227\232\204\204 \232\211\220\213\232"},
{STRING_UNPSPACE,
- " %sUnpartitioned space%s %6lu %s"},
+ "Unpartitioned space"},
{STRING_MAXSIZE,
"\216\"\201 (\216\227\221. ul% \216\"\201)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/hu-HU.h b/base/setup/usetup/lang/hu-HU.h
index 8ddecbbb818..57e72b146d6 100644
--- a/base/setup/usetup/lang/hu-HU.h
+++ b/base/setup/usetup/lang/hu-HU.h
@@ -2128,31 +2128,21 @@ MUI_STRING huHUStrings[] =
{STRING_KEEPFORMAT,
" Jelenlegi f\240jlrendszer megtart\240sa (nincs v\240ltoztat\240s) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "itt: %I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "itt: %I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "a %lu. merevlemezre (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "itt: %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) itt: %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "%lu. merevlemez (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s %lu. merevlemez (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"A telep\241t\213 egy \243j part\241ci\242t hozott l\202tre itt:"},
{STRING_UNPSPACE,
- " %sNem particion\240lt ter\201let%s %6lu %s"},
+ "Nem particion\240lt ter\201let"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/id-ID.h b/base/setup/usetup/lang/id-ID.h
index fc566c19022..fe23c7148cd 100644
--- a/base/setup/usetup/lang/id-ID.h
+++ b/base/setup/usetup/lang/id-ID.h
@@ -2237,35 +2237,21 @@ MUI_STRING idIDStrings[] =
{STRING_KEEPFORMAT,
" Tetapkan sistem berkas seperti ini (tanpa perubahan) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Jenis 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "pada %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "pada %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTZEROED_2,
- // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Jenis 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "pada Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- // {STRING_HDINFOPARTEXISTS_2,
- // "pada Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sJenis %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "pada %s."},
+ {STRING_PARTTYPE,
+ "Jenis 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) pada %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Penyetelan membuat partisi baru pada"},
{STRING_UNPSPACE,
- " %sUkuran yang belum dipartisi%s %6lu %s"},
+ "Ukuran yang belum dipartisi"},
{STRING_MAXSIZE,
"MB (maks. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/it-IT.h b/base/setup/usetup/lang/it-IT.h
index 7d46e399ba3..c87f3993d41 100644
--- a/base/setup/usetup/lang/it-IT.h
+++ b/base/setup/usetup/lang/it-IT.h
@@ -2243,31 +2243,21 @@ MUI_STRING itITStrings[] =
{STRING_KEEPFORMAT,
" Mantieni il file system attuale (nessuna modifica) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Tipo 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "su %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Tipo 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "su Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTipo %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "su %s."},
+ {STRING_PARTTYPE,
+ "Tipo 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) su %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup ha creato una nuova partizione su"},
{STRING_UNPSPACE,
- " %sSpazio non partizionato%s %6lu %s"},
+ "Spazio non partizionato"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/ja-JP.h b/base/setup/usetup/lang/ja-JP.h
index d7b6d78bcfa..b2836e6d0ea 100644
--- a/base/setup/usetup/lang/ja-JP.h
+++ b/base/setup/usetup/lang/ja-JP.h
@@ -2242,31 +2242,21 @@ MUI_STRING jaJPStrings[] =
{STRING_KEEPFORMAT,
" \271\336\335\273\336\262\311 \314\247\262\331 \274\275\303\321\311 \317\317
(\315\335\272\263 \274\305\262) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c \274\255\331\262 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "\312\260\304\336\303\336\250\275\270 %lu (%I64u %s), \316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c \274\255\331\262 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "on \312\260\304\336\303\336\250\275\270 %lu (%I64u %s), \316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %s\274\255\331\262 %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) [%s]"},
+ "on %s."},
+ {STRING_PARTTYPE,
+ "\274\255\331\262 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "\312\260\304\336\303\336\250\275\270 %lu (%I64u %s), \316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "\312\260\304\336\303\336\250\275\270 %lu (%I64u %s), \316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu [%s]"
+ "%I64u %s \312\260\304\336\303\336\250\275\270 %lu (\316\337\260\304=%hu,
\312\336\275=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"\276\257\304\261\257\314\337\312 \261\300\327\274\262
\312\337\260\303\250\274\256\335\246 \302\267\336\306
\273\270\276\262\274\317\274\300:"},
{STRING_UNPSPACE,
- " %s\320\314\336\335\266\302\311 \275\315\337\260\275%s %6lu
%s"},
+ "\320\314\336\335\266\302\311 \275\315\337\260\275"},
{STRING_MAXSIZE,
"MB (\273\262\300\336\262. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/lt-LT.h b/base/setup/usetup/lang/lt-LT.h
index e9f4a8e9779..0a1ad3bf4ea 100644
--- a/base/setup/usetup/lang/lt-LT.h
+++ b/base/setup/usetup/lang/lt-LT.h
@@ -2248,31 +2248,21 @@ MUI_STRING ltLTStrings[] =
{STRING_KEEPFORMAT,
" Keep current file system (no changes) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "on %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup created a new partition on"},
{STRING_UNPSPACE,
- " %sUnpartitioned space%s %6lu %s"},
+ "Unpartitioned space"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/ms-MY.h b/base/setup/usetup/lang/ms-MY.h
index d5c9581c1bf..e0de99c669b 100644
--- a/base/setup/usetup/lang/ms-MY.h
+++ b/base/setup/usetup/lang/ms-MY.h
@@ -2222,31 +2222,21 @@ MUI_STRING msMYStrings[] =
{STRING_KEEPFORMAT,
" Memastikan sistem fail semasa (tiada perubahan) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "on Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "on %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Persediaan yang dicipta partition yang baru di"},
{STRING_UNPSPACE,
- " %sRuang unpartitioned%s %6lu %s"},
+ "Ruang unpartitioned"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/nl-NL.h b/base/setup/usetup/lang/nl-NL.h
index 547b4229be3..35969d809b4 100644
--- a/base/setup/usetup/lang/nl-NL.h
+++ b/base/setup/usetup/lang/nl-NL.h
@@ -2264,31 +2264,21 @@ MUI_STRING nlNLStrings[] =
{STRING_KEEPFORMAT,
" Behoud huidig bestandssysteem (geen wijzigingen) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "op %I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "op Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "op %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) op %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Schijf %lu (%I64u %s), Poort=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Schijf %lu (Poort=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup heeft een nieuwe partitie aangemaakt op"},
{STRING_UNPSPACE,
- " %sNiet gepartitioneerde ruimte%s %6lu %s"},
+ "Niet gepartitioneerde ruimte"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/pl-PL.h b/base/setup/usetup/lang/pl-PL.h
index 4f5af3cc482..33dccfe2359 100644
--- a/base/setup/usetup/lang/pl-PL.h
+++ b/base/setup/usetup/lang/pl-PL.h
@@ -2245,31 +2245,21 @@ MUI_STRING plPLStrings[] =
{STRING_KEEPFORMAT,
" Zachowaj obecny system plik\242w (bez zmian) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Dysku twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ
[%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Dysk 02 twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c 03Typ 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "na %I64u %s Dysku twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "na %I64u %s Dysku 05 twardym %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c 07Typ 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "na Dysku twardym %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ)
[%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %s09Typ %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Dysk11 twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]"},
+ "na: %s."},
+ {STRING_PARTTYPE,
+ "Typ 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) na %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Dysk twardy %lu (%I64u %s), Port=%hu, Szyna=%hu, Id=%hu [%s]"
+ "%I64u %s Dysk twardy %lu (Port=%hu, Szyna=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Instalator utworzy\210 now\245 partycj\251"},
{STRING_UNPSPACE,
- " %sMiejsce poza partycjami%s %6lu %s"},
+ "Miejsce poza partycjami"},
{STRING_MAXSIZE,
"MB (maks. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/pt-BR.h b/base/setup/usetup/lang/pt-BR.h
index ac4265cc5ec..94a52be50fb 100644
--- a/base/setup/usetup/lang/pt-BR.h
+++ b/base/setup/usetup/lang/pt-BR.h
@@ -2277,31 +2277,21 @@ MUI_STRING ptBRStrings[] =
{STRING_KEEPFORMAT,
" Manter o sistema de arquivos atual (sem altera\207\344es) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Tipo 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Tipo 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTipo %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"},
+ "em %s."},
+ {STRING_PARTTYPE,
+ "Tipo 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu [%s]"
+ "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"O instalador criou uma nova parti\207\306o em"},
{STRING_UNPSPACE,
- " %sEspa\207o n\306o particionado%s %6lu %s"},
+ "Espa\207o n\306o particionado"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/pt-PT.h b/base/setup/usetup/lang/pt-PT.h
index 189b0bf2067..42b38912341 100644
--- a/base/setup/usetup/lang/pt-PT.h
+++ b/base/setup/usetup/lang/pt-PT.h
@@ -2261,31 +2261,21 @@ MUI_STRING ptPTStrings[] =
{STRING_KEEPFORMAT,
" Manter o sistema de arquivos actual (sem altera\207\344es) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Tipo 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "em %I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Tipo 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "em Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTipo %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"},
+ "em %s."},
+ {STRING_PARTTYPE,
+ "Tipo 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) em %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Disco %lu (%I64u %s), Porta=%hu, Barramento=%hu, Id=%hu [%s]"
+ "%I64u %s Disco %lu (Porta=%hu, Barramento=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"O instalador criou uma nova parti\207\306o em"},
{STRING_UNPSPACE,
- " %sEspa\207o n\306o particionado%s %6lu %s"},
+ "Espa\207o n\306o particionado"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/ro-RO.h b/base/setup/usetup/lang/ro-RO.h
index 496d6722502..bb60547c18f 100644
--- a/base/setup/usetup/lang/ro-RO.h
+++ b/base/setup/usetup/lang/ro-RO.h
@@ -2283,31 +2283,21 @@ MUI_STRING roROStrings[] =
{STRING_KEEPFORMAT,
" P\343streaz\343 sistemul de fi\272iere actual (f\343r\343 schimb\343ri)
"},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ
[%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Tip 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "de pe %I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Tip 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "de pe Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ)
[%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTip %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ
[%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]"},
+ "de pe %s."},
+ {STRING_PARTTYPE,
+ "Tip 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) de tip %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Discul %lu (%I64u %s), Port=%hu, Magistrala=%hu, Id=%hu [%s]"
+ "%I64u %s Discul %lu (Port=%hu, Magistrala=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"O nou\343 parti\376ie a fost creat\343 \356n"},
{STRING_UNPSPACE,
- " %sSpa\376iu neparti\376ionat%s %6lu %s"},
+ "Spa\376iu neparti\376ionat"},
{STRING_MAXSIZE,
"Mo (max. %lu Mo)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/ru-RU.h b/base/setup/usetup/lang/ru-RU.h
index 8636f56777f..07a933ebe26 100644
--- a/base/setup/usetup/lang/ru-RU.h
+++ b/base/setup/usetup/lang/ru-RU.h
@@ -2260,31 +2260,21 @@ MUI_STRING ruRUStrings[] =
{STRING_KEEPFORMAT,
" \216\341\342\240\242\250\342\354
\341\343\351\245\341\342\242\343\356\351\343\356 \344\240\251\253\256\242\343\356
\341\250\341\342\245\254\343 (\241\245\247 \250\247\254\245\255\245\255\250\251) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c \207\240\257\250\341\354 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "\255\240 %I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "\255\240 %I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s),
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c \207\240\257\250\341\354 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "\255\240 \246\245\341\342\252\256\254 \244\250\341\252\245 %lu (%I64u %s),
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %s\207\240\257\250\341\354 %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"},
+ "\255\240: %s."},
+ {STRING_PARTTYPE,
+ "\207\240\257\250\341\354 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s),
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "\206\245\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s),
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]"
+ "%I64u %s \206\245\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"\217\340\256\243\340\240\254\254\240 \343\341\342\240\255\256\242\252\250
\341\256\247\244\240\253\240 \255\256\242\353\251 \340\240\247\244\245\253
\255\240:"},
{STRING_UNPSPACE,
- " %s\215\245\340\240\247\254\245\347\245\255\255\256\245
\257\340\256\341\342\340\240\255\341\342\242\256%s %6lu %s"},
+ "\215\245\340\240\247\254\245\347\245\255\255\256\245
\257\340\256\341\342\340\240\255\341\342\242\256"},
{STRING_MAXSIZE,
"\214\201 (\254\240\252\341. %lu \214\201)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/sk-SK.h b/base/setup/usetup/lang/sk-SK.h
index 2d0ddf70c4a..356e67c897d 100644
--- a/base/setup/usetup/lang/sk-SK.h
+++ b/base/setup/usetup/lang/sk-SK.h
@@ -2251,31 +2251,21 @@ MUI_STRING skSKStrings[] =
{STRING_KEEPFORMAT,
" Ponecha\234 s\243\237asn\354 syst\202m s\243borov (bez zmeny) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c typ 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "na %I64u %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c typ 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "na pevnom disku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %styp %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s pevnom disku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "na: %s."},
+ {STRING_PARTTYPE,
+ "Typ 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "pevn\354 disk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s pevn\354 disk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"In\347tal\240tor vytvoril nov\243 oblas\234 na"},
{STRING_UNPSPACE,
- " %sMiesto bez oblast\241%s %6lu %s"},
+ "Miesto bez oblast\241"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/sq-AL.h b/base/setup/usetup/lang/sq-AL.h
index 96d55ff1f36..0af0a33b066 100644
--- a/base/setup/usetup/lang/sq-AL.h
+++ b/base/setup/usetup/lang/sq-AL.h
@@ -2252,31 +2252,21 @@ MUI_STRING sqALStrings[] =
{STRING_KEEPFORMAT,
" Mbaj dokumentat e sistemit siq jan\211 (pa ndryshime) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Tipi 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Tipi 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "on Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTipi %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "on %s."},
+ {STRING_PARTTYPE,
+ "Tipi 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) on %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "Harddisku %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s Harddisku %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Instalimi krijoj nj\211 particion t\211 ri n\211"},
{STRING_UNPSPACE,
- " %sHap\211sire e papjesesezuar%s %6lu %s"},
+ "Hap\211sire e papjesesezuar"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/sv-SE.h b/base/setup/usetup/lang/sv-SE.h
index 92e99838fcf..e88feaa8ee7 100644
--- a/base/setup/usetup/lang/sv-SE.h
+++ b/base/setup/usetup/lang/sv-SE.h
@@ -2248,31 +2248,21 @@ MUI_STRING svSEStrings[] =
{STRING_KEEPFORMAT,
" Beh\206ll nuvarande filsystem (inga f\224r\204ndringar) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Typ 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "on %I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ
[%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "on %I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Typ 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "p\206 H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ)
[%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sTyp %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
+ "p\206 %s."},
+ {STRING_PARTTYPE,
+ "Typ 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) p\206 %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "H\206rddisk %lu (%I64u %s), Port=%hu, Bus=%hu, Id=%hu [%s]"
+ "%I64u %s H\206rddisk %lu (Port=%hu, Bus=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"Setup skapade en ny partition p\206"},
{STRING_UNPSPACE,
- " %sOpartitionerat utrymme%s %6lu %s"},
+ "Opartitionerat utrymme"},
{STRING_MAXSIZE,
"MB (max. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/tr-TR.h b/base/setup/usetup/lang/tr-TR.h
index 83480a62c94..5d58b79a70c 100644
--- a/base/setup/usetup/lang/tr-TR.h
+++ b/base/setup/usetup/lang/tr-TR.h
@@ -2214,31 +2214,21 @@ MUI_STRING trTRStrings[] =
{STRING_KEEPFORMAT,
" \236imdiki dosya sistemini koru. (De\247i\237iklik yok.) "},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ
\201zerinde [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s abit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu)
[%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c T\201r 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "\232zerinde: %I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu,
Kimlik=%hu), %wZ \201zerinde [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "\232zerinde: %I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu)
[%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ)
[%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c T\201r 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "\232zerinde: Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu
(%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sT\201r %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ
\201zerinde [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]"},
+ "\232zerinde: %s."},
+ {STRING_PARTTYPE,
+ "T\201r 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu (%wZ)
[%s]"
+ "%I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu), %wZ
\201zerinde [%s]"},
+ {STRING_HDDINFO_2,
+ // "Sabit Disk %lu (%I64u %s), Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu
[%s]"
+ "%I64u %s Sabit Disk %lu (Giri\237=%hu, Veriyolu=%hu, Kimlik=%hu) [%s]"},
{STRING_NEWPARTITION,
"Kur, \201zerinde bir yeni b\224l\201m olu\237turdu:"},
{STRING_UNPSPACE,
- " %sKullan\215lmayan Bo\237luk%s %6lu %s"},
+ "Kullan\215lmayan Bo\237luk"},
{STRING_MAXSIZE,
"MB (En \207ok %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/lang/uk-UA.h b/base/setup/usetup/lang/uk-UA.h
index 3ee82254bcd..0105c9dfa3b 100644
--- a/base/setup/usetup/lang/uk-UA.h
+++ b/base/setup/usetup/lang/uk-UA.h
@@ -2248,31 +2248,21 @@ MUI_STRING ukUAStrings[] =
{STRING_KEEPFORMAT,
" \207\240\253\250\350\250\342\250 i\341\255\343\356\347\343
\344\240\251\253\256\242\343 \341\250\341\342\245\254\343 (\241\245\247 \247\254i\255)
"},
{STRING_HDINFOPARTCREATE_1,
- "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]."},
- {STRING_HDINFOPARTCREATE_2,
- "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]."},
- {STRING_HDDINFOUNK2,
- " %c%c Type 0x%02X %I64u %s"},
+ "%s."},
{STRING_HDINFOPARTDELETE_1,
- "\255\240 %I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]."},
- {STRING_HDINFOPARTDELETE_2,
- "\255\240 %I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]."},
- {STRING_HDINFOPARTZEROED_1,
- "\206\256\340\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s),
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK4,
- "%c%c Type 0x%02X %I64u %s"},
- {STRING_HDINFOPARTEXISTS_1,
- "\255\240 \206\256\340\341\342\252\256\254\343 \244\250\341\252\343 %lu (%I64u
%s), \217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]."},
- {STRING_HDDINFOUNK5,
- "%c%c %c %sType %-3u%s %6lu %s"},
- {STRING_HDINFOPARTSELECT_1,
- "%6lu %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"},
- {STRING_HDINFOPARTSELECT_2,
- "%6lu %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"},
+ "\255\240: %s."},
+ {STRING_PARTTYPE,
+ "Type 0x%02x"},
+ {STRING_HDDINFO_1,
+ // "\206\256\340\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s),
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu (%wZ) [%s]"
+ "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) \255\240 %wZ [%s]"},
+ {STRING_HDDINFO_2,
+ // "\206\256\340\341\342\252\250\251 \244\250\341\252 %lu (%I64u %s),
\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu [%s]"
+ "%I64u %s \206\256\340\341\342\252\250\251 \244\250\341\252 %lu
(\217\256\340\342=%hu, \230\250\255\240=%hu, Id=%hu) [%s]"},
{STRING_NEWPARTITION,
"\202\341\342\240\255\256\242\253\356\242\240\347 \341\342\242\256\340\250\242
\255\256\242\250\251 \340\256\247\244i\253 \255\240"},
{STRING_UNPSPACE,
- " %s\215\245\340\256\247\254i\347\245\255\240 \256\241\253\240\341\342\354%s
%6lu %s"},
+ "\215\245\340\256\247\254i\347\245\255\240 \256\241\253\240\341\342\354"},
{STRING_MAXSIZE,
"MB (\254\240\252\341. %lu MB)"},
{STRING_EXTENDED_PARTITION,
diff --git a/base/setup/usetup/mui.h b/base/setup/usetup/mui.h
index 13bedf61edd..bb158c72bf5 100644
--- a/base/setup/usetup/mui.h
+++ b/base/setup/usetup/mui.h
@@ -150,16 +150,10 @@ MUISetStyledText(
#define STRING_FORMATDISK2 34
#define STRING_KEEPFORMAT 35
#define STRING_HDINFOPARTCREATE_1 36
-#define STRING_HDINFOPARTCREATE_2 37
-#define STRING_HDDINFOUNK2 38
#define STRING_HDINFOPARTDELETE_1 39
-#define STRING_HDINFOPARTDELETE_2 40
-#define STRING_HDINFOPARTZEROED_1 41
-#define STRING_HDDINFOUNK4 42
-#define STRING_HDINFOPARTEXISTS_1 43
-#define STRING_HDDINFOUNK5 44
-#define STRING_HDINFOPARTSELECT_1 45
-#define STRING_HDINFOPARTSELECT_2 46
+#define STRING_PARTTYPE 42
+#define STRING_HDDINFO_1 45
+#define STRING_HDDINFO_2 46
#define STRING_NEWPARTITION 47
#define STRING_UNPSPACE 48
#define STRING_MAXSIZE 49
diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c
index f62b75b0595..d10f6c3af6a 100644
--- a/base/setup/usetup/partlist.c
+++ b/base/setup/usetup/partlist.c
@@ -29,23 +29,23 @@
#define NDEBUG
#include <debug.h>
-/* HELPERS FOR PARTITION TYPES **********************************************/
+/* HELPERS FOR DISK AND PARTITION DESCRIPTIONS ******************************/
VOID
-GetPartTypeStringFromPartitionType(
- IN UCHAR partitionType,
- OUT PCHAR strPartType,
- IN ULONG cchPartType)
+GetPartitionTypeString(
+ IN PPARTENTRY PartEntry,
+ OUT PSTR strBuffer,
+ IN ULONG cchBuffer)
{
- /* Determine partition type */
-
- if (IsContainerPartition(partitionType))
+ if (PartEntry->PartitionType == PARTITION_ENTRY_UNUSED)
{
- RtlStringCchCopyA(strPartType, cchPartType,
MUIGetString(STRING_EXTENDED_PARTITION));
+ RtlStringCchCopyA(strBuffer, cchBuffer,
+ MUIGetString(STRING_FORMATUNUSED));
}
- else if (partitionType == PARTITION_ENTRY_UNUSED)
+ else if (IsContainerPartition(PartEntry->PartitionType))
{
- RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNUSED));
+ RtlStringCchCopyA(strBuffer, cchBuffer,
+ MUIGetString(STRING_EXTENDED_PARTITION));
}
else
{
@@ -54,15 +54,274 @@ GetPartTypeStringFromPartitionType(
/* Do the table lookup */
for (i = 0; i < ARRAYSIZE(PartitionTypes); i++)
{
- if (partitionType == PartitionTypes[i].Type)
+ if (PartEntry->PartitionType == PartitionTypes[i].Type)
{
- RtlStringCchCopyA(strPartType, cchPartType,
PartitionTypes[i].Description);
+ RtlStringCchCopyA(strBuffer, cchBuffer, PartitionTypes[i].Description);
return;
}
}
/* We are here because the partition type is unknown */
- RtlStringCchCopyA(strPartType, cchPartType, MUIGetString(STRING_FORMATUNKNOWN));
+ if (cchBuffer > 0) *strBuffer = '\0';
+ }
+
+ if ((cchBuffer > 0) && (*strBuffer == '\0'))
+ {
+ RtlStringCchPrintfA(strBuffer, cchBuffer,
+ MUIGetString(STRING_PARTTYPE),
+ PartEntry->PartitionType);
+ }
+}
+
+VOID
+PrettifySize1(
+ IN OUT PULONGLONG Size,
+ OUT PCSTR* Unit)
+{
+ ULONGLONG DiskSize = *Size;
+
+ if (DiskSize >= 10 * GB) /* 10 GB */
+ {
+ DiskSize = RoundingDivide(DiskSize, GB);
+ *Unit = MUIGetString(STRING_GB);
+ }
+ else
+ {
+ DiskSize = RoundingDivide(DiskSize, MB);
+ if (DiskSize == 0)
+ DiskSize = 1;
+ *Unit = MUIGetString(STRING_MB);
+ }
+
+ *Size = DiskSize;
+}
+
+VOID
+PrettifySize2(
+ IN OUT PULONGLONG Size,
+ OUT PCSTR* Unit)
+{
+ ULONGLONG PartSize = *Size;
+
+#if 0
+ if (PartSize >= 10 * GB) /* 10 GB */
+ {
+ PartSize = RoundingDivide(PartSize, GB);
+ *Unit = MUIGetString(STRING_GB);
+ }
+ else
+#endif
+ if (PartSize >= 10 * MB) /* 10 MB */
+ {
+ PartSize = RoundingDivide(PartSize, MB);
+ *Unit = MUIGetString(STRING_MB);
+ }
+ else
+ {
+ PartSize = RoundingDivide(PartSize, KB);
+ *Unit = MUIGetString(STRING_KB);
+ }
+
+ *Size = PartSize;
+}
+
+VOID
+PartitionDescription(
+ IN PPARTENTRY PartEntry,
+ OUT PSTR strBuffer,
+ IN SIZE_T cchBuffer)
+{
+ PSTR pBuffer = strBuffer;
+ size_t cchBufferSize = cchBuffer;
+ ULONGLONG PartSize;
+ PCSTR Unit;
+
+ /* Get the partition size */
+ PartSize = PartEntry->SectorCount.QuadPart *
PartEntry->DiskEntry->BytesPerSector;
+ PrettifySize2(&PartSize, &Unit);
+
+ if (PartEntry->IsPartitioned == FALSE)
+ {
+ /* Unpartitioned space: Just display the description and size */
+ RtlStringCchPrintfExA(pBuffer, cchBufferSize,
+ &pBuffer, &cchBufferSize, 0,
+ " %s%-.30s",
+ PartEntry->LogicalPartition ? " " :
"", // Optional indentation
+ MUIGetString(STRING_UNPSPACE));
+
+ RtlStringCchPrintfA(pBuffer, cchBufferSize,
+ "%*s%6I64u %s",
+ 38 - min(strlen(strBuffer), 38), "", //
Indentation
+ PartSize,
+ Unit);
+ return;
+ }
+
+//
+// NOTE: This could be done with the next case.
+//
+ if ((PartEntry->DiskEntry->DiskStyle == PARTITION_STYLE_MBR) &&
+ IsContainerPartition(PartEntry->PartitionType))
+ {
+ /* Extended partition container: Just display the partition's type and size
*/
+ RtlStringCchPrintfExA(pBuffer, cchBufferSize,
+ &pBuffer, &cchBufferSize, 0,
+ " %-.30s",
+ MUIGetString(STRING_EXTENDED_PARTITION));
+
+ RtlStringCchPrintfA(pBuffer, cchBufferSize,
+ "%*s%6I64u %s",
+ 38 - min(strlen(strBuffer), 38), "", //
Indentation
+ PartSize,
+ Unit);
+ return;
+ }
+
+ /*
+ * Not an extended partition container.
+ */
+
+ /* Drive letter and partition number */
+ RtlStringCchPrintfExA(pBuffer, cchBufferSize,
+ &pBuffer, &cchBufferSize, 0,
+ "%c%c %c %s(%lu) ",
+ (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
+ (PartEntry->DriveLetter == 0) ? '-' : ':',
+ PartEntry->BootIndicator ? '*' : ' ',
+ PartEntry->LogicalPartition ? " " : "",
// Optional indentation
+ PartEntry->PartitionNumber);
+
+ /*
+ * If the volume's file system is recognized, display the volume label
+ * (if any) and the file system name. Otherwise, display the partition
+ * type if it's not a new partition.
+ */
+ if (!PartEntry->New && *PartEntry->FileSystem &&
+ _wcsicmp(PartEntry->FileSystem, L"RAW") != 0)
+ {
+ size_t cchLabelSize = 0;
+ if (*PartEntry->VolumeLabel)
+ {
+ RtlStringCchPrintfExA(pBuffer, cchBufferSize,
+ &pBuffer, &cchLabelSize, 0,
+ "\"%-.11S\" ",
+ PartEntry->VolumeLabel);
+ cchLabelSize = cchBufferSize - cchLabelSize; // Actual length of the label
part.
+ cchBufferSize -= cchLabelSize; // And reset cchBufferSize to what it should
be.
+ }
+
+ // TODO: Group this part together with the similar one
+ // from below once the strings are in the same encoding...
+ RtlStringCchPrintfExA(pBuffer, cchBufferSize,
+ &pBuffer, &cchBufferSize, 0,
+ "[%-.*S]",
+ /* The minimum length can be at most 11 since
+ * cchLabelSize can be at most == 11 + 3 == 14 */
+ 25 - min(cchLabelSize, 25),
+ PartEntry->FileSystem);
+ }
+ else
+ {
+ CHAR PartTypeString[32];
+ PCSTR PartType = PartTypeString;
+
+ if (PartEntry->New)
+ {
+ /* Use this description if the partition is new (and thus, not formatted) */
+ PartType = MUIGetString(STRING_UNFORMATTED);
+ }
+ else
+ {
+ /* If the partition is not new but its file system is not recognized
+ * (or is not formatted), use the partition type description. */
+ GetPartitionTypeString(PartEntry,
+ PartTypeString,
+ ARRAYSIZE(PartTypeString));
+ PartType = PartTypeString;
+ }
+ if (!PartType || !*PartType)
+ {
+ PartType = MUIGetString(STRING_FORMATUNKNOWN);
+ }
+
+ // TODO: Group this part together with the similar one
+ // from above once the strings are in the same encoding...
+ RtlStringCchPrintfExA(pBuffer, cchBufferSize,
+ &pBuffer, &cchBufferSize, 0,
+ "[%-.*s]",
+ 25,
+ PartType);
+ }
+
+ /* Show the remaining free space only if a FS is mounted */
+ // FIXME: We don't support that yet!
+#if 0
+ if (*PartEntry->FileSystem)
+ {
+ RtlStringCchPrintfA(pBuffer, cchBufferSize,
+ "%*s%6I64u %s (%6I64u %s %s)",
+ 38 - min(strlen(strBuffer), 38), "", //
Indentation
+ PartSize,
+ Unit,
+ PartFreeSize,
+ Unit,
+ "free");
+ }
+ else
+#endif
+ {
+ RtlStringCchPrintfA(pBuffer, cchBufferSize,
+ "%*s%6I64u %s",
+ 38 - min(strlen(strBuffer), 38), "", //
Indentation
+ PartSize,
+ Unit);
+ }
+}
+
+VOID
+DiskDescription(
+ IN PDISKENTRY DiskEntry,
+ OUT PSTR strBuffer,
+ IN SIZE_T cchBuffer)
+{
+ ULONGLONG DiskSize;
+ PCSTR Unit;
+
+ /* Get the disk size */
+ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
+ PrettifySize1(&DiskSize, &Unit);
+
+ //
+ // FIXME: We *MUST* use TXTSETUP.SIF strings from section "DiskDriverMap"
!!
+ //
+ if (DiskEntry->DriverName.Length > 0)
+ {
+ RtlStringCchPrintfA(strBuffer, cchBuffer,
+ MUIGetString(STRING_HDDINFO_1),
+ DiskSize,
+ Unit,
+ DiskEntry->DiskNumber,
+ DiskEntry->Port,
+ DiskEntry->Bus,
+ DiskEntry->Id,
+ &DiskEntry->DriverName,
+ DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
+ DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
+
"RAW");
+ }
+ else
+ {
+ RtlStringCchPrintfA(strBuffer, cchBuffer,
+ MUIGetString(STRING_HDDINFO_2),
+ DiskSize,
+ Unit,
+ DiskEntry->DiskNumber,
+ DiskEntry->Port,
+ DiskEntry->Bus,
+ DiskEntry->Id,
+ DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
+ DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
+
"RAW");
}
}
@@ -166,16 +425,14 @@ PrintPartitionData(
IN PDISKENTRY DiskEntry,
IN PPARTENTRY PartEntry)
{
- CHAR LineBuffer[128];
COORD coPos;
ULONG Written;
USHORT Width;
USHORT Height;
- LARGE_INTEGER PartSize;
- PCSTR Unit;
UCHAR Attribute;
- CHAR PartTypeString[32];
- PCSTR PartType = PartTypeString;
+ CHAR LineBuffer[100];
+
+ PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
Width = ListUi->Right - ListUi->Left - 1;
Height = ListUi->Bottom - ListUi->Top - 2;
@@ -183,80 +440,6 @@ PrintPartitionData(
coPos.X = ListUi->Left + 1;
coPos.Y = ListUi->Top + 1 + ListUi->Line;
- /* Get the partition size */
- PartSize.QuadPart = PartEntry->SectorCount.QuadPart *
DiskEntry->BytesPerSector;
-#if 0
- if (PartSize.QuadPart >= 10 * GB) /* 10 GB */
- {
- PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, GB);
- Unit = MUIGetString(STRING_GB);
- }
- else
-#endif
- if (PartSize.QuadPart >= 10 * MB) /* 10 MB */
- {
- PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, MB);
- Unit = MUIGetString(STRING_MB);
- }
- else
- {
- PartSize.QuadPart = RoundingDivide(PartSize.QuadPart, KB);
- Unit = MUIGetString(STRING_KB);
- }
-
- if (PartEntry->IsPartitioned == FALSE)
- {
- sprintf(LineBuffer,
- MUIGetString(STRING_UNPSPACE),
- PartEntry->LogicalPartition ? " " : "",
- PartEntry->LogicalPartition ? "" : " ",
- PartSize.u.LowPart,
- Unit);
- }
- else
- {
- /* Determine partition type */
- PartTypeString[0] = '\0';
- if (PartEntry->New != FALSE)
- {
- PartType = MUIGetString(STRING_UNFORMATTED);
- }
- else if (PartEntry->IsPartitioned != FALSE)
- {
- GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
- PartTypeString,
- ARRAYSIZE(PartTypeString));
- PartType = PartTypeString;
- }
-
- if (strcmp(PartType, MUIGetString(STRING_FORMATUNKNOWN)) == 0)
- {
- sprintf(LineBuffer,
- MUIGetString(STRING_HDDINFOUNK5),
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' : ':',
- PartEntry->BootIndicator ? '*' : ' ',
- PartEntry->LogicalPartition ? " " : "",
- PartEntry->PartitionType,
- PartEntry->LogicalPartition ? "" : " ",
- PartSize.u.LowPart,
- Unit);
- }
- else
- {
- sprintf(LineBuffer,
- "%c%c %c %s%-24s%s %6lu %s",
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' : ':',
- PartEntry->BootIndicator ? '*' : ' ',
- PartEntry->LogicalPartition ? " " : "",
- PartType,
- PartEntry->LogicalPartition ? "" : " ",
- PartSize.u.LowPart,
- Unit);
- }
- }
-
Attribute = (ListUi->CurrentDisk == DiskEntry &&
ListUi->CurrentPartition == PartEntry) ?
FOREGROUND_BLUE | BACKGROUND_WHITE :
@@ -302,13 +485,13 @@ PrintDiskData(
{
PPARTENTRY PrimaryPartEntry, LogicalPartEntry;
PLIST_ENTRY PrimaryEntry, LogicalEntry;
- CHAR LineBuffer[128];
COORD coPos;
ULONG Written;
USHORT Width;
USHORT Height;
- ULARGE_INTEGER DiskSize;
- PCSTR Unit;
+ CHAR LineBuffer[100];
+
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
Width = ListUi->Right - ListUi->Left - 1;
Height = ListUi->Bottom - ListUi->Top - 2;
@@ -316,53 +499,6 @@ PrintDiskData(
coPos.X = ListUi->Left + 1;
coPos.Y = ListUi->Top + 1 + ListUi->Line;
- DiskSize.QuadPart = DiskEntry->SectorCount.QuadPart *
DiskEntry->BytesPerSector;
- if (DiskSize.QuadPart >= 10 * GB) /* 10 GB */
- {
- DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, GB);
- Unit = MUIGetString(STRING_GB);
- }
- else
- {
- DiskSize.QuadPart = RoundingDivide(DiskSize.QuadPart, MB);
- if (DiskSize.QuadPart == 0)
- DiskSize.QuadPart = 1;
- Unit = MUIGetString(STRING_MB);
- }
-
- //
- // FIXME: We *MUST* use TXTSETUP.SIF strings from section "DiskDriverMap"
!!
- //
- if (DiskEntry->DriverName.Length > 0)
- {
- sprintf(LineBuffer,
- MUIGetString(STRING_HDINFOPARTSELECT_1),
- DiskSize.u.LowPart,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
- "RAW");
- }
- else
- {
- sprintf(LineBuffer,
- MUIGetString(STRING_HDINFOPARTSELECT_2),
- DiskSize.u.LowPart,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ? "MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ? "GPT" :
- "RAW");
- }
-
if (ListUi->Line >= 0 && ListUi->Line <= Height)
{
FillConsoleOutputAttribute(StdOutput,
diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h
index ea92e756c1d..02972fd8f55 100644
--- a/base/setup/usetup/partlist.h
+++ b/base/setup/usetup/partlist.h
@@ -71,10 +71,22 @@ typedef struct _PARTLIST_UI
VOID
-GetPartTypeStringFromPartitionType(
- IN UCHAR partitionType,
- OUT PCHAR strPartType,
- IN ULONG cchPartType);
+GetPartitionTypeString(
+ IN PPARTENTRY PartEntry,
+ OUT PSTR strBuffer,
+ IN ULONG cchBuffer);
+
+VOID
+PartitionDescription(
+ IN PPARTENTRY PartEntry,
+ OUT PSTR strBuffer,
+ IN SIZE_T cchBuffer);
+
+VOID
+DiskDescription(
+ IN PDISKENTRY DiskEntry,
+ OUT PSTR strBuffer,
+ IN SIZE_T cchBuffer);
VOID
InitPartitionListUi(
diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index 898b5790f65..ccde8792db7 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -419,66 +419,6 @@ PopupError(PCCH Text,
}
-/** See also usetup:partlist.c!PrintDiskData() **/
-VOID
-PrettifySize1(
- IN OUT PULONGLONG Size,
- OUT PCSTR* Unit)
-{
- ULONGLONG DiskSize = *Size;
-
-#if 0
- if (DiskSize >= 10 * GB) /* 10 GB */
- {
- DiskSize = DiskSize / GB;
- *Unit = MUIGetString(STRING_GB);
- }
- else
-#endif
- {
- DiskSize = DiskSize / MB;
- if (DiskSize == 0)
- DiskSize = 1;
-
- *Unit = MUIGetString(STRING_MB);
- }
-
- *Size = DiskSize;
-}
-
-/** See also usetup:partlist.c!PrintPartitionData() **/
-VOID
-PrettifySize2(
- IN OUT PULONGLONG Size,
- OUT PCSTR* Unit)
-{
- ULONGLONG PartSize = *Size;
-
-#if 0
- if (PartSize >= 10 * GB) /* 10 GB */
- {
- PartSize = PartSize / GB;
- *Unit = MUIGetString(STRING_GB);
- }
- else
-#endif
- if (PartSize >= 10 * MB) /* 10 MB */
- {
- PartSize = PartSize / MB;
- *Unit = MUIGetString(STRING_MB);
- }
- else
- {
- PartSize = PartSize / KB;
- *Unit = MUIGetString(STRING_KB);
- }
-
- // if (PartSize == 0)
- // PartSize = 1;
- *Size = PartSize;
-}
-
-
/*
* Confirm quit setup
* RETURNS
@@ -2137,12 +2077,11 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
PDISKENTRY DiskEntry;
BOOLEAN Quit;
BOOLEAN Cancel;
- WCHAR InputBuffer[50];
ULONG MaxSize;
ULONGLONG PartSize;
- ULONGLONG DiskSize;
ULONGLONG SectorCount;
- PCSTR Unit;
+ WCHAR InputBuffer[50];
+ CHAR LineBuffer[100];
if (PartitionList == NULL || CurrentPartition == NULL)
{
@@ -2157,38 +2096,9 @@ CreatePrimaryPartitionPage(PINPUT_RECORD Ir)
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSENEWPARTITION));
- DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- PrettifySize1(&DiskSize, &Unit);
-
- if (DiskEntry->DriverName.Length > 0)
- {
- CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE_1),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
- else
- {
- CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE_2),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+ LineBuffer);
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2285,12 +2195,11 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
PDISKENTRY DiskEntry;
BOOLEAN Quit;
BOOLEAN Cancel;
- WCHAR InputBuffer[50];
ULONG MaxSize;
ULONGLONG PartSize;
- ULONGLONG DiskSize;
ULONGLONG SectorCount;
- PCSTR Unit;
+ WCHAR InputBuffer[50];
+ CHAR LineBuffer[100];
if (PartitionList == NULL || CurrentPartition == NULL)
{
@@ -2305,38 +2214,9 @@ CreateExtendedPartitionPage(PINPUT_RECORD Ir)
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_EXTENDED_PARTITION));
- DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- PrettifySize1(&DiskSize, &Unit);
-
- if (DiskEntry->DriverName.Length > 0)
- {
- CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE_1),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
- else
- {
- CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE_2),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+ LineBuffer);
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2432,12 +2312,11 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
PDISKENTRY DiskEntry;
BOOLEAN Quit;
BOOLEAN Cancel;
- WCHAR InputBuffer[50];
ULONG MaxSize;
ULONGLONG PartSize;
- ULONGLONG DiskSize;
ULONGLONG SectorCount;
- PCSTR Unit;
+ WCHAR InputBuffer[50];
+ CHAR LineBuffer[100];
if (PartitionList == NULL || CurrentPartition == NULL)
{
@@ -2452,38 +2331,9 @@ CreateLogicalPartitionPage(PINPUT_RECORD Ir)
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHOOSE_NEW_LOGICAL_PARTITION));
- DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- PrettifySize1(&DiskSize, &Unit);
-
- if (DiskEntry->DriverName.Length > 0)
- {
- CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE_1),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
- else
- {
- CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDINFOPARTCREATE_2),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(6, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+ LineBuffer);
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_HDDSIZE));
@@ -2619,10 +2469,7 @@ DeletePartitionPage(PINPUT_RECORD Ir)
{
PPARTENTRY PartEntry;
PDISKENTRY DiskEntry;
- ULONGLONG DiskSize;
- ULONGLONG PartSize;
- PCSTR Unit;
- CHAR PartTypeString[32];
+ CHAR LineBuffer[100];
if (PartitionList == NULL || CurrentPartition == NULL)
{
@@ -2635,67 +2482,12 @@ DeletePartitionPage(PINPUT_RECORD Ir)
MUIDisplayPage(DELETE_PARTITION_PAGE);
- /* Adjust partition type */
- GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
- PartTypeString,
- ARRAYSIZE(PartTypeString));
+ PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(6, 10, " %s", LineBuffer);
- PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- PrettifySize2(&PartSize, &Unit);
-
- if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ??
- {
- CONSOLE_PrintTextXY(6, 10,
- MUIGetString(STRING_HDDINFOUNK2),
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartEntry->PartitionType,
- PartSize,
- Unit);
- }
- else
- {
- CONSOLE_PrintTextXY(6, 10,
- " %c%c %s %I64u %s",
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartTypeString,
- PartSize,
- Unit);
- }
-
- DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- PrettifySize1(&DiskSize, &Unit);
-
- if (DiskEntry->DriverName.Length > 0)
- {
- CONSOLE_PrintTextXY(6, 12,
- MUIGetString(STRING_HDINFOPARTDELETE_1),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
- else
- {
- CONSOLE_PrintTextXY(6, 12,
- MUIGetString(STRING_HDINFOPARTDELETE_2),
- DiskSize,
- Unit,
- DiskEntry->DiskNumber,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
- }
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1),
+ LineBuffer);
while (TRUE)
{
@@ -2759,13 +2551,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
{
PPARTENTRY PartEntry;
PDISKENTRY DiskEntry;
- ULONGLONG DiskSize;
- ULONGLONG PartSize;
- PCSTR DiskUnit;
- PCSTR PartUnit;
- CHAR PartTypeString[32];
FORMATMACHINESTATE PreviousFormatState;
PCWSTR DefaultFs;
+ CHAR LineBuffer[100];
DPRINT("SelectFileSystemPage()\n");
@@ -2805,114 +2593,19 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
PartEntry = PartitionList->SystemPartition;
DiskEntry = PartEntry->DiskEntry;
- /* Adjust partition size */
- PartSize = PartEntry->SectorCount.QuadPart *
DiskEntry->BytesPerSector;
- if (PartSize >= 10 * GB) /* 10 GB */
- {
- PartSize = PartSize / GB;
- PartUnit = MUIGetString(STRING_GB);
- }
- else
- {
- PartSize = PartSize / MB;
- PartUnit = MUIGetString(STRING_MB);
- }
-
- /* Adjust partition type */
- GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
- PartTypeString,
- ARRAYSIZE(PartTypeString));
+ PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_SetTextXY(8, 10, LineBuffer);
- if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ??
- {
- CONSOLE_PrintTextXY(8, 10,
- MUIGetString(STRING_HDDINFOUNK4),
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartEntry->PartitionType,
- PartSize,
- PartUnit);
- }
- else
- {
- CONSOLE_PrintTextXY(8, 10,
- "%c%c %s %I64u %s",
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartTypeString,
- PartSize,
- PartUnit);
- }
-
-
- /* Adjust disk size */
- DiskSize = DiskEntry->SectorCount.QuadPart *
DiskEntry->BytesPerSector;
- if (DiskSize >= 10 * GB) /* 10 GB */
- {
- DiskSize = DiskSize / GB;
- DiskUnit = MUIGetString(STRING_GB);
- }
- else
- {
- DiskSize = DiskSize / MB;
- DiskUnit = MUIGetString(STRING_MB);
- }
-
- CONSOLE_PrintTextXY(8, 14, MUIGetString(STRING_HDINFOPARTZEROED_1),
- DiskEntry->DiskNumber,
- DiskSize,
- DiskUnit,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(8, 14, MUIGetString(STRING_HDINFOPARTCREATE_1),
+ LineBuffer);
PartEntry = SystemPartition;
DiskEntry = PartEntry->DiskEntry;
- /* Adjust partition size */
- PartSize = PartEntry->SectorCount.QuadPart *
DiskEntry->BytesPerSector;
- if (PartSize >= 10 * GB) /* 10 GB */
- {
- PartSize = PartSize / GB;
- PartUnit = MUIGetString(STRING_GB);
- }
- else
- {
- PartSize = PartSize / MB;
- PartUnit = MUIGetString(STRING_MB);
- }
-
- /* Adjust partition type */
- GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
- PartTypeString,
- ARRAYSIZE(PartTypeString));
-
- if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ??
- {
- CONSOLE_PrintTextXY(8, 23,
- MUIGetString(STRING_HDDINFOUNK4),
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartEntry->PartitionType,
- PartSize,
- PartUnit);
- }
- else
- {
- CONSOLE_PrintTextXY(8, 23,
- "%c%c %s %I64u %s",
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartTypeString,
- PartSize,
- PartUnit);
- }
-
+ PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_SetTextXY(8, 23, LineBuffer);
}
while (TRUE)
@@ -3119,19 +2812,6 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
ASSERT(PartEntry->IsPartitioned && PartEntry->PartitionNumber != 0);
- /* Adjust disk size */
- DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- PrettifySize1(&DiskSize, &DiskUnit);
-
- /* Adjust partition size */
- PartSize = PartEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector;
- PrettifySize2(&PartSize, &PartUnit);
-
- /* Adjust partition type */
- GetPartTypeStringFromPartitionType(PartEntry->PartitionType,
- PartTypeString,
- ARRAYSIZE(PartTypeString));
-
MUIDisplayPage(SELECT_FILE_SYSTEM_PAGE);
if (PartEntry->AutoCreate)
@@ -3139,24 +2819,13 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NEWPARTITION));
#if 0
- CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of",
- PartEntry->PartitionNumber,
- PartSize,
- PartUnit,
- PartTypeString);
+ PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_SetTextXY(8, 10, LineBuffer);
#endif
- CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1),
- DiskEntry->DiskNumber,
- DiskSize,
- DiskUnit,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+ LineBuffer);
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
@@ -3183,17 +2852,9 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
break;
}
- CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTZEROED_1),
- DiskEntry->DiskNumber,
- DiskSize,
- DiskUnit,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(8, 10, MUIGetString(STRING_HDINFOPARTCREATE_1),
+ LineBuffer);
CONSOLE_SetTextXY(6, 12, MUIGetString(STRING_PARTFORMAT));
}
@@ -3201,38 +2862,12 @@ SelectFileSystemPage(PINPUT_RECORD Ir)
{
CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_INSTALLONPART));
- if (*PartTypeString == '\0') // STRING_FORMATUNKNOWN ??
- {
- CONSOLE_PrintTextXY(8, 10,
- MUIGetString(STRING_HDDINFOUNK4),
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartEntry->PartitionType,
- PartSize,
- PartUnit);
- }
- else
- {
- CONSOLE_PrintTextXY(8, 10,
- "%c%c %s %I64u %s",
- (PartEntry->DriveLetter == 0) ? '-' :
(CHAR)PartEntry->DriveLetter,
- (PartEntry->DriveLetter == 0) ? '-' :
':',
- PartTypeString,
- PartSize,
- PartUnit);
- }
-
- CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTEXISTS_1),
- DiskEntry->DiskNumber,
- DiskSize,
- DiskUnit,
- DiskEntry->Port,
- DiskEntry->Bus,
- DiskEntry->Id,
- &DiskEntry->DriverName,
- DiskEntry->DiskStyle == PARTITION_STYLE_MBR ?
"MBR" :
- DiskEntry->DiskStyle == PARTITION_STYLE_GPT ?
"GPT" :
-
"RAW");
+ PartitionDescription(PartEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_SetTextXY(8, 10, LineBuffer);
+
+ DiskDescription(DiskEntry, LineBuffer, ARRAYSIZE(LineBuffer));
+ CONSOLE_PrintTextXY(6, 12, MUIGetString(STRING_HDINFOPARTDELETE_1),
+ LineBuffer);
}
ASSERT(FileSystemList == NULL);