Vlv2TbltDevicePkg/Override/GenericBdsLib: Use BmpSupportLib

https://bugzilla.tianocore.org/show_bug.cgi?id=800

Based on content from the following branch/commits:
https://github.com/Microsoft/MS_UEFI/tree/share/MsCapsuleSupport
https://github.com/Microsoft/MS_UEFI/commit/33bab4031a417d7d5a7d356c15a14c2e60302b2d
https://github.com/Microsoft/MS_UEFI/commit/ca516b1a61315c2d823f453e12d2135098f53d61
https://github.com/Microsoft/MS_UEFI/commit/2b9f111f2e74a4c2ef4c4e32379e111f016dbd9b

Update GenericBdsLib to use BmpSupportLib to convert a BMP
graphics image to a GOP BLT buffer to display the boot logo.

Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: David Wei <david.wei@intel.com>
Cc: Mang Guo <mang.guo@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Bret Barkelew <Bret.Barkelew@microsoft.com>

6 files changed, 13 insertions, 250 deletions

diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
index eefec0642a..9c21cfcd59 100644
--- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
+++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c
@@ -1,7 +1,7 @@
 /** @file

   BDS Lib functions which contain all the code to connect console device

 

-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 **/

 

 #include "InternalBdsLib.h"

-#include <IndustryStandard/Bmp.h>

 

 

 /**

@@ -643,250 +642,6 @@ BdsLibConnectAllDefaultConsolesWithOutConIn (
 }

 

 /**

-  Convert a *.BMP graphics image to a GOP blt buffer. If a NULL Blt buffer

-  is passed in a GopBlt buffer will be allocated by this routine. If a GopBlt

-  buffer is passed in it will be used if it is big enough.

-

-  @param  BmpImage      Pointer to BMP file

-  @param  BmpImageSize  Number of bytes in BmpImage

-  @param  GopBlt        Buffer containing GOP version of BmpImage.

-  @param  GopBltSize    Size of GopBlt in bytes.

-  @param  PixelHeight   Height of GopBlt/BmpImage in pixels

-  @param  PixelWidth    Width of GopBlt/BmpImage in pixels

-

-  @retval EFI_SUCCESS           GopBlt and GopBltSize are returned.

-  @retval EFI_UNSUPPORTED       BmpImage is not a valid *.BMP image

-  @retval EFI_BUFFER_TOO_SMALL  The passed in GopBlt buffer is not big enough.

-                                GopBltSize will contain the required size.

-  @retval EFI_OUT_OF_RESOURCES  No enough buffer to allocate.

-

-**/

-EFI_STATUS

-ConvertBmpToGopBlt (

-  IN     VOID      *BmpImage,

-  IN     UINTN     BmpImageSize,

-  IN OUT VOID      **GopBlt,

-  IN OUT UINTN     *GopBltSize,

-     OUT UINTN     *PixelHeight,

-     OUT UINTN     *PixelWidth

-  )

-{

-  UINT8                         *Image;

-  UINT8                         *ImageHeader;

-  BMP_IMAGE_HEADER              *BmpHeader;

-  BMP_COLOR_MAP                 *BmpColorMap;

-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer;

-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt;

-  UINT64                        BltBufferSize;

-  UINTN                         Index;

-  UINTN                         Height;

-  UINTN                         Width;

-  UINTN                         ImageIndex;

-  UINT32                        DataSizePerLine;

-  BOOLEAN                       IsAllocated;

-  UINT32                        ColorMapNum;

-

-  if (sizeof (BMP_IMAGE_HEADER) > BmpImageSize) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  BmpHeader = (BMP_IMAGE_HEADER *) BmpImage;

-

-  if (BmpHeader->CharB != 'B' || BmpHeader->CharM != 'M') {

-    return EFI_UNSUPPORTED;

-  }

-

-  //

-  // Doesn't support compress.

-  //

-  if (BmpHeader->CompressionType != 0) {

-    return EFI_UNSUPPORTED;

-  }

-

-  //

-  // Only support BITMAPINFOHEADER format.

-  // BITMAPFILEHEADER + BITMAPINFOHEADER = BMP_IMAGE_HEADER

-  //

-  if (BmpHeader->HeaderSize != sizeof (BMP_IMAGE_HEADER) - OFFSET_OF(BMP_IMAGE_HEADER, HeaderSize)) {

-    return EFI_UNSUPPORTED;

-  }

-

-  //

-  // The data size in each line must be 4 byte alignment.

-  //

-  DataSizePerLine = ((BmpHeader->PixelWidth * BmpHeader->BitPerPixel + 31) >> 3) & (~0x3);

-  BltBufferSize = MultU64x32 (DataSizePerLine, BmpHeader->PixelHeight);

-  if (BltBufferSize > (UINT32) ~0) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  if ((BmpHeader->Size != BmpImageSize) || 

-      (BmpHeader->Size < BmpHeader->ImageOffset) ||

-      (BmpHeader->Size - BmpHeader->ImageOffset !=  BmpHeader->PixelHeight * DataSizePerLine)) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  //

-  // Calculate Color Map offset in the image.

-  //

-  Image       = BmpImage;

-  BmpColorMap = (BMP_COLOR_MAP *) (Image + sizeof (BMP_IMAGE_HEADER));

-  if (BmpHeader->ImageOffset < sizeof (BMP_IMAGE_HEADER)) {

-    return EFI_INVALID_PARAMETER;

-  }

-

-  if (BmpHeader->ImageOffset > sizeof (BMP_IMAGE_HEADER)) {

-    switch (BmpHeader->BitPerPixel) {

-      case 1:

-        ColorMapNum = 2;

-        break;

-      case 4:

-        ColorMapNum = 16;

-        break;

-      case 8:

-        ColorMapNum = 256;

-        break;

-      default:

-        ColorMapNum = 0;

-        break;

-      }

-    //

-    // BMP file may has padding data between the bmp header section and the bmp data section.

-    //

-    if (BmpHeader->ImageOffset - sizeof (BMP_IMAGE_HEADER) < sizeof (BMP_COLOR_MAP) * ColorMapNum) {

-      return EFI_INVALID_PARAMETER;

-    }

-  }

-

-  //

-  // Calculate graphics image data address in the image

-  //

-  Image         = ((UINT8 *) BmpImage) + BmpHeader->ImageOffset;

-  ImageHeader   = Image;

-

-  //

-  // Calculate the BltBuffer needed size.

-  //

-  BltBufferSize = MultU64x32 ((UINT64) BmpHeader->PixelWidth, BmpHeader->PixelHeight);

-  //

-  // Ensure the BltBufferSize * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) doesn't overflow

-  //

-  if (BltBufferSize > DivU64x32 ((UINTN) ~0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL))) {

-    return EFI_UNSUPPORTED;

-  }

-  BltBufferSize = MultU64x32 (BltBufferSize, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL));

-

-  IsAllocated   = FALSE;

-  if (*GopBlt == NULL) {

-    //

-    // GopBlt is not allocated by caller.

-    //

-    *GopBltSize = (UINTN) BltBufferSize;

-    *GopBlt     = AllocatePool (*GopBltSize);

-    IsAllocated = TRUE;

-    if (*GopBlt == NULL) {

-      return EFI_OUT_OF_RESOURCES;

-    }

-  } else {

-    //

-    // GopBlt has been allocated by caller.

-    //

-    if (*GopBltSize < (UINTN) BltBufferSize) {

-      *GopBltSize = (UINTN) BltBufferSize;

-      return EFI_BUFFER_TOO_SMALL;

-    }

-  }

-

-  *PixelWidth   = BmpHeader->PixelWidth;

-  *PixelHeight  = BmpHeader->PixelHeight;

-

-  //

-  // Convert image from BMP to Blt buffer format

-  //

-  BltBuffer = *GopBlt;

-  for (Height = 0; Height < BmpHeader->PixelHeight; Height++) {

-    Blt = &BltBuffer[(BmpHeader->PixelHeight - Height - 1) * BmpHeader->PixelWidth];

-    for (Width = 0; Width < BmpHeader->PixelWidth; Width++, Image++, Blt++) {

-      switch (BmpHeader->BitPerPixel) {

-      case 1:

-        //

-        // Convert 1-bit (2 colors) BMP to 24-bit color

-        //

-        for (Index = 0; Index < 8 && Width < BmpHeader->PixelWidth; Index++) {

-          Blt->Red    = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Red;

-          Blt->Green  = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Green;

-          Blt->Blue   = BmpColorMap[((*Image) >> (7 - Index)) & 0x1].Blue;

-          Blt++;

-          Width++;

-        }

-

-        Blt--;

-        Width--;

-        break;

-

-      case 4:

-        //

-        // Convert 4-bit (16 colors) BMP Palette to 24-bit color

-        //

-        Index       = (*Image) >> 4;

-        Blt->Red    = BmpColorMap[Index].Red;

-        Blt->Green  = BmpColorMap[Index].Green;

-        Blt->Blue   = BmpColorMap[Index].Blue;

-        if (Width < (BmpHeader->PixelWidth - 1)) {

-          Blt++;

-          Width++;

-          Index       = (*Image) & 0x0f;

-          Blt->Red    = BmpColorMap[Index].Red;

-          Blt->Green  = BmpColorMap[Index].Green;

-          Blt->Blue   = BmpColorMap[Index].Blue;

-        }

-        break;

-

-      case 8:

-        //

-        // Convert 8-bit (256 colors) BMP Palette to 24-bit color

-        //

-        Blt->Red    = BmpColorMap[*Image].Red;

-        Blt->Green  = BmpColorMap[*Image].Green;

-        Blt->Blue   = BmpColorMap[*Image].Blue;

-        break;

-

-      case 24:

-        //

-        // It is 24-bit BMP.

-        //

-        Blt->Blue   = *Image++;

-        Blt->Green  = *Image++;

-        Blt->Red    = *Image;

-        break;

-

-      default:

-        //

-        // Other bit format BMP is not supported.

-        //

-        if (IsAllocated) {

-          FreePool (*GopBlt);

-          *GopBlt = NULL;

-        }

-        return EFI_UNSUPPORTED;

-        break;

-      };

-

-    }

-

-    ImageIndex = (UINTN) (Image - ImageHeader);

-    if ((ImageIndex % 4) != 0) {

-      //

-      // Bmp Image starts each row on a 32-bit boundary!

-      //

-      Image = Image + (4 - (ImageIndex % 4));

-    }

-  }

-

-  return EFI_SUCCESS;

-}

-

-/**

   Use SystemTable Conout to stop video based Simple Text Out consoles from going

   to the video device. Put up LogoFile on every video device that is a console.

 

@@ -1043,10 +798,10 @@ EnableQuietBoot (
       FreePool (Blt);

     }

     Blt = NULL;

-    Status = ConvertBmpToGopBlt (

+    Status = TranslateBmpToGopBlt (

               ImageData,

               ImageSize,

-              (VOID **) &Blt,

+              &Blt,

               &BltSize,

               &Height,

               &Width

diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index 404dd0caf4..bd93847941 100644
--- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -6,7 +6,7 @@
 #  2) BDS boot device connect interface;

 #  3) BDS Misc interfaces for mainting boot variable, ouput string, etc.

 #  

-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -70,6 +70,7 @@
   HiiLib

   ReportStatusCodeLib

   NetLib

+  BmpSupportLib

 

 [Guids]

   ## SOMETIMES_CONSUMES ## HOB         # The hob holding memory type information

diff --git a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index 6faebbee5d..9a2660efd3 100644
--- a/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/Vlv2TbltDevicePkg/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -1,7 +1,7 @@
 /** @file

   BDS library definition, include the file and data structure

 

-Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -71,6 +71,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>

 #include <Library/DxeServicesLib.h>

 #include <Library/ReportStatusCodeLib.h>

+#include <Library/BmpSupportLib.h>

 

 #if !defined (EFI_REMOVABLE_MEDIA_FILE_NAME)

     #if defined (MDE_CPU_EBC)

diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
index bbe75391e7..682e090a99 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc
@@ -146,6 +146,8 @@
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf

   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

   GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

+  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf

+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf

   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf

   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

   DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
index a01d2ba342..baba5e2055 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc
@@ -146,6 +146,8 @@
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf

   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

   GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

+  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf

+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf

   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf

   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

   DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf

diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
index 0d0c8f7c6a..1f0be98944 100644
--- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
+++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc
@@ -146,6 +146,8 @@
   UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf

   UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf

   GenericBdsLib|$(PLATFORM_PACKAGE)/Override/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf

+  BmpSupportLib|MdeModulePkg/Library/BaseBmpSupportLib/BaseBmpSupportLib.inf

+  SafeIntLib|MdePkg/Library/BaseSafeIntLib/BaseSafeIntLib.inf

   PlatformBdsLib|$(PLATFORM_PACKAGE)/Library/PlatformBdsLib/PlatformBdsLib.inf

   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf

   DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf