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

[SETUPLIB][USETUP] Minor code refactoring, consisting in renaming the "ntos boot loader" stuff into "boot store", since this happens to be functionality that is a bit more general than previously thought.

Browse source 
- Fix the usage of the BootEntry's "Version" member.
- Don't surround with too many quotation marks the "friendly" boot entry name in AddBootStoreEntry().

svn path=/branches/setup_improvements/; revision=74964
This commit is contained in:
Hermès Bélusca-Maïto 2017-06-08 17:30:23 +00:00
parent e589513b46
commit a28461124b
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
4 changed files with 174 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

20
base/setup/lib/osdetect.c
View file

@ -68,8 +68,8 @@ typedef struct _ENUM_INSTALLS_DATA
static NTSTATUS
NTAPI
EnumerateInstallations(
IN NTOS_BOOT_LOADER_TYPE Type,
IN PNTOS_BOOT_ENTRY BootEntry,
IN BOOT_STORE_TYPE Type,
IN PBOOT_STORE_ENTRY BootEntry,
IN PVOID Parameter OPTIONAL)
{
PENUM_INSTALLS_DATA Data = (PENUM_INSTALLS_DATA)Parameter;
@ -95,8 +95,10 @@ EnumerateInstallations(
RTL_FIELD_SIZE(NTOS_OPTIONS, Signature))
{
/* This is not a ReactOS entry */
DPRINT1(" An installation '%S' of unsupported type '%S'\n",
BootEntry->FriendlyName, BootEntry->Version ? BootEntry->Version : L"n/a");
// DPRINT1(" An installation '%S' of unsupported type '%S'\n",
// BootEntry->FriendlyName, BootEntry->Version ? BootEntry->Version : L"n/a");
DPRINT1(" An installation '%S' of unsupported type %lu\n",
BootEntry->FriendlyName, BootEntry->OsOptionsLength);
/* Continue the enumeration */
return STATUS_SUCCESS;
}
@ -641,7 +643,7 @@ FindNTOSInstallations(
OBJECT_ATTRIBUTES ObjectAttributes;
IO_STATUS_BLOCK IoStatusBlock;
UNICODE_STRING PartitionRootPath;
NTOS_BOOT_LOADER_TYPE Type;
BOOT_STORE_TYPE Type;
PVOID BootStoreHandle;
ENUM_INSTALLS_DATA Data;
ULONG Version;
@ -678,7 +680,7 @@ FindNTOSInstallations(
/* Try to see whether we recognize some NT boot loaders */
for (Type = FreeLdr; Type < BldrTypeMax; ++Type)
{
Status = FindNTOSBootLoader(PartitionDirectoryHandle, Type, &Version);
Status = FindBootStore(PartitionDirectoryHandle, Type, &Version);
if (!NT_SUCCESS(Status))
{
/* The loader does not exist, continue with another one */
@ -691,15 +693,15 @@ FindNTOSInstallations(
DPRINT1("Analyse the OS installations for loader type '%d' in disk #%d, partition #%d\n",
Type, DiskNumber, PartitionNumber);
Status = OpenNTOSBootLoaderStoreByHandle(&BootStoreHandle, PartitionDirectoryHandle, Type, FALSE);
Status = OpenBootStoreByHandle(&BootStoreHandle, PartitionDirectoryHandle, Type, FALSE);
if (!NT_SUCCESS(Status))
{
DPRINT1("Could not open the NTOS boot store of type '%d' (Status 0x%08lx), continue with another one...\n",
Type, Status);
continue;
}
EnumerateNTOSBootEntries(BootStoreHandle, EnumerateInstallations, &Data);
CloseNTOSBootLoaderStore(BootStoreHandle);
EnumerateBootStoreEntries(BootStoreHandle, EnumerateInstallations, &Data);
CloseBootStore(BootStoreHandle);
}
/* Close the partition */