[ros-diffs] [ekohl] 65923: [USETUP] You can install ReactOS on 'unpartitioned space' again. Usetup will create a primary partition that spans the whole unpartitioned space, format the partition and install Rea...

Author: ekohl
Date: Wed Dec 31 20:51:56 2014
New Revision: 65923

URL: http://svn.reactos.org/svn/reactos?rev=65923&view=rev
Log:
[USETUP]
You can install ReactOS on 'unpartitioned space' again. Usetup will create a primary partition that spans the whole unpartitioned space, format the partition and install ReactOS on that partition.

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

Modified: trunk/reactos/base/setup/usetup/interface/usetup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interface...
==============================================================================
--- trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] (original)
+++ trunk/reactos/base/setup/usetup/interface/usetup.c	[iso-8859-1] Wed Dec 31 20:51:56 2014
@@ -46,6 +46,7 @@
 UNICODE_STRING SourceRootDir;
 UNICODE_STRING SourcePath;
 BOOLEAN IsUnattendedSetup = FALSE;
+BOOLEAN InstallShortcut = FALSE;
 LONG UnattendDestinationDiskNumber;
 LONG UnattendDestinationPartitionNumber;
 LONG UnattendMBRInstallType = -1;
@@ -1601,19 +1602,22 @@
             if (IsContainerPartition(PartitionList->CurrentPartition->PartitionType))
                 continue; //return SELECT_PARTITION_PAGE;

+            if (!IsDiskSizeValid(PartitionList->CurrentPartition))
+            {
+                MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY,
+                                RequiredPartitionDiskSpace);
+                continue; //return SELECT_PARTITION_PAGE; /* let the user select another partition */
+            }
+
             if (PartitionList->CurrentPartition == NULL ||
                 PartitionList->CurrentPartition->IsPartitioned == FALSE)
             {
                 CreatePrimaryPartition(PartitionList,
                                        0ULL,
                                        TRUE);
-            }
-
-            if (!IsDiskSizeValid(PartitionList->CurrentPartition))
-            {
-                MUIDisplayError(ERROR_INSUFFICIENT_PARTITION_SIZE, Ir, POPUP_WAIT_ANY_KEY,
-                                RequiredPartitionDiskSpace);
-                return SELECT_PARTITION_PAGE; /* let the user select another partition */
+                InstallShortcut = TRUE;
+
+                return SELECT_FILE_SYSTEM_PAGE;
             }

DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter;
@@ -2875,7 +2879,7 @@
             DestroyFileSystemList(FileSystemList);
             FileSystemList = NULL;

-            if (IsUnattendedSetup)
+            if (IsUnattendedSetup || InstallShortcut)
                 return INSTALL_DIRECTORY_PAGE;
             else
                 return SELECT_PARTITION_PAGE;