https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fd27d34a51d4086d509d5bffd6d7db29dc4001e
commit 3fd27d34a51d4086d509d5bffd6d7db29dc4001e Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Thu Jun 8 02:01:56 2017 +0000 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Wed Oct 24 00:55:13 2018 +0200 [USETUP] The 'DestinationDriveLetter' variable (that is just used for SetDefaultPagefile()...) just needs to be initialized at one place only. svn path=/branches/setup_improvements/; revision=74951 --- base/setup/usetup/usetup.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 410e25753a..d83be76f24 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -93,7 +93,8 @@ static UNICODE_STRING DestinationPath; 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; @@ -1527,7 +1528,6 @@ IsDiskSizeValid(PPARTENTRY PartEntry) * QuitPage * * SIDEEFFECTS - * Init DestinationDriveLetter (only if unattended or not free space is selected) * Set InstallShortcut (only if not unattended + free space is selected) * * RETURNS @@ -1594,8 +1594,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } } @@ -1611,8 +1609,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } } @@ -1707,8 +1703,6 @@ SelectPartitionPage(PINPUT_RECORD Ir) return SELECT_PARTITION_PAGE; /* let the user select another partition */ } - DestinationDriveLetter = (WCHAR)PartitionList->CurrentPartition->DriveLetter; - return SELECT_FILE_SYSTEM_PAGE; } else if (Ir->Event.KeyEvent.wVirtualKeyCode == 'P') /* P */ @@ -3254,6 +3248,9 @@ BuildInstallPaths(PWSTR InstallDir, PartEntry->PartitionNumber); ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallDir); RtlCreateUnicodeString(&DestinationArcPath, PathBuffer); + + /* Initialize DestinationDriveLetter */ + DestinationDriveLetter = (WCHAR)PartEntry->DriveLetter; }
