[ros-diffs] [ekohl] 64482: [USETUP] - DeleteCurrentPartition: A deleted partition is of type PARTITION_ENTRY_UNUSED. - ScrollDownPartitionList / ScrollUpPartitionList: Ignore container partitions if they are n...

Author: ekohl
Date: Fri Oct  3 09:24:54 2014
New Revision: 64482

URL: http://svn.reactos.org/svn/reactos?rev=64482&view=rev
Log:
[USETUP]
- DeleteCurrentPartition: A deleted partition is of type PARTITION_ENTRY_UNUSED.
- ScrollDownPartitionList / ScrollUpPartitionList: Ignore container partitions if they are
not used.
CORE-8413 #resolve #comment Fixed in r64482.

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] Fri Oct  3 09:24:54 2014
@@ -2054,7 +2054,8 @@
         {
             /* Primary or extended partition */
 
-            if (IsContainerPartition(List->CurrentPartition->PartitionType))
+            if (List->CurrentPartition->IsPartitioned == TRUE &&
+                IsContainerPartition(List->CurrentPartition->PartitionType))
             {
                 /* First logical partition */
                 PartListEntry = List->CurrentDisk->LogicalPartListHead.Flink;
@@ -2147,7 +2148,8 @@
             {
                 PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry);
 
-                if (IsContainerPartition(PartEntry->PartitionType))
+                if (PartEntry->IsPartitioned == TRUE &&
+                    IsContainerPartition(PartEntry->PartitionType))
                 {
                     PartListEntry = List->CurrentDisk->LogicalPartListHead.Blink;
                     PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry);
@@ -2171,7 +2173,8 @@
         {
             PartEntry = CONTAINING_RECORD(PartListEntry, PARTENTRY, ListEntry);
 
-            if (IsContainerPartition(PartEntry->PartitionType))
+            if (PartEntry->IsPartitioned == TRUE &&
+                IsContainerPartition(PartEntry->PartitionType))
             {
                 PartListEntry = DiskEntry->LogicalPartListHead.Blink;
                 if (PartListEntry != &DiskEntry->LogicalPartListHead)
@@ -2697,6 +2700,7 @@
     {
         /* Nothing to merge but change current entry */
         PartEntry->IsPartitioned = FALSE;
+        PartEntry->PartitionType = PARTITION_ENTRY_UNUSED;
         PartEntry->FormatState = Unformatted;
         PartEntry->DriveLetter = 0;
     }