[cgutman] 55215: [USETUP] - Allow removable media to be selected as an installation target - Fix broken unpartitioned space calculation if the first partition starts below the disk's track size (su...

Author: cgutman
Date: Thu Jan 26 18:27:21 2012
New Revision: 55215

URL: http://svn.reactos.org/svn/reactos?rev=55215&view=rev
Log:
[USETUP]
- Allow removable media to be selected as an installation target
- Fix broken unpartitioned space calculation if the first partition starts below the disk's track size (such as a 1MB aligned partition)

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

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 Jan 26 18:27:21 2012
@@ -374,7 +374,8 @@
           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);

@@ -718,7 +719,8 @@
     return;
   }

-  if (DiskGeometry.MediaType != FixedMedia)
+  if (DiskGeometry.MediaType != FixedMedia &&
+      DiskGeometry.MediaType != RemovableMedia)
   {
     return;
   }