Merge in [EDK 1166]: Form title is not displayed by Setup Browser

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5664 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index b958f4fdc7a635fc0c83a32ab7290fdca3d3ae64..5235d32fe88d5e7270b33518121d2b926827788a 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -498,6 +498,8 @@ TheKey2:
             PrintChar (RIGHT_NUMERIC_DELIMITER);\r
           }\r
         }\r
+\r
+        goto EnterCarriageReturn;\r
         break;\r
 \r
       case SCAN_UP:\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index 47f99f5b8dda4d0f4a87163cd3fc389032575432..a35ca35df9426a7af7435459c4a03c1697fd96c1 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -462,7 +462,7 @@ DisplayForm (
 \r
   CopyMem (&LocalScreen, &gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));\r
 \r
-  StringPtr = GetToken (Selection->FormSet->FormSetTitle, Handle);\r
+  StringPtr = GetToken (Selection->Form->FormTitle, Handle);\r
 \r
   if (gClassOfVfr != EFI_FRONT_PAGE_SUBCLASS) {\r
     gST->ConOut->SetAttribute (gST->ConOut, TITLE_TEXT | TITLE_BACKGROUND);\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 663bf7a2096605b5abb95eea2a6b716021067ca8..fd5aee4ca1e8b096ccdc060310228cefd7335051 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -298,7 +298,7 @@ SendForm (
       // Initialize internal data structures of FormSet\r
       //\r
       Status = InitializeFormSet (Selection->Handle, &Selection->FormSetGuid, FormSet);\r
-      if (EFI_ERROR (Status)) {\r
+      if (EFI_ERROR (Status) || IsListEmpty (&FormSet->FormListHead)) {\r
         DestroyFormSet (FormSet);\r
         break;\r
       }\r