From bc3fc71a3797ee4d84ed0ada3957ea279078d423 Mon Sep 17 00:00:00 2001 From: qwang12 Date: Fri, 12 Sep 2008 03:01:01 +0000 Subject: Change the status code to EFI_NOT_FOUND for Framework Hii's GetGlyph if EFI_WARN_UNKNOWN_GLYPH is return from GetGlyph i.e. no matching font found and UNKNOWN glyph is returned. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5886 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c index 49c82b9..2360296 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c @@ -87,13 +87,10 @@ HiiGetGlyph ( &BaseLine ); - if (!EFI_ERROR (Status)) { + if (!EFI_ERROR (Status) && (Status != EFI_WARN_UNKNOWN_GLYPH)) { // // For simplicity, we only handle Narrow Glyph. // - ASSERT (Blt->Height == EFI_GLYPH_HEIGHT); - ASSERT (Blt->Width == EFI_GLYPH_WIDTH); - if (Blt->Height == EFI_GLYPH_HEIGHT && Blt->Width == EFI_GLYPH_WIDTH) { ZeroMem (&mNarrowGlyphBuffer, sizeof (mNarrowGlyphBuffer)); @@ -115,7 +112,10 @@ HiiGetGlyph ( } - if (EFI_ERROR (Status)) { + if (EFI_ERROR (Status) || (Status == EFI_WARN_UNKNOWN_GLYPH)) { + if (Status == EFI_WARN_UNKNOWN_GLYPH) { + Status = EFI_NOT_FOUND; + } *GlyphBuffer = NULL; } return Status; -- cgit v1.1