1) StrGather (Build.exe) in compatible mode add a Framework Package Header to replace the original “ArrayLength” generated in the output.

2) VfrCompiler in compatible mode add a Framework Package Header to replace the original “ArrayLength” generated in the output.
3) HII Thunk module nows support Narrow Font registered using Framework New Pack HII interface.
4) Fix a bug in IfrLibCreatePopUp2 by updating the prototype. The previous way of using VA_START to get the address of parameter in the argument list and expecting the parameters that follows will be found using VA_ARG macro is wrong. 


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

1 files changed, 4 insertions, 10 deletions

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index 48a133da63..ca870990e1 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -267,20 +267,14 @@ GetIfrPackage (
     // may not be the exact number of valid package number in the binary generated 

     // by HII Build tool.

     //

-    switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) {

-      case EFI_HII_PACKAGE_FORMS:

+    switch (TianoAutogenPackageHdrArray[Index]->FrameworkPackageHeader.Type) {

+      case EFI_HII_IFR:

         return &TianoAutogenPackageHdrArray[Index]->PackageHeader;

         break;

-      case EFI_HII_PACKAGE_STRINGS:

-      case EFI_HII_PACKAGE_SIMPLE_FONTS:

+      case EFI_HII_STRING:

+      case EFI_HII_FONT:

         break;

 

-      //

-      // The following fonts are invalid for a module that using Framework to UEFI thunk layer.

-      //

-      case EFI_HII_PACKAGE_KEYBOARD_LAYOUT:

-      case EFI_HII_PACKAGE_FONTS:

-      case EFI_HII_PACKAGE_IMAGES:

       default:

         ASSERT (FALSE);

         return NULL;