ShellPkg: Also accept gEfiUnicodeCollation2ProtocolGuid for parsing.

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

View File

@ -904,12 +904,19 @@ ProcessCommandLine(
// 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 ( Status = gBS->LocateProtocol (
&gEfiUnicodeCollationProtocolGuid, &gEfiUnicodeCollation2ProtocolGuid,
NULL, NULL,
(VOID **) &UnicodeCollation (VOID **) &UnicodeCollation
); );
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
return Status; Status = gBS->LocateProtocol (
&gEfiUnicodeCollationProtocolGuid,
NULL,
(VOID **) &UnicodeCollation
);
if (EFI_ERROR (Status)) {
return Status;
}
} }
// Set default options // Set default options