GCC cleanup for all EDK I DXE libraries.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4969 6f19259b-4bc3-4df7-8a09-765794883524

16 files changed, 255 insertions, 243 deletions

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
index a968f407b7..bcfdf7ee8e 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
@@ -77,7 +77,14 @@ Returns:
   //

   // Put break point in module that contained the error.

   //

+#ifndef __GNUC__

   EFI_BREAKPOINT ();

+#else

+  //

+  // Bugbug: Need to fix a GNC style cpu break point

+  // 

+  EFI_DEADLOOP ();

+#endif

 }

 

 VOID

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
index 3d44562ecf..c9fb788807 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
@@ -140,7 +140,7 @@ GetImageEx (
     Status = gBS->HandleProtocol (

                ImageHandle,

                &gEfiLoadedImageProtocolGuid,

-               &LoadedImage

+               (VOID **) &LoadedImage

                );

     if (EFI_ERROR (Status)) {

       return Status;

@@ -152,7 +152,7 @@ GetImageEx (
                   #else

                     &gEfiFirmwareVolume2ProtocolGuid,

                   #endif

-                    &ImageFv

+                    (VOID **) &ImageFv

                     );

     if (!EFI_ERROR (Status)) {

       Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
index 55d1a1d14e..3ac8052a6c 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
@@ -98,7 +98,7 @@ Returns:
   UINTN EndIndex;

 

   if (PdbFileName == NULL) {

-    EfiAsciiStrCpy (GaugeString, " ");

+    EfiAsciiStrCpy (GaugeString, (CHAR8 *)" ");

   } else {

     StartIndex = 0;

     for (EndIndex = 0; PdbFileName[EndIndex] != 0; EndIndex++)

@@ -229,7 +229,7 @@ GetNameFromHandle (
   CHAR8                       *PdbFileName;

   EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;

 

-  EfiAsciiStrCpy (GaugeString, " ");

+  EfiAsciiStrCpy (GaugeString, (CHAR8 *)" ");

 

   //

   // Get handle name from image protocol

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
index 030ab14c5a..b7b15fe709 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
@@ -58,7 +58,7 @@ Returns:
                   );

 

   if (EFI_ERROR (Status)) {

-    EfiAsciiStrCpy (Language, "eng");

+    EfiAsciiStrCpy (Language, (CHAR8 *) "eng");

   }

 

   for (Index = 0; Index < 3; Index++) {

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c
index e31546f28e..d99859d1eb 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c
@@ -52,7 +52,7 @@ Returns:
 

   BS      = SystemTable->BootServices;

 

-  Status  = BS->LocateProtocol (&gEfiBootScriptSaveGuid, NULL, &mBootScriptSave);

+  Status  = BS->LocateProtocol (&gEfiBootScriptSaveGuid, NULL, (VOID **)&mBootScriptSave);

   if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {

     mBootScriptSave = NULL;

   }

@@ -623,7 +623,7 @@ Returns:
   return BootScriptSaveInformation (      

            TableName,

            (UINT32) EfiStrLen (String) * 2 + 2, 

-           (EFI_PHYSICAL_ADDRESS)String

+           (EFI_PHYSICAL_ADDRESS) (UINTN) String

            );

 }

 

@@ -656,7 +656,7 @@ Returns:
   return BootScriptSaveInformation (      

            TableName,

            (UINT32) EfiAsciiStrLen (String) + 1, 

-           (EFI_PHYSICAL_ADDRESS)String

+           (EFI_PHYSICAL_ADDRESS) (UINTN) String

            );

 }

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c
index 69fc8f7afe..aaf5bec1a2 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c
@@ -384,6 +384,8 @@ Returns:
   UINT8             Idx;

   UINT8             i;

 

+  Idx = 0;

+  TempVal = 0;

   //

   // Iterate the decimal values separated by dots

   //

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
index 2a42302c76..61929d5bd9 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
@@ -463,7 +463,7 @@ Returns:
         continue;

       }

     } else {

-      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, &ImageData, &ImageSize);

+      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, (VOID **) &ImageData, &ImageSize);

       if (EFI_ERROR (Status)) {

         return EFI_UNSUPPORTED;

       }

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
index 3b63433e0a..4e0980a1fc 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
@@ -99,22 +99,22 @@ EfiStatusToString (
   );

 

 static EFI_GRAPHICS_OUTPUT_BLT_PIXEL  mEfiColors[16] = {

-  0x00, 0x00, 0x00, 0x00,

-  0x98, 0x00, 0x00, 0x00,

-  0x00, 0x98, 0x00, 0x00,

-  0x98, 0x98, 0x00, 0x00,

-  0x00, 0x00, 0x98, 0x00,

-  0x98, 0x00, 0x98, 0x00,

-  0x00, 0x98, 0x98, 0x00,

-  0x98, 0x98, 0x98, 0x00,

-  0x10, 0x10, 0x10, 0x00,

-  0xff, 0x10, 0x10, 0x00,

-  0x10, 0xff, 0x10, 0x00,

-  0xff, 0xff, 0x10, 0x00,

-  0x10, 0x10, 0xff, 0x00,

-  0xf0, 0x10, 0xff, 0x00,

-  0x10, 0xff, 0xff, 0x00,

-  0xff, 0xff, 0xff, 0x00,

+  {0x00, 0x00, 0x00, 0x00},

+  {0x98, 0x00, 0x00, 0x00},

+  {0x00, 0x98, 0x00, 0x00},

+  {0x98, 0x98, 0x00, 0x00},

+  {0x00, 0x00, 0x98, 0x00},

+  {0x98, 0x00, 0x98, 0x00},

+  {0x00, 0x98, 0x98, 0x00},

+  {0x98, 0x98, 0x98, 0x00},

+  {0x10, 0x10, 0x10, 0x00},

+  {0xff, 0x10, 0x10, 0x00},

+  {0x10, 0xff, 0x10, 0x00},

+  {0xff, 0xff, 0x10, 0x00},

+  {0x10, 0x10, 0xff, 0x00},

+  {0xf0, 0x10, 0xff, 0x00},

+  {0x10, 0xff, 0xff, 0x00},

+  {0xff, 0xff, 0xff, 0x00},

 };

 

 

@@ -632,7 +632,7 @@ Returns:
       case 'a':

         AsciiStr = (CHAR8 *) VA_ARG (Marker, CHAR8 *);

         if (AsciiStr == NULL) {

-          AsciiStr = "<null string>";

+          AsciiStr = (CHAR8 *) "<null string>";

         }

 

         for (Count = 0; (*AsciiStr != '\0') && (Index < NumberOfCharacters - 1); AsciiStr++, Count++) {

@@ -929,35 +929,35 @@ Returns:
   //

   // Can't use global Status String Array as UINTN is not constant for EBC

   //

-  if (Status == EFI_SUCCESS) { Desc = "Success"; } else 

-  if (Status == EFI_LOAD_ERROR) { Desc = "Load Error"; } else

-  if (Status == EFI_INVALID_PARAMETER) { Desc = "Invalid Parameter"; } else

-  if (Status == EFI_UNSUPPORTED) { Desc = "Unsupported"; } else

-  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = "Bad Buffer Size"; } else

-  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = "Buffer Too Small"; } else

-  if (Status == EFI_NOT_READY) { Desc = "Not Ready"; } else

-  if (Status == EFI_DEVICE_ERROR) { Desc = "Device Error"; } else

-  if (Status == EFI_WRITE_PROTECTED) { Desc = "Write Protected"; } else

-  if (Status == EFI_OUT_OF_RESOURCES) { Desc = "Out of Resources"; } else

-  if (Status == EFI_VOLUME_CORRUPTED) { Desc = "Volume Corrupt"; } else

-  if (Status == EFI_VOLUME_FULL) { Desc = "Volume Full"; } else

-  if (Status == EFI_NO_MEDIA) { Desc = "No Media"; } else

-  if (Status == EFI_MEDIA_CHANGED) { Desc = "Media changed"; } else

-  if (Status == EFI_NOT_FOUND) { Desc = "Not Found"; } else

-  if (Status == EFI_ACCESS_DENIED) { Desc = "Access Denied"; } else

-  if (Status == EFI_NO_RESPONSE) { Desc = "No Response"; } else

-  if (Status == EFI_NO_MAPPING) { Desc = "No mapping"; } else

-  if (Status == EFI_TIMEOUT) { Desc = "Time out"; } else

-  if (Status == EFI_NOT_STARTED) { Desc = "Not started"; } else

-  if (Status == EFI_ALREADY_STARTED) { Desc = "Already started"; } else

-  if (Status == EFI_ABORTED) { Desc = "Aborted"; } else

-  if (Status == EFI_ICMP_ERROR) { Desc = "ICMP Error"; } else

-  if (Status == EFI_TFTP_ERROR) { Desc = "TFTP Error"; } else

-  if (Status == EFI_PROTOCOL_ERROR) { Desc = "Protocol Error"; } else

-  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = "Warning Unknown Glyph"; } else

-  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = "Warning Delete Failure"; } else

-  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = "Warning Write Failure"; } else

-  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = "Warning Buffer Too Small"; } 

+  if (Status == EFI_SUCCESS) { Desc = (CHAR8 *) "Success"; } else 

+  if (Status == EFI_LOAD_ERROR) { Desc = (CHAR8 *) "Load Error"; } else

+  if (Status == EFI_INVALID_PARAMETER) { Desc = (CHAR8 *) "Invalid Parameter"; } else

+  if (Status == EFI_UNSUPPORTED) { Desc = (CHAR8 *) "Unsupported"; } else

+  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = (CHAR8 *) "Bad Buffer Size"; } else

+  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Buffer Too Small"; } else

+  if (Status == EFI_NOT_READY) { Desc = (CHAR8 *) "Not Ready"; } else

+  if (Status == EFI_DEVICE_ERROR) { Desc = (CHAR8 *) "Device Error"; } else

+  if (Status == EFI_WRITE_PROTECTED) { Desc = (CHAR8 *) "Write Protected"; } else

+  if (Status == EFI_OUT_OF_RESOURCES) { Desc = (CHAR8 *) "Out of Resources"; } else

+  if (Status == EFI_VOLUME_CORRUPTED) { Desc = (CHAR8 *) "Volume Corrupt"; } else

+  if (Status == EFI_VOLUME_FULL) { Desc = (CHAR8 *) "Volume Full"; } else

+  if (Status == EFI_NO_MEDIA) { Desc = (CHAR8 *) "No Media"; } else

+  if (Status == EFI_MEDIA_CHANGED) { Desc = (CHAR8 *) "Media changed"; } else

+  if (Status == EFI_NOT_FOUND) { Desc = (CHAR8 *) "Not Found"; } else

+  if (Status == EFI_ACCESS_DENIED) { Desc = (CHAR8 *) "Access Denied"; } else

+  if (Status == EFI_NO_RESPONSE) { Desc = (CHAR8 *) "No Response"; } else

+  if (Status == EFI_NO_MAPPING) { Desc = (CHAR8 *) "No mapping"; } else

+  if (Status == EFI_TIMEOUT) { Desc = (CHAR8 *) "Time out"; } else

+  if (Status == EFI_NOT_STARTED) { Desc = (CHAR8 *) "Not started"; } else

+  if (Status == EFI_ALREADY_STARTED) { Desc = (CHAR8 *) "Already started"; } else

+  if (Status == EFI_ABORTED) { Desc = (CHAR8 *) "Aborted"; } else

+  if (Status == EFI_ICMP_ERROR) { Desc = (CHAR8 *) "ICMP Error"; } else

+  if (Status == EFI_TFTP_ERROR) { Desc = (CHAR8 *) "TFTP Error"; } else

+  if (Status == EFI_PROTOCOL_ERROR) { Desc = (CHAR8 *) "Protocol Error"; } else

+  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = (CHAR8 *) "Warning Unknown Glyph"; } else

+  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = (CHAR8 *) "Warning Delete Failure"; } else

+  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = (CHAR8 *) "Warning Write Failure"; } else

+  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Warning Buffer Too Small"; } 

 

   //

   // If we found a match, copy the message to the user's buffer. Otherwise

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c
index 82933a521d..0f0c6f2010 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c
@@ -313,7 +313,7 @@ Returns:
   EFI_STATUS                    Status;

   EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;

 

-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);

+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);

   if (EFI_ERROR (Status)) {

     return EFI_UNSUPPORTED;

   }

@@ -398,7 +398,7 @@ Returns:
   UINT32                        RefreshRate;

   EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;

 

-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);

+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);

   if (EFI_ERROR (Status)) {

     return EFI_UNSUPPORTED;

   }

@@ -407,20 +407,20 @@ Returns:
   //

   // Try to open GOP first

   //

-  Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, &GraphicsOutput);

+  Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);

   if (EFI_ERROR (Status)) {

     GraphicsOutput = NULL;

     //

     // Open GOP failed, try to open UGA

     //

-    Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, &UgaDraw);

+    Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw);

     if (EFI_ERROR (Status)) {

       return EFI_UNSUPPORTED;

     }

   }

 

   Badging = NULL;

-  Status  = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, &Badging);

+  Status  = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, (VOID **) &Badging);

 

   ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenGraphics);

 

@@ -462,7 +462,7 @@ Returns:
         continue;

       }

     } else {

-      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, &ImageData, &ImageSize);

+      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, (VOID **) &ImageData, &ImageSize);

       if (EFI_ERROR (Status)) {

         return EFI_UNSUPPORTED;

       }

@@ -476,7 +476,7 @@ Returns:
     Status = ConvertBmpToGopBlt (

               ImageData,

               ImageSize,

-              &Blt,

+              (VOID **) &Blt,

               &BltSize,

               &Height,

               &Width

@@ -609,7 +609,7 @@ Returns:
   EFI_STATUS                    Status;

   EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;

 

-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);

+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);

   if (EFI_ERROR (Status)) {

     return EFI_UNSUPPORTED;

   }

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
index 2f29293b42..29da2673cf 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
@@ -66,22 +66,22 @@ Abstract:
 #endif

 

 static EFI_GRAPHICS_OUTPUT_BLT_PIXEL  mEfiColors[16] = {

-  0x00, 0x00, 0x00, 0x00,

-  0x98, 0x00, 0x00, 0x00,

-  0x00, 0x98, 0x00, 0x00,

-  0x98, 0x98, 0x00, 0x00,

-  0x00, 0x00, 0x98, 0x00,

-  0x98, 0x00, 0x98, 0x00,

-  0x00, 0x98, 0x98, 0x00,

-  0x98, 0x98, 0x98, 0x00,

-  0x10, 0x10, 0x10, 0x00,

-  0xff, 0x10, 0x10, 0x00,

-  0x10, 0xff, 0x10, 0x00,

-  0xff, 0xff, 0x10, 0x00,

-  0x10, 0x10, 0xff, 0x00,

-  0xf0, 0x10, 0xff, 0x00,

-  0x10, 0xff, 0xff, 0x00,

-  0xff, 0xff, 0xff, 0x00,

+  {0x00, 0x00, 0x00, 0x00},

+  {0x98, 0x00, 0x00, 0x00},

+  {0x00, 0x98, 0x00, 0x00},

+  {0x98, 0x98, 0x00, 0x00},

+  {0x00, 0x00, 0x98, 0x00},

+  {0x98, 0x00, 0x98, 0x00},

+  {0x00, 0x98, 0x98, 0x00},

+  {0x98, 0x98, 0x98, 0x00},

+  {0x10, 0x10, 0x10, 0x00},

+  {0xff, 0x10, 0x10, 0x00},

+  {0x10, 0xff, 0x10, 0x00},

+  {0xff, 0xff, 0x10, 0x00},

+  {0x10, 0x10, 0xff, 0x00},

+  {0xf0, 0x10, 0xff, 0x00},

+  {0x10, 0xff, 0xff, 0x00},

+  {0xff, 0xff, 0xff, 0x00},

 };

 

 

@@ -393,7 +393,7 @@ Returns:
   Status = gBS->HandleProtocol (

                   Handle,

                   &gEfiGraphicsOutputProtocolGuid,

-                  &GraphicsOutput

+                  (VOID **) &GraphicsOutput

                   );

 

   UgaDraw = NULL;

@@ -403,7 +403,7 @@ Returns:
     Status = gBS->HandleProtocol (

                     Handle,

                     &gEfiUgaDrawProtocolGuid,

-                    &UgaDraw

+                    (VOID **) &UgaDraw

                     );

 

     if (EFI_ERROR (Status)) {

@@ -414,7 +414,7 @@ Returns:
   Status = gBS->HandleProtocol (

                   Handle,

                   &gEfiSimpleTextOutProtocolGuid,

-                  &Sto

+                  (VOID **) &Sto

                   );

 

   if (EFI_ERROR (Status)) {

@@ -504,7 +504,7 @@ Returns:
   Status = gBS->LocateProtocol (

                   &gEfiPrintProtocolGuid,

                   NULL,

-                  &PrintProtocol

+                  (VOID **) &PrintProtocol

                   );

   if (EFI_ERROR (Status)) {

     return 0;

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c
index bad563993d..86b0216818 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c
@@ -42,64 +42,64 @@ typedef struct {
 //

 

 static UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = {

-  BOXDRAW_HORIZONTAL,                 0xc4, L'-', 

-  BOXDRAW_VERTICAL,                   0xb3, L'|',

-  BOXDRAW_DOWN_RIGHT,                 0xda, L'/',

-  BOXDRAW_DOWN_LEFT,                  0xbf, L'\\',

-  BOXDRAW_UP_RIGHT,                   0xc0, L'\\',

-  BOXDRAW_UP_LEFT,                    0xd9, L'/',

-  BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|',

-  BOXDRAW_VERTICAL_LEFT,              0xb4, L'|',

-  BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+',

-  BOXDRAW_UP_HORIZONTAL,              0xc1, L'+',

-  BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+',

-  BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-',

-  BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|',

-  BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/',

-  BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/',

-  BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/',

-  BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\',

-  BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\',

-  BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\',

-  BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\',

-  BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\',

-  BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\',

-  BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/',

-  BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/',

-  BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/',

-  BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|',

-  BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|',

-  BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|',

-  BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|',

-  BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|',

-  BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|',

-  BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+',

-  BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+',

-  BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+',

-  BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+',

-  BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+',

-  BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+',

-  BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+',

-  BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+',

-  BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+',

-

-  BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*',

-  BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+',

-

-  GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^',

-  GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>',

-  GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v',

-  GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<',

-

-  ARROW_LEFT,                         0x3c, L'<',

-

-  ARROW_UP,                           0x18, L'^',

-

-  ARROW_RIGHT,                        0x3e, L'>',

-

-  ARROW_DOWN,                         0x19, L'v',

+  {BOXDRAW_HORIZONTAL,                 0xc4, L'-'}, 

+  {BOXDRAW_VERTICAL,                   0xb3, L'|'},

+  {BOXDRAW_DOWN_RIGHT,                 0xda, L'/'},

+  {BOXDRAW_DOWN_LEFT,                  0xbf, L'\\'},

+  {BOXDRAW_UP_RIGHT,                   0xc0, L'\\'},

+  {BOXDRAW_UP_LEFT,                    0xd9, L'/'},

+  {BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|'},

+  {BOXDRAW_VERTICAL_LEFT,              0xb4, L'|'},

+  {BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+'},

+  {BOXDRAW_UP_HORIZONTAL,              0xc1, L'+'},

+  {BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+'},

+  {BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-'},

+  {BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|'},

+  {BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/'},

+  {BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/'},

+  {BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/'},

+  {BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\'},

+  {BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\'},

+  {BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\'},

+  {BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\'},

+  {BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\'},

+  {BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\'},

+  {BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/'},

+  {BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/'},

+  {BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/'},

+  {BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|'},

+  {BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|'},

+  {BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|'},

+  {BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|'},

+  {BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|'},

+  {BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|'},

+  {BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+'},

+  {BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+'},

+  {BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+'},

+  {BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+'},

+  {BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+'},

+  {BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+'},

+  {BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+'},

+  {BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+'},

+  {BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+'},

+

+  {BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*'},

+  {BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+'},

+

+  {GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^'},

+  {GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>'},

+  {GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v'},

+  {GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<'},

+

+  {ARROW_LEFT,                         0x3c, L'<'},

+

+  {ARROW_UP,                           0x18, L'^'},

+

+  {ARROW_RIGHT,                        0x3e, L'>'},

+

+  {ARROW_DOWN,                         0x19, L'v'},

   

-  0x0000, 0x00

+  {0x0000,                             0x00, L'\0'},

 };

 

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c
index 69242a15fb..b4f9a740ce 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c
@@ -263,7 +263,7 @@ Returns:
       case 'a':

         AsciiStr = (CHAR8 *)VA_ARG (Marker, CHAR8 *);

         if (AsciiStr == NULL) {

-          AsciiStr = "<null string>";

+          AsciiStr = (CHAR8 *) "<null string>";

         }

         for (Count = 0 ;(*AsciiStr != '\0') && (Index < NumberOfCharacters - 1); AsciiStr++, Count++) {

           Buffer[Index++] = (CHAR_W)*AsciiStr;

@@ -543,35 +543,35 @@ Returns:
   //

   // Can't use global Status String Array as UINTN is not constant for EBC

   //

-  if (Status == EFI_SUCCESS) { Desc = "Success"; } else 

-  if (Status == EFI_LOAD_ERROR) { Desc = "Load Error"; } else

-  if (Status == EFI_INVALID_PARAMETER) { Desc = "Invalid Parameter"; } else

-  if (Status == EFI_UNSUPPORTED) { Desc = "Unsupported"; } else

-  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = "Bad Buffer Size"; } else

-  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = "Buffer Too Small"; } else

-  if (Status == EFI_NOT_READY) { Desc = "Not Ready"; } else

-  if (Status == EFI_DEVICE_ERROR) { Desc = "Device Error"; } else

-  if (Status == EFI_WRITE_PROTECTED) { Desc = "Write Protected"; } else

-  if (Status == EFI_OUT_OF_RESOURCES) { Desc = "Out of Resources"; } else

-  if (Status == EFI_VOLUME_CORRUPTED) { Desc = "Volume Corrupt"; } else

-  if (Status == EFI_VOLUME_FULL) { Desc = "Volume Full"; } else

-  if (Status == EFI_NO_MEDIA) { Desc = "No Media"; } else

-  if (Status == EFI_MEDIA_CHANGED) { Desc = "Media changed"; } else

-  if (Status == EFI_NOT_FOUND) { Desc = "Not Found"; } else

-  if (Status == EFI_ACCESS_DENIED) { Desc = "Access Denied"; } else

-  if (Status == EFI_NO_RESPONSE) { Desc = "No Response"; } else

-  if (Status == EFI_NO_MAPPING) { Desc = "No mapping"; } else

-  if (Status == EFI_TIMEOUT) { Desc = "Time out"; } else

-  if (Status == EFI_NOT_STARTED) { Desc = "Not started"; } else

-  if (Status == EFI_ALREADY_STARTED) { Desc = "Already started"; } else

-  if (Status == EFI_ABORTED) { Desc = "Aborted"; } else

-  if (Status == EFI_ICMP_ERROR) { Desc = "ICMP Error"; } else

-  if (Status == EFI_TFTP_ERROR) { Desc = "TFTP Error"; } else

-  if (Status == EFI_PROTOCOL_ERROR) { Desc = "Protocol Error"; } else

-  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = "Warning Unknown Glyph"; } else

-  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = "Warning Delete Failure"; } else

-  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = "Warning Write Failure"; } else

-  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = "Warning Buffer Too Small"; } 

+  if (Status == EFI_SUCCESS) { Desc = (CHAR8 *) "Success"; } else 

+  if (Status == EFI_LOAD_ERROR) { Desc = (CHAR8 *) "Load Error"; } else

+  if (Status == EFI_INVALID_PARAMETER) { Desc = (CHAR8 *) "Invalid Parameter"; } else

+  if (Status == EFI_UNSUPPORTED) { Desc = (CHAR8 *) "Unsupported"; } else

+  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = (CHAR8 *) "Bad Buffer Size"; } else

+  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Buffer Too Small"; } else

+  if (Status == EFI_NOT_READY) { Desc = (CHAR8 *) "Not Ready"; } else

+  if (Status == EFI_DEVICE_ERROR) { Desc = (CHAR8 *) "Device Error"; } else

+  if (Status == EFI_WRITE_PROTECTED) { Desc = (CHAR8 *) "Write Protected"; } else

+  if (Status == EFI_OUT_OF_RESOURCES) { Desc = (CHAR8 *) "Out of Resources"; } else

+  if (Status == EFI_VOLUME_CORRUPTED) { Desc = (CHAR8 *) "Volume Corrupt"; } else

+  if (Status == EFI_VOLUME_FULL) { Desc = (CHAR8 *) "Volume Full"; } else

+  if (Status == EFI_NO_MEDIA) { Desc = (CHAR8 *) "No Media"; } else

+  if (Status == EFI_MEDIA_CHANGED) { Desc = (CHAR8 *) "Media changed"; } else

+  if (Status == EFI_NOT_FOUND) { Desc = (CHAR8 *) "Not Found"; } else

+  if (Status == EFI_ACCESS_DENIED) { Desc = (CHAR8 *) "Access Denied"; } else

+  if (Status == EFI_NO_RESPONSE) { Desc = (CHAR8 *) "No Response"; } else

+  if (Status == EFI_NO_MAPPING) { Desc = (CHAR8 *) "No mapping"; } else

+  if (Status == EFI_TIMEOUT) { Desc = (CHAR8 *) "Time out"; } else

+  if (Status == EFI_NOT_STARTED) { Desc = (CHAR8 *) "Not started"; } else

+  if (Status == EFI_ALREADY_STARTED) { Desc = (CHAR8 *) "Already started"; } else

+  if (Status == EFI_ABORTED) { Desc = (CHAR8 *) "Aborted"; } else

+  if (Status == EFI_ICMP_ERROR) { Desc = (CHAR8 *) "ICMP Error"; } else

+  if (Status == EFI_TFTP_ERROR) { Desc = (CHAR8 *) "TFTP Error"; } else

+  if (Status == EFI_PROTOCOL_ERROR) { Desc = (CHAR8 *) "Protocol Error"; } else

+  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = (CHAR8 *) "Warning Unknown Glyph"; } else

+  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = (CHAR8 *) "Warning Delete Failure"; } else

+  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = (CHAR8 *) "Warning Write Failure"; } else

+  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Warning Buffer Too Small"; } 

   

   //

   // If we found a match, copy the message to the user's buffer. Otherwise

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c
index 0fb537829b..a510a52967 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c
@@ -42,64 +42,64 @@ typedef struct {
 //

 

 static UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = {

-  BOXDRAW_HORIZONTAL,                 0xc4, L'-', 

-  BOXDRAW_VERTICAL,                   0xb3, L'|',

-  BOXDRAW_DOWN_RIGHT,                 0xda, L'/',

-  BOXDRAW_DOWN_LEFT,                  0xbf, L'\\',

-  BOXDRAW_UP_RIGHT,                   0xc0, L'\\',

-  BOXDRAW_UP_LEFT,                    0xd9, L'/',

-  BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|',

-  BOXDRAW_VERTICAL_LEFT,              0xb4, L'|',

-  BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+',

-  BOXDRAW_UP_HORIZONTAL,              0xc1, L'+',

-  BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+',

-  BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-',

-  BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|',

-  BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/',

-  BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/',

-  BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/',

-  BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\',

-  BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\',

-  BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\',

-  BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\',

-  BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\',

-  BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\',

-  BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/',

-  BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/',

-  BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/',

-  BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|',

-  BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|',

-  BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|',

-  BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|',

-  BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|',

-  BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|',

-  BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+',

-  BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+',

-  BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+',

-  BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+',

-  BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+',

-  BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+',

-  BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+',

-  BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+',

-  BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+',

-

-  BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*',

-  BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+',

-

-  GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^',

-  GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>',

-  GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v',

-  GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<',

-

-  ARROW_LEFT,                         0x3c, L'<',

-

-  ARROW_UP,                           0x18, L'^',

-

-  ARROW_RIGHT,                        0x3e, L'>',

-

-  ARROW_DOWN,                         0x19, L'v',

+  {BOXDRAW_HORIZONTAL,                 0xc4, L'-'}, 

+  {BOXDRAW_VERTICAL,                   0xb3, L'|'},

+  {BOXDRAW_DOWN_RIGHT,                 0xda, L'/'},

+  {BOXDRAW_DOWN_LEFT,                  0xbf, L'\\'},

+  {BOXDRAW_UP_RIGHT,                   0xc0, L'\\'},

+  {BOXDRAW_UP_LEFT,                    0xd9, L'/'},

+  {BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|'},

+  {BOXDRAW_VERTICAL_LEFT,              0xb4, L'|'},

+  {BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+'},

+  {BOXDRAW_UP_HORIZONTAL,              0xc1, L'+'},

+  {BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+'},

+  {BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-'},

+  {BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|'},

+  {BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/'},

+  {BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/'},

+  {BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/'},

+  {BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\'},

+  {BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\'},

+  {BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\'},

+  {BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\'},

+  {BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\'},

+  {BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\'},

+  {BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/'},

+  {BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/'},

+  {BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/'},

+  {BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|'},

+  {BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|'},

+  {BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|'},

+  {BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|'},

+  {BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|'},

+  {BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|'},

+  {BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+'},

+  {BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+'},

+  {BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+'},

+  {BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+'},

+  {BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+'},

+  {BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+'},

+  {BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+'},

+  {BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+'},

+  {BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+'},

+

+  {BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*'},

+  {BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+'},

+

+  {GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^'},

+  {GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>'},

+  {GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v'},

+  {GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<'},

+

+  {ARROW_LEFT,                         0x3c, L'<'},

+

+  {ARROW_UP,                           0x18, L'^'},

+

+  {ARROW_RIGHT,                        0x3e, L'>'},

+

+  {ARROW_DOWN,                         0x19, L'v'},

   

-  0x0000, 0x00

+  {0x0000,                             0x00, L'\0'},

 };

 

 

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c
index 7e9553ffe0..91548c4253 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c
@@ -30,8 +30,10 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePathTemplate = {
       {

         HARDWARE_DEVICE_PATH,

         HW_VENDOR_DP,

-        (UINT8) (sizeof (HII_VENDOR_DEVICE_PATH_NODE)),

-        (UINT8) ((sizeof (HII_VENDOR_DEVICE_PATH_NODE)) >> 8)

+        {

+          (UINT8) (sizeof (HII_VENDOR_DEVICE_PATH_NODE)),

+          (UINT8) ((sizeof (HII_VENDOR_DEVICE_PATH_NODE)) >> 8)

+        }

       },

       EFI_IFR_TIANO_GUID,

     },

@@ -40,8 +42,9 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePathTemplate = {
   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    END_DEVICE_PATH_LENGTH,

-    0

+    {

+      END_DEVICE_PATH_LENGTH

+    }

   }

 };

 

@@ -76,10 +79,10 @@ Returns:
     return;

   }

 

-  Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, &gIfrLibHiiDatabase);

+  Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gIfrLibHiiDatabase);

   ASSERT_EFI_ERROR (Status);

 

-  Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, &gIfrLibHiiString);

+  Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gIfrLibHiiString);

   ASSERT_EFI_ERROR (Status);

 

   mHiiProtocolsInitialized = TRUE;

@@ -226,7 +229,7 @@ Returns:
   Status = gBS->HandleProtocol (

                   DriverHandle,

                   &gEfiDevicePathProtocolGuid,

-                  &DevicePath

+                  (VOID **) &DevicePath

                   );

   if (EFI_ERROR (Status)) {

     return Status;

@@ -294,7 +297,7 @@ Returns:
   BufferSize = EfiDevicePathSize (DevicePath);

   for(Index = 0; Index < HandleCount; Index++) {

     Handle = Handles[Index];

-    gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &TmpDevicePath);

+    gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **) &TmpDevicePath);

 

     //

     // Check whether DevicePath match

@@ -456,7 +459,7 @@ Returns:
   Status = gBS->LocateProtocol (

                   &gEfiHiiDatabaseProtocolGuid,

                   NULL,

-                  &HiiDatabase

+                  (VOID **) &HiiDatabase

                   );

   if (EFI_ERROR (Status)) {

     return Status;

@@ -533,7 +536,7 @@ Returns:
   Status = gBS->LocateProtocol (

                   &gEfiHiiDatabaseProtocolGuid,

                   NULL,

-                  &HiiDatabase

+                  (VOID **) &HiiDatabase

                   );

   if (EFI_ERROR (Status)) {

     return Status;

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
index 381e9d21a5..abee5318d8 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
@@ -802,7 +802,7 @@ Returns:
   Status = gBS->HandleProtocol (

                   DriverHandle,

                   &gEfiDevicePathProtocolGuid,

-                  &DevicePath

+                  (VOID **) &DevicePath

                   );

   if (EFI_ERROR (Status)) {

     return Status;

@@ -948,12 +948,12 @@ Returns:
   //

   // Locate protocols for use

   //

-  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, &FormBrowser2);

+  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &FormBrowser2);

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

-  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, &HiiConfigRouting);

+  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &HiiConfigRouting);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -1062,12 +1062,12 @@ Returns:
   //

   // Locate protocols for use

   //

-  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, &FormBrowser2);

+  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &FormBrowser2);

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

-  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, &HiiConfigRouting);

+  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &HiiConfigRouting);

   if (EFI_ERROR (Status)) {

     return Status;

   }

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
index c2e57dd16b..5289992699 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
@@ -280,7 +280,7 @@ Returns:
                   );

 

   if (EFI_ERROR (Status)) {

-    EfiAsciiStrCpy (Lang, "en-US");

+    EfiAsciiStrCpy (Lang, (CHAR8 *) "en-US");

   }

 

   return Status;