From: qwang12 <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 3 Sep 2008 10:47:00 +0000 (+0000)
Subject: Update FrameworkHiiToUefiHiiThunk to produce Framework HII Protocol and Framework... 
X-Git-Tag: edk2-stable201903~20419
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=962045a2ab04020080af99c30be3166c77240ebf

Update FrameworkHiiToUefiHiiThunk to produce Framework HII Protocol and Framework Setup Browser in new GUIDs. This is because the interfaces produced only handle IFR and String packages in UEFI format.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
index 68b3bead20..f555e86b84 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/FrameworkHiiToUefiHiiThunk.inf
@@ -85,7 +85,6 @@
   PrintLib
 
 [Protocols]
-  gEfiHiiProtocolGuid
   gEfiHiiImageProtocolGuid
   gEfiHiiDatabaseProtocolGuid
   gEfiHiiStringProtocolGuid
@@ -94,7 +93,8 @@
   gEfiHiiConfigAccessProtocolGuid
   gEfiFormCallbackProtocolGuid
   gEfiUnicodeCollation2ProtocolGuid
-  gEfiFormBrowserProtocolGuid
+  gEfiHiiCompatibilityProtocolGuid
+  gEfiFormBrowserCompatibilityProtocolGuid
 
 [Depex]
   gEfiHiiDatabaseProtocolGuid AND
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index b53beb1ed4..845a9f72e0 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -104,7 +104,8 @@ Returns:
   HII_THUNK_CONTEXT       *ThunkContext;
   
 
-  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiProtocolGuid);
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiHiiCompatibilityProtocolGuid);
+  ASSERT_PROTOCOL_ALREADY_INSTALLED (NULL, &gEfiFormBrowserCompatibilityProtocolGuid);
 
   Private = AllocateCopyPool (sizeof (HII_THUNK_PRIVATE_DATA), &mHiiThunkPrivateDataTempate);
   ASSERT (Private != NULL);
@@ -158,7 +159,7 @@ Returns:
   //
   Status = gBS->InstallProtocolInterface (
                   &Private->Handle,
-                  &gEfiHiiProtocolGuid,
+                  &gEfiHiiCompatibilityProtocolGuid,
                   EFI_NATIVE_INTERFACE,
                   (VOID *) &Private->Hii
                   );
@@ -229,7 +230,7 @@ Returns:
   mBrowserThunkPrivateDataTemplate.ThunkPrivate = Private;
   Status = gBS->InstallProtocolInterface (
                   &mBrowserThunkPrivateDataTemplate.Handle,
-                  &gEfiFormBrowserProtocolGuid,
+                  &gEfiFormBrowserCompatibilityProtocolGuid,
                   EFI_NATIVE_INTERFACE,
                   (VOID *) &mBrowserThunkPrivateDataTemplate.FormBrowser
                   );