[DISKPART] The active and inactive commands do not work on GPT disks

Author: EricKohl

base/system/diskpart/active.c

@@ -33,23 +33,30 @@ active_main(
         return TRUE;
     }
 
-    if (CurrentPartition->BootIndicator)
+    if (CurrentDisk->PartitionStyle == PARTITION_STYLE_MBR)
     {
-        ConResPuts(StdOut, IDS_ACTIVE_ALREADY);
-        return TRUE;
-    }
-
-    CurrentPartition->BootIndicator = TRUE;
-    CurrentDisk->Dirty = TRUE;
-    UpdateDiskLayout(CurrentDisk);
-    Status = WritePartitions(CurrentDisk);
-    if (NT_SUCCESS(Status))
-    {
-        ConResPuts(StdOut, IDS_ACTIVE_SUCCESS);
+        if (CurrentPartition->BootIndicator)
+        {
+            ConResPuts(StdOut, IDS_ACTIVE_ALREADY);
+            return TRUE;
+        }
+
+        CurrentPartition->BootIndicator = TRUE;
+        CurrentDisk->Dirty = TRUE;
+        UpdateDiskLayout(CurrentDisk);
+        Status = WritePartitions(CurrentDisk);
+        if (NT_SUCCESS(Status))
+        {
+            ConResPuts(StdOut, IDS_ACTIVE_SUCCESS);
+        }
+        else
+        {
+            ConResPuts(StdOut, IDS_ACTIVE_FAIL);
+        }
     }
     else
     {
-        ConResPuts(StdOut, IDS_ACTIVE_FAIL);
+        ConResPuts(StdOut, IDS_ACTIVE_NO_MBR);
     }
 
     return TRUE;

base/system/diskpart/inactive.c

@@ -33,23 +33,30 @@ inactive_main(
         return TRUE;
     }
 
-    if (!CurrentPartition->BootIndicator)
+    if (CurrentDisk->PartitionStyle == PARTITION_STYLE_MBR)
     {
-        ConResPuts(StdOut, IDS_INACTIVE_ALREADY);
-        return TRUE;
-    }
-
-    CurrentPartition->BootIndicator = FALSE;
-    CurrentDisk->Dirty = TRUE;
-    UpdateDiskLayout(CurrentDisk);
-    Status = WritePartitions(CurrentDisk);
-    if (NT_SUCCESS(Status))
-    {
-        ConResPuts(StdOut, IDS_INACTIVE_SUCCESS);
+        if (!CurrentPartition->BootIndicator)
+        {
+            ConResPuts(StdOut, IDS_INACTIVE_ALREADY);
+            return TRUE;
+        }
+
+        CurrentPartition->BootIndicator = FALSE;
+        CurrentDisk->Dirty = TRUE;
+        UpdateDiskLayout(CurrentDisk);
+        Status = WritePartitions(CurrentDisk);
+        if (NT_SUCCESS(Status))
+        {
+            ConResPuts(StdOut, IDS_INACTIVE_SUCCESS);
+        }
+        else
+        {
+            ConResPuts(StdOut, IDS_INACTIVE_FAIL);
+        }
     }
     else
     {
-        ConResPuts(StdOut, IDS_INACTIVE_FAIL);
+        ConResPuts(StdOut, IDS_INACTIVE_NO_MBR);
     }
 
     return TRUE;

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

@@ -20,6 +20,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDie Partition konnte nicht als aktiv markiert werden.\nVergewissern Sie sich, dass diese Partition gültig ist.\n"
     IDS_ACTIVE_SUCCESS "\nDie aktuelle Partition wurde als aktiv markiert.\n"
     IDS_ACTIVE_ALREADY "\nDie aktuelle Partition wurde bereits als aktiv markiert.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -96,6 +97,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDie Partition konnte nicht als inaktiv markiert werden.\nVergewissern Sie sich, dass diese Partition gültig ist.\n"
     IDS_INACTIVE_SUCCESS "\nDie aktuelle Partition wurde als inaktiv markiert.\n"
     IDS_INACTIVE_ALREADY "\nDie aktuelle Partition wurde bereits als inaktiv markiert.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */

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

@@ -20,6 +20,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n"
     IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n"
     IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -96,6 +97,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n"
     IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n"
     IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */

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

@@ -27,6 +27,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDiskPart non ha potuto segnare la partizione come attiva.\nAssicurarsi che la partizione sia valida.\n"
     IDS_ACTIVE_SUCCESS "\nDiskPart ha segnato la partizione corrente come attiva.\n"
     IDS_ACTIVE_ALREADY "\nLa partizione corrente è già segnata come attiva.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -103,6 +104,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDiskPart non è stato in grado di segnare la partizione inattiva.\nAssicurarsi che la partizione sia valida.\n"
     IDS_INACTIVE_SUCCESS "\nDiskPart ha segnato la partizione corrente come inattiva.\n"
     IDS_INACTIVE_ALREADY "\nLa partizione corrente è già segnata come attiva.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */

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

@@ -20,6 +20,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDiskPart nie mógł oznaczyć partycji jako aktywnej.\nUpewnij się, że partycja jest prawidłowa.\n"
     IDS_ACTIVE_SUCCESS "\nDiskPart oznaczył bieżącą partycję jako aktywną.\n"
     IDS_ACTIVE_ALREADY "\nBieżąca partycja jest już oznaczona jako aktywna.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -96,6 +97,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDiskPart nie może oznaczyć partycji jako nieaktywnej.\nUpewnij się, że partycja jest prawidłowa.\n"
     IDS_INACTIVE_SUCCESS "\nDiskPart oznaczył bieżącą partycję jako nieaktywną.\n"
     IDS_INACTIVE_ALREADY "\nBieżąca partycja jest już oznaczona jako nieaktywna.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */

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

@@ -22,6 +22,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n"
     IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n"
     IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -98,6 +99,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n"
     IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n"
     IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */

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

@@ -28,6 +28,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDiskpart nu a reușit să marcheze partiția activă.\nAsigurați-vă că partiția este validă.\n"
     IDS_ACTIVE_SUCCESS "\nDiskPart a marcat partiția curentă ca activă.\n"
     IDS_ACTIVE_ALREADY "\nPartiția curentă este deja marcată ca activă.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -104,6 +105,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDiskpart nu a reușit să marcheze partiția inactivă.\nAsigurați-vă că partiția este validă.\n"
     IDS_INACTIVE_SUCCESS "\nDiskPart a marcat partiția curentă ca inactivă.\n"
     IDS_INACTIVE_ALREADY "\nPartiția curentă este deja marcată ca inactivă.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */

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

@@ -22,6 +22,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n"
     IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n"
     IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -98,6 +99,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n"
     IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n"
     IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */

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

@@ -24,6 +24,7 @@ BEGIN
     IDS_ACTIVE_FAIL "\nDiskPart was unable to mark the partition active.\nMake sure the partition is valid.\n"
     IDS_ACTIVE_SUCCESS "\nDiskPart marked the current partition as active.\n"
     IDS_ACTIVE_ALREADY "\nThe current partition is already marked as active.\n"
+    IDS_ACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe ACTIVE command can only be used on an MBR disk.\n"
 END
 
 STRINGTABLE
@@ -100,6 +101,7 @@ BEGIN
     IDS_INACTIVE_FAIL "\nDiskPart was unable to mark the partition inactive.\nMake sure the partition is valid.\n"
     IDS_INACTIVE_SUCCESS "\nDiskPart marked the current partition as inactive.\n"
     IDS_INACTIVE_ALREADY "\nThe current partition is already marked as inactive.\n"
+    IDS_INACTIVE_NO_MBR "\nThe selected disk is not an MBR disk.\nThe INACTIVE command can only be used on an MBR disk.\n"
 END
 
 /* Detail header titles */