Sync in bug fix from EDK I:

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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index ba6927c7193e2667ac3bdc6564e1f9a9d86ab198..6b51cc62802f0697d0c21053c8589ed6e24e9a5a 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1,7 +1,7 @@
 /** @file\r
 Utility functions for UI presentation.\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation\r
+Copyright (c) 2004 - 2008, Intel Corporation\r
 All rights reserved. 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
@@ -482,24 +482,6 @@ DisplayForm (
     if (!IsListEmpty (&gMenuList)) {\r
       PrintStringAt (LocalScreen.LeftColumn + 2, LocalScreen.TopRow + 1, gFunctionTwoString);\r
     }\r
-\r
-    PrintStringAt (LocalScreen.LeftColumn + 2, LocalScreen.BottomRow - 4, gFunctionOneString);\r
-    PrintStringAt (\r
-      LocalScreen.LeftColumn + (LocalScreen.RightColumn - LocalScreen.LeftColumn) / 3,\r
-      LocalScreen.BottomRow - 4,\r
-      gFunctionNineString\r
-      );\r
-    PrintStringAt (\r
-      LocalScreen.LeftColumn + (LocalScreen.RightColumn - LocalScreen.LeftColumn) * 2 / 3,\r
-      LocalScreen.BottomRow - 4,\r
-      gFunctionTenString\r
-      );\r
-    PrintAt (LocalScreen.LeftColumn + 2, LocalScreen.BottomRow - 3, L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);\r
-    PrintStringAt (\r
-      LocalScreen.LeftColumn + (LocalScreen.RightColumn - LocalScreen.LeftColumn) / 3,\r
-      LocalScreen.BottomRow - 3,\r
-      gEscapeString\r
-      );\r
   }\r
   //\r
   // Remove Buffer allocated for StringPtr after it has been used.\r
@@ -575,6 +557,7 @@ InitializeBrowserStrings (
   gFunctionTenString    = GetToken (STRING_TOKEN (FUNCTION_TEN_STRING), gHiiHandle);\r
   gEnterString          = GetToken (STRING_TOKEN (ENTER_STRING), gHiiHandle);\r
   gEnterCommitString    = GetToken (STRING_TOKEN (ENTER_COMMIT_STRING), gHiiHandle);\r
+  gEnterEscapeString    = GetToken (STRING_TOKEN (ENTER_ESCAPE_STRING), gHiiHandle);\r
   gEscapeString         = GetToken (STRING_TOKEN (ESCAPE_STRING), gHiiHandle);\r
   gSaveFailed           = GetToken (STRING_TOKEN (SAVE_FAILED), gHiiHandle);\r
   gMoveHighlight        = GetToken (STRING_TOKEN (MOVE_HIGHLIGHT), gHiiHandle);\r
@@ -598,6 +581,7 @@ InitializeBrowserStrings (
   gMinusString          = GetToken (STRING_TOKEN (MINUS_STRING), gHiiHandle);\r
   gAdjustNumber         = GetToken (STRING_TOKEN (ADJUST_NUMBER), gHiiHandle);\r
   gSaveChanges          = GetToken (STRING_TOKEN (SAVE_CHANGES), gHiiHandle);\r
+  gOptionMismatch       = GetToken (STRING_TOKEN (OPTION_MISMATCH), gHiiHandle);\r
   return ;\r
 }\r
 \r
@@ -617,6 +601,7 @@ FreeBrowserStrings (
   FreePool (gFunctionTenString);\r
   FreePool (gEnterString);\r
   FreePool (gEnterCommitString);\r
+  FreePool (gEnterEscapeString);\r
   FreePool (gEscapeString);\r
   FreePool (gMoveHighlight);\r
   FreePool (gMakeSelection);\r
@@ -639,6 +624,7 @@ FreeBrowserStrings (
   FreePool (gMinusString);\r
   FreePool (gAdjustNumber);\r
   FreePool (gSaveChanges);\r
+  FreePool (gOptionMismatch);\r
   return ;\r
 }\r
 \r
@@ -701,8 +687,7 @@ UpdateKeyHelp (
       }\r
 \r
       if ((Statement->Operand == EFI_IFR_DATE_OP) ||\r
-          (Statement->Operand == EFI_IFR_TIME_OP) ||\r
-          (Statement->Operand == EFI_IFR_NUMERIC_OP && Statement->Step != 0)) {\r
+          (Statement->Operand == EFI_IFR_TIME_OP)) {\r
         PrintAt (\r
           StartColumnOfHelp,\r
           BottomRowOfHelp,\r
@@ -716,7 +701,11 @@ UpdateKeyHelp (
         PrintStringAt (SecCol, BottomRowOfHelp, gAdjustNumber);\r
       } else {\r
         PrintAt (StartColumnOfHelp, BottomRowOfHelp, L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);\r
-        PrintStringAt (SecCol, BottomRowOfHelp, gEnterString);\r
+        if (Statement->Operand == EFI_IFR_NUMERIC_OP && Statement->Step != 0) {\r
+          PrintStringAt (SecCol, BottomRowOfHelp, gAdjustNumber);\r
+        } else {\r
+          PrintStringAt (SecCol, BottomRowOfHelp, gEnterString);\r
+        }\r
       }\r
     } else {\r
       PrintStringAt (SecCol, BottomRowOfHelp, gEnterCommitString);\r
@@ -739,7 +728,7 @@ UpdateKeyHelp (
         PrintStringAt (ThdCol, TopRowOfHelp, gMinusString);\r
       }\r
 \r
-      PrintStringAt (ThdCol, BottomRowOfHelp, gEscapeString);\r
+      PrintStringAt (ThdCol, BottomRowOfHelp, gEnterEscapeString);\r
     }\r
     break;\r
 \r
@@ -784,7 +773,7 @@ UpdateKeyHelp (
           BottomRowOfHelp,\r
           gEnterCommitString\r
           );\r
-        PrintStringAt (ThdCol, BottomRowOfHelp, gEscapeString);\r
+        PrintStringAt (ThdCol, BottomRowOfHelp, gEnterEscapeString);\r
       }\r
     }\r
     break;\r
@@ -874,7 +863,7 @@ SetupBrowser (
   //\r
   Status = mHiiDatabase->RegisterPackageNotify (\r
                            mHiiDatabase,\r
-                           EFI_HII_PACKAGE_FORM,\r
+                           EFI_HII_PACKAGE_FORMS,\r
                            NULL,\r
                            FormUpdateNotify,\r
                            EFI_HII_DATABASE_NOTIFY_REMOVE_PACK,\r