1. Bug fix for "EDK GenericBds WriteBootToOsPerformanceData() uses AcpiReclaimMemory";

2. Bug fix for "[FT] in new BDS, add a long item in Boot Option will cause an empty line appear";
3. Bug fix for "In "SetBootNextValue" page,description does not display properly"

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

2 files changed, 14 insertions, 5 deletions

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c
index cf3d0004d9..7b219c85bb 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Presentation.c
@@ -9,7 +9,7 @@ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

 

 Module Name:

-        Presentation.c

+  Presentation.c

 

 Abstract:

 

@@ -732,7 +732,7 @@ Returns:
         PrintStringAt (SecCol, BottomRowOfHelp, gEnterString);

       }

     } else {

-      PrintStringAt (StartColumnOfHelp, BottomRowOfHelp, gEnterCommitString);

+      PrintStringAt (SecCol, BottomRowOfHelp, gEnterCommitString);

 

       //

       // If it is a selected numeric with manual input, display different message

@@ -740,7 +740,7 @@ Returns:
       if ((Selection->ThisTag->Operand == EFI_IFR_NUMERIC_OP) && (Selection->ThisTag->Step == 0)) {

         PrintStringAt (SecCol, TopRowOfHelp, gNumericInput);

       } else if (Selection->ThisTag->Operand != EFI_IFR_ORDERED_LIST_OP) {

-        PrintAt (SecCol, BottomRowOfHelp, (CHAR16 *) L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);

+        PrintAt (StartColumnOfHelp, BottomRowOfHelp, L"%c%c%s", ARROW_UP, ARROW_DOWN, gMoveHighlight);

       }

 

       if (Selection->ThisTag->Operand == EFI_IFR_ORDERED_LIST_OP) {

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
index 0d512fd34e..7a2ec04403 100644
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
@@ -806,7 +806,7 @@ UpdateStatusBar (
           gScreenDimensions.BottomRow - 1,

           NvUpdateMessage

           );

-        gResetRequired    = (BOOLEAN) (gResetRequired | (Flags & RESET_REQUIRED));

+        gResetRequired    = (BOOLEAN) (gResetRequired | ((Flags & EFI_IFR_FLAG_RESET_REQUIRED) == EFI_IFR_FLAG_RESET_REQUIRED));

 

         gNvUpdateRequired = TRUE;

       } else {

@@ -1222,6 +1222,15 @@ Returns:
   // Ensure we have got a valid buffer

   //

   if (*OutputString != NULL) {

+  

+    //

+    //NARROW_CHAR can not be printed in screen, so if a line only contain  the two CHARs: 'NARROW_CHAR + CHAR_CARRIAGE_RETURN' , it is a empty line  in Screen.

+    //To avoid displaying this  empty line in screen,  just skip  the two CHARs here.

+    //

+   if ((InputString[*Index] == NARROW_CHAR) && (InputString[*Index + 1] == CHAR_CARRIAGE_RETURN)) {

+     *Index = *Index + 2;

+   } 

+

     //

     // Fast-forward the string and see if there is a carriage-return in the string

     //

@@ -1441,7 +1450,7 @@ Returns:
   UI_MENU_OPTION              *PreviousMenuOption;

   EFI_IFR_BINARY              *IfrBinary;

   UI_CONTROL_FLAG             ControlFlag;

-  EFI_SCREEN_DESCRIPTOR           LocalScreen;

+  EFI_SCREEN_DESCRIPTOR       LocalScreen;

   EFI_FILE_FORM_TAGS          *FileFormTags;

   MENU_REFRESH_ENTRY          *MenuRefreshEntry;

   MENU_REFRESH_ENTRY          *OldMenuRefreshEntry;