From 5a58200d19b6d9c544d671cf05d6fc54d4744315 Mon Sep 17 00:00:00 2001 From: lgao4 Date: Fri, 19 Sep 2008 09:26:18 +0000 Subject: Correct CompareGuid function git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5933 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c | 2 +- .../Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c index 6c7d19c..8870128 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c @@ -979,7 +979,7 @@ ParseOpCodes ( // // check the formset GUID // - if (CompareGuid ((EFI_GUID *)(VOID *)&FormSet->Guid, (EFI_GUID *)(VOID *)&((EFI_IFR_FORM_SET *) OpCodeData)->Guid) != 0) { + if (!CompareGuid ((EFI_GUID *)(VOID *)&FormSet->Guid, (EFI_GUID *)(VOID *)&((EFI_IFR_FORM_SET *) OpCodeData)->Guid)) { return EFI_INVALID_PARAMETER; } diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c index 810e3af..4934b2b 100644 --- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c +++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c @@ -344,7 +344,7 @@ GetAttributesOfFirstFormSet ( case EFI_IFR_GUID_OP: Class = (EFI_IFR_GUID_CLASS*) OpCode; - if (CompareGuid ((EFI_GUID *)(VOID *)&Class->Guid, &gTianoHiiIfrGuid) == 0) { + if (CompareGuid ((EFI_GUID *)(VOID *)&Class->Guid, &gTianoHiiIfrGuid)) { Class = (EFI_IFR_GUID_CLASS *) OpCode; switch (Class->ExtendOpCode) { @@ -497,7 +497,7 @@ CreateQuestionIdMap ( case EFI_IFR_GUID_OP: OptionMap = (EFI_IFR_GUID_OPTIONKEY *) OpCode; - if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gFrameworkHiiCompatbilityGuid) == 0) { + if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gFrameworkHiiCompatbilityGuid)) { if (OptionMap->ExtendOpCode == EFI_IFR_EXTEND_OP_OPTIONKEY) { OneOfOptinMapEntryListHead = GetOneOfOptionMapEntryListHead (ThunkContext, OptionMap->QuestionId); if (OneOfOptinMapEntryListHead == NULL) { @@ -525,7 +525,7 @@ CreateQuestionIdMap ( InsertTailList (OneOfOptinMapEntryListHead, &OneOfOptionMapEntry->Link); } - } else if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gTianoHiiIfrGuid) == 0) { + } else if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gTianoHiiIfrGuid)) { Class = (EFI_IFR_GUID_CLASS *) OpCode; switch (Class->ExtendOpCode) { -- cgit v1.1