From e6106e892d5fb4662b5dccf2891451b0e4bfe3e5 Mon Sep 17 00:00:00 2001 From: Eric Dong Date: Fri, 18 Apr 2014 06:40:13 +0000 Subject: Refine the check expression result logic. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong Reviewed-by: Gao, Liming git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15476 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Universal/SetupBrowserDxe/Expression.c | 41 ++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) (limited to 'MdeModulePkg/Universal/SetupBrowserDxe/Expression.c') diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c index d4ab369a4c..92a4727b46 100644 --- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c +++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c @@ -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; -- cgit v1.2.3