Sync in bug fix from EDK I:

1) issue with setup browser and IFR refresh opcode
2) [HII]HIIConfigRoutingExportConfig generate error format of <MultiConfigAltResp>
3) [HII] ConfigRouting->ExtractConfig() will cause overflow
4) [Hii Database] EFI_HII_DATABASE_NOTIFY should be invoked when a string package is created internally when a new String Token is created
5) [PT]HIIConfigAccessProtocolTest fail on NT32uefi
6) Incorrect HII package types in EDK

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
index 0e4125450f8d5e7b5dd24e93ec02065ab5a30218..589b98b2e4537bc748a30d785c31790b0f9ead91 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
@@ -72,7 +72,7 @@ GetIfrFormSet (
     // by HII Build tool.\r
     //\r
     switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) {\r
-      case EFI_HII_PACKAGE_FORM:\r
+      case EFI_HII_PACKAGE_FORMS:\r
         return &TianoAutogenPackageHdrArray[Index]->PackageHeader;\r
         break;\r
 \r
@@ -122,7 +122,7 @@ GetBufferStorage  (
   EFI_IFR_VARSTORE        *VarStoreOpCode;\r
   BUFFER_STORAGE_ENTRY *BufferStorage;\r
 \r
-  ASSERT (FormSetPackage->Type == EFI_HII_PACKAGE_FORM);\r
+  ASSERT (FormSetPackage->Type == EFI_HII_PACKAGE_FORMS);\r
 \r
   OpCodeOffset = sizeof (EFI_HII_PACKAGE_HEADER);\r
   //\r
@@ -932,7 +932,7 @@ ThunkCallback (
 \r
   Status = mHiiDatabase->RegisterPackageNotify (\r
                            mHiiDatabase,\r
-                           EFI_HII_PACKAGE_FORM,\r
+                           EFI_HII_PACKAGE_FORMS,\r
                            NULL,\r
                            FormUpdateNotify,\r
                            EFI_HII_DATABASE_NOTIFY_REMOVE_PACK,\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
index 6616526e950b94435a362b29857cc210110ea2da..fb0a6900b8d4f3c556dbc00a9e3058ff5ecdb2b4 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
@@ -445,7 +445,7 @@ LocateFormId (
     Status = GetPackageData (HiiPackageList, Index, &PackageLength, &Package);\r
     if (!EFI_ERROR (Status)) {\r
       CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
-      if (PackageHeader.Type == EFI_HII_PACKAGE_FORM) {\r
+      if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
         Status = LocateLabel (Package, Label, FormsetGuid, FormId);\r
         if (!EFI_ERROR(Status)) {\r
           break;\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
index c6b30cb85ae4aef9424670f72a9bfd3e0b7a5706..d312af46dd778ab93fc816fae2e01f9c193d1cf1 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
@@ -199,7 +199,7 @@ Returns:
 \r
   Status = mHiiDatabase->RegisterPackageNotify (\r
                            mHiiDatabase,\r
-                           EFI_HII_PACKAGE_FORM,\r
+                           EFI_HII_PACKAGE_FORMS,\r
                            NULL,\r
                            NewOrAddPackNotify,\r
                            EFI_HII_DATABASE_NOTIFY_NEW_PACK,\r
@@ -209,7 +209,7 @@ Returns:
 \r
   Status = mHiiDatabase->RegisterPackageNotify (\r
                            mHiiDatabase,\r
-                           EFI_HII_PACKAGE_FORM,\r
+                           EFI_HII_PACKAGE_FORMS,\r
                            NULL,\r
                            NewOrAddPackNotify,\r
                            EFI_HII_DATABASE_NOTIFY_ADD_PACK,\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
index d87b2a28d16d787125b792742a31dbf5898b6be4..9717c2f56e7ec7f66f121d986c56a3a11573d91f 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
@@ -50,7 +50,7 @@ GetPackageCount (
     // by HII Build tool.\r
     //\r
     switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) {\r
-      case EFI_HII_PACKAGE_FORM:\r
+      case EFI_HII_PACKAGE_FORMS:\r
         *IfrPackageCount += 1;\r
         break;\r
       case EFI_HII_PACKAGE_STRINGS:\r
@@ -524,7 +524,7 @@ NewOrAddPackNotify (
   HII_THUNK_PRIVATE_DATA  *Private;\r
   HII_THUNK_CONTEXT       *ThunkContext;\r
 \r
-  ASSERT (PackageType == EFI_HII_PACKAGE_STRINGS || PackageType == EFI_HII_PACKAGE_FORM);\r
+  ASSERT (PackageType == EFI_HII_PACKAGE_STRINGS || PackageType == EFI_HII_PACKAGE_FORMS);\r
   ASSERT (NotifyType == EFI_HII_DATABASE_NOTIFY_ADD_PACK || NotifyType == EFI_HII_DATABASE_NOTIFY_NEW_PACK);\r
 \r
   Status  = EFI_SUCCESS;\r
@@ -546,7 +546,7 @@ NewOrAddPackNotify (
     InsertTailList (&Private->ThunkContextListHead, &ThunkContext->Link);\r
   } \r
 \r
-  if (PackageType == EFI_HII_PACKAGE_FORM) {\r
+  if (PackageType == EFI_HII_PACKAGE_FORMS) {\r
     GetAttributesOfFirstFormSet (ThunkContext);\r
   }\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
index a803b0e6c359eb4b11c5aea01bce6d0cfede1e58..b46a31e37be2af5b2ede623395bac823f4dbabb2 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
@@ -114,7 +114,7 @@ GetIfrBinaryData (
     Package = ((UINT8 *) HiiPackageList) + Offset;\r
     CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
 \r
-    if (PackageHeader.Type == EFI_HII_PACKAGE_FORM) {\r
+    if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
       //\r
       // Search FormSet in this Form Package\r
       //\r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index 4934b2b3f46b3e6a034a671478dbea4137b7c62c..77143d893a2051793603279c965f747b1cb47ed2 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -237,7 +237,7 @@ GetIfrPackage (
     // by HII Build tool.\r
     //\r
     switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) {\r
-      case EFI_HII_PACKAGE_FORM:\r
+      case EFI_HII_PACKAGE_FORMS:\r
         return &TianoAutogenPackageHdrArray[Index]->PackageHeader;\r
         break;\r
       case EFI_HII_PACKAGE_STRINGS:\r
@@ -314,9 +314,9 @@ GetAttributesOfFirstFormSet (
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
-  // There must be at least one EFI_HII_PACKAGE_FORM in the package list.\r
+  // There must be at least one EFI_HII_PACKAGE_FORMS in the package list.\r
   //\r
-  ASSERT (GetPackageCountByType (List, EFI_HII_PACKAGE_FORM) >= 1);\r
+  ASSERT (GetPackageCountByType (List, EFI_HII_PACKAGE_FORMS) >= 1);\r
 \r
   //\r
   // Skip the package list header.\r
@@ -325,7 +325,7 @@ GetAttributesOfFirstFormSet (
 \r
   while (Package->Type != EFI_HII_PACKAGE_END) {\r
 \r
-    if (Package->Type == EFI_HII_PACKAGE_FORM) {\r
+    if (Package->Type == EFI_HII_PACKAGE_FORMS) {\r
 \r
       //\r
       // Skip the package header\r
@@ -434,7 +434,7 @@ CreateQuestionIdMap (
 \r
   while (Package->Type != EFI_HII_PACKAGE_END) {\r
 \r
-    if (Package->Type == EFI_HII_PACKAGE_FORM) {\r
+    if (Package->Type == EFI_HII_PACKAGE_FORMS) {\r
 \r
       //\r
       // Skip the package header\r