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

[mirror_edk2.git] / EdkModulePkg / Universal / UserInterface / HiiDataBase / Dxe / Fonts.c

diff --git a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c
index 52dc12e8772e72a0cebe049d0dae9574ee706647..ebab3bc3d09a418b766d66563a9855478697ee18 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c
+++ b/EdkModulePkg/Universal/UserInterface/HiiDataBase/Dxe/Fonts.c
@@ -210,14 +210,17 @@ Returns:
 \r
     if (Narrow) {\r
       for (Value = 0; Value != Count; Value++) {\r
-        *GlyphBuffer[Location + Value] |= GlobalData->NarrowGlyphs[Character].GlyphCol1[Value];\r
+        *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] |\r
+                                                  GlobalData->NarrowGlyphs[Character].GlyphCol1[Value]);\r
       }\r
 \r
       Attributes = GlobalData->NarrowGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;\r
     } else {\r
       for (Value = 0; Value != Count; Value++) {\r
-        *GlyphBuffer[Location + Value] |= GlobalData->WideGlyphs[Character].GlyphCol1[Value];\r
-        *GlyphBuffer[Location + Value + Count] |= GlobalData->WideGlyphs[Character].GlyphCol2[Value];\r
+        *GlyphBuffer[Location + Value] = (UINT8) (*GlyphBuffer[Location + Value] | \r
+                                                  GlobalData->WideGlyphs[Character].GlyphCol1[Value]);\r
+        *GlyphBuffer[Location + Value + Count] = (UINT8) (*GlyphBuffer[Location + Value + Count] |\r
+                                                          GlobalData->WideGlyphs[Character].GlyphCol2[Value]);\r
       }\r
 \r
       Attributes = GlobalData->WideGlyphs[Character].Attributes & EFI_GLYPH_NON_SPACING;\r
@@ -233,14 +236,14 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 HiiGlyphToBlt (\r
-  IN     EFI_HII_PROTOCOL   *This,\r
-  IN     UINT8              *GlyphBuffer,\r
-  IN     EFI_UGA_PIXEL      Foreground,\r
-  IN     EFI_UGA_PIXEL      Background,\r
-  IN     UINTN              Count,\r
-  IN     UINTN              Width,\r
-  IN     UINTN              Height,\r
-  IN OUT EFI_UGA_PIXEL      *BltBuffer\r
+  IN     EFI_HII_PROTOCOL              *This,\r
+  IN     UINT8                         *GlyphBuffer,\r
+  IN     EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground,\r
+  IN     EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background,\r
+  IN     UINTN                         Count,\r
+  IN     UINTN                         Width,\r
+  IN     UINTN                         Height,\r
+  IN OUT EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer\r
   )\r
 {\r
   UINTN X;\r