- Synchronize up to trunk's revision r57864.

[reactos.git] / base / setup / usetup / partlist.c

diff --git a/base/setup/usetup/partlist.c b/base/setup/usetup/partlist.c
index 2a9b493..3f8a98a 100644 (file)
--- a/base/setup/usetup/partlist.c
+++ b/base/setup/usetup/partlist.c
@@ -88,12 +88,12 @@ AssignDriverLetters (PPARTLIST List)
                                      PARTENTRY,
                                      ListEntry);
 
                                      PARTENTRY,
                                      ListEntry);
 

-      for (i=0; i<3; i++)
+      for (i=0; i<4; i++)

         PartEntry->DriveLetter[i] = 0;
 
       if (PartEntry->Unpartitioned == FALSE)
       {
         PartEntry->DriveLetter[i] = 0;
 
       if (PartEntry->Unpartitioned == FALSE)
       {

-        for (i=0; i<3; i++)
+        for (i=0; i<4; i++)

         {
           if (IsContainerPartition (PartEntry->PartInfo[i].PartitionType))
             continue;
         {
           if (IsContainerPartition (PartEntry->PartInfo[i].PartitionType))
             continue;


@@ -374,7 +374,8 @@ ScanForUnpartitionedDiskSpace (PDISKENTRY DiskEntry)
           PartEntry->PartInfo[j].StartingOffset.QuadPart -
           (LastStartingOffset + LastPartitionLength);
 
           PartEntry->PartInfo[j].StartingOffset.QuadPart -
           (LastStartingOffset + LastPartitionLength);
 

-          if (LastUnusedPartitionLength >= DiskEntry->CylinderSize)
+          if (PartEntry->PartInfo[j].StartingOffset.QuadPart > (LastStartingOffset + LastPartitionLength) &&
+              LastUnusedPartitionLength >= DiskEntry->CylinderSize)

           {
             DPRINT ("Unpartitioned disk space %I64u\n", LastUnusedPartitionLength);
 
           {
             DPRINT ("Unpartitioned disk space %I64u\n", LastUnusedPartitionLength);
 


@@ -718,7 +719,8 @@ AddDiskToList (HANDLE FileHandle,
     return;
   }
 
     return;
   }
 

-  if (DiskGeometry.MediaType != FixedMedia)
+  if (DiskGeometry.MediaType != FixedMedia &&
+      DiskGeometry.MediaType != RemovableMedia)

   {
     return;
   }
   {
     return;
   }


@@ -836,8 +838,12 @@ AddDiskToList (HANDLE FileHandle,
 
   if (!DiskEntry->BiosFound)
   {
 
   if (!DiskEntry->BiosFound)
   {

+#if 0

     RtlFreeHeap(ProcessHeap, 0, DiskEntry);
     return;
     RtlFreeHeap(ProcessHeap, 0, DiskEntry);
     return;

+#else
+    DPRINT1("WARNING: Setup could not find a matching BIOS disk entry. Disk %d is not be bootable by the BIOS!\n", DiskNumber);
+#endif

   }
 
   InitializeListHead (&DiskEntry->PartListHead);
   }
 
   InitializeListHead (&DiskEntry->PartListHead);


@@ -869,7 +875,7 @@ AddDiskToList (HANDLE FileHandle,
 
   GetDriverName (DiskEntry);
 
 
   GetDriverName (DiskEntry);
 

-  InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, BiosDiskNumber);
+  InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber);

 
   /*
    * Allocate a buffer for 26 logical drives (2 entries each == 52) 
 
   /*
    * Allocate a buffer for 26 logical drives (2 entries each == 52) 


@@ -2371,9 +2377,8 @@ CheckActiveBootPartition (PPARTLIST List)
   }
 #endif
 
   }
 #endif
 

-  DiskEntry = CONTAINING_RECORD (List->DiskListHead.Flink,
-                                 DISKENTRY,
-                                 ListEntry);
+  /* Choose the currently selected disk */
+  DiskEntry = List->CurrentDisk;

 
   /* Check for empty partition list */
   if (IsListEmpty (&DiskEntry->PartListHead))
 
   /* Check for empty partition list */
   if (IsListEmpty (&DiskEntry->PartListHead))


@@ -2434,7 +2439,7 @@ CheckActiveBootPartition (PPARTLIST List)
           List->ActiveBootPartitionNumber = i;
 
           DPRINT("Found bootable partition disk %d, drive letter %c\n",
           List->ActiveBootPartitionNumber = i;
 
           DPRINT("Found bootable partition disk %d, drive letter %c\n",

-              DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]);
+              DiskEntry->DiskNumber, PartEntry->DriveLetter[i]);

 
           break;
         }
 
           break;
         }