[ros-diffs] [cgutman] 55299: [USETUP] - Fix the ordering of disks in the 1st stage setup list - Search for the active partition on the selected install disk instead of the first disk

[cgutman at svn.reactos.org]

Author: cgutman
Date: Sun Jan 29 22:54:57 2012
New Revision: 55299

URL: http://svn.reactos.org/svn/reactos?rev=55299&view=rev
Log:
[USETUP]
- Fix the ordering of disks in the 1st stage setup list
- Search for the active partition on the selected install disk instead of the first disk

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/usetup/partlist.c?rev=55299&r1=55298&r2=55299&view=diff
==============================================================================
--- 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] Sun Jan 29 22:54:57 2012
@@ -875,7 +875,7 @@
 
   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) 
@@ -2377,9 +2377,8 @@
   }
 #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))
@@ -2440,7 +2439,7 @@
           List->ActiveBootPartitionNumber = i;
 
           DPRINT("Found bootable partition disk %d, drive letter %c\n",
-              DiskEntry->BiosDiskNumber, PartEntry->DriveLetter[i]);
+              DiskEntry->DiskNumber, PartEntry->DriveLetter[i]);
 
           break;
         }