X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FUniversal%2FUserInterface%2FSetupBrowser%2FDxe%2FUi.c;h=7a2ec044034acabb65bd0bb8df424b8f129a6830;hp=0d512fd34e87156df70cddc0ba2506c7b8bd8c5a;hb=cb44bbdb8e15fc40362e6b0542be196c15c04615;hpb=878ddf1fc3540a715f63594ed22b6929e881afb4

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;