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

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
index a968f407b7a2eb3407cd55fb394a077f42ec5c1b..bcfdf7ee8e30477433b71594ccc50b2c7d06c771 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Debug.c
@@ -77,7 +77,14 @@ Returns:
   //\r
   // Put break point in module that contained the error.\r
   //\r
+#ifndef __GNUC__\r
   EFI_BREAKPOINT ();\r
+#else\r
+  //\r
+  // Bugbug: Need to fix a GNC style cpu break point\r
+  // \r
+  EFI_DEADLOOP ();\r
+#endif\r
 }\r
 \r
 VOID\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
index 3d44562ecfb8179e147feeb31790177f7238921d..c9fb788807f8cf9ce07bae252cac1d0be5117a4a 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/GetImage.c
@@ -140,7 +140,7 @@ GetImageEx (
     Status = gBS->HandleProtocol (\r
                ImageHandle,\r
                &gEfiLoadedImageProtocolGuid,\r
-               &LoadedImage\r
+               (VOID **) &LoadedImage\r
                );\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
@@ -152,7 +152,7 @@ GetImageEx (
                   #else\r
                     &gEfiFirmwareVolume2ProtocolGuid,\r
                   #endif\r
-                    &ImageFv\r
+                    (VOID **) &ImageFv\r
                     );\r
     if (!EFI_ERROR (Status)) {\r
       Status = GetImageFromFv (ImageFv, NameGuid, SectionType, Buffer, Size);\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
index 55d1a1d14e4083fa8b1a99f9c04498aef699dfbe..3ac8052a6cf256df2bcfd7ba1042d5b96d2f7adf 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiDriverLib/Perf.c
@@ -98,7 +98,7 @@ Returns:
   UINTN EndIndex;\r
 \r
   if (PdbFileName == NULL) {\r
-    EfiAsciiStrCpy (GaugeString, " ");\r
+    EfiAsciiStrCpy (GaugeString, (CHAR8 *)" ");\r
   } else {\r
     StartIndex = 0;\r
     for (EndIndex = 0; PdbFileName[EndIndex] != 0; EndIndex++)\r
@@ -229,7 +229,7 @@ GetNameFromHandle (
   CHAR8                       *PdbFileName;\r
   EFI_DRIVER_BINDING_PROTOCOL *DriverBinding;\r
 \r
-  EfiAsciiStrCpy (GaugeString, " ");\r
+  EfiAsciiStrCpy (GaugeString, (CHAR8 *)" ");\r
 \r
   //\r
   // Get handle name from image protocol\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
index 030ab14c5ae5e0a9f17c0292bc480e854db789c2..b7b15fe70921548a36b95f8895bbdefad0ab55a1 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiIfrSupportLib/IfrCommon.c
@@ -58,7 +58,7 @@ Returns:
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    EfiAsciiStrCpy (Language, "eng");\r
+    EfiAsciiStrCpy (Language, (CHAR8 *) "eng");\r
   }\r
 \r
   for (Index = 0; Index < 3; Index++) {\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c
index e31546f28e957c80e6c6506d49d519263ebcae3e..d99859d1ebbdac80bc881b0d0c4137981d6e2428 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiScriptLib/EfiScriptLib.c
@@ -52,7 +52,7 @@ Returns:
 \r
   BS      = SystemTable->BootServices;\r
 \r
-  Status  = BS->LocateProtocol (&gEfiBootScriptSaveGuid, NULL, &mBootScriptSave);\r
+  Status  = BS->LocateProtocol (&gEfiBootScriptSaveGuid, NULL, (VOID **)&mBootScriptSave);\r
   if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
     mBootScriptSave = NULL;\r
   }\r
@@ -623,7 +623,7 @@ Returns:
   return BootScriptSaveInformation (      \r
            TableName,\r
            (UINT32) EfiStrLen (String) * 2 + 2, \r
-           (EFI_PHYSICAL_ADDRESS)String\r
+           (EFI_PHYSICAL_ADDRESS) (UINTN) String\r
            );\r
 }\r
 \r
@@ -656,7 +656,7 @@ Returns:
   return BootScriptSaveInformation (      \r
            TableName,\r
            (UINT32) EfiAsciiStrLen (String) + 1, \r
-           (EFI_PHYSICAL_ADDRESS)String\r
+           (EFI_PHYSICAL_ADDRESS) (UINTN) String\r
            );\r
 }\r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c
index 69fc8f7afeef82f248f2562cbcc95294c4060590..aaf5bec1a2276d294cf6301d19f9ae77101f04d8 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/EfiUiLib/EfiUiLib.c
@@ -384,6 +384,8 @@ Returns:
   UINT8             Idx;\r
   UINT8             i;\r
 \r
+  Idx = 0;\r
+  TempVal = 0;\r
   //\r
   // Iterate the decimal values separated by dots\r
   //\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
index 2a42302c76b06a08b461587b6a53e2c90be7ba87..61929d5bd9953c1d9b1ff66c9e8b0c6dccd59bbc 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Graphics.c
@@ -463,7 +463,7 @@ Returns:
         continue;\r
       }\r
     } else {\r
-      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, &ImageData, &ImageSize);\r
+      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, (VOID **) &ImageData, &ImageSize);\r
       if (EFI_ERROR (Status)) {\r
         return EFI_UNSUPPORTED;\r
       }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
index 3b63433e0aa8c5e5bfa76675c265078d282491f0..4e0980a1fc71cc02fc5a4482c97e602ce9432810 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Graphics/Print.c
@@ -99,22 +99,22 @@ EfiStatusToString (
   );\r
 \r
 static EFI_GRAPHICS_OUTPUT_BLT_PIXEL  mEfiColors[16] = {\r
-  0x00, 0x00, 0x00, 0x00,\r
-  0x98, 0x00, 0x00, 0x00,\r
-  0x00, 0x98, 0x00, 0x00,\r
-  0x98, 0x98, 0x00, 0x00,\r
-  0x00, 0x00, 0x98, 0x00,\r
-  0x98, 0x00, 0x98, 0x00,\r
-  0x00, 0x98, 0x98, 0x00,\r
-  0x98, 0x98, 0x98, 0x00,\r
-  0x10, 0x10, 0x10, 0x00,\r
-  0xff, 0x10, 0x10, 0x00,\r
-  0x10, 0xff, 0x10, 0x00,\r
-  0xff, 0xff, 0x10, 0x00,\r
-  0x10, 0x10, 0xff, 0x00,\r
-  0xf0, 0x10, 0xff, 0x00,\r
-  0x10, 0xff, 0xff, 0x00,\r
-  0xff, 0xff, 0xff, 0x00,\r
+  {0x00, 0x00, 0x00, 0x00},\r
+  {0x98, 0x00, 0x00, 0x00},\r
+  {0x00, 0x98, 0x00, 0x00},\r
+  {0x98, 0x98, 0x00, 0x00},\r
+  {0x00, 0x00, 0x98, 0x00},\r
+  {0x98, 0x00, 0x98, 0x00},\r
+  {0x00, 0x98, 0x98, 0x00},\r
+  {0x98, 0x98, 0x98, 0x00},\r
+  {0x10, 0x10, 0x10, 0x00},\r
+  {0xff, 0x10, 0x10, 0x00},\r
+  {0x10, 0xff, 0x10, 0x00},\r
+  {0xff, 0xff, 0x10, 0x00},\r
+  {0x10, 0x10, 0xff, 0x00},\r
+  {0xf0, 0x10, 0xff, 0x00},\r
+  {0x10, 0xff, 0xff, 0x00},\r
+  {0xff, 0xff, 0xff, 0x00},\r
 };\r
 \r
 \r
@@ -632,7 +632,7 @@ Returns:
       case 'a':\r
         AsciiStr = (CHAR8 *) VA_ARG (Marker, CHAR8 *);\r
         if (AsciiStr == NULL) {\r
-          AsciiStr = "<null string>";\r
+          AsciiStr = (CHAR8 *) "<null string>";\r
         }\r
 \r
         for (Count = 0; (*AsciiStr != '\0') && (Index < NumberOfCharacters - 1); AsciiStr++, Count++) {\r
@@ -929,35 +929,35 @@ Returns:
   //\r
   // Can't use global Status String Array as UINTN is not constant for EBC\r
   //\r
-  if (Status == EFI_SUCCESS) { Desc = "Success"; } else \r
-  if (Status == EFI_LOAD_ERROR) { Desc = "Load Error"; } else\r
-  if (Status == EFI_INVALID_PARAMETER) { Desc = "Invalid Parameter"; } else\r
-  if (Status == EFI_UNSUPPORTED) { Desc = "Unsupported"; } else\r
-  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = "Bad Buffer Size"; } else\r
-  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = "Buffer Too Small"; } else\r
-  if (Status == EFI_NOT_READY) { Desc = "Not Ready"; } else\r
-  if (Status == EFI_DEVICE_ERROR) { Desc = "Device Error"; } else\r
-  if (Status == EFI_WRITE_PROTECTED) { Desc = "Write Protected"; } else\r
-  if (Status == EFI_OUT_OF_RESOURCES) { Desc = "Out of Resources"; } else\r
-  if (Status == EFI_VOLUME_CORRUPTED) { Desc = "Volume Corrupt"; } else\r
-  if (Status == EFI_VOLUME_FULL) { Desc = "Volume Full"; } else\r
-  if (Status == EFI_NO_MEDIA) { Desc = "No Media"; } else\r
-  if (Status == EFI_MEDIA_CHANGED) { Desc = "Media changed"; } else\r
-  if (Status == EFI_NOT_FOUND) { Desc = "Not Found"; } else\r
-  if (Status == EFI_ACCESS_DENIED) { Desc = "Access Denied"; } else\r
-  if (Status == EFI_NO_RESPONSE) { Desc = "No Response"; } else\r
-  if (Status == EFI_NO_MAPPING) { Desc = "No mapping"; } else\r
-  if (Status == EFI_TIMEOUT) { Desc = "Time out"; } else\r
-  if (Status == EFI_NOT_STARTED) { Desc = "Not started"; } else\r
-  if (Status == EFI_ALREADY_STARTED) { Desc = "Already started"; } else\r
-  if (Status == EFI_ABORTED) { Desc = "Aborted"; } else\r
-  if (Status == EFI_ICMP_ERROR) { Desc = "ICMP Error"; } else\r
-  if (Status == EFI_TFTP_ERROR) { Desc = "TFTP Error"; } else\r
-  if (Status == EFI_PROTOCOL_ERROR) { Desc = "Protocol Error"; } else\r
-  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = "Warning Unknown Glyph"; } else\r
-  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = "Warning Delete Failure"; } else\r
-  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = "Warning Write Failure"; } else\r
-  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = "Warning Buffer Too Small"; } \r
+  if (Status == EFI_SUCCESS) { Desc = (CHAR8 *) "Success"; } else \r
+  if (Status == EFI_LOAD_ERROR) { Desc = (CHAR8 *) "Load Error"; } else\r
+  if (Status == EFI_INVALID_PARAMETER) { Desc = (CHAR8 *) "Invalid Parameter"; } else\r
+  if (Status == EFI_UNSUPPORTED) { Desc = (CHAR8 *) "Unsupported"; } else\r
+  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = (CHAR8 *) "Bad Buffer Size"; } else\r
+  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Buffer Too Small"; } else\r
+  if (Status == EFI_NOT_READY) { Desc = (CHAR8 *) "Not Ready"; } else\r
+  if (Status == EFI_DEVICE_ERROR) { Desc = (CHAR8 *) "Device Error"; } else\r
+  if (Status == EFI_WRITE_PROTECTED) { Desc = (CHAR8 *) "Write Protected"; } else\r
+  if (Status == EFI_OUT_OF_RESOURCES) { Desc = (CHAR8 *) "Out of Resources"; } else\r
+  if (Status == EFI_VOLUME_CORRUPTED) { Desc = (CHAR8 *) "Volume Corrupt"; } else\r
+  if (Status == EFI_VOLUME_FULL) { Desc = (CHAR8 *) "Volume Full"; } else\r
+  if (Status == EFI_NO_MEDIA) { Desc = (CHAR8 *) "No Media"; } else\r
+  if (Status == EFI_MEDIA_CHANGED) { Desc = (CHAR8 *) "Media changed"; } else\r
+  if (Status == EFI_NOT_FOUND) { Desc = (CHAR8 *) "Not Found"; } else\r
+  if (Status == EFI_ACCESS_DENIED) { Desc = (CHAR8 *) "Access Denied"; } else\r
+  if (Status == EFI_NO_RESPONSE) { Desc = (CHAR8 *) "No Response"; } else\r
+  if (Status == EFI_NO_MAPPING) { Desc = (CHAR8 *) "No mapping"; } else\r
+  if (Status == EFI_TIMEOUT) { Desc = (CHAR8 *) "Time out"; } else\r
+  if (Status == EFI_NOT_STARTED) { Desc = (CHAR8 *) "Not started"; } else\r
+  if (Status == EFI_ALREADY_STARTED) { Desc = (CHAR8 *) "Already started"; } else\r
+  if (Status == EFI_ABORTED) { Desc = (CHAR8 *) "Aborted"; } else\r
+  if (Status == EFI_ICMP_ERROR) { Desc = (CHAR8 *) "ICMP Error"; } else\r
+  if (Status == EFI_TFTP_ERROR) { Desc = (CHAR8 *) "TFTP Error"; } else\r
+  if (Status == EFI_PROTOCOL_ERROR) { Desc = (CHAR8 *) "Protocol Error"; } else\r
+  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = (CHAR8 *) "Warning Unknown Glyph"; } else\r
+  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = (CHAR8 *) "Warning Delete Failure"; } else\r
+  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = (CHAR8 *) "Warning Write Failure"; } else\r
+  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Warning Buffer Too Small"; } \r
 \r
   //\r
   // If we found a match, copy the message to the user's buffer. Otherwise\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c
index 82933a521d554e74e62f72186e9a5f012c3e2d10..0f0c6f201030efbc724c805f414d97ae78886a20 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.c
@@ -313,7 +313,7 @@ Returns:
   EFI_STATUS                    Status;\r
   EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);\r
+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
@@ -398,7 +398,7 @@ Returns:
   UINT32                        RefreshRate;\r
   EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);\r
+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
@@ -407,20 +407,20 @@ Returns:
   //\r
   // Try to open GOP first\r
   //\r
-  Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, &GraphicsOutput);\r
+  Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiGraphicsOutputProtocolGuid, (VOID **) &GraphicsOutput);\r
   if (EFI_ERROR (Status)) {\r
     GraphicsOutput = NULL;\r
     //\r
     // Open GOP failed, try to open UGA\r
     //\r
-    Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, &UgaDraw);\r
+    Status = gBS->HandleProtocol (gST->ConsoleOutHandle, &gEfiUgaDrawProtocolGuid, (VOID **) &UgaDraw);\r
     if (EFI_ERROR (Status)) {\r
       return EFI_UNSUPPORTED;\r
     }\r
   }\r
 \r
   Badging = NULL;\r
-  Status  = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, &Badging);\r
+  Status  = gBS->LocateProtocol (&gEfiOEMBadgingProtocolGuid, NULL, (VOID **) &Badging);\r
 \r
   ConsoleControl->SetMode (ConsoleControl, EfiConsoleControlScreenGraphics);\r
 \r
@@ -462,7 +462,7 @@ Returns:
         continue;\r
       }\r
     } else {\r
-      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, &ImageData, &ImageSize);\r
+      Status = GetGraphicsBitMapFromFVEx (ImageHandle, LogoFile, (VOID **) &ImageData, &ImageSize);\r
       if (EFI_ERROR (Status)) {\r
         return EFI_UNSUPPORTED;\r
       }\r
@@ -476,7 +476,7 @@ Returns:
     Status = ConvertBmpToGopBlt (\r
               ImageData,\r
               ImageSize,\r
-              &Blt,\r
+              (VOID **) &Blt,\r
               &BltSize,\r
               &Height,\r
               &Width\r
@@ -609,7 +609,7 @@ Returns:
   EFI_STATUS                    Status;\r
   EFI_CONSOLE_CONTROL_PROTOCOL  *ConsoleControl;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, &ConsoleControl);\r
+  Status = gBS->LocateProtocol (&gEfiConsoleControlProtocolGuid, NULL, (VOID **) &ConsoleControl);\r
   if (EFI_ERROR (Status)) {\r
     return EFI_UNSUPPORTED;\r
   }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
index 2f29293b4269da48d363045e9737998f87a276bc..29da2673cfc26620b7707cb883a8f860f7314d02 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Print.c
@@ -66,22 +66,22 @@ Abstract:
 #endif\r
 \r
 static EFI_GRAPHICS_OUTPUT_BLT_PIXEL  mEfiColors[16] = {\r
-  0x00, 0x00, 0x00, 0x00,\r
-  0x98, 0x00, 0x00, 0x00,\r
-  0x00, 0x98, 0x00, 0x00,\r
-  0x98, 0x98, 0x00, 0x00,\r
-  0x00, 0x00, 0x98, 0x00,\r
-  0x98, 0x00, 0x98, 0x00,\r
-  0x00, 0x98, 0x98, 0x00,\r
-  0x98, 0x98, 0x98, 0x00,\r
-  0x10, 0x10, 0x10, 0x00,\r
-  0xff, 0x10, 0x10, 0x00,\r
-  0x10, 0xff, 0x10, 0x00,\r
-  0xff, 0xff, 0x10, 0x00,\r
-  0x10, 0x10, 0xff, 0x00,\r
-  0xf0, 0x10, 0xff, 0x00,\r
-  0x10, 0xff, 0xff, 0x00,\r
-  0xff, 0xff, 0xff, 0x00,\r
+  {0x00, 0x00, 0x00, 0x00},\r
+  {0x98, 0x00, 0x00, 0x00},\r
+  {0x00, 0x98, 0x00, 0x00},\r
+  {0x98, 0x98, 0x00, 0x00},\r
+  {0x00, 0x00, 0x98, 0x00},\r
+  {0x98, 0x00, 0x98, 0x00},\r
+  {0x00, 0x98, 0x98, 0x00},\r
+  {0x98, 0x98, 0x98, 0x00},\r
+  {0x10, 0x10, 0x10, 0x00},\r
+  {0xff, 0x10, 0x10, 0x00},\r
+  {0x10, 0xff, 0x10, 0x00},\r
+  {0xff, 0xff, 0x10, 0x00},\r
+  {0x10, 0x10, 0xff, 0x00},\r
+  {0xf0, 0x10, 0xff, 0x00},\r
+  {0x10, 0xff, 0xff, 0x00},\r
+  {0xff, 0xff, 0xff, 0x00},\r
 };\r
 \r
 \r
@@ -393,7 +393,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  &GraphicsOutput\r
+                  (VOID **) &GraphicsOutput\r
                   );\r
 \r
   UgaDraw = NULL;\r
@@ -403,7 +403,7 @@ Returns:
     Status = gBS->HandleProtocol (\r
                     Handle,\r
                     &gEfiUgaDrawProtocolGuid,\r
-                    &UgaDraw\r
+                    (VOID **) &UgaDraw\r
                     );\r
 \r
     if (EFI_ERROR (Status)) {\r
@@ -414,7 +414,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   Handle,\r
                   &gEfiSimpleTextOutProtocolGuid,\r
-                  &Sto\r
+                  (VOID **) &Sto\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -504,7 +504,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiPrintProtocolGuid,\r
                   NULL,\r
-                  &PrintProtocol\r
+                  (VOID **) &PrintProtocol\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return 0;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c
index bad563993d81020665ab93db49f5209ce0f20970..86b0216818559b57ec2f971d8c20d6fe52f39762 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/BoxDraw.c
@@ -42,64 +42,64 @@ typedef struct {
 //\r
 \r
 static UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = {\r
-  BOXDRAW_HORIZONTAL,                 0xc4, L'-', \r
-  BOXDRAW_VERTICAL,                   0xb3, L'|',\r
-  BOXDRAW_DOWN_RIGHT,                 0xda, L'/',\r
-  BOXDRAW_DOWN_LEFT,                  0xbf, L'\\',\r
-  BOXDRAW_UP_RIGHT,                   0xc0, L'\\',\r
-  BOXDRAW_UP_LEFT,                    0xd9, L'/',\r
-  BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|',\r
-  BOXDRAW_VERTICAL_LEFT,              0xb4, L'|',\r
-  BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+',\r
-  BOXDRAW_UP_HORIZONTAL,              0xc1, L'+',\r
-  BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+',\r
-  BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-',\r
-  BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|',\r
-  BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/',\r
-  BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/',\r
-  BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/',\r
-  BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\',\r
-  BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\',\r
-  BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\',\r
-  BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\',\r
-  BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\',\r
-  BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\',\r
-  BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/',\r
-  BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/',\r
-  BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/',\r
-  BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|',\r
-  BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|',\r
-  BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|',\r
-  BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|',\r
-  BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|',\r
-  BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|',\r
-  BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+',\r
-  BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+',\r
-  BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+',\r
-  BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+',\r
-  BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+',\r
-  BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+',\r
-  BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+',\r
-  BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+',\r
-  BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+',\r
-\r
-  BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*',\r
-  BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+',\r
-\r
-  GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^',\r
-  GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>',\r
-  GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v',\r
-  GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<',\r
-\r
-  ARROW_LEFT,                         0x3c, L'<',\r
-\r
-  ARROW_UP,                           0x18, L'^',\r
-\r
-  ARROW_RIGHT,                        0x3e, L'>',\r
-\r
-  ARROW_DOWN,                         0x19, L'v',\r
+  {BOXDRAW_HORIZONTAL,                 0xc4, L'-'}, \r
+  {BOXDRAW_VERTICAL,                   0xb3, L'|'},\r
+  {BOXDRAW_DOWN_RIGHT,                 0xda, L'/'},\r
+  {BOXDRAW_DOWN_LEFT,                  0xbf, L'\\'},\r
+  {BOXDRAW_UP_RIGHT,                   0xc0, L'\\'},\r
+  {BOXDRAW_UP_LEFT,                    0xd9, L'/'},\r
+  {BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|'},\r
+  {BOXDRAW_VERTICAL_LEFT,              0xb4, L'|'},\r
+  {BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+'},\r
+  {BOXDRAW_UP_HORIZONTAL,              0xc1, L'+'},\r
+  {BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+'},\r
+  {BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-'},\r
+  {BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|'},\r
+  {BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/'},\r
+  {BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/'},\r
+  {BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/'},\r
+  {BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\'},\r
+  {BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\'},\r
+  {BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\'},\r
+  {BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\'},\r
+  {BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\'},\r
+  {BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\'},\r
+  {BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/'},\r
+  {BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/'},\r
+  {BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/'},\r
+  {BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|'},\r
+  {BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|'},\r
+  {BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|'},\r
+  {BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|'},\r
+  {BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|'},\r
+  {BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|'},\r
+  {BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+'},\r
+  {BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+'},\r
+  {BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+'},\r
+  {BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+'},\r
+  {BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+'},\r
+  {BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+'},\r
+  {BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+'},\r
+  {BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+'},\r
+  {BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+'},\r
+\r
+  {BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*'},\r
+  {BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+'},\r
+\r
+  {GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^'},\r
+  {GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>'},\r
+  {GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v'},\r
+  {GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<'},\r
+\r
+  {ARROW_LEFT,                         0x3c, L'<'},\r
+\r
+  {ARROW_UP,                           0x18, L'^'},\r
+\r
+  {ARROW_RIGHT,                        0x3e, L'>'},\r
+\r
+  {ARROW_DOWN,                         0x19, L'v'},\r
   \r
-  0x0000, 0x00\r
+  {0x0000,                             0x00, L'\0'},\r
 };\r
 \r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c
index 69242a15fbff95e3bd288b78aea319ad8d3dea2c..b4f9a740ce3ff358bcebdb2a374ab5f6be6580e6 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/Print/Print.c
@@ -263,7 +263,7 @@ Returns:
       case 'a':\r
         AsciiStr = (CHAR8 *)VA_ARG (Marker, CHAR8 *);\r
         if (AsciiStr == NULL) {\r
-          AsciiStr = "<null string>";\r
+          AsciiStr = (CHAR8 *) "<null string>";\r
         }\r
         for (Count = 0 ;(*AsciiStr != '\0') && (Index < NumberOfCharacters - 1); AsciiStr++, Count++) {\r
           Buffer[Index++] = (CHAR_W)*AsciiStr;\r
@@ -543,35 +543,35 @@ Returns:
   //\r
   // Can't use global Status String Array as UINTN is not constant for EBC\r
   //\r
-  if (Status == EFI_SUCCESS) { Desc = "Success"; } else \r
-  if (Status == EFI_LOAD_ERROR) { Desc = "Load Error"; } else\r
-  if (Status == EFI_INVALID_PARAMETER) { Desc = "Invalid Parameter"; } else\r
-  if (Status == EFI_UNSUPPORTED) { Desc = "Unsupported"; } else\r
-  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = "Bad Buffer Size"; } else\r
-  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = "Buffer Too Small"; } else\r
-  if (Status == EFI_NOT_READY) { Desc = "Not Ready"; } else\r
-  if (Status == EFI_DEVICE_ERROR) { Desc = "Device Error"; } else\r
-  if (Status == EFI_WRITE_PROTECTED) { Desc = "Write Protected"; } else\r
-  if (Status == EFI_OUT_OF_RESOURCES) { Desc = "Out of Resources"; } else\r
-  if (Status == EFI_VOLUME_CORRUPTED) { Desc = "Volume Corrupt"; } else\r
-  if (Status == EFI_VOLUME_FULL) { Desc = "Volume Full"; } else\r
-  if (Status == EFI_NO_MEDIA) { Desc = "No Media"; } else\r
-  if (Status == EFI_MEDIA_CHANGED) { Desc = "Media changed"; } else\r
-  if (Status == EFI_NOT_FOUND) { Desc = "Not Found"; } else\r
-  if (Status == EFI_ACCESS_DENIED) { Desc = "Access Denied"; } else\r
-  if (Status == EFI_NO_RESPONSE) { Desc = "No Response"; } else\r
-  if (Status == EFI_NO_MAPPING) { Desc = "No mapping"; } else\r
-  if (Status == EFI_TIMEOUT) { Desc = "Time out"; } else\r
-  if (Status == EFI_NOT_STARTED) { Desc = "Not started"; } else\r
-  if (Status == EFI_ALREADY_STARTED) { Desc = "Already started"; } else\r
-  if (Status == EFI_ABORTED) { Desc = "Aborted"; } else\r
-  if (Status == EFI_ICMP_ERROR) { Desc = "ICMP Error"; } else\r
-  if (Status == EFI_TFTP_ERROR) { Desc = "TFTP Error"; } else\r
-  if (Status == EFI_PROTOCOL_ERROR) { Desc = "Protocol Error"; } else\r
-  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = "Warning Unknown Glyph"; } else\r
-  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = "Warning Delete Failure"; } else\r
-  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = "Warning Write Failure"; } else\r
-  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = "Warning Buffer Too Small"; } \r
+  if (Status == EFI_SUCCESS) { Desc = (CHAR8 *) "Success"; } else \r
+  if (Status == EFI_LOAD_ERROR) { Desc = (CHAR8 *) "Load Error"; } else\r
+  if (Status == EFI_INVALID_PARAMETER) { Desc = (CHAR8 *) "Invalid Parameter"; } else\r
+  if (Status == EFI_UNSUPPORTED) { Desc = (CHAR8 *) "Unsupported"; } else\r
+  if (Status == EFI_BAD_BUFFER_SIZE) { Desc = (CHAR8 *) "Bad Buffer Size"; } else\r
+  if (Status == EFI_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Buffer Too Small"; } else\r
+  if (Status == EFI_NOT_READY) { Desc = (CHAR8 *) "Not Ready"; } else\r
+  if (Status == EFI_DEVICE_ERROR) { Desc = (CHAR8 *) "Device Error"; } else\r
+  if (Status == EFI_WRITE_PROTECTED) { Desc = (CHAR8 *) "Write Protected"; } else\r
+  if (Status == EFI_OUT_OF_RESOURCES) { Desc = (CHAR8 *) "Out of Resources"; } else\r
+  if (Status == EFI_VOLUME_CORRUPTED) { Desc = (CHAR8 *) "Volume Corrupt"; } else\r
+  if (Status == EFI_VOLUME_FULL) { Desc = (CHAR8 *) "Volume Full"; } else\r
+  if (Status == EFI_NO_MEDIA) { Desc = (CHAR8 *) "No Media"; } else\r
+  if (Status == EFI_MEDIA_CHANGED) { Desc = (CHAR8 *) "Media changed"; } else\r
+  if (Status == EFI_NOT_FOUND) { Desc = (CHAR8 *) "Not Found"; } else\r
+  if (Status == EFI_ACCESS_DENIED) { Desc = (CHAR8 *) "Access Denied"; } else\r
+  if (Status == EFI_NO_RESPONSE) { Desc = (CHAR8 *) "No Response"; } else\r
+  if (Status == EFI_NO_MAPPING) { Desc = (CHAR8 *) "No mapping"; } else\r
+  if (Status == EFI_TIMEOUT) { Desc = (CHAR8 *) "Time out"; } else\r
+  if (Status == EFI_NOT_STARTED) { Desc = (CHAR8 *) "Not started"; } else\r
+  if (Status == EFI_ALREADY_STARTED) { Desc = (CHAR8 *) "Already started"; } else\r
+  if (Status == EFI_ABORTED) { Desc = (CHAR8 *) "Aborted"; } else\r
+  if (Status == EFI_ICMP_ERROR) { Desc = (CHAR8 *) "ICMP Error"; } else\r
+  if (Status == EFI_TFTP_ERROR) { Desc = (CHAR8 *) "TFTP Error"; } else\r
+  if (Status == EFI_PROTOCOL_ERROR) { Desc = (CHAR8 *) "Protocol Error"; } else\r
+  if (Status == EFI_WARN_UNKNOWN_GLYPH) { Desc = (CHAR8 *) "Warning Unknown Glyph"; } else\r
+  if (Status == EFI_WARN_DELETE_FAILURE) { Desc = (CHAR8 *) "Warning Delete Failure"; } else\r
+  if (Status == EFI_WARN_WRITE_FAILURE) { Desc = (CHAR8 *) "Warning Write Failure"; } else\r
+  if (Status == EFI_WARN_BUFFER_TOO_SMALL) { Desc = (CHAR8 *) "Warning Buffer Too Small"; } \r
   \r
   //\r
   // If we found a match, copy the message to the user's buffer. Otherwise\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c
index 0fb537829bb7137b09bb2097858e2afca0b19156..a510a52967371b8ab198866d6287bba8e9ae8c6a 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/BoxDraw.c
@@ -42,64 +42,64 @@ typedef struct {
 //\r
 \r
 static UNICODE_TO_CHAR UnicodeToPcAnsiOrAscii[] = {\r
-  BOXDRAW_HORIZONTAL,                 0xc4, L'-', \r
-  BOXDRAW_VERTICAL,                   0xb3, L'|',\r
-  BOXDRAW_DOWN_RIGHT,                 0xda, L'/',\r
-  BOXDRAW_DOWN_LEFT,                  0xbf, L'\\',\r
-  BOXDRAW_UP_RIGHT,                   0xc0, L'\\',\r
-  BOXDRAW_UP_LEFT,                    0xd9, L'/',\r
-  BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|',\r
-  BOXDRAW_VERTICAL_LEFT,              0xb4, L'|',\r
-  BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+',\r
-  BOXDRAW_UP_HORIZONTAL,              0xc1, L'+',\r
-  BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+',\r
-  BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-',\r
-  BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|',\r
-  BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/',\r
-  BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/',\r
-  BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/',\r
-  BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\',\r
-  BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\',\r
-  BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\',\r
-  BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\',\r
-  BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\',\r
-  BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\',\r
-  BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/',\r
-  BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/',\r
-  BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/',\r
-  BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|',\r
-  BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|',\r
-  BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|',\r
-  BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|',\r
-  BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|',\r
-  BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|',\r
-  BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+',\r
-  BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+',\r
-  BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+',\r
-  BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+',\r
-  BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+',\r
-  BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+',\r
-  BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+',\r
-  BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+',\r
-  BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+',\r
-\r
-  BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*',\r
-  BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+',\r
-\r
-  GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^',\r
-  GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>',\r
-  GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v',\r
-  GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<',\r
-\r
-  ARROW_LEFT,                         0x3c, L'<',\r
-\r
-  ARROW_UP,                           0x18, L'^',\r
-\r
-  ARROW_RIGHT,                        0x3e, L'>',\r
-\r
-  ARROW_DOWN,                         0x19, L'v',\r
+  {BOXDRAW_HORIZONTAL,                 0xc4, L'-'}, \r
+  {BOXDRAW_VERTICAL,                   0xb3, L'|'},\r
+  {BOXDRAW_DOWN_RIGHT,                 0xda, L'/'},\r
+  {BOXDRAW_DOWN_LEFT,                  0xbf, L'\\'},\r
+  {BOXDRAW_UP_RIGHT,                   0xc0, L'\\'},\r
+  {BOXDRAW_UP_LEFT,                    0xd9, L'/'},\r
+  {BOXDRAW_VERTICAL_RIGHT,             0xc3, L'|'},\r
+  {BOXDRAW_VERTICAL_LEFT,              0xb4, L'|'},\r
+  {BOXDRAW_DOWN_HORIZONTAL,            0xc2, L'+'},\r
+  {BOXDRAW_UP_HORIZONTAL,              0xc1, L'+'},\r
+  {BOXDRAW_VERTICAL_HORIZONTAL,        0xc5, L'+'},\r
+  {BOXDRAW_DOUBLE_HORIZONTAL,          0xcd, L'-'},\r
+  {BOXDRAW_DOUBLE_VERTICAL,            0xba, L'|'},\r
+  {BOXDRAW_DOWN_RIGHT_DOUBLE,          0xd5, L'/'},\r
+  {BOXDRAW_DOWN_DOUBLE_RIGHT,          0xd6, L'/'},\r
+  {BOXDRAW_DOUBLE_DOWN_RIGHT,          0xc9, L'/'},\r
+  {BOXDRAW_DOWN_LEFT_DOUBLE,           0xb8, L'\\'},\r
+  {BOXDRAW_DOWN_DOUBLE_LEFT,           0xb7, L'\\'},\r
+  {BOXDRAW_DOUBLE_DOWN_LEFT,           0xbb, L'\\'},\r
+  {BOXDRAW_UP_RIGHT_DOUBLE,            0xd4, L'\\'},\r
+  {BOXDRAW_UP_DOUBLE_RIGHT,            0xd3, L'\\'},\r
+  {BOXDRAW_DOUBLE_UP_RIGHT,            0xc8, L'\\'},\r
+  {BOXDRAW_UP_LEFT_DOUBLE,             0xbe, L'/'},\r
+  {BOXDRAW_UP_DOUBLE_LEFT,             0xbd, L'/'},\r
+  {BOXDRAW_DOUBLE_UP_LEFT,             0xbc, L'/'},\r
+  {BOXDRAW_VERTICAL_RIGHT_DOUBLE,      0xc6, L'|'},\r
+  {BOXDRAW_VERTICAL_DOUBLE_RIGHT,      0xc7, L'|'},\r
+  {BOXDRAW_DOUBLE_VERTICAL_RIGHT,      0xcc, L'|'},\r
+  {BOXDRAW_VERTICAL_LEFT_DOUBLE,       0xb5, L'|'},\r
+  {BOXDRAW_VERTICAL_DOUBLE_LEFT,       0xb6, L'|'},\r
+  {BOXDRAW_DOUBLE_VERTICAL_LEFT,       0xb9, L'|'},\r
+  {BOXDRAW_DOWN_HORIZONTAL_DOUBLE,     0xd1, L'+'},\r
+  {BOXDRAW_DOWN_DOUBLE_HORIZONTAL,     0xd2, L'+'},\r
+  {BOXDRAW_DOUBLE_DOWN_HORIZONTAL,     0xcb, L'+'},\r
+  {BOXDRAW_UP_HORIZONTAL_DOUBLE,       0xcf, L'+'},\r
+  {BOXDRAW_UP_DOUBLE_HORIZONTAL,       0xd0, L'+'},\r
+  {BOXDRAW_DOUBLE_UP_HORIZONTAL,       0xca, L'+'},\r
+  {BOXDRAW_VERTICAL_HORIZONTAL_DOUBLE, 0xd8, L'+'},\r
+  {BOXDRAW_VERTICAL_DOUBLE_HORIZONTAL, 0xd7, L'+'},\r
+  {BOXDRAW_DOUBLE_VERTICAL_HORIZONTAL, 0xce, L'+'},\r
+\r
+  {BLOCKELEMENT_FULL_BLOCK,            0xdb, L'*'},\r
+  {BLOCKELEMENT_LIGHT_SHADE,           0xb0, L'+'},\r
+\r
+  {GEOMETRICSHAPE_UP_TRIANGLE,         0x1e, L'^'},\r
+  {GEOMETRICSHAPE_RIGHT_TRIANGLE,      0x10, L'>'},\r
+  {GEOMETRICSHAPE_DOWN_TRIANGLE,       0x1f, L'v'},\r
+  {GEOMETRICSHAPE_LEFT_TRIANGLE,       0x11, L'<'},\r
+\r
+  {ARROW_LEFT,                         0x3c, L'<'},\r
+\r
+  {ARROW_UP,                           0x18, L'^'},\r
+\r
+  {ARROW_RIGHT,                        0x3e, L'>'},\r
+\r
+  {ARROW_DOWN,                         0x19, L'v'},\r
   \r
-  0x0000, 0x00\r
+  {0x0000,                             0x00, L'\0'},\r
 };\r
 \r
 \r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrCommon.c
index 7e9553ffe07192464e6e7fbbf2a4a055849f1449..91548c42532e26e68a4d5d0bde42f5c82012e1b3 100644 (file)
--- 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 = {
       {\r
         HARDWARE_DEVICE_PATH,\r
         HW_VENDOR_DP,\r
-        (UINT8) (sizeof (HII_VENDOR_DEVICE_PATH_NODE)),\r
-        (UINT8) ((sizeof (HII_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+        {\r
+          (UINT8) (sizeof (HII_VENDOR_DEVICE_PATH_NODE)),\r
+          (UINT8) ((sizeof (HII_VENDOR_DEVICE_PATH_NODE)) >> 8)\r
+        }\r
       },\r
       EFI_IFR_TIANO_GUID,\r
     },\r
@@ -40,8 +42,9 @@ HII_VENDOR_DEVICE_PATH  mHiiVendorDevicePathTemplate = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    END_DEVICE_PATH_LENGTH,\r
-    0\r
+    {\r
+      END_DEVICE_PATH_LENGTH\r
+    }\r
   }\r
 };\r
 \r
@@ -76,10 +79,10 @@ Returns:
     return;\r
   }\r
 \r
-  Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, &gIfrLibHiiDatabase);\r
+  Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gIfrLibHiiDatabase);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, &gIfrLibHiiString);\r
+  Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gIfrLibHiiString);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   mHiiProtocolsInitialized = TRUE;\r
@@ -226,7 +229,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   DriverHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (VOID **) &DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -294,7 +297,7 @@ Returns:
   BufferSize = EfiDevicePathSize (DevicePath);\r
   for(Index = 0; Index < HandleCount; Index++) {\r
     Handle = Handles[Index];\r
-    gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, &TmpDevicePath);\r
+    gBS->HandleProtocol (Handle, &gEfiDevicePathProtocolGuid, (VOID **) &TmpDevicePath);\r
 \r
     //\r
     // Check whether DevicePath match\r
@@ -456,7 +459,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiDatabaseProtocolGuid,\r
                   NULL,\r
-                  &HiiDatabase\r
+                  (VOID **) &HiiDatabase\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -533,7 +536,7 @@ Returns:
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiDatabaseProtocolGuid,\r
                   NULL,\r
-                  &HiiDatabase\r
+                  (VOID **) &HiiDatabase\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
index 381e9d21a53be84d9c13ded226891f2de1faa571..abee5318d8e55750611df8a76221634541699b4b 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrForm.c
@@ -802,7 +802,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   DriverHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (VOID **) &DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -948,12 +948,12 @@ Returns:
   //\r
   // Locate protocols for use\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, &FormBrowser2);\r
+  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &FormBrowser2);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, &HiiConfigRouting);\r
+  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &HiiConfigRouting);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1062,12 +1062,12 @@ Returns:
   //\r
   // Locate protocols for use\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, &FormBrowser2);\r
+  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &FormBrowser2);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
-  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, &HiiConfigRouting);\r
+  Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &HiiConfigRouting);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

diff --git a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
index c2e57dd16bc4576d8d7f771c56fe683ecb3ef83c..528999269985ea291cc82be7d072e774bb301424 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Dxe/UefiEfiIfrSupportLib/UefiIfrString.c
@@ -280,7 +280,7 @@ Returns:
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    EfiAsciiStrCpy (Lang, "en-US");\r
+    EfiAsciiStrCpy (Lang, (CHAR8 *) "en-US");\r
   }\r
 \r
   return Status;\r