Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Efi / Protocol / HiiImage / HiiImage.h

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h
index 1eb4e6fab0626fabe1f3c9507f0fbe408d378024..0a27599e8a39d75629d5366be1f3cb02fb8d5572 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/HiiImage/HiiImage.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
 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
@@ -45,7 +45,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
 #define EFI_IMAGE_TRANSPARENT          0x00000001\r
@@ -101,8 +101,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
@@ -115,14 +114,14 @@ EFI_STATUS
     PackageList       - Handle of the package list where this image will be searched.    \r
     ImageId           - The image's id,, which is unique within PackageList.\r
     Image             - Points to the image.\r
-    ImageSize         - On entry, points to the size of the buffer pointed to by Image, in bytes. On return,\r
-                        points to the length of the image, in bytes.                                        \r
                         \r
   Returns:\r
     EFI_SUCCESS            - The new image was returned successfully.\r
     EFI_NOT_FOUND          - The image specified by ImageId is not available.\r
-    EFI_BUFFER_TOO_SMALL   - The buffer specified by ImageSize is too small to hold the image.                                                      \r
+                             The specified PackageList is not in the database.\r
     EFI_INVALID_PARAMETER  - The Image or ImageSize was NULL.\r
+    EFI_OUT_OF_RESOURCES   - The bitmap could not be retrieved because there was not\r
+                             enough memory.\r
     \r
 --*/  \r
 ;\r
@@ -149,7 +148,8 @@ EFI_STATUS
                         \r
   Returns:\r
     EFI_SUCCESS            - The new image was updated successfully.\r
-    EFI_NOT_FOUND          - The image specified by ImageId is not in the database.    \r
+    EFI_NOT_FOUND          - The image specified by ImageId is not in the database.\r
+                             The specified PackageList is not in the database.    \r
     EFI_INVALID_PARAMETER  - The Image was NULL.\r
     \r
 --*/  \r
@@ -233,7 +233,9 @@ EFI_STATUS
   Returns:\r
     EFI_SUCCESS            - The image was successfully drawn.\r
     EFI_OUT_OF_RESOURCES   - Unable to allocate an output buffer for Blt.\r
-    EFI_INVALID_PARAMETER  - The Image was NULL.\r
+    EFI_NOT_FOUND          - The image specified by ImageId is not in the database. \r
+                             The specified PackageList is not in the database.                            \r
+    EFI_INVALID_PARAMETER  - The Blt was NULL.    \r
 \r
 --*/\r
 ;\r