tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
qwang12 2008-11-04 14:47:21 +00:00
parent 8d00a0f195
commit 4dd76ade7d
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/ConfigAccess.c
View File

@ -72,7 +72,7 @@ GetIfrFormSet (
// by HII Build tool. // by HII Build tool.
// //
switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) { switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) {
case EFI_HII_PACKAGE_FORM: case EFI_HII_PACKAGE_FORMS:
return &TianoAutogenPackageHdrArray[Index]->PackageHeader; return &TianoAutogenPackageHdrArray[Index]->PackageHeader;
break; break;
@ -122,7 +122,7 @@ GetBufferStorage (
EFI_IFR_VARSTORE *VarStoreOpCode; EFI_IFR_VARSTORE *VarStoreOpCode;
BUFFER_STORAGE_ENTRY *BufferStorage; BUFFER_STORAGE_ENTRY *BufferStorage;
ASSERT (FormSetPackage->Type == EFI_HII_PACKAGE_FORM); ASSERT (FormSetPackage->Type == EFI_HII_PACKAGE_FORMS);
OpCodeOffset = sizeof (EFI_HII_PACKAGE_HEADER); OpCodeOffset = sizeof (EFI_HII_PACKAGE_HEADER);
// //
@ -932,7 +932,7 @@ ThunkCallback (
Status = mHiiDatabase->RegisterPackageNotify ( Status = mHiiDatabase->RegisterPackageNotify (
mHiiDatabase, mHiiDatabase,
EFI_HII_PACKAGE_FORM, EFI_HII_PACKAGE_FORMS,
NULL, NULL,
FormUpdateNotify, FormUpdateNotify,
EFI_HII_DATABASE_NOTIFY_REMOVE_PACK, EFI_HII_DATABASE_NOTIFY_REMOVE_PACK,

2
EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Forms.c
View File

@ -445,7 +445,7 @@ LocateFormId (
Status = GetPackageData (HiiPackageList, Index, &PackageLength, &Package); Status = GetPackageData (HiiPackageList, Index, &PackageLength, &Package);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER)); 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); Status = LocateLabel (Package, Label, FormsetGuid, FormId);
if (!EFI_ERROR(Status)) { if (!EFI_ERROR(Status)) {
break; break;

4
EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/HiiDatabase.c
View File

@ -199,7 +199,7 @@ Returns:
Status = mHiiDatabase->RegisterPackageNotify ( Status = mHiiDatabase->RegisterPackageNotify (
mHiiDatabase, mHiiDatabase,
EFI_HII_PACKAGE_FORM, EFI_HII_PACKAGE_FORMS,
NULL, NULL,
NewOrAddPackNotify, NewOrAddPackNotify,
EFI_HII_DATABASE_NOTIFY_NEW_PACK, EFI_HII_DATABASE_NOTIFY_NEW_PACK,
@ -209,7 +209,7 @@ Returns:
Status = mHiiDatabase->RegisterPackageNotify ( Status = mHiiDatabase->RegisterPackageNotify (
mHiiDatabase, mHiiDatabase,
EFI_HII_PACKAGE_FORM, EFI_HII_PACKAGE_FORMS,
NULL, NULL,
NewOrAddPackNotify, NewOrAddPackNotify,
EFI_HII_DATABASE_NOTIFY_ADD_PACK, EFI_HII_DATABASE_NOTIFY_ADD_PACK,

6
EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Package.c
View File

@ -50,7 +50,7 @@ GetPackageCount (
// by HII Build tool. // by HII Build tool.
// //
switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) { switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) {
case EFI_HII_PACKAGE_FORM: case EFI_HII_PACKAGE_FORMS:
*IfrPackageCount += 1; *IfrPackageCount += 1;
break; break;
case EFI_HII_PACKAGE_STRINGS: case EFI_HII_PACKAGE_STRINGS:
@ -524,7 +524,7 @@ NewOrAddPackNotify (
HII_THUNK_PRIVATE_DATA *Private; HII_THUNK_PRIVATE_DATA *Private;
HII_THUNK_CONTEXT *ThunkContext; 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); ASSERT (NotifyType == EFI_HII_DATABASE_NOTIFY_ADD_PACK || NotifyType == EFI_HII_DATABASE_NOTIFY_NEW_PACK);
Status = EFI_SUCCESS; Status = EFI_SUCCESS;
@ -546,7 +546,7 @@ NewOrAddPackNotify (
InsertTailList (&Private->ThunkContextListHead, &ThunkContext->Link); InsertTailList (&Private->ThunkContextListHead, &ThunkContext->Link);
} }
if (PackageType == EFI_HII_PACKAGE_FORM) { if (PackageType == EFI_HII_PACKAGE_FORMS) {
GetAttributesOfFirstFormSet (ThunkContext); GetAttributesOfFirstFormSet (ThunkContext);
} }

2
EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrDefault.c
View File

@ -114,7 +114,7 @@ GetIfrBinaryData (
Package = ((UINT8 *) HiiPackageList) + Offset; Package = ((UINT8 *) HiiPackageList) + Offset;
CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER)); 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 // Search FormSet in this Form Package
// //

10
EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
View File

@ -237,7 +237,7 @@ GetIfrPackage (
// by HII Build tool. // by HII Build tool.
// //
switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) { switch (TianoAutogenPackageHdrArray[Index]->PackageHeader.Type) {
case EFI_HII_PACKAGE_FORM: case EFI_HII_PACKAGE_FORMS:
return &TianoAutogenPackageHdrArray[Index]->PackageHeader; return &TianoAutogenPackageHdrArray[Index]->PackageHeader;
break; break;
case EFI_HII_PACKAGE_STRINGS: case EFI_HII_PACKAGE_STRINGS:
@ -314,9 +314,9 @@ GetAttributesOfFirstFormSet (
ASSERT_EFI_ERROR (Status); 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. // Skip the package list header.
@ -325,7 +325,7 @@ GetAttributesOfFirstFormSet (
while (Package->Type != EFI_HII_PACKAGE_END) { 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 // Skip the package header
@ -434,7 +434,7 @@ CreateQuestionIdMap (
while (Package->Type != EFI_HII_PACKAGE_END) { 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 // Skip the package header