DibyaXP/alcyone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BOOT:LIB] Do some renaming

Browse Source 
BOOT_APPLICATION_ENTRY_OPTION -> BOOT_APPLICATION_OPTION
BOOT_APPLICATION_ENTRY -> BOOT_INPUT_APPLICATION_ENTRY
This commit is contained in:
Quinn Stephens 2024-08-25 10:49:44 -04:00
parent e61d0f5155
commit de9501aee9
4 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BOOT/ENVIRON/INC/bootlib.h
View File

@ -36,12 +36,12 @@ ConsolePrintf (
ULONG ULONG
BlGetBootOptionSize ( BlGetBootOptionSize (
IN PBOOT_APPLICATION_ENTRY_OPTION Option IN PBOOT_APPLICATION_OPTION Option
); );
ULONG ULONG
BlGetBootOptionListSize ( BlGetBootOptionListSize (
IN PBOOT_APPLICATION_ENTRY_OPTION Options IN PBOOT_APPLICATION_OPTION Options
); );
NTSTATUS NTSTATUS

10
BOOT/ENVIRON/INC/bootmgr.h
View File

@ -78,19 +78,19 @@ typedef struct {
ULONG NextOptionOffset; ULONG NextOptionOffset;
BOOLEAN IsInvalid; BOOLEAN IsInvalid;
UCHAR Unknown[3]; UCHAR Unknown[3];
} BOOT_APPLICATION_ENTRY_OPTION, *PBOOT_APPLICATION_ENTRY_OPTION; } BOOT_APPLICATION_OPTION, *PBOOT_APPLICATION_OPTION;
#define BOOT_APPLICATION_ENTRY_SIGNATURE 0x544e4550415442 /* "BTAPENT" */ #define BOOT_INPUT_APPLICATION_ENTRY_SIGNATURE 0x544e4550415442 /* "BTAPENT" */
#define BOOT_APPLICATION_ENTRY_NO_BCD_IDENTIFIER 0x01 #define BOOT_INPUT_APPLICATION_ENTRY_NO_BCD_IDENTIFIER 0x01
typedef struct { typedef struct {
ULONGLONG Signature; ULONGLONG Signature;
ULONG Attributes; ULONG Attributes;
GUID BcdIdentifier; GUID BcdIdentifier;
UCHAR Unknown[16]; UCHAR Unknown[16];
BOOT_APPLICATION_ENTRY_OPTION Options; BOOT_APPLICATION_OPTION Options;
} BOOT_APPLICATION_ENTRY, *PBOOT_APPLICATION_ENTRY; } BOOT_INPUT_APPLICATION_ENTRY, *PBOOT_INPUT_APPLICATION_ENTRY;
#define BOOT_MEMORY_INFO_VERSION 1 #define BOOT_MEMORY_INFO_VERSION 1

42
BOOT/ENVIRON/LIB/EFI/efiinit.c
View File

@ -293,7 +293,7 @@ NTSTATUS
EfiInitpConvertEfiDevicePath ( EfiInitpConvertEfiDevicePath (
IN EFI_DEVICE_PATH *EfiDevicePath, IN EFI_DEVICE_PATH *EfiDevicePath,
IN BCDE_DATA_TYPE OptionType, IN BCDE_DATA_TYPE OptionType,
IN OUT PBOOT_APPLICATION_ENTRY_OPTION Option, IN OUT PBOOT_APPLICATION_OPTION Option,
IN ULONG BufferSize IN ULONG BufferSize
) )
@ -327,19 +327,19 @@ Return Value:
// //
// Check for available buffer space. // Check for available buffer space.
// //
if (BufferSize < sizeof(BOOT_APPLICATION_ENTRY_OPTION) + FIELD_OFFSET(BCDE_DEVICE, Device)) { if (BufferSize < sizeof(BOOT_APPLICATION_OPTION) + FIELD_OFFSET(BCDE_DEVICE, Device)) {
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
// //
// Translate device path. // Translate device path.
// //
RtlZeroMemory(Option, sizeof(BOOT_APPLICATION_ENTRY_OPTION)); RtlZeroMemory(Option, sizeof(BOOT_APPLICATION_OPTION));
DeviceElement = (PBCDE_DEVICE)((PUCHAR)Option + sizeof(BOOT_APPLICATION_ENTRY_OPTION)); DeviceElement = (PBCDE_DEVICE)((PUCHAR)Option + sizeof(BOOT_APPLICATION_OPTION));
Status = EfiInitTranslateDevicePath( Status = EfiInitTranslateDevicePath(
EfiDevicePath, EfiDevicePath,
&DeviceElement->Device, &DeviceElement->Device,
BufferSize - (sizeof(BOOT_APPLICATION_ENTRY_OPTION) + FIELD_OFFSET(BCDE_DEVICE, Device)) BufferSize - (sizeof(BOOT_APPLICATION_OPTION) + FIELD_OFFSET(BCDE_DEVICE, Device))
); );
if (!NT_SUCCESS(Status)) { if (!NT_SUCCESS(Status)) {
return Status; return Status;
@ -349,7 +349,7 @@ Return Value:
// Set up option structure. // Set up option structure.
// //
Option->Type = OptionType; Option->Type = OptionType;
Option->DataOffset = sizeof(BOOT_APPLICATION_ENTRY_OPTION); Option->DataOffset = sizeof(BOOT_APPLICATION_OPTION);
Option->DataSize = FIELD_OFFSET(BCDE_DEVICE, Device) + DeviceElement->Device.Size; Option->DataSize = FIELD_OFFSET(BCDE_DEVICE, Device) + DeviceElement->Device.Size;
return STATUS_SUCCESS; return STATUS_SUCCESS;
@ -359,7 +359,7 @@ NTSTATUS
EfiInitpConvertEfiFilePath ( EfiInitpConvertEfiFilePath (
IN EFI_DEVICE_PATH *EfiFilePath, IN EFI_DEVICE_PATH *EfiFilePath,
IN BCDE_DATA_TYPE OptionType, IN BCDE_DATA_TYPE OptionType,
IN OUT PBOOT_APPLICATION_ENTRY_OPTION Option, IN OUT PBOOT_APPLICATION_OPTION Option,
IN ULONG BufferSize IN ULONG BufferSize
) )
@ -395,22 +395,22 @@ Return Value:
// //
// Check for available buffer space. // Check for available buffer space.
// //
if (BufferSize < sizeof(BOOT_APPLICATION_ENTRY_OPTION)) { if (BufferSize < sizeof(BOOT_APPLICATION_OPTION)) {
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
// //
// Set up option structure. // Set up option structure.
// //
RtlZeroMemory(Option, sizeof(BOOT_APPLICATION_ENTRY_OPTION)); RtlZeroMemory(Option, sizeof(BOOT_APPLICATION_OPTION));
Option->Type = OptionType; Option->Type = OptionType;
Option->DataOffset = sizeof(BOOT_APPLICATION_ENTRY_OPTION); Option->DataOffset = sizeof(BOOT_APPLICATION_OPTION);
// //
// Add to the path one file path node at a time. // Add to the path one file path node at a time.
// //
Option->DataSize = 0; Option->DataSize = 0;
BufferRemaining = BufferSize - sizeof(BOOT_APPLICATION_ENTRY_OPTION); BufferRemaining = BufferSize - sizeof(BOOT_APPLICATION_OPTION);
Node = EfiFilePath; Node = EfiFilePath;
PathStart = (PWCHAR)((PUCHAR)Option + Option->DataOffset); PathStart = (PWCHAR)((PUCHAR)Option + Option->DataOffset);
Position = PathStart; Position = PathStart;
@ -458,7 +458,7 @@ Return Value:
VOID VOID
EfiInitpCreateApplicationEntry ( EfiInitpCreateApplicationEntry (
IN EFI_SYSTEM_TABLE *SystemTable, IN EFI_SYSTEM_TABLE *SystemTable,
IN OUT PBOOT_APPLICATION_ENTRY Entry, IN OUT PBOOT_INPUT_APPLICATION_ENTRY Entry,
IN ULONG BufferSize, IN ULONG BufferSize,
IN EFI_DEVICE_PATH *EfiDevicePath, IN EFI_DEVICE_PATH *EfiDevicePath,
IN EFI_DEVICE_PATH *EfiFilePath, IN EFI_DEVICE_PATH *EfiFilePath,
@ -509,7 +509,7 @@ Return Value:
PWCHAR BcdOptionString; PWCHAR BcdOptionString;
BOOLEAN BcdIdentifierSet; BOOLEAN BcdIdentifierSet;
UNICODE_STRING UnicodeString; UNICODE_STRING UnicodeString;
PBOOT_APPLICATION_ENTRY_OPTION Option, PrevOption; PBOOT_APPLICATION_OPTION Option, PrevOption;
PBCDE_DEVICE BootDeviceElement; PBCDE_DEVICE BootDeviceElement;
(VOID)SystemTable; (VOID)SystemTable;
@ -526,16 +526,16 @@ Return Value:
// Require enough space for the application entry. // Require enough space for the application entry.
// //
BufferRemaining = BufferSize; BufferRemaining = BufferSize;
if (BufferRemaining < sizeof(BOOT_APPLICATION_ENTRY)) { if (BufferRemaining < sizeof(BOOT_INPUT_APPLICATION_ENTRY)) {
return; return;
} }
// //
// Set up application entry structure. // Set up application entry structure.
// //
RtlZeroMemory(Entry, sizeof(BOOT_APPLICATION_ENTRY)); RtlZeroMemory(Entry, sizeof(BOOT_INPUT_APPLICATION_ENTRY));
Entry->Signature = BOOT_APPLICATION_ENTRY_SIGNATURE; Entry->Signature = BOOT_INPUT_APPLICATION_ENTRY_SIGNATURE;
BufferRemaining -= FIELD_OFFSET(BOOT_APPLICATION_ENTRY, Options); BufferRemaining -= FIELD_OFFSET(BOOT_INPUT_APPLICATION_ENTRY, Options);
// //
// Terminate load options string. // Terminate load options string.
@ -556,7 +556,7 @@ Return Value:
} }
if (!BcdIdentifierSet) { if (!BcdIdentifierSet) {
Entry->Attributes |= BOOT_APPLICATION_ENTRY_NO_BCD_IDENTIFIER; Entry->Attributes |= BOOT_INPUT_APPLICATION_ENTRY_NO_BCD_IDENTIFIER;
} }
// //
@ -579,7 +579,7 @@ Return Value:
// TODO: UDP/PXE boot is not supported. // TODO: UDP/PXE boot is not supported.
// //
PrevOption = Option; PrevOption = Option;
Option = (PBOOT_APPLICATION_ENTRY_OPTION)((PUCHAR)&Entry->Options + OptionsSize); Option = (PBOOT_APPLICATION_OPTION)((PUCHAR)&Entry->Options + OptionsSize);
Status = EfiInitpConvertEfiFilePath(EfiFilePath, BCDE_DATA_TYPE_APPLICATION_PATH, Option, BufferRemaining); Status = EfiInitpConvertEfiFilePath(EfiFilePath, BCDE_DATA_TYPE_APPLICATION_PATH, Option, BufferRemaining);
if (!NT_SUCCESS(Status)) { if (!NT_SUCCESS(Status)) {
goto exit; goto exit;
@ -593,7 +593,7 @@ Return Value:
// TODO: This section is incomplete. // TODO: This section is incomplete.
// //
PrevOption = Option; PrevOption = Option;
Option = (PBOOT_APPLICATION_ENTRY_OPTION)((PUCHAR)&Entry->Options + OptionsSize); Option = (PBOOT_APPLICATION_OPTION)((PUCHAR)&Entry->Options + OptionsSize);
// Status = Unknown(LoadOptions, &Entry->Options, RemainingSize, &OptionsSize, &PrevOption, &Size); // Status = Unknown(LoadOptions, &Entry->Options, RemainingSize, &OptionsSize, &PrevOption, &Size);
if (!NT_SUCCESS(Status)) { if (!NT_SUCCESS(Status)) {
goto exit; goto exit;
@ -712,7 +712,7 @@ Return Value:
InputParameters->ApplicationEntryOffset = ScratchUsed; InputParameters->ApplicationEntryOffset = ScratchUsed;
EfiInitpCreateApplicationEntry( EfiInitpCreateApplicationEntry(
SystemTable, SystemTable,
(PBOOT_APPLICATION_ENTRY)(&EfiInitScratch[ScratchUsed]), (PBOOT_INPUT_APPLICATION_ENTRY)(&EfiInitScratch[ScratchUsed]),
sizeof(EfiInitScratch) - ScratchUsed, sizeof(EfiInitScratch) - ScratchUsed,
DevicePath, DevicePath,
LoadedImage->FilePath, LoadedImage->FilePath,

22
BOOT/ENVIRON/LIB/bootlib.c
View File

@ -27,12 +27,12 @@ Abstract:
ULONG ULONG
BlGetBootOptionListSize ( BlGetBootOptionListSize (
IN PBOOT_APPLICATION_ENTRY_OPTION Options IN PBOOT_APPLICATION_OPTION Options
); );
ULONG ULONG
BlGetBootOptionSize ( BlGetBootOptionSize (
IN PBOOT_APPLICATION_ENTRY_OPTION Option IN PBOOT_APPLICATION_OPTION Option
) )
/*++ /*++
@ -57,11 +57,11 @@ Return Value:
if (Option->DataOffset != 0) { if (Option->DataOffset != 0) {
TotalSize = Option->DataOffset + Option->DataSize; TotalSize = Option->DataOffset + Option->DataSize;
} else { } else {
TotalSize = sizeof(BOOT_APPLICATION_ENTRY_OPTION); TotalSize = sizeof(BOOT_APPLICATION_OPTION);
} }
if (Option->OtherOptionsOffset != 0) { if (Option->OtherOptionsOffset != 0) {
TotalSize += BlGetBootOptionListSize((PBOOT_APPLICATION_ENTRY_OPTION)((PUCHAR)Option + Option->OtherOptionsOffset)); TotalSize += BlGetBootOptionListSize((PBOOT_APPLICATION_OPTION)((PUCHAR)Option + Option->OtherOptionsOffset));
} }
return TotalSize; return TotalSize;
@ -69,7 +69,7 @@ Return Value:
ULONG ULONG
BlGetBootOptionListSize ( BlGetBootOptionListSize (
IN PBOOT_APPLICATION_ENTRY_OPTION Options IN PBOOT_APPLICATION_OPTION Options
) )
/*++ /*++
@ -90,12 +90,12 @@ Return Value:
{ {
ULONG TotalSize, NextOffset; ULONG TotalSize, NextOffset;
PBOOT_APPLICATION_ENTRY_OPTION Option; PBOOT_APPLICATION_OPTION Option;
TotalSize = 0; TotalSize = 0;
NextOffset = 0; NextOffset = 0;
do { do {
Option = (PBOOT_APPLICATION_ENTRY_OPTION)((PUCHAR)Options + NextOffset); Option = (PBOOT_APPLICATION_OPTION)((PUCHAR)Options + NextOffset);
NextOffset = Option->NextOptionOffset; NextOffset = Option->NextOptionOffset;
TotalSize += BlGetBootOptionSize(Option); TotalSize += BlGetBootOptionSize(Option);
} while (NextOffset != 0); } while (NextOffset != 0);
@ -129,11 +129,11 @@ Return Value:
{ {
NTSTATUS Status; NTSTATUS Status;
PBOOT_APPLICATION_ENTRY ApplicationEntry; PBOOT_INPUT_APPLICATION_ENTRY ApplicationEntry;
PBOOT_DEVICE BootDevice; PBOOT_DEVICE BootDevice;
PBOOT_FIRMWARE_DATA FirmwareData; PBOOT_FIRMWARE_DATA FirmwareData;
PBOOT_BLOCK_IDENTIFIER BlockDevice; PBOOT_BLOCK_IDENTIFIER BlockDevice;
PBOOT_APPLICATION_ENTRY_OPTION Option; PBOOT_APPLICATION_OPTION Option;
(VOID)LibraryParameters; (VOID)LibraryParameters;
@ -149,7 +149,7 @@ Return Value:
// //
// Calculate structure addresses from offsets. // Calculate structure addresses from offsets.
// //
ApplicationEntry = (PBOOT_APPLICATION_ENTRY)((PUCHAR)InputParameters + InputParameters->ApplicationEntryOffset); ApplicationEntry = (PBOOT_INPUT_APPLICATION_ENTRY)((PUCHAR)InputParameters + InputParameters->ApplicationEntryOffset);
BootDevice = (PBOOT_DEVICE)((PUCHAR)InputParameters + InputParameters->BootDeviceOffset); BootDevice = (PBOOT_DEVICE)((PUCHAR)InputParameters + InputParameters->BootDeviceOffset);
FirmwareData = (PBOOT_FIRMWARE_DATA)((PUCHAR)InputParameters + InputParameters->FirmwareDataOffset); FirmwareData = (PBOOT_FIRMWARE_DATA)((PUCHAR)InputParameters + InputParameters->FirmwareDataOffset);
@ -216,7 +216,7 @@ Return Value:
break; break;
} }
Option = (PBOOT_APPLICATION_ENTRY_OPTION)((PUCHAR)Option + Option->NextOptionOffset); Option = (PBOOT_APPLICATION_OPTION)((PUCHAR)Option + Option->NextOptionOffset);
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;