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

MdeModulePkg:System hangs in setup menu

Browse Source 
System hangs when RTC time rollover 1999 to 2000
Error processing of GetTime function:
If get time fail,the date/time will display ??,
and update help info to let user know get time fail.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17651 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Dandan Bi
2015-06-17 09:36:35 +00:00
committed by dandanbi
parent b269f89563
commit cc63add853
4 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2545,6 +2545,8 @@ UiDisplayMenu (
UINTN BottomRow;
UINTN Index;
CHAR16 *StringPtr;
CHAR16 *StringRightPtr;
CHAR16 *StringErrorPtr;
CHAR16 *OptionString;
CHAR16 *HelpString;
CHAR16 *HelpHeaderString;
@ -2579,6 +2581,7 @@ UiDisplayMenu (
EFI_STRING_ID HelpInfo;
UI_EVENT_TYPE EventType;
BOOLEAN SkipHighLight;
EFI_HII_VALUE *StatementValue;
EventType = UIEventNone;
Status = EFI_SUCCESS;
@ -2885,10 +2888,26 @@ UiDisplayMenu (
//
ASSERT(MenuOption != NULL);
HelpInfo = ((EFI_IFR_STATEMENT_HEADER *) ((CHAR8 *)MenuOption->ThisTag->OpCode + sizeof (EFI_IFR_OP_HEADER)))->Help;
Statement = MenuOption->ThisTag;
StatementValue = &Statement->CurrentValue;
if (HelpInfo == 0 || !IsSelectable (MenuOption)) {
StringPtr = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle);
if ((Statement->OpCode->OpCode == EFI_IFR_DATE_OP && StatementValue->Value.date.Month== 0xff)||(Statement->OpCode->OpCode == EFI_IFR_TIME_OP && StatementValue->Value.time.Hour == 0xff)){
StringPtr = GetToken (STRING_TOKEN (GET_TIME_FAIL), gHiiHandle);
} else {
StringPtr = GetToken (STRING_TOKEN (EMPTY_STRING), gHiiHandle);
}
} else {
StringPtr = GetToken (HelpInfo, gFormData->HiiHandle);
if ((Statement->OpCode->OpCode == EFI_IFR_DATE_OP && StatementValue->Value.date.Month== 0xff)||(Statement->OpCode->OpCode == EFI_IFR_TIME_OP && StatementValue->Value.time.Hour == 0xff)){
StringRightPtr = GetToken (HelpInfo, gFormData->HiiHandle);
StringErrorPtr = GetToken (STRING_TOKEN (GET_TIME_FAIL), gHiiHandle);
StringPtr = AllocateZeroPool ((StrLen (StringRightPtr) + StrLen (StringErrorPtr)+ 1 ) * sizeof (CHAR16));
StrCpyS (StringPtr, StrLen (StringRightPtr) + StrLen (StringErrorPtr) + 1, StringRightPtr);
StrCatS (StringPtr, StrLen (StringRightPtr) + StrLen (StringErrorPtr) + 1, StringErrorPtr);
FreePool (StringRightPtr);
FreePool (StringErrorPtr);
} else {
StringPtr = GetToken (HelpInfo, gFormData->HiiHandle);
}
}
}