EFI_HII_DATABASE_PROTOCOL.NewPackageList() allows installation of multiple package lists with same package list GUID onto different handles. According, change behavior of the HII Library function HiiAddPackages() to be consistent with EFI_HII_DATABASE_PROTOCOL.NewPackageList().

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9452 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 3 insertions, 5 deletions

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;

     }

   }