Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[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..854d023f8e4a29b2a2e946a6219b2cea88fbd852 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/Ui.c
@@ -211,6 +211,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 UpdateDateAndTime (\r
   VOID\r
@@ -492,7 +493,6 @@ Returns:
   UINTN         Start;\r
   UINTN         Top;\r
   UINTN         Index;\r
-  EFI_STATUS    Status;\r
   BOOLEAN       SelectionComplete;\r
   UINTN         InputOffset;\r
   UINTN         CurrentAttribute;\r
@@ -570,12 +570,12 @@ Returns:
   // Take the first key typed and report it back?\r
   //\r
   if (HotKey) {\r
-    Status = WaitForKeyStroke (&Key);\r
+    WaitForKeyStroke (&Key);\r
     CopyMem (KeyValue, &Key, sizeof (EFI_INPUT_KEY));\r
 \r
   } else {\r
     do {\r
-      Status = WaitForKeyStroke (&Key);\r
+      WaitForKeyStroke (&Key);\r
 \r
       switch (Key.UnicodeChar) {\r
       case CHAR_NULL:\r
@@ -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
@@ -1046,6 +1046,7 @@ Returns:
   return ;\r
 }\r
 \r
+STATIC\r
 BOOLEAN\r
 SelectionsAreValid (\r
   IN  UI_MENU_OPTION               *MenuOption,\r
@@ -1068,7 +1069,6 @@ Returns:
   EFI_FILE_FORM_TAGS      *FileFormTags;\r
   CHAR16                  *StringPtr;\r
   CHAR16                  NullCharacter;\r
-  EFI_STATUS              Status;\r
   UINTN                   Index;\r
   UINT16                  *NvRamMap;\r
   STRING_REF              PopUp;\r
@@ -1103,7 +1103,7 @@ Returns:
           CreatePopUp (GetStringWidth (StringPtr) / 2, 3, &NullCharacter, StringPtr, &NullCharacter);\r
 \r
           do {\r
-            Status = WaitForKeyStroke (&Key);\r
+            WaitForKeyStroke (&Key);\r
 \r
             switch (Key.UnicodeChar) {\r
 \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
@@ -1275,6 +1284,7 @@ Returns:
   }\r
 }\r
 \r
+STATIC\r
 VOID\r
 UpdateOptionSkipLines (\r
   IN EFI_IFR_DATA_ARRAY           *PageData,\r
@@ -1441,7 +1451,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
@@ -2994,7 +3004,10 @@ Returns:
         FileFormTags->VariableDefinitions->VariableFakeSize = (UINT16) (FileFormTags->VariableDefinitions->VariableFakeSize + FileFormTags->VariableDefinitions->VariableSize);\r
         \r
         FileFormTags->VariableDefinitions->NvRamMap = AllocateZeroPool (FileFormTags->VariableDefinitions->VariableSize);\r
+        ASSERT (FileFormTags->VariableDefinitions->NvRamMap != NULL);\r
+\r
         FileFormTags->VariableDefinitions->FakeNvRamMap = AllocateZeroPool (NvMapSize + FileFormTags->VariableDefinitions->VariableFakeSize);\r
+        ASSERT (FileFormTags->VariableDefinitions->FakeNvRamMap != NULL);\r
 \r
         CopyMem (FileFormTags->VariableDefinitions->NvRamMap, NvMap, NvMapSize);\r
         gBS->FreePool (NvMapListHead);\r