Change the status code to EFI_NOT_FOUND for Framework Hii's GetGlyph if EFI_WARN_UNKN...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5886 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
index 49c82b91df40021a05a25a07ec88432ffad966ad..236029671b98e9c0a32707585803ab997ca163dc 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c
@@ -87,13 +87,10 @@ HiiGetGlyph (
                                &BaseLine\r
                                );\r
 \r
-  if (!EFI_ERROR (Status)) {\r
+  if (!EFI_ERROR (Status) && (Status != EFI_WARN_UNKNOWN_GLYPH)) {\r
     //\r
     // For simplicity, we only handle Narrow Glyph.\r
     //\r
-    ASSERT (Blt->Height == EFI_GLYPH_HEIGHT);\r
-    ASSERT (Blt->Width == EFI_GLYPH_WIDTH);\r
-\r
     if (Blt->Height == EFI_GLYPH_HEIGHT && Blt->Width == EFI_GLYPH_WIDTH) {\r
 \r
       ZeroMem (&mNarrowGlyphBuffer, sizeof (mNarrowGlyphBuffer));\r
@@ -115,7 +112,10 @@ HiiGetGlyph (
 \r
   }\r
 \r
-  if (EFI_ERROR (Status)) {\r
+  if (EFI_ERROR (Status) || (Status == EFI_WARN_UNKNOWN_GLYPH)) {\r
+    if (Status == EFI_WARN_UNKNOWN_GLYPH) {\r
+      Status = EFI_NOT_FOUND;\r
+    }\r
     *GlyphBuffer = NULL;\r
   }\r
   return Status;\r