[ros-diffs] [janderwald] 28576: - if partition cannot be selected, let user create partition themselves - autopartitioning still needs to be done See issue #2593 for more details.

[janderwald at svn.reactos.org]

Author: janderwald
Date: Sun Aug 26 22:19:23 2007
New Revision: 28576

URL: http://svn.reactos.org/svn/reactos?rev=28576&view=rev
Log:
- if partition cannot be selected, let user create partition themselves
- autopartitioning still needs to be done
See issue #2593 for more details.

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

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface/usetup.c?rev=28576&r1=28575&r2=28576&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c Sun Aug 26 22:19:23 2007
@@ -1387,10 +1387,10 @@
 
   if (IsUnattendedSetup)
     {
-      SelectPartition(PartitionList,
-        UnattendDestinationDiskNumber,
-        UnattendDestinationPartitionNumber);
-      return(SELECT_FILE_SYSTEM_PAGE);
+      if (SelectPartition(PartitionList, UnattendDestinationDiskNumber, UnattendDestinationPartitionNumber))
+        {
+          return(SELECT_FILE_SYSTEM_PAGE);
+        }
     }
 
   while(TRUE)

Modified: trunk/reactos/base/setup/usetup/partlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.c?rev=28576&r1=28575&r2=28576&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c (original)
+++ trunk/reactos/base/setup/usetup/partlist.c Sun Aug 26 22:19:23 2007
@@ -1543,7 +1543,7 @@
 }
 
 
-VOID
+DWORD
 SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber)
 {
   PDISKENTRY DiskEntry;
@@ -1554,7 +1554,7 @@
 
   /* Check for empty disks */
   if (IsListEmpty (&List->DiskListHead))
-    return;
+    return FALSE;
 
   /* Check for first usable entry on next disk */
   Entry1 = List->CurrentDisk->ListEntry.Flink;
@@ -1575,16 +1575,17 @@
 	            {
 	              List->CurrentDisk = DiskEntry;
 	              List->CurrentPartition = PartEntry;
-                      DrawPartitionList (List);
-	              return;
+                  DrawPartitionList (List);
+	              return TRUE;
 	            }
                 }
               Entry2 = Entry2->Flink;
             }
-          return;
+          return FALSE;
         }
       Entry1 = Entry1->Flink;
     }
+    return FALSE;
 }
 
 

Modified: trunk/reactos/base/setup/usetup/partlist.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.h?rev=28576&r1=28575&r2=28576&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.h (original)
+++ trunk/reactos/base/setup/usetup/partlist.h Sun Aug 26 22:19:23 2007
@@ -188,7 +188,7 @@
 VOID
 DrawPartitionList (PPARTLIST List);
 
-VOID
+DWORD
 SelectPartition(PPARTLIST List, ULONG DiskNumber, ULONG PartitionNumber);
 
 BOOL