Author: cgutman Date: Thu Jan 26 18:49:50 2012 New Revision: 55217
URL: http://svn.reactos.org/svn/reactos?rev=55217&view=rev Log: [USETUP] - Merge r55212 and 55215 - Add a temporary hack to allow testing installation on a device not bootable by the BIOS (like USB drives in VirtualBox) - USB devices now show up as installation targets during setup but attempting to install onto them results in setup hanging due to bugs in the USB code
Modified: branches/usb-bringup-trunk/base/setup/usetup/partlist.c
Modified: branches/usb-bringup-trunk/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/use... ============================================================================== --- branches/usb-bringup-trunk/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/setup/usetup/partlist.c [iso-8859-1] Thu Jan 26 18:49:50 2012 @@ -88,12 +88,12 @@ PARTENTRY, ListEntry);
- for (i=0; i<3; i++) + for (i=0; i<4; i++) 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; @@ -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; } @@ -836,8 +838,12 @@
if (!DiskEntry->BiosFound) { +#if 0 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);