diff options
| -rw-r--r-- | MdeModulePkg/Include/Library/HiiLib.h | 10 | ||||
| -rw-r--r-- | MdeModulePkg/Library/UefiHiiLib/HiiLib.c | 23 | ||||
| -rw-r--r-- | MdeModulePkg/Universal/HiiDatabaseDxe/Database.c | 8 |
3 files changed, 14 insertions, 27 deletions
diff --git a/MdeModulePkg/Include/Library/HiiLib.h b/MdeModulePkg/Include/Library/HiiLib.h index 9a040326c0..e39ed8e260 100644 --- a/MdeModulePkg/Include/Library/HiiLib.h +++ b/MdeModulePkg/Include/Library/HiiLib.h @@ -1,7 +1,7 @@ /** @file
Public include file for the HII Library
- Copyright (c) 2007 - 2008, Intel Corporation
+ Copyright (c) 2007 - 2009, Intel Corporation
All rights reserved. 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
@@ -24,10 +24,10 @@ /**
Registers a list of packages in the HII Database and returns the HII Handle
associated with that registration. If an HII Handle has already been registered
- with the same PackageListGuid, then NULL is returned. If there are not enough
- resources to perform the registration, then NULL is returned. If an empty list
- of packages is passed in, then NULL is returned. If the size of the list of
- package is 0, then NULL is returned.
+ with the same PackageListGuid and DeviceHandle, then NULL is returned. If there
+ are not enough resources to perform the registration, then NULL is returned.
+ If an empty list of packages is passed in, then NULL is returned. If the size of
+ the list of package is 0, then NULL is returned.
The variable arguments are pointers that point to package headers defined
by UEFI VFR compiler and StringGather tool.
diff --git a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c index 2a42cd799e..56bf55bcaa 100644 --- a/MdeModulePkg/Library/UefiHiiLib/HiiLib.c +++ b/MdeModulePkg/Library/UefiHiiLib/HiiLib.c @@ -1,7 +1,7 @@ /** @file
HII Library implementation that uses DXE protocols and services.
- Copyright (c) 2006 - 2008, Intel Corporation<BR>
+ Copyright (c) 2006 - 2009, Intel Corporation<BR>
All rights reserved. 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
@@ -105,10 +105,10 @@ InternalHiiExtractGuidFromHiiHandle ( /**
Registers a list of packages in the HII Database and returns the HII Handle
associated with that registration. If an HII Handle has already been registered
- with the same PackageListGuid, then NULL is returned. If there are not enough
- resources to perform the registration, then NULL is returned. If an empty list
- of packages is passed in, then NULL is returned. If the size of the list of
- package is 0, then NULL is returned.
+ with the same PackageListGuid and DeviceHandle, then NULL is returned. If there
+ are not enough resources to perform the registration, then NULL is returned.
+ If an empty list of packages is passed in, then NULL is returned. If the size of
+ the list of package is 0, then NULL is returned.
The variable arguments are pointers which point to package header that defined
by UEFI VFR compiler and StringGather tool.
@@ -145,7 +145,6 @@ HiiAddPackages ( )
{
EFI_STATUS Status;
- EFI_HII_HANDLE *HiiHandleBuffer;
VA_LIST Args;
UINT32 *Package;
EFI_HII_PACKAGE_LIST_HEADER *PackageListHeader;
@@ -156,16 +155,6 @@ HiiAddPackages ( ASSERT (PackageListGuid != NULL);
//
- // Check to see if an HII Handle has already been registered with the same
- // PackageListGuid
- //
- HiiHandleBuffer = HiiGetHiiHandles (PackageListGuid);
- if (HiiHandleBuffer != NULL) {
- FreePool (HiiHandleBuffer);
- return NULL;
- }
-
- //
// Calculate the length of all the packages in the variable argument list
//
for (Length = 0, VA_START (Args, DeviceHandle); (Package = VA_ARG (Args, UINT32 *)) != NULL; ) {
@@ -192,7 +181,7 @@ HiiAddPackages ( PackageListHeader = AllocateZeroPool (Length);
//
- // If the Packahge List can not be allocated, then return a NULL HII Handle
+ // If the Package List can not be allocated, then return a NULL HII Handle
//
if (PackageListHeader == NULL) {
return NULL;
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c index 918559e544..6c0062db7c 100644 --- a/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c +++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Database.c @@ -1,8 +1,7 @@ /** @file
Implementation for EFI_HII_DATABASE_PROTOCOL.
-
-Copyright (c) 2007 - 2008, Intel Corporation
+Copyright (c) 2007 - 2009, Intel Corporation
All rights reserved. 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
@@ -2740,9 +2739,8 @@ HiiNewPackageList ( DatabaseRecord = CR (Link, HII_DATABASE_RECORD, DatabaseEntry, HII_DATABASE_RECORD_SIGNATURE);
if (CompareGuid (
&(DatabaseRecord->PackageList->PackageListHdr.PackageListGuid),
- &PackageListGuid
- )
- ) {
+ &PackageListGuid) &&
+ DatabaseRecord->DriverHandle == DriverHandle) {
return EFI_INVALID_PARAMETER;
}
}
|