Refine code to make code run safely.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10880 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1499,7 +1499,7 @@ ParseOpCodes (
|
||||
CurrentStatement->Minimum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MinValue;
|
||||
CurrentStatement->Maximum = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.MaxValue;
|
||||
CurrentStatement->Step = ((EFI_IFR_NUMERIC *) OpCodeData)->data.u8.Step;
|
||||
CurrentStatement->StorageWidth = sizeof (UINT8);
|
||||
CurrentStatement->StorageWidth = (UINT16) sizeof (UINT8);
|
||||
Value->Type = EFI_IFR_TYPE_NUM_SIZE_8;
|
||||
break;
|
||||
|
||||
@@ -1507,7 +1507,7 @@ ParseOpCodes (
|
||||
CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MinValue, sizeof (UINT16));
|
||||
CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.MaxValue, sizeof (UINT16));
|
||||
CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u16.Step, sizeof (UINT16));
|
||||
CurrentStatement->StorageWidth = sizeof (UINT16);
|
||||
CurrentStatement->StorageWidth = (UINT16) sizeof (UINT16);
|
||||
Value->Type = EFI_IFR_TYPE_NUM_SIZE_16;
|
||||
break;
|
||||
|
||||
@@ -1515,7 +1515,7 @@ ParseOpCodes (
|
||||
CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MinValue, sizeof (UINT32));
|
||||
CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.MaxValue, sizeof (UINT32));
|
||||
CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u32.Step, sizeof (UINT32));
|
||||
CurrentStatement->StorageWidth = sizeof (UINT32);
|
||||
CurrentStatement->StorageWidth = (UINT16) sizeof (UINT32);
|
||||
Value->Type = EFI_IFR_TYPE_NUM_SIZE_32;
|
||||
break;
|
||||
|
||||
@@ -1523,7 +1523,7 @@ ParseOpCodes (
|
||||
CopyMem (&CurrentStatement->Minimum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MinValue, sizeof (UINT64));
|
||||
CopyMem (&CurrentStatement->Maximum, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.MaxValue, sizeof (UINT64));
|
||||
CopyMem (&CurrentStatement->Step, &((EFI_IFR_NUMERIC *) OpCodeData)->data.u64.Step, sizeof (UINT64));
|
||||
CurrentStatement->StorageWidth = sizeof (UINT64);
|
||||
CurrentStatement->StorageWidth = (UINT16) sizeof (UINT64);
|
||||
Value->Type = EFI_IFR_TYPE_NUM_SIZE_64;
|
||||
break;
|
||||
|
||||
@@ -1558,7 +1558,7 @@ ParseOpCodes (
|
||||
ASSERT(CurrentStatement != NULL);
|
||||
|
||||
CurrentStatement->Flags = ((EFI_IFR_CHECKBOX *) OpCodeData)->Flags;
|
||||
CurrentStatement->StorageWidth = sizeof (BOOLEAN);
|
||||
CurrentStatement->StorageWidth = (UINT16) sizeof (BOOLEAN);
|
||||
CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_BOOLEAN;
|
||||
|
||||
InitializeRequestElement (FormSet, CurrentStatement);
|
||||
@@ -1610,7 +1610,7 @@ ParseOpCodes (
|
||||
CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_DATE;
|
||||
|
||||
if ((CurrentStatement->Flags & EFI_QF_DATE_STORAGE) == QF_DATE_STORAGE_NORMAL) {
|
||||
CurrentStatement->StorageWidth = sizeof (EFI_HII_DATE);
|
||||
CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_HII_DATE);
|
||||
|
||||
InitializeRequestElement (FormSet, CurrentStatement);
|
||||
} else {
|
||||
@@ -1630,7 +1630,7 @@ ParseOpCodes (
|
||||
CurrentStatement->HiiValue.Type = EFI_IFR_TYPE_TIME;
|
||||
|
||||
if ((CurrentStatement->Flags & QF_TIME_STORAGE) == QF_TIME_STORAGE_NORMAL) {
|
||||
CurrentStatement->StorageWidth = sizeof (EFI_IFR_TIME);
|
||||
CurrentStatement->StorageWidth = (UINT16) sizeof (EFI_IFR_TIME);
|
||||
|
||||
InitializeRequestElement (FormSet, CurrentStatement);
|
||||
} else {
|
||||
|
@@ -1775,8 +1775,8 @@ UiDisplayMenu (
|
||||
UpArrow = FALSE;
|
||||
Row = TopRow;
|
||||
|
||||
Temp = SkipValue;
|
||||
Temp2 = SkipValue;
|
||||
Temp = (UINTN) SkipValue;
|
||||
Temp2 = (UINTN) SkipValue;
|
||||
|
||||
ClearLines (
|
||||
LocalScreen.LeftColumn,
|
||||
@@ -2532,6 +2532,7 @@ UiDisplayMenu (
|
||||
}
|
||||
BufferSize = StrLen (StringPtr) / 2;
|
||||
DevicePath = AllocatePool (BufferSize);
|
||||
ASSERT (DevicePath != NULL);
|
||||
|
||||
//
|
||||
// Convert from Device Path String to DevicePath Buffer in the reverse order.
|
||||
@@ -2940,6 +2941,7 @@ UiDisplayMenu (
|
||||
case CfUiPageDown:
|
||||
ControlFlag = CfCheckSelection;
|
||||
|
||||
ASSERT (NewPos != NULL);
|
||||
if (NewPos->ForwardLink == &gMenuOption) {
|
||||
NewLine = FALSE;
|
||||
Repaint = FALSE;
|
||||
@@ -3007,7 +3009,7 @@ UiDisplayMenu (
|
||||
//
|
||||
// An option might be multi-line, so we need to reflect that data in the overall skip value
|
||||
//
|
||||
UpdateOptionSkipLines (Selection, NextMenuOption, &OptionString, SkipValue);
|
||||
UpdateOptionSkipLines (Selection, NextMenuOption, &OptionString, (UINTN) SkipValue);
|
||||
|
||||
Temp = MenuOption->Row + MenuOption->Skip + DistanceValue - 1;
|
||||
if ((MenuOption->Row + MenuOption->Skip == BottomRow + 1) &&
|
||||
|
Reference in New Issue
Block a user