From: eric_tian Date: Fri, 3 Jul 2009 09:18:30 +0000 (+0000) Subject: fix the issue of "Simple File System Protocol Test -> SetInfo_Conf failed on RAS_MB... X-Git-Tag: edk2-stable201903~17572 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5e0b1e3f828d1c6cb449373628616fe3ee03221d;p=mirror_edk2.git 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 --- 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,