Enable lock attribute for statement and form; show this attribute same as grayout.

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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index b58a00a5444d42374ef06c7772ce7b7e8cee278a..a6be2bbcee62b4f14536fd721fe5fcd59fb77da3 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -554,7 +554,7 @@ DisplayForm (
       // We are NOT!! removing this StringPtr buffer via FreePool since it is being used in the menuoptions, we will do\r
       // it in UiFreeMenu.\r
       //\r
-      MenuOption = UiAddMenuOption (StringPtr, Selection->Handle, Statement, NumberOfLines, MenuItemCount);\r
+      MenuOption = UiAddMenuOption (StringPtr, Selection->Handle, Selection->Form, Statement, NumberOfLines, MenuItemCount);\r
       MenuItemCount++;\r
 \r
       if (MenuOption->IsQuestion && !MenuOption->ReadOnly) {\r
@@ -1005,7 +1005,6 @@ FindNextMenu (
   CHAR16                  YesResponse;\r
   CHAR16                  NoResponse;\r
   EFI_INPUT_KEY           Key;\r
-  EFI_STATUS              Status;\r
   BROWSER_SETTING_SCOPE   Scope;\r
   \r
   CurrentMenu = Selection->CurrentMenu;\r
@@ -1032,7 +1031,7 @@ FindNextMenu (
     //\r
     if ((gBrowserSettingScope == FormLevel && Selection->Form->NvUpdateRequired) ||\r
         (gBrowserSettingScope == FormSetLevel && IsNvUpdateRequired(Selection->FormSet) && Scope == FormSetLevel)) {\r
-      Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+      gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
   \r
       YesResponse = gYesResponse[0];\r
       NoResponse  = gNoResponse[0];\r
@@ -1068,12 +1067,12 @@ FindNextMenu (
         //\r
         // If the user hits the YesResponse key\r
         //\r
-        Status = SubmitForm (Selection->FormSet, Selection->Form, Scope);\r
+        SubmitForm (Selection->FormSet, Selection->Form, Scope);\r
       } else {\r
         //\r
         // If the user hits the NoResponse key\r
         //\r
-        Status = DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
+        DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
       }\r
     }\r
 \r
@@ -1101,7 +1100,7 @@ FindNextMenu (
   // We are going to leave current FormSet, so check uncommited data in this FormSet\r
   //\r
   if (gBrowserSettingScope != SystemLevel && IsNvUpdateRequired(Selection->FormSet)) {\r
-    Status      = gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
+    gST->ConIn->ReadKeyStroke (gST->ConIn, &Key);\r
 \r
     YesResponse = gYesResponse[0];\r
     NoResponse  = gNoResponse[0];\r
@@ -1138,12 +1137,12 @@ FindNextMenu (
       //\r
       // If the user hits the YesResponse key\r
       //\r
-      Status = SubmitForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
+      SubmitForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
     } else {\r
       //\r
       // If the user hits the NoResponse key\r
       //\r
-      Status = DiscardForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
+      DiscardForm (Selection->FormSet, Selection->Form, FormSetLevel);\r
     }\r
   }\r
 \r