Author: hbelusca Date: Thu Jun 8 02:01:56 2017 New Revision: 74951
URL: http://svn.reactos.org/svn/reactos?rev=74951&view=rev Log: [USETUP]: The 'DestinationDriveLetter' variable (that is just used for SetDefaultPagefile()...) just needs to be initialized at one place only.
Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c
Modified: branches/setup_improvements/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/setup_improvements/base/setup/us... ============================================================================== --- branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/setup_improvements/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu Jun 8 02:01:56 2017 @@ -90,7 +90,8 @@ static UNICODE_STRING DestinationArcPath; static UNICODE_STRING DestinationRootPath;
-static WCHAR DestinationDriveLetter; // FIXME: Is it really useful?? +// FIXME: Is it really useful?? Just used for SetDefaultPagefile... +static WCHAR DestinationDriveLetter;
static HINF SetupInf;
@@ -1614,7 +1615,6 @@ * QuitPage * * SIDEEFFECTS - * Init DestinationDriveLetter (only if unattended or not free space is selected) * Set InstallShortcut (only if not unattended + free space is selected) * * RETURNS @@ -1655,8 +1655,6 @@ DPRINT1("Whaaaaaat?!?! ASSERT!\n"); ASSERT(FALSE); } - - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter;
return SELECT_FILE_SYSTEM_PAGE; } @@ -1697,8 +1695,6 @@ return SELECT_PARTITION_PAGE; /* let the user select another partition */ }
- DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } } @@ -1713,8 +1709,6 @@ RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter;
return SELECT_FILE_SYSTEM_PAGE; } @@ -1809,8 +1803,6 @@ RequiredPartitionDiskSpace); return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter;
return SELECT_FILE_SYSTEM_PAGE; } @@ -3267,6 +3259,7 @@ * Inits DestinationRootPath * Inits DestinationPath * Inits DestinationArcPath + * Inits DestinationDriveLetter * * RETURNS * Number of the next page. @@ -3305,6 +3298,9 @@ PartEntry->PartitionNumber); ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); + + /* Initialize DestinationDriveLetter */ + DestinationDriveLetter = (WCHAR)PartEntry->DriveLetter;
return PREPARE_COPY_PAGE; }