mirror of https://github.com/acidanthera/audk.git
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
This commit is contained in:
parent
e21ef3a227
commit
bc3fc71a37
|
@ -87,13 +87,10 @@ HiiGetGlyph (
|
||||||
&BaseLine
|
&BaseLine
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!EFI_ERROR (Status)) {
|
if (!EFI_ERROR (Status) && (Status != EFI_WARN_UNKNOWN_GLYPH)) {
|
||||||
//
|
//
|
||||||
// For simplicity, we only handle Narrow 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) {
|
if (Blt->Height == EFI_GLYPH_HEIGHT && Blt->Width == EFI_GLYPH_WIDTH) {
|
||||||
|
|
||||||
ZeroMem (&mNarrowGlyphBuffer, sizeof (mNarrowGlyphBuffer));
|
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;
|
*GlyphBuffer = NULL;
|
||||||
}
|
}
|
||||||
return Status;
|
return Status;
|
||||||
|
|
Loading…
Reference in New Issue