Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 05:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SETUPLIB] Improve a bit the management of boot-store options

Browse source 
- QueryBootStoreOptions(): De-duplicate code.
- SetBootStoreOpt(): Respect the FieldsToChange flag.
- BOOT_STORE_OPTIONS: Remove unused Version field and distinguish
  between "Current" and "Next" BootEntryKey.
This commit is contained in:
Hermès Bélusca-Maïto 2024-05-04 12:47:13 +02:00
parent 68c2a28973
commit 9b563d32d2
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 68 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

22
base/setup/lib/utils/bldrsup.h
View file

@ -30,14 +30,18 @@ typedef enum _BOOT_STORE_TYPE
*/
typedef struct _BOOT_STORE_OPTIONS
{
ULONG Version; // BOOT_STORE_TYPE value
// ULONG Length;
ULONG Timeout;
ULONG_PTR CurrentBootEntryKey;
// ULONG_PTR NextBootEntryKey;
// WCHAR HeadlessRedirection[1];
ULONG Timeout; //< Timeout in seconds before the default boot entry is started.
ULONG_PTR CurrentBootEntryKey; //< Selected boot entry for the current boot (informative only).
ULONG_PTR NextBootEntryKey; //< The boot entry for the next boot.
// WCHAR HeadlessRedirection[ANYSIZE_ARRAY];
} BOOT_STORE_OPTIONS, *PBOOT_STORE_OPTIONS;
/* FieldsToChange flags for SetBootStoreOptions() */
#define BOOT_OPTIONS_TIMEOUT 1
#define BOOT_OPTIONS_NEXT_BOOTENTRY_KEY 2
// #define BOOT_OPTIONS_HEADLESS_REDIRECTION 4
/*
* These macros are used to set a value for the BootEntryKey member of a
* BOOT_STORE_ENTRY structure, much in the same idea as MAKEINTRESOURCE and
@ -63,10 +67,10 @@ typedef struct _BOOT_STORE_ENTRY
{
ULONG Version; // BOOT_STORE_TYPE value
// ULONG Length;
ULONG_PTR BootEntryKey; // Boot entry "key"
PCWSTR FriendlyName; // Human-readable boot entry description // LoadIdentifier
PCWSTR BootFilePath; // Path to e.g. osloader.exe, or winload.efi // EfiOsLoaderFilePath
ULONG OsOptionsLength; // Loader-specific options blob (can be a string, or a binary structure...)
ULONG_PTR BootEntryKey; //< Boot entry "key"
PCWSTR FriendlyName; //< Human-readable boot entry description // LoadIdentifier
PCWSTR BootFilePath; //< Path to e.g. osloader.exe, or winload.efi // EfiOsLoaderFilePath
ULONG OsOptionsLength; //< Loader-specific options blob (can be a string, or a binary structure...)
UCHAR OsOptions[ANYSIZE_ARRAY];
/*
* In packed form, this structure would contain offsets to 'FriendlyName'