Enable nest for suppressif/grayoutif/diableif for form/question/option.

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / ProcessOptions.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
index 1ce139cbb0d25a0beef2c9a95d943f4f8137e40f..81d328014507143eaf5ad02aaa7323e0ebfad05e 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
@@ -2,7 +2,7 @@
 Implementation for handling the User Interface option processing.\r
 \r
 \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -491,7 +491,7 @@ ProcessOptions (
 \r
         Suppress = FALSE;\r
         if ((OneOfOption->SuppressExpression != NULL) &&\r
-            (OneOfOption->SuppressExpression->Result.Value.b)) {\r
+            (EvaluateExpressionList(OneOfOption->SuppressExpression, FALSE, NULL, NULL) == ExpressSuppress)) {\r
           //\r
           // This option is suppressed\r
           //\r
@@ -548,7 +548,7 @@ ProcessOptions (
           Option = QUESTION_OPTION_FROM_LINK (Link);\r
 \r
           if ((Option->SuppressExpression == NULL) ||\r
-              !Option->SuppressExpression->Result.Value.b) {\r
+              (EvaluateExpressionList(Option->SuppressExpression, FALSE, NULL, NULL) == ExpressFalse)) {\r
             CopyMem (QuestionValue, &Option->Value, sizeof (EFI_HII_VALUE));\r
             SetQuestionValue (Selection->FormSet, Selection->Form, Question, TRUE);\r
             UpdateStatusBar (Selection, NV_UPDATE_REQUIRED, Question->QuestionFlags, TRUE);\r
@@ -564,7 +564,7 @@ ProcessOptions (
       }\r
 \r
       if ((OneOfOption->SuppressExpression != NULL) &&\r
-          (OneOfOption->SuppressExpression->Result.Value.b)) {\r
+          ((EvaluateExpressionList(OneOfOption->SuppressExpression, FALSE, NULL, NULL) == ExpressSuppress))) {\r
         //\r
         // This option is suppressed\r
         //\r
@@ -583,7 +583,7 @@ ProcessOptions (
           OneOfOption = QUESTION_OPTION_FROM_LINK (Link);\r
 \r
           if ((OneOfOption->SuppressExpression == NULL) ||\r
-              !OneOfOption->SuppressExpression->Result.Value.b) {\r
+              (EvaluateExpressionList(OneOfOption->SuppressExpression, FALSE, NULL, NULL) == ExpressFalse)) {\r
             Suppress = FALSE;\r
             CopyMem (QuestionValue, &OneOfOption->Value, sizeof (EFI_HII_VALUE));\r
             SetQuestionValue (Selection->FormSet, Selection->Form, Question, TRUE);\r