1) Fix a bug. Before this fix, a Module that calling UEFI HII Interface to get the String Information will fail to locate the Package List based on a Package GUID if a required String Pack is registered using Framework HII NewPack instance.

2) Correct a few other minor issues.

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

1 files changed, 8 insertions, 0 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index 53863d8114..8eab0813e6 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -136,6 +136,10 @@ AddPackNotify (
   Status  = EFI_SUCCESS;

   Private = mHiiThunkPrivateData;

 

+  if (mInFrameworkHiiNewPack) {

+    return EFI_SUCCESS;

+  }

+

   //

   // We only create a MapEntry if the Uefi Hii Handle is only already registered

   // by the HII Thunk Layer.

@@ -252,6 +256,10 @@ RemovePackNotify (
   ASSERT (PackageType == EFI_HII_PACKAGE_STRINGS);

   ASSERT (NotifyType == EFI_HII_DATABASE_NOTIFY_REMOVE_PACK);

 

+  if (mInFrameworkHiiRemovePack) {

+    return EFI_SUCCESS;

+  }

+

   Private = mHiiThunkPrivateData;

 

   MapEntry = UefiHiiHandleToMapDatabaseEntry (Private, Handle);