sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for word wrapping.

Browse Source 
fix for SimpleTextInEx callbacks.
remove an ASSERT.
fix for -noconsolein parameter.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11544 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jcarsey
2011-04-15 18:20:40 +00:00
parent f6ea51e5ac
commit a49f6a2f7e
7 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ShellPkg/Application/Shell/ConsoleLogger.c
View File

@ -729,7 +729,7 @@ ConsoleLoggerPrintWithPageBreak(
//
// check if that is the last column
//
if ((INTN)ConsoleInfo->ColsPerScreen == ConsoleInfo->OurConOut.Mode->CursorColumn - 1) {
if ((INTN)ConsoleInfo->ColsPerScreen == ConsoleInfo->OurConOut.Mode->CursorColumn + 1) {
//
// output a line similar to the linefeed character.
//
@ -753,7 +753,7 @@ ConsoleLoggerPrintWithPageBreak(
//
// Update LineStart Variable
//
LineStart = Walker;
LineStart = Walker + 1;
//
// increment row count and zero the column
@ -810,12 +810,22 @@ ConsoleLoggerOutputString (
IN CHAR16 *WString
)
{
EFI_INPUT_KEY Key;
UINTN EventIndex;
CONSOLE_LOGGER_PRIVATE_DATA *ConsoleInfo;
ConsoleInfo = CONSOLE_LOGGER_PRIVATE_DATA_FROM_THIS(This);
if (ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoConsoleOut) {
return (EFI_UNSUPPORTED);
}
ASSERT(ShellInfoObject.ConsoleInfo == ConsoleInfo);
if (ShellInfoObject.HaltOutput) {
//
// just get some key
//
gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &EventIndex);
gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);
ShellInfoObject.HaltOutput = FALSE;
}
if (!ShellInfoObject.ConsoleInfo->Enabled) {
return (EFI_DEVICE_ERROR);
} else if (ShellInfoObject.PageBreakEnabled) {