Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-29 05:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP] Check the status value of BuildInstallPaths() (#1349)

Browse source
This commit is contained in:
Bișoc George 2019-02-13 15:22:28 +01:00 committed by Hermès BÉLUSCA - MAÏTO
parent 42515190c5
commit 35f7267a97
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
base/setup/usetup/usetup.c
View file

@ -3324,6 +3324,7 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
WCHAR InstallDir[MAX_PATH]; WCHAR InstallDir[MAX_PATH];
WCHAR c; WCHAR c;
ULONG Length, Pos; ULONG Length, Pos;
NTSTATUS Status;
/* We do not need the filesystem list anymore */ /* We do not need the filesystem list anymore */
if (FileSystemList != NULL) if (FileSystemList != NULL)
@ -3360,9 +3361,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
*/ */
if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidPath(InstallDir)) if ((RepairUpdateFlag || IsUnattendedSetup) && IsValidPath(InstallDir))
{ {
BuildInstallPaths(InstallDir, Status = BuildInstallPaths(InstallDir,
DiskEntry, DiskEntry,
PartEntry); PartEntry);
if (!NT_SUCCESS(Status))
{
DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);
PopupError("Failed to build the installation paths for the ReactOS installation directory!",
MUIGetString(STRING_CONTINUE),
Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
/* /*
* Check whether the user attempts to install ReactOS within the * Check whether the user attempts to install ReactOS within the
@ -3462,9 +3471,17 @@ InstallDirectoryPage(PINPUT_RECORD Ir)
return INSTALL_DIRECTORY_PAGE; return INSTALL_DIRECTORY_PAGE;
} }
BuildInstallPaths(InstallDir, Status = BuildInstallPaths(InstallDir,
DiskEntry, DiskEntry,
PartEntry); PartEntry);
if (!NT_SUCCESS(Status))
{
DPRINT1("BuildInstallPaths() failed. Status code: 0x%lx", Status);
PopupError("Failed to build the installation paths for the ReactOS installation directory!",
MUIGetString(STRING_CONTINUE),
Ir, POPUP_WAIT_ENTER);
return QUIT_PAGE;
}
/* /*
* Check whether the user attempts to install ReactOS within the * Check whether the user attempts to install ReactOS within the