Correct CompareGuid function

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c
index 6c7d19c2cd17bb2c5c2251cf7204b9925c6827e8..8870128ad2cc976b04cf184b09c924f609f89d49 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/UefiIfrParser.c
@@ -979,7 +979,7 @@ ParseOpCodes (
       //\r
       // check the formset GUID\r
       //\r
-      if (CompareGuid ((EFI_GUID *)(VOID *)&FormSet->Guid, (EFI_GUID *)(VOID *)&((EFI_IFR_FORM_SET *) OpCodeData)->Guid) != 0) {\r
+      if (!CompareGuid ((EFI_GUID *)(VOID *)&FormSet->Guid, (EFI_GUID *)(VOID *)&((EFI_IFR_FORM_SET *) OpCodeData)->Guid)) {\r
         return EFI_INVALID_PARAMETER;\r
       }\r
 \r

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index 810e3aff8f64d7272f31e7384cc093bc13dce81c..4934b2b3f46b3e6a034a671478dbea4137b7c62c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -344,7 +344,7 @@ GetAttributesOfFirstFormSet (
 \r
         case EFI_IFR_GUID_OP:\r
           Class = (EFI_IFR_GUID_CLASS*) OpCode;\r
-          if (CompareGuid ((EFI_GUID *)(VOID *)&Class->Guid, &gTianoHiiIfrGuid) == 0) {\r
+          if (CompareGuid ((EFI_GUID *)(VOID *)&Class->Guid, &gTianoHiiIfrGuid)) {\r
             Class = (EFI_IFR_GUID_CLASS *) OpCode;\r
 \r
             switch (Class->ExtendOpCode) {\r
@@ -497,7 +497,7 @@ CreateQuestionIdMap (
        \r
         case EFI_IFR_GUID_OP:\r
           OptionMap = (EFI_IFR_GUID_OPTIONKEY *) OpCode;\r
-          if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gFrameworkHiiCompatbilityGuid) == 0) {\r
+          if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gFrameworkHiiCompatbilityGuid)) {\r
             if (OptionMap->ExtendOpCode == EFI_IFR_EXTEND_OP_OPTIONKEY) {\r
               OneOfOptinMapEntryListHead = GetOneOfOptionMapEntryListHead (ThunkContext, OptionMap->QuestionId);\r
               if (OneOfOptinMapEntryListHead == NULL) {\r
@@ -525,7 +525,7 @@ CreateQuestionIdMap (
               \r
               InsertTailList (OneOfOptinMapEntryListHead, &OneOfOptionMapEntry->Link);\r
             }\r
-         } else if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gTianoHiiIfrGuid) == 0) {\r
+         } else if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gTianoHiiIfrGuid)) {\r
             Class = (EFI_IFR_GUID_CLASS *) OpCode;\r
 \r
             switch (Class->ExtendOpCode) {\r