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

[mirror_edk2.git] / EdkModulePkg / Universal / Console / GraphicsConsole / Dxe / GraphicsConsole.c

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
index 473e73ff7b9c0058996f0c9bbc1cb39ffc99492d..866aaad4440d5f4581afb12a64784a1499130b71 100644 (file)
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.c
@@ -101,7 +101,7 @@ GRAPHICS_CONSOLE_DEV        mGraphicsConsoleDevTemplate = {
   },\r
   {\r
     { 80, 25, 0, 0, 0, 0 },  // Mode 0\r
-    { 80, 50, 0, 0, 0, 0 },  // Mode 1\r
+    { 80, 50, 0, 0, 0, 0 },  // Mode 1 \r
     {  0,  0, 0, 0, 0, 0 }   // Mode 2\r
   },\r
   (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *) NULL,\r
@@ -144,7 +144,7 @@ EFI_DRIVER_BINDING_PROTOCOL gGraphicsConsoleDriverBinding = {
   GraphicsConsoleControllerDriverSupported,\r
   GraphicsConsoleControllerDriverStart,\r
   GraphicsConsoleControllerDriverStop,\r
-  0x10,\r
+  0xa,\r
   NULL,\r
   NULL\r
 };\r
@@ -378,9 +378,7 @@ GraphicsConsoleControllerDriverStart (
                          );\r
       if (!EFI_ERROR (Status)) {\r
         if ((Info->HorizontalResolution == 800) &&\r
-            (Info->VerticalResolution == 600) &&\r
-            ((Info->PixelFormat == PixelRedGreenBlueReserved8BitPerColor) ||\r
-             (Info->PixelFormat == PixelBlueGreenRedReserved8BitPerColor))) {\r
+            (Info->VerticalResolution == 600)) {\r
           Status = Private->GraphicsOutput->SetMode (Private->GraphicsOutput, ModeNumber);\r
           if (!EFI_ERROR (Status)) {\r
             gBS->FreePool (Info);\r
@@ -1034,10 +1032,8 @@ GraphicsConsoleConOutTestString (
   UINT16                GlyphWidth;\r
   UINT32                GlyphStatus;\r
   UINT16                Count;\r
-  GRAPHICS_CONSOLE_DEV  *Private;\r
   GLYPH_UNION           *Glyph;\r
 \r
-  Private     = GRAPHICS_CONSOLE_CON_OUT_DEV_FROM_THIS (This);\r
   GlyphStatus = 0;\r
   Count       = 0;\r
 \r
@@ -1164,6 +1160,10 @@ GraphicsConsoleConOutSetMode (
   UgaDraw   = Private->UgaDraw;\r
   ModeData  = &(Private->ModeData[ModeNumber]);\r
 \r
+  if (ModeData->Columns <= 0 && ModeData->Rows <= 0) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
   //\r
   // Make sure the requested mode number is supported\r
   //\r