Skip to content

O
OpenCorePKG_MOD

btwise / OpenCorePKG_MOD

通知 26
Star 0
Fork 0
O
OpenCorePKG_MOD

体验新版 GitCode，发现更多精彩内容 >>

提交 7fafb357 编写于 作者: V vit9696
浏览文件
操作

OcBootManagementLib: Implement tool loading

上级 633207e3
隐藏空白更改
内联 并排
Showing with 131 addition and 74 deletion
Include/Library/OcBootManagementLib.h
浏览文件 @ 7fafb357
......@@ -24,6 +24,7 @@
typedef struct OC_BOOT_ENTRY_ {
//
// Device path to booter or its directory.
// Can be NULL, for example, for custom entries.
//
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
//
......@@ -32,9 +33,14 @@ typedef struct OC_BOOT_ENTRY_ {
CHAR16 *Name;
//
// Obtained boot path directory.
// For custom entries this contains tool path.
//
CHAR16 *PathName;
//
// Set when this entry is a custom externally loadable tool entry.
//
BOOLEAN IsCustom;
//
// Should try booting from first dmg found in DevicePath.
//
BOOLEAN IsFolder;
......@@ -44,12 +50,16 @@ typedef struct OC_BOOT_ENTRY_ {
BOOLEAN IsRecovery;
//
// Heuristical value signalising about Windows os (otherwise macOS).
// WARNING: This is only for debug purposes.
//
BOOLEAN IsWindows;
//
// Load option data (usually "boot args")
// Load option data (usually "boot args") size.
//
UINT32 LoadOptionsSize;
//
// Load option data (usually "boot args").
//
VOID *LoadOptions;
} OC_BOOT_ENTRY;
......@@ -215,11 +225,31 @@ EFI_STATUS
OUT CHAR16 **ExitData OPTIONAL
);
/**
Exposed custom entry load interface.
Must return allocated file buffer from pool.
**/
typedef
EFI_STATUS
(EFIAPI *OC_CUSTOM_READ) (
IN VOID *Context,
IN OC_BOOT_ENTRY *ChosenEntry,
OUT VOID **Data,
OUT UINT32 *DataSize
);
/**
Custom picker entry
**/
typedef struct {
VOID *Smth;
//
// Entry name.
//
CONST CHAR8 *Name;
//
// Entry path.
//
CONST CHAR8 *Path;
} OC_PICKER_ENTRY;
/**
......@@ -247,6 +277,14 @@ typedef struct {
//
BOOLEAN CustomBootGuid;
//
// Custom entry reading routine, optional for no custom entries.
//
OC_CUSTOM_READ CustomRead;
//
// Context to pass to CustomRead, optional.
//
VOID *CustomEntryContext;
//
// Image starting routine used, required.
//
OC_IMAGE_START StartImage;
......@@ -330,7 +368,7 @@ OcFillBootEntry (
Scan system for boot entries.
@param[in] BootPolicy Apple Boot Policy Protocol.
@param[in] Policy Scan policy.
@param[in] Context Picker context.
@param[out] BootEntries List of boot entries (allocated from pool).
@param[out] Count Number of boot entries.
@param[out] AllocCount Number of allocated boot entries.
......@@ -342,11 +380,10 @@ OcFillBootEntry (
EFI_STATUS
OcScanForBootEntries (
IN APPLE_BOOT_POLICY_PROTOCOL *BootPolicy,
IN UINT32 Policy,
IN OC_PICKER_CONTEXT *Context,
OUT OC_BOOT_ENTRY **BootEntries,
OUT UINTN *Count,
OUT UINTN *AllocCount OPTIONAL,
IN EFI_HANDLE LoadHandle OPTIONAL,
IN BOOLEAN Describe
);
......@@ -372,23 +409,21 @@ OcShowSimpleBootMenu (
);
/**
Load boot entry loader image with given options and return its handle.
Load & start boot entry loader image with given options.
@param[in] BootPolicy Apple Boot Policy Protocol.
@param[in] Context Picker context.
@param[in] BootEntry Located boot entry.
@param[in] Policy Load policy.
@param[in] ParentHandle Parent image handle.
@param[out] EntryHandle Loaded image handle.
@retval EFI_SUCCESS The image was found and loaded succesfully.
@retval EFI_SUCCESS The image was found, started, and ended succesfully.
**/
EFI_STATUS
OcLoadBootEntry (
IN APPLE_BOOT_POLICY_PROTOCOL *BootPolicy,
IN OC_PICKER_CONTEXT *Context,
IN OC_BOOT_ENTRY *BootEntry,
IN UINT32 Policy,
IN EFI_HANDLE ParentHandle,
OUT EFI_HANDLE *EntryHandle
IN EFI_HANDLE ParentHandle
);
/**
......
Library/OcBootManagementLib/OcBootManagementLib.c
浏览文件 @ 7fafb357
......@@ -22,6 +22,7 @@
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/DevicePathLib.h>
#include <Library/OcGuardLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/OcBootManagementLib.h>
#include <Library/OcFileLib.h>
......@@ -35,8 +36,8 @@ STATIC
EFI_STATUS
InternalLoadBootEntry (
IN APPLE_BOOT_POLICY_PROTOCOL *BootPolicy,
IN OC_PICKER_CONTEXT *Context,
IN OC_BOOT_ENTRY *BootEntry,
IN UINT32 Policy,
IN EFI_HANDLE ParentHandle,
OUT EFI_HANDLE *EntryHandle,
OUT INTERNAL_DMG_LOAD_CONTEXT *DmgLoadContext
......@@ -47,6 +48,8 @@ InternalLoadBootEntry (
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
CHAR16 *UnicodeDevicePath;
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
VOID *EntryData;
UINT32 EntryDataSize;
//
// TODO: support Apple loaded image, policy, and dmg boot.
......@@ -55,7 +58,7 @@ InternalLoadBootEntry (
ZeroMem (DmgLoadContext, sizeof (*DmgLoadContext));
if (BootEntry->IsFolder) {
if ((Policy & OC_LOAD_ALLOW_DMG_BOOT) == 0) {
if ((Context->LoadPolicy & OC_LOAD_ALLOW_DMG_BOOT) == 0) {
return EFI_SECURITY_VIOLATION;
}
......@@ -63,7 +66,7 @@ InternalLoadBootEntry (
DevicePath = InternalLoadDmg (
DmgLoadContext,
BootPolicy,
Policy
Context->LoadPolicy
);
if (DevicePath == NULL) {
return EFI_UNSUPPORTED;
......@@ -82,12 +85,28 @@ InternalLoadBootEntry (
}
DEBUG_CODE_END ();
Status = gBS->LoadImage (FALSE, ParentHandle, DevicePath, NULL, 0, EntryHandle);
} else if (BootEntry->IsCustom) {
ASSERT (Context->CustomRead != NULL);
EntryData = NULL;
EntryDataSize = 0;
Status = Context->CustomRead (
Context->CustomEntryContext,
BootEntry,
&EntryData,
&EntryDataSize
);
if (!EFI_ERROR (Status)) {
Status = gBS->LoadImage (FALSE, ParentHandle, NULL, EntryData, EntryDataSize, EntryHandle);
FreePool (EntryData);
}
} else {
DevicePath = BootEntry->DevicePath;
Status = gBS->LoadImage (FALSE, ParentHandle, BootEntry->DevicePath, NULL, 0, EntryHandle);
}
Status = gBS->LoadImage (FALSE, ParentHandle, DevicePath, NULL, 0, EntryHandle);
if (!EFI_ERROR (Status)) {
OptionalStatus = gBS->HandleProtocol (
ParentHandle,
......@@ -119,6 +138,13 @@ OcDescribeBootEntry (
UINT32 BcdSize;
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL *FileSystem;
//
// Custom entries need no special description.
//
if (BootEntry->IsCustom) {
return EFI_SUCCESS;
}
Status = BootPolicy->GetBootInfo (
BootEntry->DevicePath,
&BootDirectoryName,
......@@ -178,7 +204,7 @@ OcDescribeBootEntry (
if (BootEntry->Name == NULL) {
BootEntry->Name = GetVolumeLabel (FileSystem);
if (BootEntry->Name != NULL
if (BootEntry->Name != NULL
&& (!StrCmp (BootEntry->Name, L"Recovery HD")
|| !StrCmp (BootEntry->Name, L"Recovery"))) {
BootEntry->IsRecovery = TRUE;
......@@ -326,11 +352,10 @@ OcFillBootEntry (
EFI_STATUS
OcScanForBootEntries (
IN APPLE_BOOT_POLICY_PROTOCOL *BootPolicy,
IN UINT32 Policy,
IN OC_PICKER_CONTEXT *Context,
OUT OC_BOOT_ENTRY **BootEntries,
OUT UINTN *Count,
OUT UINTN *AllocCount OPTIONAL,
IN EFI_HANDLE LoadHandle OPTIONAL,
IN BOOLEAN Describe
)
{
......@@ -339,6 +364,7 @@ OcScanForBootEntries (
EFI_HANDLE *Handles;
UINTN Index;
OC_BOOT_ENTRY *Entries;
UINTN EntriesSize;
UINTN EntryIndex;
CHAR16 *DevicePath;
CHAR16 *VolumeLabel;
......@@ -364,7 +390,12 @@ OcScanForBootEntries (
return EFI_NOT_FOUND;
}
Entries = AllocateZeroPool (NoHandles * 2 * sizeof (OC_BOOT_ENTRY));
if (!OcOverflowAddMulUN (NoHandles * 2, Context->CustomEntryCount, sizeof (OC_BOOT_ENTRY), &EntriesSize)) {
Entries = AllocateZeroPool (EntriesSize);
} else {
Entries = NULL;
}
if (Entries == NULL) {
FreePool (Handles);
return EFI_OUT_OF_RESOURCES;
......@@ -385,12 +416,12 @@ OcScanForBootEntries (
EntryCount = OcFillBootEntry (
BootPolicy,
Policy,
Context->ScanPolicy,
Handles[Index],
SimpleFs,
&Entries[EntryIndex],
&Entries[EntryIndex+1],
LoadHandle == Handles[Index]
Context->ExcludeHandle == Handles[Index]
);
DEBUG_CODE_BEGIN ();
......@@ -453,11 +484,21 @@ OcScanForBootEntries (
}
}
for (Index = 0; Index < Context->CustomEntryCount; ++Index, ++EntryIndex) {
Entries[EntryIndex].Name = AsciiStrCopyToUnicode (Context->CustomEntries[Index].Name, 0);
Entries[EntryIndex].PathName = AsciiStrCopyToUnicode (Context->CustomEntries[Index].Path, 0);
if (Entries[EntryIndex].Name == NULL || Entries[EntryIndex].PathName == NULL) {
OcFreeBootEntries (Entries, EntryIndex + 1);
return EFI_OUT_OF_RESOURCES;
}
Entries[EntryIndex].IsCustom = TRUE;
}
*BootEntries = Entries;
*Count = EntryIndex;
if (AllocCount != NULL) {
*AllocCount = NoHandles * 2;
*AllocCount = EntriesSize / sizeof (OC_BOOT_ENTRY);
}
return EFI_SUCCESS;
......@@ -531,25 +572,37 @@ OcShowSimpleBootMenu (
EFI_STATUS
OcLoadBootEntry (
IN APPLE_BOOT_POLICY_PROTOCOL *BootPolicy,
IN OC_PICKER_CONTEXT *Context,
IN OC_BOOT_ENTRY *BootEntry,
IN UINT32 Policy,
IN EFI_HANDLE ParentHandle,
OUT EFI_HANDLE *EntryHandle
IN EFI_HANDLE ParentHandle
)
{
//
// FIXME: Think of something when starting dmg fails.
//
EFI_STATUS Status;
EFI_HANDLE EntryHandle;
INTERNAL_DMG_LOAD_CONTEXT DmgLoadContext;
return InternalLoadBootEntry (
Status = InternalLoadBootEntry (
BootPolicy,
Context,
BootEntry,
Policy,
ParentHandle,
EntryHandle,
&EntryHandle,
&DmgLoadContext
);
if (!EFI_ERROR (Status)) {
Status = Context->StartImage (BootEntry, ParentHandle, NULL, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "OCB: StartImage failed - %r\n", Status));
//
// Unload dmg if any.
//
InternalUnloadDmg (&DmgLoadContext);
}
} else {
DEBUG ((DEBUG_ERROR, "OCB: LoadImage failed - %r\n", Status));
}
return Status;
}
EFI_STATUS
......@@ -563,9 +616,7 @@ OcRunSimpleBootPicker (
OC_BOOT_ENTRY *Entries;
OC_BOOT_ENTRY *Entry;
UINTN EntryCount;
EFI_HANDLE BooterHandle;
UINT32 DefaultEntry;
INTERNAL_DMG_LOAD_CONTEXT DmgLoadContext;
AppleBootPolicy = OcAppleBootPolicyInstallProtocol (FALSE);
if (AppleBootPolicy == NULL) {
......@@ -578,11 +629,10 @@ OcRunSimpleBootPicker (
Status = OcScanForBootEntries (
AppleBootPolicy,
Context->ScanPolicy,
Context,
&Entries,
&EntryCount,
NULL,
Context->ExcludeHandle,
TRUE
);
......@@ -637,26 +687,12 @@ OcRunSimpleBootPicker (
}
if (!EFI_ERROR (Status)) {
Status = InternalLoadBootEntry (
Status = OcLoadBootEntry (
AppleBootPolicy,
Context,
Chosen,
Context->LoadPolicy,
gImageHandle,
&BooterHandle,
&DmgLoadContext
gImageHandle
);
if (!EFI_ERROR (Status)) {
Status = Context->StartImage (Chosen, BooterHandle, NULL, NULL);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "StartImage failed - %r\n", Status));
//
// Unload dmg if any.
//
InternalUnloadDmg (&DmgLoadContext);
}
} else {
DEBUG ((DEBUG_ERROR, "LoadImage failed - %r\n", Status));
}
gBS->Stall (5000000);
}
......
Tests/BlessTest/BlessTest.c
浏览文件 @ 7fafb357
......@@ -53,8 +53,8 @@ TestBless (
OC_BOOT_ENTRY *Entries;
OC_BOOT_ENTRY *Chosen;
UINTN EntryCount;
EFI_HANDLE BooterHandle;
UINT32 TimeoutSeconds;
OC_PICKER_CONTEXT PickerContext;
Print (L"TestBless\n");
......@@ -69,14 +69,16 @@ TestBless (
TimeoutSeconds = 5;
ZeroMem (&PickerContext, sizeof (PickerContext));
while (TRUE) {
Status = OcScanForBootEntries (
AppleBootPolicy,
0,
&PickerContext,
&Entries,
&EntryCount,
NULL,
NULL,
TRUE
);
......@@ -97,22 +99,6 @@ TestBless (
if (!EFI_ERROR (Status)) {
Print (L"Should boot from %s\n", Chosen->Name);
}
//
// TODO: This should properly handle folder boot entries.
//
if (!EFI_ERROR (Status)) {
Status = OcLoadBootEntry (AppleBootPolicy, Chosen, OC_LOAD_DEFAULT_POLICY, ImageHandle, &BooterHandle);
if (!EFI_ERROR (Status)) {
Status = gBS->StartImage (BooterHandle, NULL, NULL);
if (EFI_ERROR (Status)) {
Print (L"StartImage failed - %r\n", Status);
}
} else {
Print (L"LoadImage failed - %r\n", Status);
}
gBS->Stall (5000000);
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或