archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcBootManagementLib: Assign image LoadOptions as Unicode

Browse Source
This commit is contained in:
Download-Fritz 2019-10-07 21:23:46 +02:00
parent 514f9b92ba
commit b7beb073a5
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/OcBootManagementLib/DefaultEntryChoice.c
View File

@ -872,6 +872,8 @@ InternalLoadBootEntry (
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
VOID *EntryData;
UINT32 EntryDataSize;
CONST CHAR8 *Args;
UINT32 ArgsLen;
ASSERT (BootPolicy != NULL);
ASSERT (BootEntry != NULL);
@ -974,16 +976,24 @@ InternalLoadBootEntry (
BootEntry->LoadOptions
));
LoadedImage->LoadOptionsSize = 0;
LoadedImage->LoadOptions = NULL;
if (BootEntry->LoadOptions == NULL
&& (BootEntry->Type == OcBootApple || BootEntry->Type == OcBootAppleRecovery)) {
LoadedImage->LoadOptionsSize = (UINT32)AsciiStrLen (Context->AppleBootArgs);
if (LoadedImage->LoadOptionsSize > 0) {
LoadedImage->LoadOptionsSize += 1;
LoadedImage->LoadOptions = Context->AppleBootArgs;
}
Args = Context->AppleBootArgs;
ArgsLen = (UINT32)AsciiStrLen (Args);
} else {
LoadedImage->LoadOptionsSize = BootEntry->LoadOptionsSize;
LoadedImage->LoadOptions = BootEntry->LoadOptions;
Args = BootEntry->LoadOptions;
ArgsLen = BootEntry->LoadOptionsSize;
ASSERT (ArgsLen == AsciiStrLen (Args));
}
if (ArgsLen > 0) {
LoadedImage->LoadOptions = AsciiStrCopyToUnicode (Args, ArgsLen);
if (LoadedImage->LoadOptions != NULL) {
LoadedImage->LoadOptionsSize = ArgsLen * sizeof (CHAR16) + sizeof (CHAR16);
}
}
if (BootEntry->Type == OcBootCustom) {