Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 10:31:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP][REACTOS] Check the status return value of InitDestinationPaths() (#1264)

Browse source 
- Within the function's body code, check the status values returned by the called functions.
- Change the BuildInstallPaths's function type to NTSTATUS instead of VOID (and check the status of InitDestinationPaths() as well.
This commit is contained in:
Bișoc George 2019-02-10 16:43:51 +01:00 • committed by Hermès BÉLUSCA - MAÏTO
parent 3cd3d896b7
commit 8bde4de2d6
3 changed files with 96 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

98
base/setup/lib/setuplib.c
View file

@ -628,18 +628,29 @@ InitDestinationPaths(
IN PPARTENTRY PartEntry) // FIXME: HACK!
{
WCHAR PathBuffer[MAX_PATH];
//
// TODO: Check return status values of the functions!
//
NTSTATUS Status;
/* Create 'pSetupData->DestinationRootPath' string */
RtlFreeUnicodeString(&pSetupData->DestinationRootPath);
RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer),
L"\\Device\\Harddisk%lu\\Partition%lu\\",
DiskEntry->DiskNumber,
PartEntry->PartitionNumber);
RtlCreateUnicodeString(&pSetupData->DestinationRootPath, PathBuffer);
Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer),
L"\\Device\\Harddisk%lu\\Partition%lu\\",
DiskEntry->DiskNumber,
PartEntry->PartitionNumber);
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlStringCchPrintfW() failed with status 0x%08lx\n", Status);
return Status;
}
Status = RtlCreateUnicodeString(&pSetupData->DestinationRootPath, PathBuffer) ? STATUS_SUCCESS : STATUS_NO_MEMORY;
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status);
return Status;
}
DPRINT("DestinationRootPath: %wZ\n", &pSetupData->DestinationRootPath);
// FIXME! Which variable to choose?
@ -649,23 +660,72 @@ InitDestinationPaths(
/** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/
/* Create 'pSetupData->DestinationArcPath' */
RtlFreeUnicodeString(&pSetupData->DestinationArcPath);
RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer),
L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\",
DiskEntry->BiosDiskNumber,
PartEntry->OnDiskPartitionNumber);
ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallationDir);
RtlCreateUnicodeString(&pSetupData->DestinationArcPath, PathBuffer);
Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer),
L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\",
DiskEntry->BiosDiskNumber,
PartEntry->OnDiskPartitionNumber);
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlStringCchPrintfW() failed with status 0x%08lx\n", Status);
RtlFreeUnicodeString(&pSetupData->DestinationRootPath);
return Status;
}
Status = ConcatPaths(PathBuffer, ARRAYSIZE(PathBuffer), 1, InstallationDir);
if (!NT_SUCCESS(Status))
{
DPRINT1("ConcatPaths() failed with status 0x%08lx\n", Status);
RtlFreeUnicodeString(&pSetupData->DestinationRootPath);
return Status;
}
Status = RtlCreateUnicodeString(&pSetupData->DestinationArcPath, PathBuffer) ? STATUS_SUCCESS : STATUS_NO_MEMORY;
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status);
RtlFreeUnicodeString(&pSetupData->DestinationRootPath);
return Status;
}
/** Equivalent of 'NTOS_INSTALLATION::SystemNtPath' **/
/* Create 'pSetupData->DestinationPath' string */
RtlFreeUnicodeString(&pSetupData->DestinationPath);
CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2,
pSetupData->DestinationRootPath.Buffer, InstallationDir);
RtlCreateUnicodeString(&pSetupData->DestinationPath, PathBuffer);
Status = CombinePaths(PathBuffer, ARRAYSIZE(PathBuffer), 2,
pSetupData->DestinationRootPath.Buffer, InstallationDir);
if (!NT_SUCCESS(Status))
{
DPRINT1("CombinePaths() failed with status 0x%08lx\n", Status);
RtlFreeUnicodeString(&pSetupData->DestinationRootPath);
RtlFreeUnicodeString(&pSetupData->DestinationArcPath);
return Status;
}
Status = RtlCreateUnicodeString(&pSetupData->DestinationPath, PathBuffer) ? STATUS_SUCCESS : STATUS_NO_MEMORY;
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status);
RtlFreeUnicodeString(&pSetupData->DestinationRootPath);
RtlFreeUnicodeString(&pSetupData->DestinationArcPath);
return Status;
}
/** Equivalent of 'NTOS_INSTALLATION::PathComponent' **/
// FIXME: This is only temporary!! Must be removed later!
/***/RtlCreateUnicodeString(&pSetupData->InstallPath, InstallationDir);/***/
Status = RtlCreateUnicodeString(&pSetupData->InstallPath, InstallationDir) ? STATUS_SUCCESS : STATUS_NO_MEMORY;
if (!NT_SUCCESS(Status))
{
DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status);
RtlFreeUnicodeString(&pSetupData->DestinationRootPath);
RtlFreeUnicodeString(&pSetupData->DestinationArcPath);
RtlFreeUnicodeString(&pSetupData->DestinationPath);
return Status;
}
return STATUS_SUCCESS;
}