Fix the conflicted function names to new HII library.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c
index efc205e919c9ec7d94bdf097b08ebc8d8cc1c559..623e832826f25a35eed04312ba6af21f8f9ac4e2 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c
@@ -483,7 +483,7 @@ Done:
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-HiiUpdateForm (\r
+HiiThunkUpdateForm (\r

   IN EFI_HII_PROTOCOL                  *This,\r
   IN FRAMEWORK_EFI_HII_HANDLE          Handle,\r
   IN EFI_FORM_LABEL                    Label,\r
   IN EFI_HII_PROTOCOL                  *This,\r
   IN FRAMEWORK_EFI_HII_HANDLE          Handle,\r
   IN EFI_FORM_LABEL                    Label,\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
index a89d91e23382bbe70d2e3a36ead99b2d960f3da1..7882227fafb10ffbeca9df840f8925fdde425cb9 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
@@ -34,12 +34,12 @@ HII_THUNK_PRIVATE_DATA mHiiThunkPrivateDataTempate = {
     HiiNewString,\r
     HiiGetPrimaryLanguages,\r
     HiiGetSecondaryLanguages,\r
     HiiNewString,\r
     HiiGetPrimaryLanguages,\r
     HiiGetSecondaryLanguages,\r

-    HiiGetString,\r
+    HiiThunkGetString,\r

     HiiResetStrings,\r
     HiiGetLine,\r
     HiiGetForms,\r
     HiiGetDefaultImage,\r
     HiiResetStrings,\r
     HiiGetLine,\r
     HiiGetForms,\r
     HiiGetDefaultImage,\r

-    HiiUpdateForm,\r
+    HiiThunkUpdateForm,\r

     \r
     HiiGetKeyboardLayout\r
   },\r
     \r
     HiiGetKeyboardLayout\r
   },\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 3d56a41d77f7c75c874f48a0574873451cdd35b3..a1e9c1a4c692513b04cb608a7a8c7692ecbe8a8d 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -311,7 +311,7 @@ HiiNewString (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-HiiGetString (\r
+HiiThunkGetString (\r

   IN     EFI_HII_PROTOCOL           *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
   IN     STRING_REF                 Token,\r
   IN     EFI_HII_PROTOCOL           *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
   IN     STRING_REF                 Token,\r


@@ -388,7 +388,7 @@ HiiGetDefaultImage (
 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r

-HiiUpdateForm (\r
+HiiThunkUpdateForm (\r

   IN EFI_HII_PROTOCOL                   *This,\r
   IN FRAMEWORK_EFI_HII_HANDLE           Handle,\r
   IN EFI_FORM_LABEL                     Label,\r
   IN EFI_HII_PROTOCOL                   *This,\r
   IN FRAMEWORK_EFI_HII_HANDLE           Handle,\r
   IN EFI_FORM_LABEL                     Label,\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
index 6e966192ac2243f4671dff44a0b4bbddd315ceb2..d9cc39eb8d54d6f829479199c211ecdb94114ca5 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
@@ -378,7 +378,7 @@ HiiResetStrings (
 **/\r
 EFI_STATUS\r
 EFIAPI\r
 **/\r
 EFI_STATUS\r
 EFIAPI\r

-HiiGetString (\r
+HiiThunkGetString (\r

   IN     EFI_HII_PROTOCOL           *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
   IN     STRING_REF                 Token,\r
   IN     EFI_HII_PROTOCOL           *This,\r
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,\r
   IN     STRING_REF                 Token,\r