diff options
| author | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-12 03:01:01 +0000 |
|---|---|---|
| committer | qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524> | 2008-09-12 03:01:01 +0000 |
| commit | bc3fc71a3797ee4d84ed0ada3957ea279078d423 (patch) | |
| tree | cf3ca1774329eb3ea9d3d3495f95a37bbfac1fe3 | |
| parent | e21ef3a22794f5aa3e6d6b4c2d6e74b66eb7625b (diff) | |
| download | edk2-bc3fc71a3797ee4d84ed0ada3957ea279078d423.zip edk2-bc3fc71a3797ee4d84ed0ada3957ea279078d423.tar.gz edk2-bc3fc71a3797ee4d84ed0ada3957ea279078d423.tar.bz2 | |
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
| -rw-r--r-- | EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Fonts.c | 10 |
1 files 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;
|