[DISKPART] Implement creation and deletion of GPT partitions

- Implement creation and deletion of GPT partitions.
- Adjust the active, clean, detail, inactive, list, select, setid and uniqueid
  commands as needed.
- Add a 2^32 sector count limit for MBR partition tables.

Author: EricKohl

base/system/diskpart/CMakeLists.txt

@@ -24,6 +24,7 @@ list(APPEND SOURCE
     filesystems.c
     format.c
     gpt.c
+    guid.c
     help.c
     import.c
     inactive.c

base/system/diskpart/active.c

@@ -35,16 +35,16 @@ active_main(
 
     if (CurrentDisk->PartitionStyle == PARTITION_STYLE_MBR)
     {
-        if (CurrentPartition->BootIndicator)
+        if (CurrentPartition->Mbr.BootIndicator)
         {
             ConResPuts(StdOut, IDS_ACTIVE_ALREADY);
             return TRUE;
         }
 
-        CurrentPartition->BootIndicator = TRUE;
+        CurrentPartition->Mbr.BootIndicator = TRUE;
         CurrentDisk->Dirty = TRUE;
-        UpdateDiskLayout(CurrentDisk);
-        Status = WritePartitions(CurrentDisk);
+        UpdateMbrDiskLayout(CurrentDisk);
+        Status = WriteMbrPartitions(CurrentDisk);
         if (NT_SUCCESS(Status))
         {
             ConResPuts(StdOut, IDS_ACTIVE_SUCCESS);

base/system/diskpart/clean.c

@@ -63,7 +63,7 @@ clean_main(
         PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
 
         /* Dismount the logical partition */
-        if (PartEntry->PartitionType != 0)
+        if (PartEntry->Mbr.PartitionType != 0)
         {
             DismountVolume(PartEntry);
             VolumeEntry = GetVolumeFromPartition(PartEntry);
@@ -82,8 +82,8 @@ clean_main(
         PartEntry = CONTAINING_RECORD(Entry, PARTENTRY, ListEntry);
 
         /* Dismount the primary partition */
-        if ((PartEntry->PartitionType != 0) &&
-            (IsContainerPartition(PartEntry->PartitionType) == FALSE))
+        if ((PartEntry->Mbr.PartitionType != 0) &&
+            (IsContainerPartition(PartEntry->Mbr.PartitionType) == FALSE))
         {
             DismountVolume(PartEntry);
             VolumeEntry = GetVolumeFromPartition(PartEntry);

base/system/diskpart/convert.c

@@ -23,7 +23,7 @@ CreateDisk(
     IO_STATUS_BLOCK Iosb;
     NTSTATUS Status;
 
-    DPRINT1("CreateDisk(%lu %p)\n", DiskNumber, DiskInfo);
+    DPRINT("CreateDisk(%lu %p)\n", DiskNumber, DiskInfo);
 
     StringCchPrintfW(DstPath, ARRAYSIZE(DstPath),
                      L"\\Device\\Harddisk%lu\\Partition0",
@@ -64,23 +64,17 @@ CreateDisk(
         goto done;
     }
 
-    CurrentDisk->PartitionStyle = DiskInfo->PartitionStyle;
-
     /* Free the layout buffer */
     if (CurrentDisk->LayoutBuffer)
-    {
         RtlFreeHeap(RtlGetProcessHeap(), 0, CurrentDisk->LayoutBuffer);
-        CurrentDisk->LayoutBuffer = NULL;
-        CurrentDisk->ExtendedPartition = NULL;
-    }
-
-    ReadLayoutBuffer(FileHandle, CurrentDisk);
 
-    DPRINT1("PartitionCount: %lu\n", CurrentDisk->LayoutBuffer->PartitionCount);
+    CurrentDisk->LayoutBuffer = NULL;
+    CurrentDisk->ExtendedPartition = NULL;
+    CurrentDisk->Dirty = FALSE;
+    CurrentDisk->NewDisk = TRUE;
+    CurrentDisk->PartitionStyle = DiskInfo->PartitionStyle;
 
-#ifdef DUMP_PARTITION_TABLE
-    DumpPartitionTable(CurrentDisk);
-#endif
+    ReadLayoutBuffer(FileHandle, CurrentDisk);
 
 done:
     if (FileHandle)
@@ -112,7 +106,7 @@ ConvertGPT(
         return TRUE;
     }
 
-    if (CurrentDisk->LayoutBuffer->PartitionCount != 0)
+    if (GetPrimaryPartitionCount(CurrentDisk) != 0)
     {
         ConResPuts(StdOut, IDS_CONVERT_GPT_NOT_EMPTY);
         return TRUE;
@@ -134,13 +128,18 @@ ConvertGPT(
     Status = CreateDisk(CurrentDisk->DiskNumber, &DiskInfo);
     if (!NT_SUCCESS(Status))
     {
-
-    }
-    else
-    {
-        ConResPuts(StdOut, IDS_CONVERT_GPT_SUCCESS);
+        DPRINT1("CreateDisk() failed!\n");
+        return TRUE;
     }
 
+    CurrentDisk->StartSector.QuadPart = AlignDown(CurrentDisk->LayoutBuffer->Gpt.StartingUsableOffset.QuadPart / CurrentDisk->BytesPerSector,
+                                                  CurrentDisk->SectorAlignment) + (ULONGLONG)CurrentDisk->SectorAlignment;
+    CurrentDisk->EndSector.QuadPart = AlignDown(CurrentDisk->StartSector.QuadPart + (CurrentDisk->LayoutBuffer->Gpt.UsableLength.QuadPart / CurrentDisk->BytesPerSector) - 1,
+                                                CurrentDisk->SectorAlignment);
+
+    ScanForUnpartitionedGptDiskSpace(CurrentDisk);
+    ConResPuts(StdOut, IDS_CONVERT_GPT_SUCCESS);
+
     return TRUE;
 }
 
@@ -168,7 +167,7 @@ ConvertMBR(
         return TRUE;
     }
 
-    if (CurrentDisk->LayoutBuffer->PartitionCount != 0)
+    if (GetPrimaryPartitionCount(CurrentDisk) != 0)
     {
         ConResPuts(StdOut, IDS_CONVERT_MBR_NOT_EMPTY);
         return TRUE;
@@ -180,12 +179,15 @@ ConvertMBR(
     Status = CreateDisk(CurrentDisk->DiskNumber, &DiskInfo);
     if (!NT_SUCCESS(Status))
     {
-
-    }
-    else
-    {
-        ConResPuts(StdOut, IDS_CONVERT_MBR_SUCCESS);
+        DPRINT1("CreateDisk() failed!\n");
+        return TRUE;
     }
 
+    CurrentDisk->StartSector.QuadPart = (ULONGLONG)CurrentDisk->SectorAlignment;
+    CurrentDisk->EndSector.QuadPart = min(CurrentDisk->SectorCount.QuadPart, 0x100000000) - 1;
+
+    ScanForUnpartitionedMbrDiskSpace(CurrentDisk);
+    ConResPuts(StdOut, IDS_CONVERT_MBR_SUCCESS);
+
     return TRUE;
 }