[DISKPART] Implement the 'convert mbr' and 'convert gpt' commands

- Show Disk UUIDs in the 'detail disk' and 'uniqueid disk' commands.

Author: EricKohl

base/system/diskpart/convert.c

@@ -8,7 +8,184 @@
 
 #include "diskpart.h"
 
-BOOL convert_main(INT argc, LPWSTR *argv)
+#define NDEBUG
+#include <debug.h>
+
+NTSTATUS
+CreateDisk(
+    _In_ ULONG DiskNumber,
+    _In_ PCREATE_DISK DiskInfo)
+{
+    WCHAR DstPath[MAX_PATH];
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    UNICODE_STRING Name;
+    HANDLE FileHandle = NULL;
+    IO_STATUS_BLOCK Iosb;
+    NTSTATUS Status;
+
+    DPRINT1("CreateDisk(%lu %p)\n", DiskNumber, DiskInfo);
+
+    StringCchPrintfW(DstPath, ARRAYSIZE(DstPath),
+                     L"\\Device\\Harddisk%lu\\Partition0",
+                     CurrentDisk->DiskNumber);
+    RtlInitUnicodeString(&Name, DstPath);
+
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &Name,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
+
+    Status = NtOpenFile(&FileHandle,
+                        GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE,
+                        &ObjectAttributes,
+                        &Iosb,
+                        0,
+                        FILE_SYNCHRONOUS_IO_NONALERT);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("NtOpenFile() failed (Status %lx)\n", Status);
+        goto done;
+    }
+
+    Status = NtDeviceIoControlFile(FileHandle,
+                                   NULL,
+                                   NULL,
+                                   NULL,
+                                   &Iosb,
+                                   IOCTL_DISK_CREATE_DISK,
+                                   DiskInfo,
+                                   sizeof(*DiskInfo),
+                                   NULL,
+                                   0);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("NtDeviceIoControlFile() failed (Status %lx)\n", Status);
+        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);
+
+#ifdef DUMP_PARTITION_TABLE
+    DumpPartitionTable(CurrentDisk);
+#endif
+
+done:
+    if (FileHandle)
+        NtClose(FileHandle);
+
+    return Status;
+}
+
+
+BOOL
+ConvertGPT(
+    _In_ INT argc,
+    _In_ PWSTR *argv)
 {
+    CREATE_DISK DiskInfo;
+    NTSTATUS Status;
+
+    DPRINT("ConvertGPT()\n");
+
+    if (CurrentDisk == NULL)
+    {
+        ConResPuts(StdOut, IDS_SELECT_NO_DISK);
+        return TRUE;
+    }
+
+    if (CurrentDisk->PartitionStyle == PARTITION_STYLE_GPT)
+    {
+        ConResPuts(StdOut, IDS_CONVERT_GPT_ALREADY);
+        return TRUE;
+    }
+
+    if (CurrentDisk->LayoutBuffer->PartitionCount != 0)
+    {
+        ConResPuts(StdOut, IDS_CONVERT_GPT_NOT_EMPTY);
+        return TRUE;
+    }
+
+#if 0
+    /* Fail if disk size is less than 128MB */
+    if (CurrentDisk->SectorCount.QuadPart * CurrentDisk->BytesPerSector < 128ULL * 1024ULL * 1024ULL)
+    {
+        ConResPuts(StdOut, IDS_CONVERT_GPT_TOO_SMALL);
+        return TRUE;
+    }
+#endif
+
+    DiskInfo.PartitionStyle = PARTITION_STYLE_GPT;
+    CreateGUID(&DiskInfo.Gpt.DiskId);
+    DiskInfo.Gpt.MaxPartitionCount = 128;
+
+    Status = CreateDisk(CurrentDisk->DiskNumber, &DiskInfo);
+    if (!NT_SUCCESS(Status))
+    {
+
+    }
+    else
+    {
+        ConResPuts(StdOut, IDS_CONVERT_GPT_SUCCESS);
+    }
+
+    return TRUE;
+}
+
+
+BOOL
+ConvertMBR(
+    _In_ INT argc,
+    _In_ PWSTR *argv)
+{
+    CREATE_DISK DiskInfo;
+    NTSTATUS Status;
+
+    DPRINT("ConvertMBR()\n");
+
+    if (CurrentDisk == NULL)
+    {
+        ConResPuts(StdOut, IDS_SELECT_NO_DISK);
+        return TRUE;
+    }
+
+    if ((CurrentDisk->PartitionStyle == PARTITION_STYLE_MBR) ||
+        (CurrentDisk->PartitionStyle == PARTITION_STYLE_RAW))
+    {
+        ConResPuts(StdOut, IDS_CONVERT_MBR_ALREADY);
+        return TRUE;
+    }
+
+    if (CurrentDisk->LayoutBuffer->PartitionCount != 0)
+    {
+        ConResPuts(StdOut, IDS_CONVERT_MBR_NOT_EMPTY);
+        return TRUE;
+    }
+
+    DiskInfo.PartitionStyle = PARTITION_STYLE_MBR;
+    CreateSignature(&DiskInfo.Mbr.Signature);
+
+    Status = CreateDisk(CurrentDisk->DiskNumber, &DiskInfo);
+    if (!NT_SUCCESS(Status))
+    {
+
+    }
+    else
+    {
+        ConResPuts(StdOut, IDS_CONVERT_MBR_SUCCESS);
+    }
+
     return TRUE;
 }

base/system/diskpart/detail.c

@@ -72,6 +72,7 @@ DetailDisk(
     PLIST_ENTRY Entry;
     PVOLENTRY VolumeEntry;
     BOOL bPrintHeader = TRUE;
+    WCHAR szBuffer[40];
 
     DPRINT("DetailDisk()\n");
 
@@ -89,7 +90,13 @@ DetailDisk(
 
     /* TODO: Print more disk details */
     ConPuts(StdOut, L"\n");
-    ConResPrintf(StdOut, IDS_DETAIL_INFO_DISK_ID, CurrentDisk->LayoutBuffer->Mbr.Signature);
+    if (CurrentDisk->LayoutBuffer->PartitionStyle == PARTITION_STYLE_GPT)
+        PrintGUID(szBuffer, &CurrentDisk->LayoutBuffer->Gpt.DiskId);
+    else if (CurrentDisk->LayoutBuffer->PartitionStyle == PARTITION_STYLE_MBR)
+        swprintf(szBuffer, L"%08lx", CurrentDisk->LayoutBuffer->Mbr.Signature);
+    else
+        wcscpy(szBuffer, L"00000000");
+    ConResPrintf(StdOut, IDS_DETAIL_INFO_DISK_ID, szBuffer);
     ConResPrintf(StdOut, IDS_DETAIL_INFO_PATH, CurrentDisk->PathId);
     ConResPrintf(StdOut, IDS_DETAIL_INFO_TARGET, CurrentDisk->TargetId);
     ConResPrintf(StdOut, IDS_DETAIL_INFO_LUN_ID, CurrentDisk->Lun);

base/system/diskpart/diskpart.h

@@ -20,6 +20,7 @@
 #include <winreg.h>
 #include <wincon.h>
 #include <winioctl.h>
+#include <ntsecapi.h>
 
 #include <errno.h>
 #include <strsafe.h>
@@ -52,6 +53,8 @@
 
 #include "resource.h"
 
+//#define DUMP_PARTITION_TABLE
+
 /* DEFINES *******************************************************************/
 
 typedef struct _COMMAND
@@ -246,7 +249,20 @@ BOOL clean_main(INT argc, LPWSTR *argv);
 BOOL compact_main(INT argc, LPWSTR *argv);
 
 /* convert.c */
-BOOL convert_main(INT argc, LPWSTR *argv);
+NTSTATUS
+CreateDisk(
+    _In_ ULONG DiskNumber,
+    _In_ PCREATE_DISK DiskInfo);
+
+BOOL
+ConvertGPT(
+    _In_ INT argc,
+    _In_ PWSTR *argv);
+
+BOOL
+ConvertMBR(
+    _In_ INT argc,
+    _In_ PWSTR *argv);
 
 /* create.c */
 BOOL
@@ -405,13 +421,32 @@ PWSTR
 DuplicateString(
     _In_ PWSTR pszInString);
 
+VOID
+CreateGUID(
+    _Out_ GUID *pGuid);
+
+VOID
+CreateSignature(
+    _Out_ PDWORD pSignature);
+
+VOID
+PrintGUID(
+    _Out_ PWSTR pszBuffer,
+    _In_ GUID *pGuid);
+
 /* offline.c */
 BOOL offline_main(INT argc, LPWSTR *argv);
 
 /* online.c */
 BOOL online_main(INT argc, LPWSTR *argv);
 
 /* partlist.c */
+#ifdef DUMP_PARTITION_TABLE
+VOID
+DumpPartitionTable(
+    _In_ PDISKENTRY DiskEntry);
+#endif
+
 ULONGLONG
 AlignDown(
     _In_ ULONGLONG Value,
@@ -429,6 +464,11 @@ CreateVolumeList(VOID);
 VOID
 DestroyVolumeList(VOID);
 
+VOID
+ReadLayoutBuffer(
+    _In_ HANDLE FileHandle,
+    _In_ PDISKENTRY DiskEntry);
+
 NTSTATUS
 WritePartitions(
     _In_ PDISKENTRY DiskEntry);