Refine the logic about gFunctionKeySetting, avoid some HII drivers can't show the...

Also add missing code in UI.c

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14208 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index a63b9ce0ee5922eb34632ef552fd79b7e1c2569e..ae7ff7f774b5b963cf81b9c6e4fbb2dce807a08a 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -305,8 +305,6 @@ SendForm (
   //\r
   InitializeBrowserStrings ();\r
 \r
-  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;\r
-\r
   //\r
   // Ensure we are in Text mode\r
   //\r
@@ -4009,6 +4007,8 @@ InitializeFormSet (
     }\r
   }\r
 \r
+  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;\r
+\r
   if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE) {\r
     gFrontPageHandle = FormSet->HiiHandle;\r
     gFunctionKeySetting = NONE_FUNCTION_KEY_SETTING;\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index e9f9f70edac4063a9871a7a9b4c22af6943cd851..d54466e1230e65207c0499eb2d1d03e43e307c8f 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -3285,7 +3285,8 @@ UiDisplayMenu (
           // Check whether Key matches the registered hot key.\r
           //\r
           HotKey = NULL;\r
-          if ((gBrowserSettingScope == SystemLevel) || (gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {\r
+          if ((gBrowserSettingScope == SystemLevel) || \r
+              (Selection->FormEditable && gFunctionKeySetting != NONE_FUNCTION_KEY_SETTING)) {\r
             HotKey = GetHotKeyFromRegisterList (&Key);\r
           }\r
           if (HotKey != NULL) {\r