ShellPkg/CommandLib: Use first found UC for unsupported PlatformLang

[edk2-devel] [PATCH] ShellPkg/CommandLib: Use first found UC for unsupported PlatformLang

Marvin Häuser posted 1 patch 4 years, 5 months ago

Download mbox

Failed in applying to current master (apply log)

ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)

Expand all Fold all

[edk2-devel] [PATCH] ShellPkg/CommandLib: Use first found UC for unsupported PlatformLang

Posted by Marvin Häuser 4 years, 5 months ago

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2300

On some firmwares PlatformLang is set to the local language (e.g. ru-RU),
however there is no Unicode Collation protocol instance that supports it.
As for missing PlatformLang, fall back to the first found instance.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Reviewed-by: Zhichao Gao <zhichao.gao@intel.com>
Signed-off-by: Marvin Haeuser <mhaeuser@outlook.de>
---
 ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
index 4c48b65fbc1d..345808a1eac6 100644
--- a/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
+++ b/ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c
@@ -107,9 +107,13 @@ CommandInit(
 

       //

       // Without clue provided use the first Unicode Collation2 protocol.

+      // This may happen when PlatformLang is NULL or when no installed Unicode

+      // Collation2 protocol instance supports PlatformLang.

       //

-      if (PlatformLang == NULL) {

+      if (gUnicodeCollation == NULL) {

         gUnicodeCollation = Uc;

+      }

+      if (PlatformLang == NULL) {

         break;

       }

 

-- 
2.23.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#49965): https://edk2.groups.io/g/devel/message/49965
Mute This Topic: https://groups.io/mt/42103048/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-