MdeModulePkg/HiiDatabase: Refine HiiSetImage()

Contributed-under: TianoCore Contribution Agreement 1.0
Reviewed-by: Liming Gao <liming.gao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index daf0a2e40679b23d6128604097bd3cd8a9a8e72c..2b9c3c30cd3479286d49ceb4759370bfe73af752 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
@@ -965,26 +965,15 @@ HiiSetImage (
   HII_DATABASE_PRIVATE_DATA           *Private;\r
   HII_DATABASE_PACKAGE_LIST_INSTANCE  *PackageListNode;\r
   HII_IMAGE_PACKAGE_INSTANCE          *ImagePackage;\r
-  UINT8                               *ImageBlock;\r
-  EFI_IMAGE_ID                        LocalImageId;\r
-  UINT8                               BlockType;\r
-  EFI_HII_IIBT_IMAGE_1BIT_BLOCK       Iibt1bit;\r
-  EFI_HII_IIBT_IMAGE_4BIT_BLOCK       Iibt4bit;\r
-  EFI_HII_IIBT_IMAGE_8BIT_BLOCK       Iibt8bit;\r
-  UINT16                              Width;\r
-  UINT16                              Height;\r
-  UINT32                              BlockSize;\r
+  EFI_HII_IMAGE_BLOCK                 *CurrentImageBlock;\r
+  EFI_HII_IMAGE_BLOCK                 *ImageBlocks;\r
+  EFI_HII_IMAGE_BLOCK                 *NewImageBlock;\r
   UINT32                              NewBlockSize;\r
   UINT32                              OldBlockSize;\r
-  EFI_IMAGE_INPUT                     *ImageIn;\r
-  UINT8                               *NewBlock;\r
-  UINT8                               *NewBlockPtr;\r
-  UINT8                               *Block;\r
-  UINT8                               *BlockPtr;\r
   UINT32                               Part1Size;\r
   UINT32                               Part2Size;\r
 \r
-  if (This == NULL || Image == NULL || ImageId < 1 || Image->Bitmap == NULL) {\r
+  if (This == NULL || Image == NULL || ImageId == 0 || Image->Bitmap == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -1005,19 +994,16 @@ HiiSetImage (
   //\r
   // Find the image block specified by ImageId\r
   //\r
-  LocalImageId = ImageId;\r
-  ImageBlock = (UINT8 *) GetImageIdOrAddress (ImagePackage->ImageBlock, &LocalImageId);\r
-  if (ImageBlock == NULL) {\r
+  CurrentImageBlock = GetImageIdOrAddress (ImagePackage->ImageBlock, &ImageId);\r
+  if (CurrentImageBlock == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
-  BlockType = *ImageBlock;\r
-\r
   //\r
   // Get the size of original image block. Use some common block code here\r
   // since the definition of some structures is the same.\r
   //\r
-  switch (BlockType) {\r
+  switch (CurrentImageBlock->BlockType) {\r
   case EFI_HII_IIBT_IMAGE_JPEG:\r
     //\r
     // BUGBUG: need to be supported as soon as image tool is designed.\r
@@ -1026,32 +1012,35 @@ HiiSetImage (
 \r
   case EFI_HII_IIBT_IMAGE_1BIT:\r
   case EFI_HII_IIBT_IMAGE_1BIT_TRANS:\r
-    CopyMem (&Iibt1bit, ImageBlock, sizeof (EFI_HII_IIBT_IMAGE_1BIT_BLOCK));\r
     OldBlockSize = sizeof (EFI_HII_IIBT_IMAGE_1BIT_BLOCK) - sizeof (UINT8) +\r
-                   BITMAP_LEN_1_BIT (Iibt1bit.Bitmap.Width, Iibt1bit.Bitmap.Height);\r
+                   BITMAP_LEN_1_BIT (\r
+                     ReadUnaligned16 (&((EFI_HII_IIBT_IMAGE_1BIT_BLOCK *) CurrentImageBlock)->Bitmap.Width),\r
+                     ReadUnaligned16 (&((EFI_HII_IIBT_IMAGE_1BIT_BLOCK *) CurrentImageBlock)->Bitmap.Height)\r
+                     );\r
     break;\r
   case EFI_HII_IIBT_IMAGE_4BIT:\r
   case EFI_HII_IIBT_IMAGE_4BIT_TRANS:\r
-    CopyMem (&Iibt4bit, ImageBlock, sizeof (EFI_HII_IIBT_IMAGE_4BIT_BLOCK));\r
     OldBlockSize = sizeof (EFI_HII_IIBT_IMAGE_4BIT_BLOCK) - sizeof (UINT8) +\r
-                   BITMAP_LEN_4_BIT (Iibt4bit.Bitmap.Width, Iibt4bit.Bitmap.Height);\r
+                   BITMAP_LEN_4_BIT (\r
+                     ReadUnaligned16 (&((EFI_HII_IIBT_IMAGE_4BIT_BLOCK *) CurrentImageBlock)->Bitmap.Width),\r
+                     ReadUnaligned16 (&((EFI_HII_IIBT_IMAGE_4BIT_BLOCK *) CurrentImageBlock)->Bitmap.Height)\r
+                     );\r
     break;\r
   case EFI_HII_IIBT_IMAGE_8BIT:\r
   case EFI_HII_IIBT_IMAGE_8BIT_TRANS:\r
-    CopyMem (&Iibt8bit, ImageBlock, sizeof (EFI_HII_IIBT_IMAGE_8BIT_BLOCK));\r
     OldBlockSize = sizeof (EFI_HII_IIBT_IMAGE_8BIT_BLOCK) - sizeof (UINT8) +\r
-                   BITMAP_LEN_8_BIT (Iibt8bit.Bitmap.Width, Iibt8bit.Bitmap.Height);\r
+                   BITMAP_LEN_8_BIT (\r
+                     ReadUnaligned16 (&((EFI_HII_IIBT_IMAGE_8BIT_BLOCK *) CurrentImageBlock)->Bitmap.Width),\r
+                     ReadUnaligned16 (&((EFI_HII_IIBT_IMAGE_8BIT_BLOCK *) CurrentImageBlock)->Bitmap.Height)\r
+                     );\r
     break;\r
   case EFI_HII_IIBT_IMAGE_24BIT:\r
   case EFI_HII_IIBT_IMAGE_24BIT_TRANS:\r
-    CopyMem (&Width, ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK), sizeof (UINT16));\r
-    CopyMem (\r
-      &Height,\r
-      ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT16),\r
-      sizeof (UINT16)\r
-      );\r
     OldBlockSize = sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL) +\r
-                   BITMAP_LEN_24_BIT (Width , Height);\r
+                   BITMAP_LEN_24_BIT (\r
+                     ReadUnaligned16 ((VOID *) &((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) CurrentImageBlock)->Bitmap.Width),\r
+                     ReadUnaligned16 ((VOID *) &((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) CurrentImageBlock)->Bitmap.Height)\r
+                     );\r
     break;\r
   default:\r
     return EFI_NOT_FOUND;\r
@@ -1060,53 +1049,40 @@ HiiSetImage (
   //\r
   // Create the new image block according to input image.\r
   //\r
-  ImageIn = (EFI_IMAGE_INPUT *) Image;\r
   NewBlockSize = sizeof (EFI_HII_IIBT_IMAGE_24BIT_BLOCK) - sizeof (EFI_HII_RGB_PIXEL) +\r
-                 BITMAP_LEN_24_BIT (ImageIn->Width, ImageIn->Height);\r
-  NewBlock = (UINT8 *) AllocateZeroPool (NewBlockSize);\r
-  if (NewBlock == NULL) {\r
+                 BITMAP_LEN_24_BIT (Image->Width, Image->Height);\r
+  //\r
+  // Adjust the image package to remove the original block firstly then add the new block.\r
+  //\r
+  ImageBlocks = AllocateZeroPool (ImagePackage->ImageBlockSize + NewBlockSize - OldBlockSize);\r
+  if (ImageBlocks == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  NewBlockPtr = NewBlock;\r
-  if ((ImageIn->Flags & EFI_IMAGE_TRANSPARENT) == EFI_IMAGE_TRANSPARENT) {\r
-    *NewBlockPtr = EFI_HII_IIBT_IMAGE_24BIT_TRANS;\r
-  } else {\r
-    *NewBlockPtr = EFI_HII_IIBT_IMAGE_24BIT;\r
-  }\r
-  NewBlockPtr++;\r
-\r
-  CopyMem (NewBlockPtr, &ImageIn->Width, sizeof (UINT16));\r
-  NewBlockPtr += sizeof (UINT16);\r
-  CopyMem (NewBlockPtr, &ImageIn->Height, sizeof (UINT16));\r
-  NewBlockPtr += sizeof (UINT16);\r
-\r
-  CopyGopToRgbPixel ((EFI_HII_RGB_PIXEL *) NewBlockPtr, ImageIn->Bitmap, ImageIn->Width * ImageIn->Height);\r
+  Part1Size = (UINT32) (UINTN) ((UINT8 *) CurrentImageBlock - (UINT8 *) ImagePackage->ImageBlock);\r
+  Part2Size = ImagePackage->ImageBlockSize - Part1Size - OldBlockSize;\r
+  CopyMem (ImageBlocks, ImagePackage->ImageBlock, Part1Size);\r
 \r
   //\r
-  // Adjust the image package to remove the original block firstly then add the new block.\r
+  // Set the new image block\r
   //\r
-  BlockSize = ImagePackage->ImageBlockSize + NewBlockSize - OldBlockSize;\r
-  Block = (UINT8 *) AllocateZeroPool (BlockSize);\r
-  if (Block == NULL) {\r
-    FreePool (NewBlock);\r
-    return EFI_OUT_OF_RESOURCES;\r
+  NewImageBlock = (EFI_HII_IMAGE_BLOCK *) ((UINT8 *) ImageBlocks + Part1Size);\r
+  if ((Image->Flags & EFI_IMAGE_TRANSPARENT) == EFI_IMAGE_TRANSPARENT) {\r
+    NewImageBlock->BlockType= EFI_HII_IIBT_IMAGE_24BIT_TRANS;\r
+  } else {\r
+    NewImageBlock->BlockType = EFI_HII_IIBT_IMAGE_24BIT;\r
   }\r
+  WriteUnaligned16 ((VOID *) &((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) NewImageBlock)->Bitmap.Width, Image->Width);\r
+  WriteUnaligned16 ((VOID *) &((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) NewImageBlock)->Bitmap.Height, Image->Height);\r
+  CopyGopToRgbPixel (((EFI_HII_IIBT_IMAGE_24BIT_BLOCK *) NewImageBlock)->Bitmap.Bitmap,\r
+                       Image->Bitmap, Image->Width * Image->Height);\r
 \r
-  BlockPtr  = Block;\r
-  Part1Size = (UINT32) (ImageBlock - (UINT8 *) ImagePackage->ImageBlock);\r
-  Part2Size = ImagePackage->ImageBlockSize - Part1Size - OldBlockSize;\r
-  CopyMem (BlockPtr, ImagePackage->ImageBlock, Part1Size);\r
-  BlockPtr += Part1Size;\r
-  CopyMem (BlockPtr, NewBlock, NewBlockSize);\r
-  BlockPtr += NewBlockSize;\r
-  CopyMem (BlockPtr, ImageBlock + OldBlockSize, Part2Size);\r
+  CopyMem ((UINT8 *) NewImageBlock + NewBlockSize, (UINT8 *) CurrentImageBlock + OldBlockSize, Part2Size);\r
 \r
   FreePool (ImagePackage->ImageBlock);\r
-  FreePool (NewBlock);\r
-  ImagePackage->ImageBlock     = (EFI_HII_IMAGE_BLOCK *) Block;\r
-  ImagePackage->ImageBlockSize = BlockSize;\r
-  ImagePackage->ImagePkgHdr.Header.Length += NewBlockSize - OldBlockSize;\r
+  ImagePackage->ImageBlock                       = ImageBlocks;\r
+  ImagePackage->ImageBlockSize                  += NewBlockSize - OldBlockSize;\r
+  ImagePackage->ImagePkgHdr.Header.Length       += NewBlockSize - OldBlockSize;\r
   PackageListNode->PackageListHdr.PackageLength += NewBlockSize - OldBlockSize;\r
 \r
   //\r