Skip to content

Commit 5a224e2

Browse files
EricKohlEricKohl
committed
[DISKPART] GUID partition preparations
- Improve parameter handling in the setid and uniqueid commands. - Improve error messages.
1 parent 9201535 commit 5a224e2

File tree

15 files changed

+176
-62
lines changed

15 files changed

+176
-62
lines changed

‎base/system/diskpart/create.c‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ CreateExtendedPartition(
3737

3838
if (CurrentDisk->PartitionStyle == PARTITION_STYLE_GPT)
3939
{
40-
ConPuts(StdOut, L"GPT Partitions are not supported yet!\n");
40+
ConResPuts(StdOut, IDS_CREATE_PARTITION_INVALID_STYLE);
4141
return TRUE;
4242
}
4343
else if (CurrentDisk->PartitionStyle == PARTITION_STYLE_RAW)
@@ -226,9 +226,9 @@ CreateLogicalPartition(
226226
return TRUE;
227227
}
228228

229-
if (CurrentDisk->PartitionStyle != PARTITION_STYLE_MBR)
229+
if (CurrentDisk->PartitionStyle == PARTITION_STYLE_GPT)
230230
{
231-
ConPuts(StdOut, L"Invalid partition style!\n");
231+
ConResPuts(StdOut, IDS_CREATE_PARTITION_INVALID_STYLE);
232232
return TRUE;
233233
}
234234

@@ -262,7 +262,7 @@ CreateLogicalPartition(
262262
}
263263
else if (HasPrefix(argv[i], L"id=", &pszSuffix))
264264
{
265-
/* id=<Byte>|<GUID> */
265+
/* id=<Byte> */
266266
DPRINT("Id : %s\n", pszSuffix);
267267

268268
length = wcslen(pszSuffix);
@@ -276,12 +276,6 @@ CreateLogicalPartition(
276276
return TRUE;
277277
}
278278
}
279-
#if 0
280-
else if ()
281-
{
282-
/* GUID */
283-
}
284-
#endif
285279
else
286280
{
287281
ConResPuts(StdErr, IDS_ERROR_INVALID_ARGS);

‎base/system/diskpart/lang/de-DE.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ STRINGTABLE
4343
BEGIN
4444
IDS_CREATE_PARTITION_FAIL "\nDie angegebene Partition konnte nicht erstellt werden.\n"
4545
IDS_CREATE_PARTITION_SUCCESS "\nDie angegebene Partition wurde erfolgreich erstellt.\n"
46+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
4647
END
4748

4849
STRINGTABLE
@@ -144,6 +145,11 @@ BEGIN
144145
IDS_SETID_INVALID_TYPE "\nDer Partitionstyp ist ungültig.\n"
145146
END
146147

148+
STRINGTABLE
149+
BEGIN
150+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
151+
END
152+
147153
/* Disk Status */
148154
STRINGTABLE
149155
BEGIN

‎base/system/diskpart/lang/en-US.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ STRINGTABLE
4343
BEGIN
4444
IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n"
4545
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n"
46+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
4647
END
4748

4849
STRINGTABLE
@@ -144,6 +145,11 @@ BEGIN
144145
IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n"
145146
END
146147

148+
STRINGTABLE
149+
BEGIN
150+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
151+
END
152+
147153
/* Disk Status */
148154
STRINGTABLE
149155
BEGIN

‎base/system/diskpart/lang/it-IT.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ STRINGTABLE
5050
BEGIN
5151
IDS_CREATE_PARTITION_FAIL "\nDiskPart non è stato in grado di creare la partizione specificata.\n"
5252
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart ha creato con successo la partizione selezionata.\n"
53+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
5354
END
5455

5556
STRINGTABLE
@@ -151,6 +152,11 @@ BEGIN
151152
IDS_SETID_INVALID_TYPE "\nIl tipo di partizione non è valido.\n"
152153
END
153154

155+
STRINGTABLE
156+
BEGIN
157+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
158+
END
159+
154160
/* Disk Status */
155161
STRINGTABLE
156162
BEGIN

‎base/system/diskpart/lang/pl-PL.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ STRINGTABLE
4343
BEGIN
4444
IDS_CREATE_PARTITION_FAIL "\nDiskPart nie może utworzyć określonej partycji.\n"
4545
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart pomyślnie utworzył określoną partycję.\n"
46+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
4647
END
4748

4849
STRINGTABLE
@@ -144,6 +145,11 @@ BEGIN
144145
IDS_SETID_INVALID_TYPE "\nTyp partycji jest nieprawidłowy.\n"
145146
END
146147

148+
STRINGTABLE
149+
BEGIN
150+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
151+
END
152+
147153
/* Disk Status */
148154
STRINGTABLE
149155
BEGIN

‎base/system/diskpart/lang/pt-PT.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ STRINGTABLE
4545
BEGIN
4646
IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n"
4747
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n"
48+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
4849
END
4950

5051
STRINGTABLE
@@ -146,6 +147,11 @@ BEGIN
146147
IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n"
147148
END
148149

150+
STRINGTABLE
151+
BEGIN
152+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
153+
END
154+
149155
/* Disk Status */
150156
STRINGTABLE
151157
BEGIN

‎base/system/diskpart/lang/ro-RO.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ STRINGTABLE
5151
BEGIN
5252
IDS_CREATE_PARTITION_FAIL "\nDiskPart nu a reușit să creeze partiția specificată.\n"
5353
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n"
54+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
5455
END
5556

5657
STRINGTABLE
@@ -152,6 +153,11 @@ BEGIN
152153
IDS_SETID_INVALID_TYPE "\nTipul partiției este nevalid.\n"
153154
END
154155

156+
STRINGTABLE
157+
BEGIN
158+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
159+
END
160+
155161
/* Disk Status */
156162
STRINGTABLE
157163
BEGIN

‎base/system/diskpart/lang/ru-RU.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ STRINGTABLE
4545
BEGIN
4646
IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n"
4747
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n"
48+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
4849
END
4950

5051
STRINGTABLE
@@ -146,6 +147,11 @@ BEGIN
146147
IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n"
147148
END
148149

150+
STRINGTABLE
151+
BEGIN
152+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
153+
END
154+
149155
/* Disk Status */
150156
STRINGTABLE
151157
BEGIN

‎base/system/diskpart/lang/sq-AL.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ STRINGTABLE
4747
BEGIN
4848
IDS_CREATE_PARTITION_FAIL "\nDiskPart was unable to create the specified partition.\n"
4949
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart succeeded in creating the specified partition.\n"
50+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
5051
END
5152

5253
STRINGTABLE
@@ -148,6 +149,11 @@ BEGIN
148149
IDS_SETID_INVALID_TYPE "\nThe partition type is invalid.\n"
149150
END
150151

152+
STRINGTABLE
153+
BEGIN
154+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
155+
END
156+
151157
/* Disk Status */
152158
STRINGTABLE
153159
BEGIN

‎base/system/diskpart/lang/tr-TR.rc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ STRINGTABLE
5353
BEGIN
5454
IDS_CREATE_PARTITION_FAIL "\nDiskPart belirtilen bölümü oluşturamadı.\n"
5555
IDS_CREATE_PARTITION_SUCCESS "\nDiskPart, belirtilen bölümü oluşturdu.\n"
56+
IDS_CREATE_PARTITION_INVALID_STYLE "\nLogical or extended partitions can not be created on a GPT disk.\nCreate a primary partition on a GPT disk instead.\n"
5657
END
5758

5859
STRINGTABLE
@@ -154,6 +155,11 @@ BEGIN
154155
IDS_SETID_INVALID_TYPE "\nBölüm türü geçersiz.\n"
155156
END
156157

158+
STRINGTABLE
159+
BEGIN
160+
IDS_UNIQUID_DISK_INVALID_STYLE "\nThe selected disk is neither a GPT disk nor an MBR disk.\nSelect a GPT disk or an MBR disk.\n"
161+
END
162+
157163
/* Disk Status */
158164
STRINGTABLE
159165
BEGIN

0 commit comments

Comments
 (0)