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
// 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
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