[ros-diffs] [ekohl] 65899: [USETUP] Change the partition creation workflow, so that the user is forced to choose a file system type and format a partition after it has been created.

[ekohl]

Author: ekohl
Date: Mon Dec 29 21:23:30 2014
New Revision: 65899

URL: http://svn.reactos.org/svn/reactos?rev=65899&view=rev
Log:
[USETUP]
Change the partition creation workflow, so that the user is forced to choose a 
file system type and format a partition after it has been created.

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

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=65899&r1=65898&r2=65899&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c  [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c  [iso-8859-1] Mon Dec 29 
21:23:30 2014
@@ -1618,7 +1618,7 @@
 
             DestinationDriveLetter = 
(WCHAR)PartitionList->CurrentPartition->DriveLetter;
 
-            return SELECT_FILE_SYSTEM_PAGE;
+            return INSTALL_DIRECTORY_PAGE;
         }
         else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P')  /* P */
         {
@@ -1969,7 +1969,7 @@
                 return QUIT_PAGE;
             }
 
-            return SELECT_PARTITION_PAGE;
+            return SELECT_FILE_SYSTEM_PAGE;
         }
     }
 
@@ -2279,7 +2279,7 @@
                 return QUIT_PAGE;
             }
 
-            return SELECT_PARTITION_PAGE;
+            return SELECT_FILE_SYSTEM_PAGE;
         }
     }
 
@@ -2868,7 +2868,11 @@
 
             DestroyFileSystemList(FileSystemList);
             FileSystemList = NULL;
-            return INSTALL_DIRECTORY_PAGE;
+
+            if (IsUnattendedSetup)
+                return INSTALL_DIRECTORY_PAGE;
+            else
+                return SELECT_PARTITION_PAGE;
         }
     }
 

Modified: trunk/reactos/base/setup/usetup/partlist.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist.c?rev=65899&r1=65898&r2=65899&view=diff
==============================================================================
--- trunk/reactos/base/setup/usetup/partlist.c  [iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/partlist.c  [iso-8859-1] Mon Dec 29 
21:23:30 2014
@@ -2426,6 +2426,8 @@
 
         PartEntry->StartSector.QuadPart = NewPartEntry->StartSector.QuadPart + 
NewPartEntry->SectorCount.QuadPart;
         PartEntry->SectorCount.QuadPart -= (PartEntry->StartSector.QuadPart - 
NewPartEntry->StartSector.QuadPart);
+
+        List->CurrentPartition = NewPartEntry;
     }
 
     UpdateDiskLayout(DiskEntry);
@@ -2568,6 +2570,8 @@
 DPRINT1("First Sector: %I64u\n", NewPartEntry->StartSector.QuadPart);
 DPRINT1("Last Sector: %I64u\n", NewPartEntry->StartSector.QuadPart + 
NewPartEntry->SectorCount.QuadPart - 1);
 DPRINT1("Total Sectors: %I64u\n", NewPartEntry->SectorCount.QuadPart);
+
+        List->CurrentPartition = NewPartEntry;
     }
 
     AddLogicalDiskSpace(DiskEntry);