sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: Also accept gEfiUnicodeCollation2ProtocolGuid for parsing.

Browse Source 
The EFI_UNICODE_COLLATION_PROTOCOL can have two different GUIDs.
Look for both to support more UEFI implementations.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Marvin Haeuser <Marvin.Haeuser@outlook.com>
Reviewed-by: Qiu Shumin <shumin.qiu@intel.com>
This commit is contained in:
Marvin H?user
2016-05-19 07:21:35 +08:00
committed by Qiu Shumin
parent b6e5da196a
commit f3a51e989a
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ShellPkg/Application/Shell/Shell.c
View File

@ -903,6 +903,12 @@ ProcessCommandLine(
// arguments manually, ignoring those after the first thing that doesn't look // arguments manually, ignoring those after the first thing that doesn't look
// like a shell option (which is assumed to be `file-name`). // like a shell option (which is assumed to be `file-name`).
Status = gBS->LocateProtocol (
&gEfiUnicodeCollation2ProtocolGuid,
NULL,
(VOID **) &UnicodeCollation
);
if (EFI_ERROR (Status)) {
Status = gBS->LocateProtocol ( Status = gBS->LocateProtocol (
&gEfiUnicodeCollationProtocolGuid, &gEfiUnicodeCollationProtocolGuid,
NULL, NULL,
@ -911,6 +917,7 @@ ProcessCommandLine(
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; return Status;
} }
}
// Set default options // Set default options
ShellInfoObject.ShellInitSettings.BitUnion.Bits.Startup = FALSE; ShellInfoObject.ShellInitSettings.BitUnion.Bits.Startup = FALSE;