From 4dd76ade7df961aba6773169e102c51b9c584f5a Mon Sep 17 00:00:00 2001 From: qwang12 Date: Tue, 4 Nov 2008 14:47:21 +0000 Subject: [PATCH] Sync in bug fix from EDK I: 1) issue with setup browser and IFR refresh opcode 2) [HII]HIIConfigRoutingExportConfig generate error format of 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 --- .../FrameworkHiiToUefiHiiThunk/ConfigAccess.c | 6 +++--- .../Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c | 2 +- .../FrameworkHiiToUefiHiiThunk/HiiDatabase.c | 4 ++-- .../Compatibility/FrameworkHiiToUefiHiiThunk/Package.c | 6 +++--- .../FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c | 2 +- .../Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c index 0e4125450f..589b98b2e4 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c @@ -72,7 +72,7 @@ GetIfrFormSet ( // by HII Build tool. // switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) { - case EFI_HII_PACKAGE_FORM: + case EFI_HII_PACKAGE_FORMS: return &TianoAutogenPackageHdrArray[Index]->PackageHeader; break; @@ -122,7 +122,7 @@ GetBufferStorage ( EFI_IFR_VARSTORE *VarStoreOpCode; BUFFER_STORAGE_ENTRY *BufferStorage; - ASSERT (FormSetPackage->Type == EFI_HII_PACKAGE_FORM); + ASSERT (FormSetPackage->Type == EFI_HII_PACKAGE_FORMS); OpCodeOffset = sizeof (EFI_HII_PACKAGE_HEADER); // @@ -932,7 +932,7 @@ ThunkCallback ( Status = mHiiDatabase->RegisterPackageNotify ( mHiiDatabase, - EFI_HII_PACKAGE_FORM, + EFI_HII_PACKAGE_FORMS, NULL, FormUpdateNotify, EFI_HII_DATABASE_NOTIFY_REMOVE_PACK, diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c index 6616526e95..fb0a6900b8 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c @@ -445,7 +445,7 @@ LocateFormId ( Status = GetPackageData (HiiPackageList, Index, &PackageLength, &Package); if (!EFI_ERROR (Status)) { CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER)); - if (PackageHeader.Type == EFI_HII_PACKAGE_FORM) { + if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) { Status = LocateLabel (Package, Label, FormsetGuid, FormId); if (!EFI_ERROR(Status)) { break; diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c index c6b30cb85a..d312af46dd 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c @@ -199,7 +199,7 @@ Returns: Status = mHiiDatabase->RegisterPackageNotify ( mHiiDatabase, - EFI_HII_PACKAGE_FORM, + EFI_HII_PACKAGE_FORMS, NULL, NewOrAddPackNotify, EFI_HII_DATABASE_NOTIFY_NEW_PACK, @@ -209,7 +209,7 @@ Returns: Status = mHiiDatabase->RegisterPackageNotify ( mHiiDatabase, - EFI_HII_PACKAGE_FORM, + EFI_HII_PACKAGE_FORMS, NULL, NewOrAddPackNotify, EFI_HII_DATABASE_NOTIFY_ADD_PACK, diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c index d87b2a28d1..9717c2f56e 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c @@ -50,7 +50,7 @@ GetPackageCount ( // by HII Build tool. // switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) { - case EFI_HII_PACKAGE_FORM: + case EFI_HII_PACKAGE_FORMS: *IfrPackageCount += 1; break; case EFI_HII_PACKAGE_STRINGS: @@ -524,7 +524,7 @@ NewOrAddPackNotify ( HII_THUNK_PRIVATE_DATA *Private; HII_THUNK_CONTEXT *ThunkContext; - ASSERT (PackageType == EFI_HII_PACKAGE_STRINGS || PackageType == EFI_HII_PACKAGE_FORM); + ASSERT (PackageType == EFI_HII_PACKAGE_STRINGS || PackageType == EFI_HII_PACKAGE_FORMS); ASSERT (NotifyType == EFI_HII_DATABASE_NOTIFY_ADD_PACK || NotifyType == EFI_HII_DATABASE_NOTIFY_NEW_PACK); Status = EFI_SUCCESS; @@ -546,7 +546,7 @@ NewOrAddPackNotify ( InsertTailList (&Private->ThunkContextListHead, &ThunkContext->Link); } - if (PackageType == EFI_HII_PACKAGE_FORM) { + if (PackageType == EFI_HII_PACKAGE_FORMS) { GetAttributesOfFirstFormSet (ThunkContext); } diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c index a803b0e6c3..b46a31e37b 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c @@ -114,7 +114,7 @@ GetIfrBinaryData ( Package = ((UINT8 *) HiiPackageList) + Offset; CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER)); - if (PackageHeader.Type == EFI_HII_PACKAGE_FORM) { + if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) { // // Search FormSet in this Form Package // diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c index 4934b2b3f4..77143d893a 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c @@ -237,7 +237,7 @@ GetIfrPackage ( // by HII Build tool. // switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) { - case EFI_HII_PACKAGE_FORM: + case EFI_HII_PACKAGE_FORMS: return &TianoAutogenPackageHdrArray[Index]->PackageHeader; break; case EFI_HII_PACKAGE_STRINGS: @@ -314,9 +314,9 @@ GetAttributesOfFirstFormSet ( ASSERT_EFI_ERROR (Status); // - // There must be at least one EFI_HII_PACKAGE_FORM in the package list. + // There must be at least one EFI_HII_PACKAGE_FORMS in the package list. // - ASSERT (GetPackageCountByType (List, EFI_HII_PACKAGE_FORM) >= 1); + ASSERT (GetPackageCountByType (List, EFI_HII_PACKAGE_FORMS) >= 1); // // Skip the package list header. @@ -325,7 +325,7 @@ GetAttributesOfFirstFormSet ( while (Package->Type != EFI_HII_PACKAGE_END) { - if (Package->Type == EFI_HII_PACKAGE_FORM) { + if (Package->Type == EFI_HII_PACKAGE_FORMS) { // // Skip the package header @@ -434,7 +434,7 @@ CreateQuestionIdMap ( while (Package->Type != EFI_HII_PACKAGE_END) { - if (Package->Type == EFI_HII_PACKAGE_FORM) { + if (Package->Type == EFI_HII_PACKAGE_FORMS) { // // Skip the package header -- 2.39.2