diff options
| author | eric_tian <eric_tian@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-07-03 09:18:30 +0000 |
|---|---|---|
| committer | eric_tian <eric_tian@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-07-03 09:18:30 +0000 |
| commit | 5e0b1e3f828d1c6cb449373628616fe3ee03221d (patch) | |
| tree | 4cfb0234c95b024615914eda1b123704164ebd43 | |
| parent | 8d303ef3049c0580a0d5003a3aee782d0bed2300 (diff) | |
| download | edk2-5e0b1e3f828d1c6cb449373628616fe3ee03221d.tar.gz edk2-5e0b1e3f828d1c6cb449373628616fe3ee03221d.tar.bz2 edk2-5e0b1e3f828d1c6cb449373628616fe3ee03221d.zip | |
fix the issue of "Simple File System Protocol Test -> SetInfo_Conf failed on RAS_MB". When it print a string contained a control character of 0xc, it will hang on ConOut->OutputString() which will preprocessor some control character and call HiiStringToImage to render. There is gap between ConOut->OutputString() and HiiStringToImage.The former doesn't identify '0xc' as a line break character and assert only one line font printed. But the latter think it is so and print 2 line, which causes assertion.
I add EFI_HII_IGNORE_LINE_BREAK flag to force HiiStringToImage ignore the force line break character.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8736 6f19259b-4bc3-4df7-8a09-765794883524
| -rw-r--r-- | MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c index ebc2bf53ee..14a1913879 100644 --- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c +++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c @@ -1648,7 +1648,7 @@ DrawUnicodeWeightAtCursorN ( Status = mHiiFont->StringToImage (
mHiiFont,
- EFI_HII_IGNORE_IF_NO_GLYPH | EFI_HII_DIRECT_TO_SCREEN,
+ EFI_HII_IGNORE_IF_NO_GLYPH | EFI_HII_DIRECT_TO_SCREEN | EFI_HII_IGNORE_LINE_BREAK,
String,
FontInfo,
&Blt,
@@ -1682,7 +1682,7 @@ DrawUnicodeWeightAtCursorN ( //
Status = mHiiFont->StringToImage (
mHiiFont,
- EFI_HII_IGNORE_IF_NO_GLYPH,
+ EFI_HII_IGNORE_IF_NO_GLYPH | EFI_HII_IGNORE_LINE_BREAK,
String,
FontInfo,
&Blt,
|