Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11094 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*++
|
||||
|
||||
Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>
|
||||
Copyright (c) 2007 - 2010, 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
|
||||
@@ -45,7 +45,7 @@ typedef struct _EFI_IMAGE_INPUT {
|
||||
UINT32 Flags;
|
||||
UINT16 Width;
|
||||
UINT16 Height;
|
||||
EFI_GRAPHICS_OUTPUT_BLT_PIXEL Bitmap[1];
|
||||
EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Bitmap;
|
||||
} EFI_IMAGE_INPUT;
|
||||
|
||||
#define EFI_IMAGE_TRANSPARENT 0x00000001
|
||||
@@ -101,8 +101,7 @@ EFI_STATUS
|
||||
IN CONST EFI_HII_IMAGE_PROTOCOL *This,
|
||||
IN EFI_HII_HANDLE PackageList,
|
||||
IN EFI_IMAGE_ID ImageId,
|
||||
OUT EFI_IMAGE_INPUT *Image,
|
||||
OUT UINTN *ImageSize
|
||||
OUT EFI_IMAGE_INPUT *Image
|
||||
)
|
||||
/*++
|
||||
|
||||
@@ -115,14 +114,14 @@ EFI_STATUS
|
||||
PackageList - Handle of the package list where this image will be searched.
|
||||
ImageId - The image's id,, which is unique within PackageList.
|
||||
Image - Points to the image.
|
||||
ImageSize - On entry, points to the size of the buffer pointed to by Image, in bytes. On return,
|
||||
points to the length of the image, in bytes.
|
||||
|
||||
Returns:
|
||||
EFI_SUCCESS - The new image was returned successfully.
|
||||
EFI_NOT_FOUND - The image specified by ImageId is not available.
|
||||
EFI_BUFFER_TOO_SMALL - The buffer specified by ImageSize is too small to hold the image.
|
||||
The specified PackageList is not in the database.
|
||||
EFI_INVALID_PARAMETER - The Image or ImageSize was NULL.
|
||||
EFI_OUT_OF_RESOURCES - The bitmap could not be retrieved because there was not
|
||||
enough memory.
|
||||
|
||||
--*/
|
||||
;
|
||||
@@ -149,7 +148,8 @@ EFI_STATUS
|
||||
|
||||
Returns:
|
||||
EFI_SUCCESS - The new image was updated successfully.
|
||||
EFI_NOT_FOUND - The image specified by ImageId is not in the database.
|
||||
EFI_NOT_FOUND - The image specified by ImageId is not in the database.
|
||||
The specified PackageList is not in the database.
|
||||
EFI_INVALID_PARAMETER - The Image was NULL.
|
||||
|
||||
--*/
|
||||
@@ -233,7 +233,9 @@ EFI_STATUS
|
||||
Returns:
|
||||
EFI_SUCCESS - The image was successfully drawn.
|
||||
EFI_OUT_OF_RESOURCES - Unable to allocate an output buffer for Blt.
|
||||
EFI_INVALID_PARAMETER - The Image was NULL.
|
||||
EFI_NOT_FOUND - The image specified by ImageId is not in the database.
|
||||
The specified PackageList is not in the database.
|
||||
EFI_INVALID_PARAMETER - The Blt was NULL.
|
||||
|
||||
--*/
|
||||
;
|
||||
|
Reference in New Issue
Block a user