diff options
| author | Marvin H?user <Marvin.Haeuser@outlook.com> | 2016-05-19 07:21:35 +0800 |
|---|---|---|
| committer | Qiu Shumin <shumin.qiu@intel.com> | 2016-05-20 14:16:47 +0800 |
| commit | f3a51e989aeae40b754eb76e38a3cea73fe1c2d2 (patch) | |
| tree | 7451e6ea7b4cfb131b0b34e415b32b229994cab0 | |
| parent | b6e5da196a9c1412ed863601e3230e094309c41b (diff) | |
| download | edk2-f3a51e989aeae40b754eb76e38a3cea73fe1c2d2.zip edk2-f3a51e989aeae40b754eb76e38a3cea73fe1c2d2.tar.gz edk2-f3a51e989aeae40b754eb76e38a3cea73fe1c2d2.tar.bz2 | |
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>
| -rw-r--r-- | ShellPkg/Application/Shell/Shell.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index 47b3118..2c56409 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -904,12 +904,19 @@ ProcessCommandLine( // like a shell option (which is assumed to be `file-name`).
Status = gBS->LocateProtocol (
- &gEfiUnicodeCollationProtocolGuid,
+ &gEfiUnicodeCollation2ProtocolGuid,
NULL,
(VOID **) &UnicodeCollation
);
if (EFI_ERROR (Status)) {
- return Status;
+ Status = gBS->LocateProtocol (
+ &gEfiUnicodeCollationProtocolGuid,
+ NULL,
+ (VOID **) &UnicodeCollation
+ );
+ if (EFI_ERROR (Status)) {
+ return Status;
+ }
}
// Set default options
|