**** Move stuff around for future WIP drive letters assignment

HBelusca · Oct 24, 2024 · c7dfe28 · c7dfe28
1 parent bf71f9e
commit c7dfe28
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 36 deletions.
diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c
@@ -13,21 +13,11 @@
 #include "volutil.h"
 #include "fsrec.h" // For FileSystemToMBRPartitionType()
 
-#include "registry.h"
-
 #define NDEBUG
 #include <debug.h>
 
 // #define DUMP_PARTITION_TABLE
 
-#include <pshpack1.h>
-typedef struct _REG_DISK_MOUNT_INFO
-{
-    ULONG Signature;
-    ULONGLONG StartingOffset;
-} REG_DISK_MOUNT_INFO, *PREG_DISK_MOUNT_INFO;
-#include <poppack.h>
-
 
 /* FUNCTIONS ****************************************************************/
 
@@ -3130,6 +3120,11 @@ DeletePartition(
     return TRUE;
 }
 
+
+/*****************************************************************************\
+ * SETUP-specific support functions
+ */
+
 static
 BOOLEAN
 IsSupportedActivePartition(
@@ -3519,6 +3514,11 @@ FindSupportedSystemPartition(
     return CandidatePartition;
 }
 
+/*
+ * End of SETUP-specific support functions
+ *****************************************************************************/
+
+
 BOOLEAN
 SetActivePartition(
     IN PPARTLIST List,
@@ -3797,6 +3797,43 @@ WritePartitionsToDisk(
     return TRUE;
 }
 
+VOID
+SetMBRPartitionType(
+    IN PPARTENTRY PartEntry,
+    IN UCHAR PartitionType)
+{
+    PDISKENTRY DiskEntry = PartEntry->DiskEntry;
+
+    ASSERT(DiskEntry->DiskStyle == PARTITION_STYLE_MBR);
+
+    /* Nothing to do if we assign the same type */
+    if (PartitionType == PartEntry->PartitionType)
+        return;
+
+    // TODO: We might need to remount the associated basic volume...
+
+    PartEntry->PartitionType = PartitionType;
+
+    DiskEntry->Dirty = TRUE;
+    DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartitionType;
+    DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RecognizedPartition = IsRecognizedPartition(PartitionType);
+    DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE;
+}
+
+
+/*****************************************************************************\
+ * SETUP-specific support functions
+ */
+
+#include "registry.h" // For GetRootKeyByPredefKey()
+
+#include <pshpack1.h>
+typedef struct _REG_DISK_MOUNT_INFO
+{
+    ULONG Signature;
+    ULONGLONG StartingOffset;
+} REG_DISK_MOUNT_INFO, *PREG_DISK_MOUNT_INFO;
+#include <poppack.h>
 
 /**
  * @brief
@@ -3892,27 +3929,8 @@ SetMountedDeviceValues(
     return TRUE;
 }
 
-VOID
-SetMBRPartitionType(
-    IN PPARTENTRY PartEntry,
-    IN UCHAR PartitionType)
-{
-    PDISKENTRY DiskEntry = PartEntry->DiskEntry;
-
-    ASSERT(DiskEntry->DiskStyle == PARTITION_STYLE_MBR);
-
-    /* Nothing to do if we assign the same type */
-    if (PartitionType == PartEntry->PartitionType)
-        return;
-
-    // TODO: We might need to remount the associated basic volume...
-
-    PartEntry->PartitionType = PartitionType;
-
-    DiskEntry->Dirty = TRUE;
-    DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartitionType;
-    DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RecognizedPartition = IsRecognizedPartition(PartitionType);
-    DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE;
-}
+/*
+ * End of SETUP-specific support functions
+ *****************************************************************************/
 
 /* EOF */
diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h
@@ -379,13 +379,13 @@ BOOLEAN
 WritePartitionsToDisk(
     IN PPARTLIST List);
 
-BOOLEAN
-SetMountedDeviceValues(
-    _In_ PPARTLIST List);
-
 VOID
 SetMBRPartitionType(
     IN PPARTENTRY PartEntry,
     IN UCHAR PartitionType);
 
+BOOLEAN
+SetMountedDeviceValues(
+    _In_ PPARTLIST List);
+
 /* EOF */