UEFI HII: Merge UEFI HII support changes from branch.

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

diff --git a/MdePkg/Include/Protocol/HiiImage.h b/MdePkg/Include/Protocol/HiiImage.h
index 4958687e8369a793ff98a47733eb03b3b4a8e6e0..5bd84905c2298df093f8b6262a80d28f861e6fff 100644 (file)
--- a/MdePkg/Include/Protocol/HiiImage.h
+++ b/MdePkg/Include/Protocol/HiiImage.h
@@ -15,8 +15,6 @@
 #ifndef __HII_IMAGE_H__\r
 #define __HII_IMAGE_H__\r
 \r
-#error "UEFI 2.1 HII is not fully implemented for now, Please don't include this file now."\r
-\r
 #define EFI_HII_IMAGE_PROTOCOL_GUID \\r
   { 0x31a6406a, 0x6bdf, 0x4e46, { 0xb2, 0xa2, 0xeb, 0xaa, 0x89, 0xc4, 0x9, 0x20 } }\r
 \r
@@ -47,10 +45,10 @@ typedef struct _EFI_HII_IMAGE_PROTOCOL EFI_HII_IMAGE_PROTOCOL;
    \r
 **/\r
 typedef struct _EFI_IMAGE_INPUT {\r
-  UINT32  Flags;\r
-  UINT16  Width;\r
-  UINT16  Height;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL   *Bitmap;\r
+  UINT32                          Flags;\r
+  UINT16                          Width;\r
+  UINT16                          Height;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL   Bitmap[1];\r
 } EFI_IMAGE_INPUT;\r
 \r
 \r
@@ -83,7 +81,7 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_NEW_IMAGE) (\r
   IN CONST  EFI_HII_IMAGE_PROTOCOL  *This,\r
-  IN CONST  EFI_HII_HANDLE          PackageList,\r
+  IN        EFI_HII_HANDLE          PackageList,\r
   OUT       EFI_IMAGE_ID            *ImageId,\r
   IN CONST  EFI_IMAGE_INPUT         *Image\r
 );\r
@@ -133,8 +131,8 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_GET_IMAGE) (\r
   IN CONST  EFI_HII_IMAGE_PROTOCOL  *This,\r
-  IN CONST  EFI_HII_HANDLE          PackageList,\r
-  IN CONST  EFI_IMAGE_ID            ImageId,\r
+  IN        EFI_HII_HANDLE          PackageList,\r
+  IN        EFI_IMAGE_ID            ImageId,\r
   OUT       EFI_IMAGE_INPUT         *Image,\r
   OUT       UINTN                   *ImageSize\r
 );\r
@@ -168,9 +166,9 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_SET_IMAGE) (\r
   IN CONST  EFI_HII_IMAGE_PROTOCOL  *This,\r
-  IN CONST  EFI_HII_HANDLE          PackageList,\r
-  IN CONST  EFI_IMAGE_ID            ImageId,\r
-  IN CONST  EFI_IMAGE_INPUT         Image\r
+  IN        EFI_HII_HANDLE          PackageList,\r
+  IN        EFI_IMAGE_ID            ImageId,\r
+  IN CONST  EFI_IMAGE_INPUT         *Image\r
 );\r
 \r
 \r
@@ -264,11 +262,11 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_DRAW_IMAGE) (\r
   IN CONST  EFI_HII_IMAGE_PROTOCOL  *This,\r
-  IN CONST  EFI_HII_DRAW_FLAGS      Flags,\r
-  IN CONST  EFI_IMAGE_INPUT         Image,\r
+  IN        EFI_HII_DRAW_FLAGS      Flags,\r
+  IN CONST  EFI_IMAGE_INPUT         *Image,\r
   IN OUT    EFI_IMAGE_OUTPUT        **Blt,\r
-  IN CONST  UINTN                   BltX,\r
-  IN CONST  UINTN                   BltY\r
+  IN        UINTN                   BltX,\r
+  IN        UINTN                   BltY\r
 );\r
 \r
 /**\r
@@ -342,12 +340,12 @@ typedef
 EFI_STATUS\r
 (EFIAPI *EFI_HII_DRAW_IMAGE_ID) (\r
 IN CONST  EFI_HII_IMAGE_PROTOCOL  *This,\r
-IN CONST  EFI_HII_DRAW_FLAGS      Flags,\r
-IN CONST  EFI_HII_HANDLE          PackageList,\r
-IN CONST  EFI_IMAGE_ID            ImageId,\r
+IN        EFI_HII_DRAW_FLAGS      Flags,\r
+IN        EFI_HII_HANDLE          PackageList,\r
+IN        EFI_IMAGE_ID            ImageId,\r
 IN OUT    EFI_IMAGE_OUTPUT        **Blt,\r
-IN CONST  UINTN                   BltX,\r
-IN CONST  UINTN                   BltY\r
+IN        UINTN                   BltX,\r
+IN        UINTN                   BltY\r
 );\r
 \r
 \r
@@ -379,3 +377,4 @@ extern EFI_GUID gEfiHiiImageProtocolGuid;
 \r
 #endif\r
 \r
+\r