[fireball] 40430: - Make it possible to assign drive letters to all partitions, not only to the first partition of a primary partition table. - Make AssignDriveLetters in partlist.c to actually assign drive letters to all partitions found (the list corresponds to how Windows 2003 install CD assign driver letters, but more investigation would not hurt). - Make CheckActiveBootPartition actually search for partition with a boot flag, instead of hardcoding it to partition 0 of disk 0. - Fix SetMount

Author: fireball
Date: Thu Apr  9 22:59:28 2009
New Revision: 40430

URL: http://svn.reactos.org/svn/reactos?rev=40430&view=rev
Log:
- Make it possible to assign drive letters to all partitions, not only to the first
partition of a primary partition table.
- Make AssignDriveLetters in partlist.c to actually assign drive letters to all partitions
found (the list corresponds to how Windows 2003 install CD assign driver letters, but more
investigation would not hurt).
- Make CheckActiveBootPartition actually search for partition with a boot flag, instead of
hardcoding it to partition 0 of disk 0.
- Fix SetMountedDeviceValues to take multiple partitions in a partition table into
account.
- Fix Select Partition, Format Partition, Check File System, Delete Partition interface
page to take partition number into account.
- IMPORTANT: Create/Delete partitions must not be used to repartition the harddrive! They
can only be used to create/delete an initial primary partition on a clean harddisk.

Modified:
    trunk/reactos/base/setup/usetup/interface/usetup.c
    trunk/reactos/base/setup/usetup/partlist.c
    trunk/reactos/base/setup/usetup/partlist.h

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac…
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu Apr  9 22:59:28
2009
@@ -1812,6 +1812,7 @@
     ULONGLONG PartSize;
     PCHAR Unit;
     PCHAR PartType;
+    UCHAR PartNumber;
 
     if (PartitionList == NULL ||
         PartitionList->CurrentDisk == NULL ||
@@ -1823,6 +1824,7 @@
 
     DiskEntry = PartitionList->CurrentDisk;
     PartEntry = PartitionList->CurrentPartition;
+    PartNumber = PartitionList->CurrentPartitionNumber;
 
     MUIDisplayPage(DELETE_PARTITION_PAGE);
 
@@ -1834,44 +1836,44 @@
     }
     else if (PartEntry->Unpartitioned == FALSE)
     {
-        if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_12) ||
-            (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_16) ||
-            (PartEntry->PartInfo[0].PartitionType == PARTITION_HUGE) ||
-            (PartEntry->PartInfo[0].PartitionType == PARTITION_XINT13))
+        if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_12) ||
+            (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_16) ||
+            (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_HUGE) ||
+            (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_XINT13))
         {
             PartType = "FAT";
         }
-        else if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32) ||
-                 (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13))
+        else if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT32)
||
+                 (PartEntry->PartInfo[PartNumber].PartitionType ==
PARTITION_FAT32_XINT13))
         {
             PartType = "FAT32";
         }
-        else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2)
+        else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_EXT2)
         {
             PartType = "EXT2";
         }
-        else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS)
+        else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_IFS)
         {
             PartType = "NTFS"; /* FIXME: Not quite correct! */
         }
     }
 
 #if 0
-    if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB
*/
-    {
-        PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29))
>> 30;
+    if (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart >= 0x280000000LL)
/* 10 GB */
+    {
+        PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1
<< 29)) >> 30;
         Unit = MUIGetString(STRING_GB);
     }
     else
 #endif
-    if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0xA00000LL) /* 10 MB */
-    {
-        PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19))
>> 20;
+    if (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart >= 0xA00000LL) /*
10 MB */
+    {
+        PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1
<< 19)) >> 20;
         Unit = MUIGetString(STRING_MB);
     }
     else
     {
-        PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 9))
>> 10;
+        PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1
<< 9)) >> 10;
         Unit = MUIGetString(STRING_KB);
     }
 
@@ -1879,9 +1881,9 @@
     {
         CONSOLE_PrintTextXY(6, 10,
                              MUIGetString(STRING_HDDINFOUNK2),
-                             (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
-                             (PartEntry->DriveLetter == 0) ? '-' :
':',
-                             PartEntry->PartInfo[0].PartitionType,
+                             (PartEntry->DriveLetter[PartNumber] == 0) ? '-' :
PartEntry->DriveLetter[PartNumber],
+                             (PartEntry->DriveLetter[PartNumber] == 0) ? '-' :
':',
+                             PartEntry->PartInfo[PartNumber].PartitionType,
                              PartSize,
                              Unit);
     }
@@ -1889,8 +1891,8 @@
     {
         CONSOLE_PrintTextXY(6, 10,
                              "   %c%c  %s    %I64u %s",
-                             (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
-                             (PartEntry->DriveLetter == 0) ? '-' :
':',
+                             (PartEntry->DriveLetter[PartNumber] == 0) ? '-' :
PartEntry->DriveLetter[PartNumber],
+                             (PartEntry->DriveLetter[PartNumber] == 0) ? '-' :
':',
                              PartType,
                              PartSize,
                              Unit);
@@ -1972,6 +1974,7 @@
 {
     PDISKENTRY DiskEntry;
     PPARTENTRY PartEntry;
+    UCHAR      PartNumber;
     ULONGLONG DiskSize;
     ULONGLONG PartSize;
     PCHAR DiskUnit;
@@ -1988,6 +1991,7 @@
 
     DiskEntry = PartitionList->CurrentDisk;
     PartEntry = PartitionList->CurrentPartition;
+    PartNumber = PartitionList->CurrentPartitionNumber;
 
     /* adjust disk size */
     if (DiskEntry->DiskSize >= 0x280000000ULL) /* 10 GB */
@@ -2002,39 +2006,39 @@
     }
 
     /* adjust partition size */
-    if (PartEntry->PartInfo[0].PartitionLength.QuadPart >= 0x280000000LL) /* 10 GB
*/
-    {
-        PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 29))
>> 30;
+    if (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart >= 0x280000000LL)
/* 10 GB */
+    {
+        PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1
<< 29)) >> 30;
         PartUnit = MUIGetString(STRING_GB);
     }
     else
     {
-        PartSize = (PartEntry->PartInfo[0].PartitionLength.QuadPart + (1 << 19))
>> 20;
+        PartSize = (PartEntry->PartInfo[PartNumber].PartitionLength.QuadPart + (1
<< 19)) >> 20;
         PartUnit = MUIGetString(STRING_MB);
     }
 
     /* adjust partition type */
-    if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_12) ||
-        (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT_16) ||
-        (PartEntry->PartInfo[0].PartitionType == PARTITION_HUGE) ||
-        (PartEntry->PartInfo[0].PartitionType == PARTITION_XINT13))
+    if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_12) ||
+        (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT_16) ||
+        (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_HUGE) ||
+        (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_XINT13))
     {
         PartType = "FAT";
     }
-    else if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32) ||
-             (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13))
+    else if ((PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_FAT32) ||
+             (PartEntry->PartInfo[PartNumber].PartitionType ==
PARTITION_FAT32_XINT13))
     {
         PartType = "FAT32";
     }
-    else if (PartEntry->PartInfo[0].PartitionType == PARTITION_EXT2)
+    else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_EXT2)
     {
         PartType = "EXT2";
     }
-    else if (PartEntry->PartInfo[0].PartitionType == PARTITION_IFS)
+    else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_IFS)
     {
         PartType = "NTFS"; /* FIXME: Not quite correct! */
     }
-    else if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED)
+    else if (PartEntry->PartInfo[PartNumber].PartitionType == PARTITION_ENTRY_UNUSED)
     {
         PartType = MUIGetString(STRING_FORMATUNUSED);
     }
@@ -2049,7 +2053,7 @@
 
 #if 0
         CONSOLE_PrintTextXY(8, 10, "Partition %lu (%I64u %s) %s of",
-                            PartEntry->PartInfo[0].PartitionNumber,
+                            PartEntry->PartInfo[PartNumber].PartitionNumber,
                             PartSize,
                             PartUnit,
                             PartType);
@@ -2082,9 +2086,9 @@
         {
             CONSOLE_PrintTextXY(8, 10,
                                  MUIGetString(STRING_HDDINFOUNK4),
-                                 (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
-                                 (PartEntry->DriveLetter == 0) ? '-' :
':',
-                                 PartEntry->PartInfo[0].PartitionType,
+                                 (PartEntry->DriveLetter[PartNumber] == 0) ?
'-' : PartEntry->DriveLetter[PartNumber],
+                                 (PartEntry->DriveLetter[PartNumber] == 0) ?
'-' : ':',
+                                 PartEntry->PartInfo[PartNumber].PartitionType,
                                  PartSize,
                                  PartUnit);
         }
@@ -2092,8 +2096,8 @@
         {
             CONSOLE_PrintTextXY(8, 10,
                                  "%c%c  %s    %I64u %s",
-                                (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
-                                (PartEntry->DriveLetter == 0) ? '-' :
':',
+                                (PartEntry->DriveLetter[PartNumber] == 0) ?
'-' : PartEntry->DriveLetter[PartNumber],
+                                (PartEntry->DriveLetter[PartNumber] == 0) ?
'-' : ':',
                                 PartType,
                                 PartSize,
                                 PartUnit);
@@ -2192,6 +2196,7 @@
     WCHAR PathBuffer[MAX_PATH];
     PDISKENTRY DiskEntry;
     PPARTENTRY PartEntry;
+    UCHAR PartNum;
     NTSTATUS Status;
 
 #ifndef NDEBUG
@@ -2212,6 +2217,7 @@
 
     DiskEntry = PartitionList->CurrentDisk;
     PartEntry = PartitionList->CurrentPartition;
+    PartNum = PartitionList->CurrentPartitionNumber;
 
     while(TRUE)
     {
@@ -2234,53 +2240,53 @@
         {
             CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
 
-            if (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED)
+            if (PartEntry->PartInfo[PartNum].PartitionType == PARTITION_ENTRY_UNUSED)
             {
                 if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT")
== 0)
                 {
-                    if (PartEntry->PartInfo[0].PartitionLength.QuadPart < (4200LL *
1024LL))
+                    if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart <
(4200LL * 1024LL))
                     {
                         /* FAT12 CHS partition (disk is smaller than 4.1MB) */
-                        PartEntry->PartInfo[0].PartitionType = PARTITION_FAT_12;
+                        PartEntry->PartInfo[PartNum].PartitionType =
PARTITION_FAT_12;
                     }
-                    else if (PartEntry->PartInfo[0].StartingOffset.QuadPart <
(1024LL * 255LL * 63LL * 512LL))
+                    else if (PartEntry->PartInfo[PartNum].StartingOffset.QuadPart <
(1024LL * 255LL * 63LL * 512LL))
                     {
                         /* Partition starts below the 8.4GB boundary ==> CHS partition
*/
 
-                        if (PartEntry->PartInfo[0].PartitionLength.QuadPart < (32LL
* 1024LL * 1024LL))
+                        if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart <
(32LL * 1024LL * 1024LL))
                         {
                             /* FAT16 CHS partition (partiton size < 32MB) */
-                            PartEntry->PartInfo[0].PartitionType = PARTITION_FAT_16;
+                            PartEntry->PartInfo[PartNum].PartitionType =
PARTITION_FAT_16;
                         }
-                        else if (PartEntry->PartInfo[0].PartitionLength.QuadPart <
(512LL * 1024LL * 1024LL))
+                        else if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart
< (512LL * 1024LL * 1024LL))
                         {
                             /* FAT16 CHS partition (partition size < 512MB) */
-                            PartEntry->PartInfo[0].PartitionType = PARTITION_HUGE;
+                            PartEntry->PartInfo[PartNum].PartitionType =
PARTITION_HUGE;
                         }
                         else
                         {
                             /* FAT32 CHS partition (partition size >= 512MB) */
-                            PartEntry->PartInfo[0].PartitionType = PARTITION_FAT32;
+                            PartEntry->PartInfo[PartNum].PartitionType =
PARTITION_FAT32;
                         }
                     }
                     else
                     {
                         /* Partition starts above the 8.4GB boundary ==> LBA partition
*/
 
-                        if (PartEntry->PartInfo[0].PartitionLength.QuadPart <
(512LL * 1024LL * 1024LL))
+                        if (PartEntry->PartInfo[PartNum].PartitionLength.QuadPart <
(512LL * 1024LL * 1024LL))
                         {
                             /* FAT16 LBA partition (partition size < 512MB) */
-                            PartEntry->PartInfo[0].PartitionType = PARTITION_XINT13;
+                            PartEntry->PartInfo[PartNum].PartitionType =
PARTITION_XINT13;
                         }
                         else
                         {
                             /* FAT32 LBA partition (partition size >= 512MB) */
-                            PartEntry->PartInfo[0].PartitionType =
PARTITION_FAT32_XINT13;
+                            PartEntry->PartInfo[PartNum].PartitionType =
PARTITION_FAT32_XINT13;
                         }
                     }
                 }
                 else if (wcscmp(FileSystemList->Selected->FileSystem,
L"EXT2") == 0)
-                    PartEntry->PartInfo[0].PartitionType = PARTITION_EXT2;
+                    PartEntry->PartInfo[PartNum].PartitionType = PARTITION_EXT2;
                 else if (!FileSystemList->Selected->FormatFunc)
                     return QUIT_PAGE;
             }
@@ -2341,7 +2347,7 @@
             swprintf (PathBuffer,
                       L"\\Device\\Harddisk%lu\\Partition%lu",
                       PartitionList->CurrentDisk->DiskNumber,
-                     
PartitionList->CurrentPartition->PartInfo[0].PartitionNumber);
+                     
PartitionList->CurrentPartition->PartInfo[PartNum].PartitionNumber);
             RtlCreateUnicodeString (&DestinationRootPath,
                                     PathBuffer);
             DPRINT ("DestinationRootPath: %wZ\n", &DestinationRootPath);
@@ -2352,7 +2358,8 @@
             swprintf (PathBuffer,
                       L"\\Device\\Harddisk%lu\\Partition%lu",
                       PartitionList->ActiveBootDisk->DiskNumber,
-                     
PartitionList->ActiveBootPartition->PartInfo[0].PartitionNumber);
+                      PartitionList->ActiveBootPartition->
+                       
PartInfo[PartitionList->ActiveBootPartitionNumber].PartitionNumber);
             RtlCreateUnicodeString (&SystemRootPath,
                                     PathBuffer);
             DPRINT ("SystemRootPath: %wZ\n", &SystemRootPath);
@@ -2376,8 +2383,8 @@
             if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") ==
0)
             {
                 /* FIXME: Install boot code. This is a hack! */
-                if ((PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32_XINT13)
||
-                    (PartEntry->PartInfo[0].PartitionType == PARTITION_FAT32))
+                if ((PartEntry->PartInfo[PartNum].PartitionType ==
PARTITION_FAT32_XINT13) ||
+                    (PartEntry->PartInfo[PartNum].PartitionType == PARTITION_FAT32))
                 {
                     wcscpy(PathBuffer, SourceRootPath.Buffer);
                     wcscat(PathBuffer, L"\\loader\\fat32.bin");
@@ -2464,6 +2471,7 @@
     WCHAR PathBuffer[MAX_PATH];
     CHAR Buffer[MAX_PATH];
     NTSTATUS Status;
+    UCHAR PartNum = PartitionList->CurrentPartitionNumber;
 
     /* FIXME: code duplicated in FormatPartitionPage */
     /* Set DestinationRootPath */
@@ -2471,7 +2479,7 @@
     swprintf(PathBuffer,
              L"\\Device\\Harddisk%lu\\Partition%lu",
     PartitionList->CurrentDisk->DiskNumber,
-    PartitionList->CurrentPartition->PartInfo[0].PartitionNumber);
+    PartitionList->CurrentPartition->PartInfo[PartNum].PartitionNumber);
     RtlCreateUnicodeString(&DestinationRootPath, PathBuffer);
     DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath);
 
@@ -2480,7 +2488,7 @@
     swprintf(PathBuffer,
              L"\\Device\\Harddisk%lu\\Partition%lu",
     PartitionList->ActiveBootDisk->DiskNumber,
-    PartitionList->ActiveBootPartition->PartInfo[0].PartitionNumber);
+    PartitionList->ActiveBootPartition->PartInfo[PartNum].PartitionNumber);
     RtlCreateUnicodeString(&SystemRootPath, PathBuffer);
     DPRINT("SystemRootPath: %wZ\n", &SystemRootPath);
 
@@ -2544,7 +2552,7 @@
 
 
 static PAGE_NUMBER
-InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry)
+InstallDirectoryPage1(PWCHAR InstallDir, PDISKENTRY DiskEntry, PPARTENTRY PartEntry,
UCHAR PartNum)
 {
     WCHAR PathBuffer[MAX_PATH];
 
@@ -2568,7 +2576,7 @@
     swprintf(PathBuffer,
              L"multi(0)disk(0)rdisk(%lu)partition(%lu)",
              DiskEntry->BiosDiskNumber,
-             PartEntry->PartInfo[0].PartitionNumber);
+             PartEntry->PartInfo[PartNum].PartitionNumber);
 
     if (InstallDir[0] != L'\\')
         wcscat(PathBuffer, L"\\");
@@ -2624,7 +2632,7 @@
 
     if (IsUnattendedSetup)
     {
-        return(InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry));
+        return(InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry,
PartitionList->CurrentPartitionNumber));
     }
 
     while(TRUE)
@@ -2641,7 +2649,7 @@
         }
         else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x0D) /* ENTER */
         {
-            return (InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry));
+            return (InstallDirectoryPage1 (InstallDir, DiskEntry, PartEntry,
PartitionList->CurrentPartitionNumber));
         }
         else if (Ir->Event.KeyEvent.uChar.AsciiChar == 0x08) /* BACKSPACE */
         {

Modified: trunk/reactos/base/setup/usetup/partlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Thu Apr  9 22:59:28 2009
@@ -70,8 +70,9 @@
   PDISKENTRY DiskEntry;
   PPARTENTRY PartEntry;
   PLIST_ENTRY Entry1;
-  PLIST_ENTRY Entry2;
+  //PLIST_ENTRY Entry2;
   CHAR Letter;
+  UCHAR i;
 
   Letter = 'C';
 
@@ -87,19 +88,25 @@
                                      PARTENTRY,
                                      ListEntry);
 
-      PartEntry->DriveLetter = 0;
-
-      if (PartEntry->Unpartitioned == FALSE &&
-        !IsContainerPartition (PartEntry->PartInfo[0].PartitionType))
-      {
-        if (IsRecognizedPartition (PartEntry->PartInfo[0].PartitionType) ||
-           (PartEntry->PartInfo[0].PartitionType == PARTITION_ENTRY_UNUSED &&
-           PartEntry->PartInfo[0].PartitionLength.QuadPart != 0LL))
+      for (i=0; i<3; i++)
+        PartEntry->DriveLetter[i] = 0;
+
+      if (PartEntry->Unpartitioned == FALSE)
+      {
+        for (i=0; i<3; i++)
         {
-          if (Letter <= 'Z')
+          if (IsContainerPartition (PartEntry->PartInfo[i].PartitionType))
+            continue;
+
+          if (IsRecognizedPartition (PartEntry->PartInfo[i].PartitionType) ||
+             (PartEntry->PartInfo[i].PartitionType == PARTITION_ENTRY_UNUSED
&&
+             PartEntry->PartInfo[i].PartitionLength.QuadPart != 0LL))
           {
-            PartEntry->DriveLetter = Letter;
-            Letter++;
+            if (Letter <= 'Z')
+            {
+              PartEntry->DriveLetter[i] = Letter;
+              Letter++;
+            }
           }
         }
       }
@@ -108,8 +115,8 @@
     Entry1 = Entry1->Flink;
   }
 
-
   /* Assign drive letters to logical drives */
+#if 0
   Entry1 = List->DiskListHead.Flink;
   while (Entry1 != &List->DiskListHead)
   {
@@ -148,6 +155,7 @@
 
     Entry1 = Entry1->Flink;
   }
+#endif
 }
 
 
@@ -1197,8 +1205,8 @@
     {
       sprintf (LineBuffer,
                MUIGetString(STRING_HDDINFOUNK5),
-               (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
-               (PartEntry->DriveLetter == 0) ? '-' : ':',
+               (PartEntry->DriveLetter[PartNumber] == 0) ? '-' :
PartEntry->DriveLetter[PartNumber],
+               (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
                PartEntry->PartInfo[PartNumber].PartitionType,
                PartSize.u.LowPart,
                Unit);
@@ -1207,8 +1215,8 @@
     {
       sprintf (LineBuffer,
                "%c%c  %-24s         %6lu %s",
-               (PartEntry->DriveLetter == 0) ? '-' :
PartEntry->DriveLetter,
-               (PartEntry->DriveLetter == 0) ? '-' : ':',
+               (PartEntry->DriveLetter[PartNumber] == 0) ? '-' :
PartEntry->DriveLetter[PartNumber],
+               (PartEntry->DriveLetter[PartNumber] == 0) ? '-' : ':',
                PartType,
                PartSize.u.LowPart,
                Unit);
@@ -2294,12 +2302,15 @@
 {
   PDISKENTRY DiskEntry;
   PPARTENTRY PartEntry;
+  PLIST_ENTRY ListEntry;
+  UCHAR i;
 
   /* Check for empty disk list */
   if (IsListEmpty (&List->DiskListHead))
   {
     List->ActiveBootDisk = NULL;
     List->ActiveBootPartition = NULL;
+    List->ActiveBootPartitionNumber = 0;
     return;
   }
 
@@ -2321,6 +2332,7 @@
   {
     List->ActiveBootDisk = NULL;
     List->ActiveBootPartition = NULL;
+    List->ActiveBootPartitionNumber = 0;
     return;
   }
 
@@ -2338,11 +2350,50 @@
     PartEntry->PartInfo[0].BootIndicator = TRUE;
     PartEntry->PartInfo[0].RewritePartition = TRUE;
     DiskEntry->Modified = TRUE;
-  }
-
-  /* FIXME: Might be incorrect if partitions were created by Linux FDISK */
-  List->ActiveBootDisk = DiskEntry;
-  List->ActiveBootPartition = PartEntry;
+
+    /* FIXME: Might be incorrect if partitions were created by Linux FDISK */
+    List->ActiveBootDisk = DiskEntry;
+    List->ActiveBootPartition = PartEntry;
+
+    return;
+  }
+
+  /* Disk is not new, scan all partitions to find a bootable one */
+  List->ActiveBootDisk = NULL;
+  List->ActiveBootPartition = NULL;
+  List->ActiveBootPartitionNumber = 0;
+
+  ListEntry = DiskEntry->PartListHead.Flink;
+  while (ListEntry != &DiskEntry->PartListHead)
+  {
+    PartEntry = CONTAINING_RECORD(ListEntry,
+                                  PARTENTRY,
+                                  ListEntry);
+
+    /* Check if it's partitioned */
+    if (!PartEntry->Unpartitioned)
+    {
+      /* Go through all of its 4 partitions */
+      for (i=0; i<4; i++)
+      {
+        if (PartEntry->PartInfo[i].PartitionType != PARTITION_ENTRY_UNUSED &&
+            PartEntry->PartInfo[i].BootIndicator)
+        {
+          /* Yes, we found it */
+          List->ActiveBootDisk = DiskEntry;
+          List->ActiveBootPartition = PartEntry;
+          List->ActiveBootPartitionNumber = i;
+
+          DPRINT1("Found bootable partition disk %d, drive letter %c\n",
+              DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]);
+
+          break;
+        }
+      }
+    }
+    /* Go to the next one */
+    ListEntry = ListEntry->Flink;
+  }
 }
 
 
@@ -2635,6 +2686,7 @@
   PLIST_ENTRY Entry1, Entry2;
   PDISKENTRY DiskEntry;
   PPARTENTRY PartEntry;
+  UCHAR i;
 
   if (List == NULL)
   {
@@ -2652,11 +2704,17 @@
     while (Entry2 != &DiskEntry->PartListHead)
     {
       PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry);
-      if (!PartEntry->Unpartitioned && PartEntry->DriveLetter)
-      {
-        if (!SetMountedDeviceValue(PartEntry->DriveLetter, DiskEntry->Signature,
PartEntry->PartInfo[0].StartingOffset))
+      if (!PartEntry->Unpartitioned)
+      {
+        for (i=0; i<4; i++)
         {
-          return FALSE;
+          if (PartEntry->DriveLetter[i])
+          {
+            if (!SetMountedDeviceValue(PartEntry->DriveLetter[i],
DiskEntry->Signature, PartEntry->PartInfo[i].StartingOffset))
+            {
+              return FALSE;
+            }
+          }
         }
       }
       Entry2 = Entry2->Flink;

Modified: trunk/reactos/base/setup/usetup/partlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist…
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Thu Apr  9 22:59:28 2009
@@ -43,7 +43,7 @@
 {
   LIST_ENTRY ListEntry;
 
-  CHAR DriveLetter;
+  CHAR DriveLetter[4];
   CHAR VolumeLabel[17];
   CHAR FileSystemName[9];
 
@@ -136,6 +136,7 @@
 
   PDISKENTRY ActiveBootDisk;
   PPARTENTRY ActiveBootPartition;
+  UCHAR      ActiveBootPartitionNumber;
 
   LIST_ENTRY DiskListHead;
   LIST_ENTRY BiosDiskListHead;