diff options
| author | Marvin H?user <Marvin.Haeuser@outlook.com> | 2016-05-19 07:21:35 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-07-13 20:43:31 +0800 |
| commit | a0c2cbfec609560d49e578ea2904ef7e598487f7 (patch) | |
| tree | b252a5452d33f6a7143c4b4ed10a778224be6a56 /ShellPkg | |
| parent | b45cc48081719e403d99e4a1d6aecf8733a89627 (diff) | |
| download | edk2-a0c2cbfec609560d49e578ea2904ef7e598487f7.tar.gz edk2-a0c2cbfec609560d49e578ea2904ef7e598487f7.tar.bz2 edk2-a0c2cbfec609560d49e578ea2904ef7e598487f7.zip | |
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>
(cherry picked from commit f3a51e989aeae40b754eb76e38a3cea73fe1c2d2)
Diffstat (limited to 'ShellPkg')
| -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 47b3118ea7..2c56409072 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
|