tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine the check expression result logic. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Gao, Liming <liming,gao@intel.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15476 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eric Dong 2014-04-18 06:40:13 +00:00 committed by ydong10
parent 7e2f32894b
commit e6106e892d
4 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
View File

@ -3280,6 +3280,44 @@ Done:
return Status;
}
/**
Check whether the result is TRUE or FALSE.
For the EFI_HII_VALUE value type is numeric, return TRUE if the
value is not 0.
@param Result Input the result data.
@retval TRUE The result is TRUE.
@retval FALSE The result is FALSE.
**/
BOOLEAN
IsTrue (
IN EFI_HII_VALUE *Result
)
{
switch (Result->Type) {
case EFI_IFR_TYPE_BOOLEAN:
return Result->Value.b;
case EFI_IFR_TYPE_NUM_SIZE_8:
return Result->Value.u8 != 0;
case EFI_IFR_TYPE_NUM_SIZE_16:
return Result->Value.u16 != 0;
case EFI_IFR_TYPE_NUM_SIZE_32:
return Result->Value.u32 != 0;
case EFI_IFR_TYPE_NUM_SIZE_64:
return Result->Value.u64 != 0;
default:
return FALSE;
}
}
/**
Return the result of the expression list. Check the expression list and
return the highest priority express result.
@ -3331,8 +3369,7 @@ EvaluateExpressionList (
//
ReturnVal = ExpressFalse;
for (Index = 0; Index < ExpList->Count; Index++) {
if (ExpList->Expression[Index]->Result.Type == EFI_IFR_TYPE_BOOLEAN &&
ExpList->Expression[Index]->Result.Value.b) {
if (IsTrue (&ExpList->Expression[Index]->Result)) {
switch (ExpList->Expression[Index]->Type) {
case EFI_HII_EXPRESSION_SUPPRESS_IF:
CompareOne = ExpressSuppress;

11
MdeModulePkg/Universal/SetupBrowserDxe/IfrParse.c
View File

@ -1559,11 +1559,7 @@ ParseOpCodes (
return Status;
}
if (CurrentExpression->Result.Type != EFI_IFR_TYPE_BOOLEAN) {
return EFI_INVALID_PARAMETER;
}
OpCodeDisabled = CurrentExpression->Result.Value.b;
OpCodeDisabled = IsTrue(&CurrentExpression->Result);
}
CurrentExpression = NULL;
@ -2512,11 +2508,8 @@ ParseOpCodes (
return Status;
}
if (CurrentExpression->Result.Type != EFI_IFR_TYPE_BOOLEAN) {
return EFI_INVALID_PARAMETER;
}
OpCodeDisabled = IsTrue (&CurrentExpression->Result);
OpCodeDisabled = CurrentExpression->Result.Value.b;
//
// DisableIf Expression is only used once and not queued, free it
//

2
MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
View File

@ -1985,7 +1985,7 @@ ValidateQuestion (
return Status;
}
if ((Expression->Result.Type == EFI_IFR_TYPE_BOOLEAN) && Expression->Result.Value.b) {
if (IsTrue (&Expression->Result)) {
switch (Type) {
case EFI_HII_EXPRESSION_INCONSISTENT_IF:
BrowserStatus = BROWSER_INCONSISTENT_IF;

17
MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
View File

@ -1711,4 +1711,21 @@ PopupErrorMessage (
IN CHAR16 *ErrorString
);
/**
Check whether the result is TRUE or FALSE.
For the EFI_HII_VALUE value type is numeric, return TRUE if the
value is not 0.
@param Result Input the result data.
@retval TRUE The result is TRUE.
@retval FALSE The result is FALSE.
**/
BOOLEAN
IsTrue (
IN EFI_HII_VALUE *Result
);
#endif