Merged in the following trackers from EDK:

[mirror_edk2.git] / MdePkg / Include / Protocol / HiiImage.h

diff --git a/MdePkg/Include/Protocol/HiiImage.h b/MdePkg/Include/Protocol/HiiImage.h
index 5bd84905c2298df093f8b6262a80d28f861e6fff..ca3d3e1ecea8c0f27b8dab446e14488ad168fffe 100644 (file)
--- a/MdePkg/Include/Protocol/HiiImage.h
+++ b/MdePkg/Include/Protocol/HiiImage.h
@@ -1,7 +1,7 @@
 /** @file\r
   The file provides services to access to images in the images database.\r
   \r
-  Copyright (c) 2006 - 2007, Intel Corporation\r
+  Copyright (c) 2006 - 2008, Intel Corporation\r
   All rights reserved. This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -48,7 +48,7 @@ typedef struct _EFI_IMAGE_INPUT {
   UINT32                          Flags;\r
   UINT16                          Width;\r
   UINT16                          Height;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL   Bitmap[1];\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *Bitmap;\r
 } EFI_IMAGE_INPUT;\r
 \r
 \r
@@ -109,21 +109,14 @@ EFI_STATUS
   \r
   @param Image  Points to the new image.\r
   \r
-  @param ImageSize  On entry, points to the size of the buffer\r
-                    pointed to by Image, in bytes. On return,\r
-                    points to the length of the image, in bytes.\r
-  \r
-  \r
   @retval EFI_SUCCESS   The image was returned successfully.\r
-  \r
+                                     The specified PackageList is not in the database.\r
   @retval EFI_NOT_FOUND The image specified by ImageId is not\r
                         available.\r
   \r
-  @retval EFI_BUFFER_TOO_SMALL  The buffer specified by\r
-                                ImageLength is too small to hold\r
-                                the image.\r
-  \r
   @retval EFI_INVALID_PARAMETER The Image or Langugae was NULL.\r
+  @retval EFI_OUT_OF_RESOURCES   The bitmap could not be retrieved because there was not\r
+                         enough memory.\r
 \r
 \r
 **/\r
@@ -133,8 +126,7 @@ EFI_STATUS
   IN CONST  EFI_HII_IMAGE_PROTOCOL  *This,\r
   IN        EFI_HII_HANDLE          PackageList,\r
   IN        EFI_IMAGE_ID            ImageId,\r
-  OUT       EFI_IMAGE_INPUT         *Image,\r
-  OUT       UINTN                   *ImageSize\r
+  OUT       EFI_IMAGE_INPUT         *Image\r
 );\r
 \r
 /**\r
@@ -156,7 +148,8 @@ EFI_STATUS
   @retval EFI_SUCCESS The image was successfully updated.\r
   \r
   @retval EFI_NOT_FOUND   The image specified by ImageId is not\r
-                          in the database.\r
+                                        in the database.\r
+                                        The specified PackageList is not in the database. \r
   \r
   @retval EFI_INVALID_PARAMETER   The Image or Language was\r
                                   NULL.\r
@@ -180,8 +173,8 @@ typedef UINT32  EFI_HII_DRAW_FLAGS;
 #define EFI_HII_DRAW_FLAG_CLIP          0x00000001\r
 #define EFI_HII_DRAW_FLAG_TRANSPARENT   0x00000030\r
 #define EFI_HII_DRAW_FLAG_DEFAULT       0x00000000\r
-#define EFI_HII_DRAW_FLAG_FORCE_TRANS   0x00000001\r
-#define EFI_HII_DRAW_FLAG_FORCE_OPAQUE  0x00000002\r
+#define EFI_HII_DRAW_FLAG_FORCE_TRANS   0x00000010\r
+#define EFI_HII_DRAW_FLAG_FORCE_OPAQUE  0x00000020\r
 #define EFI_HII_DIRECT_TO_SCREEN        0x00000080\r
 \r
 \r
@@ -332,8 +325,9 @@ EFI_STATUS
   @retval EFI_OUT_OF_RESOURCES  Unable to allocate an output\r
                                 buffer for RowInfoArray or Blt.\r
   \r
-  @retval EFI_INVALID_PARAMETER The Image or Blt or Height or\r
-                                Width was NULL.\r
+  @retval EFI_NOT_FOUND  The image specified by ImageId is not in the database. \r
+                                        The specified PackageList is not in the database.                            \r
+  @retval EFI_INVALID_PARAMETER  The Blt was NULL.    \r
 \r
 **/\r
 typedef\r