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

[mirror_edk2.git] / EdkModulePkg / Universal / UserInterface / SetupBrowser / Dxe / Ui.c

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
index 0d512fd34e87156df70cddc0ba2506c7b8bd8c5a..7a2ec044034acabb65bd0bb8df424b8f129a6830 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
@@ -806,7 +806,7 @@ UpdateStatusBar (
           gScreenDimensions.BottomRow - 1,\r
           NvUpdateMessage\r
           );\r
-        gResetRequired    = (BOOLEAN) (gResetRequired | (Flags & RESET_REQUIRED));\r
+        gResetRequired    = (BOOLEAN) (gResetRequired | ((Flags & EFI_IFR_FLAG_RESET_REQUIRED) == EFI_IFR_FLAG_RESET_REQUIRED));\r
 \r
         gNvUpdateRequired = TRUE;\r
       } else {\r
@@ -1222,6 +1222,15 @@ Returns:
   // Ensure we have got a valid buffer\r
   //\r
   if (*OutputString != NULL) {\r
+  \r
+    //\r
+    //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.\r
+    //To avoid displaying this  empty line in screen,  just skip  the two CHARs here.\r
+    //\r
+   if ((InputString[*Index] == NARROW_CHAR) && (InputString[*Index + 1] == CHAR_CARRIAGE_RETURN)) {\r
+     *Index = *Index + 2;\r
+   } \r
+\r
     //\r
     // Fast-forward the string and see if there is a carriage-return in the string\r
     //\r
@@ -1441,7 +1450,7 @@ Returns:
   UI_MENU_OPTION              *PreviousMenuOption;\r
   EFI_IFR_BINARY              *IfrBinary;\r
   UI_CONTROL_FLAG             ControlFlag;\r
-  EFI_SCREEN_DESCRIPTOR           LocalScreen;\r
+  EFI_SCREEN_DESCRIPTOR       LocalScreen;\r
   EFI_FILE_FORM_TAGS          *FileFormTags;\r
   MENU_REFRESH_ENTRY          *MenuRefreshEntry;\r
   MENU_REFRESH_ENTRY          *OldMenuRefreshEntry;\r