ShellPkg: stop using EFI_HANDLE in place of EFI_HII_HANDLE

[mirror_edk2.git] / ShellPkg / Library / UefiShellCommandLib / UefiShellCommandLib.c

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index 4635df40bbdc49397a733ac6a17de2b1d7ecb5fc..4c48b65fbc1de21f5f200ab06ca5c56714a6a78c 100644 (file)
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -74,12 +74,10 @@ CommandInit(
   EFI_STATUS                      Status;\r
   CHAR8                           *PlatformLang;\r
 \r
-  GetEfiGlobalVariable2 (EFI_PLATFORM_LANG_VARIABLE_NAME, (VOID**)&PlatformLang, NULL);\r
-  if (PlatformLang == NULL) {\r
-    return EFI_UNSUPPORTED;\r
-  }\r
-\r
   if (gUnicodeCollation == NULL) {\r
+\r
+    GetEfiGlobalVariable2 (EFI_PLATFORM_LANG_VARIABLE_NAME, (VOID**)&PlatformLang, NULL);\r
+\r
     Status = gBS->LocateHandleBuffer (\r
                     ByProtocol,\r
                     &gEfiUnicodeCollation2ProtocolGuid,\r
@@ -107,6 +105,14 @@ CommandInit(
         continue;\r
       }\r
 \r
+      //\r
+      // Without clue provided use the first Unicode Collation2 protocol.\r
+      //\r
+      if (PlatformLang == NULL) {\r
+        gUnicodeCollation = Uc;\r
+        break;\r
+      }\r
+\r
       //\r
       // Find the best matching matching language from the supported languages\r
       // of Unicode Collation2 protocol.\r
@@ -126,7 +132,9 @@ CommandInit(
     if (Handles != NULL) {\r
       FreePool (Handles);\r
     }\r
-    FreePool (PlatformLang);\r
+    if (PlatformLang != NULL) {\r
+      FreePool (PlatformLang);\r
+    }\r
   }\r
 \r
   return (gUnicodeCollation == NULL) ? EFI_UNSUPPORTED : EFI_SUCCESS;\r
@@ -546,7 +554,7 @@ ShellCommandRegisterCommandName (
   IN        UINT32                      ShellMinSupportLevel,\r
   IN CONST  CHAR16                      *ProfileName,\r
   IN CONST  BOOLEAN                     CanAffectLE,\r
-  IN CONST  EFI_HANDLE                  HiiHandle,\r
+  IN CONST  EFI_HII_HANDLE              HiiHandle,\r
   IN CONST  EFI_STRING_ID               ManFormatHelp\r
   )\r
 {\r