tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-29 16:44:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

This patch fix date/time op-code shows abnormal.

Browse Source 
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15055 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2014-01-07 08:07:47 +00:00 committed by ydong10
parent eff077992a
commit f0c5095b27
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MdeModulePkg/Universal/DisplayEngineDxe/FormDisplay.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Entry and initialization module for the browser. Entry and initialization module for the browser.
Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -1720,6 +1720,7 @@ HasOptionString (
@param SkipLine The skip line for this menu. @param SkipLine The skip line for this menu.
@param BottomRow The bottom row for this form. @param BottomRow The bottom row for this form.
@param Highlight Whether this menu will be highlight. @param Highlight Whether this menu will be highlight.
@param UpdateCol Whether need to update the column info for Date/Time.
@retval EFI_SUCESSS Process the user selection success. @retval EFI_SUCESSS Process the user selection success.
@ -1731,7 +1732,8 @@ DisplayOneMenu (
IN UINTN BeginCol, IN UINTN BeginCol,
IN UINTN SkipLine, IN UINTN SkipLine,
IN UINTN BottomRow, IN UINTN BottomRow,
IN BOOLEAN Highlight IN BOOLEAN Highlight,
IN BOOLEAN UpdateCol
) )
{ {
FORM_DISPLAY_ENGINE_STATEMENT *Statement; FORM_DISPLAY_ENGINE_STATEMENT *Statement;
@ -1780,7 +1782,7 @@ DisplayOneMenu (
// //
// Adjust option string for date/time opcode. // Adjust option string for date/time opcode.
// //
ProcessStringForDateTime(MenuOption, OptionString, TRUE); ProcessStringForDateTime(MenuOption, OptionString, UpdateCol);
} }
Width = (UINT16) gOptionBlockWidth - 1; Width = (UINT16) gOptionBlockWidth - 1;
@ -1805,8 +1807,9 @@ DisplayOneMenu (
} else { } else {
// //
// For date/ time, print the first and second past (year for date and second for time) // For date/ time, print the first and second past (year for date and second for time)
// // The OutputString has a NARROW_CHAR or WIDE_CHAR at the begin of the string,
DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, StrLen (OutputString), Highlight); // so need to - 1 to remove it, otherwise, it will clean 1 extr char follow it.
DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, StrLen (OutputString) - 1, Highlight);
} }
} else { } else {
DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, Width + 1, Highlight); DisplayMenuString (MenuOption, MenuOption->OptCol, Row, OutputString, Width + 1, Highlight);
@ -2167,7 +2170,8 @@ UiDisplayMenu (
gStatementDimensions.LeftColumn + gModalSkipColumn, gStatementDimensions.LeftColumn + gModalSkipColumn,
Link == TopOfScreen ? SkipValue : 0, Link == TopOfScreen ? SkipValue : 0,
BottomRow, BottomRow,
(BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)) (BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),
TRUE
); );
} else { } else {
Status = DisplayOneMenu (MenuOption, Status = DisplayOneMenu (MenuOption,
@ -2175,8 +2179,9 @@ UiDisplayMenu (
gStatementDimensions.LeftColumn, gStatementDimensions.LeftColumn,
Link == TopOfScreen ? SkipValue : 0, Link == TopOfScreen ? SkipValue : 0,
BottomRow, BottomRow,
(BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)) (BOOLEAN) ((Link == NewPos) && IsSelectable(MenuOption)),
); TRUE
);
} }
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
@ -2279,6 +2284,7 @@ UiDisplayMenu (
gStatementDimensions.LeftColumn, gStatementDimensions.LeftColumn,
Temp, Temp,
BottomRow, BottomRow,
FALSE,
FALSE FALSE
); );
} }
@ -2300,7 +2306,8 @@ UiDisplayMenu (
gStatementDimensions.LeftColumn, gStatementDimensions.LeftColumn,
Temp2, Temp2,
BottomRow, BottomRow,
TRUE TRUE,
FALSE
); );
} }
break; break;
@ -2782,16 +2789,16 @@ UiDisplayMenu (
NewLine = TRUE; NewLine = TRUE;
SavedListEntry = NewPos; SavedListEntry = NewPos;
ASSERT(NewPos != NULL); ASSERT(NewPos != NULL);
MenuOption = MENU_OPTION_FROM_LINK (NewPos);
ASSERT (MenuOption != NULL);
// //
// Adjust Date/Time position before we advance forward. // Adjust Date/Time position before we advance forward.
// //
AdjustDateAndTimePosition (TRUE, &NewPos); AdjustDateAndTimePosition (TRUE, &NewPos);
MenuOption = MENU_OPTION_FROM_LINK (NewPos);
ASSERT (MenuOption != NULL);
NewPos = NewPos->BackLink; NewPos = NewPos->BackLink;
// //
// Find next selectable menu or the first menu beyond current form. // Find next selectable menu or the first menu beyond current form.