Correct CompareGuid function

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiToUefiHiiThunk / Utility.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
index b0010a6f9beb85edfcc547e802ffe1bd3a19c12c..4934b2b3f46b3e6a034a671478dbea4137b7c62c 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiToUefiHiiThunk/Utility.c
@@ -277,7 +277,7 @@ GetFormSetGuid (
     switch (OpCode->OpCode) {\r
     case EFI_IFR_FORM_SET_OP:\r
       FormSet = (EFI_IFR_FORM_SET *) OpCode;\r
-      CopyMem (FormSetGuid, &FormSet->Guid, sizeof (EFI_GUID));\r
+      CopyGuid (FormSetGuid, (EFI_GUID *)(VOID *)&FormSet->Guid);\r
       return;\r
       \r
       default:\r
@@ -344,7 +344,7 @@ GetAttributesOfFirstFormSet (
 \r
         case EFI_IFR_GUID_OP:\r
           Class = (EFI_IFR_GUID_CLASS*) OpCode;\r
-          if (CompareMem (&Class->Guid, &gTianoHiiIfrGuid, sizeof (EFI_GUID)) == 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 (CompareMem (&OptionMap->Guid, &gFrameworkHiiCompatbilityGuid, sizeof (EFI_GUID)) == 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 (CompareMem (&OptionMap->Guid, &gTianoHiiIfrGuid, sizeof (EFI_GUID)) == 0) {\r
+         } else if (CompareGuid ((EFI_GUID *)(VOID *)&OptionMap->Guid, &gTianoHiiIfrGuid)) {\r
             Class = (EFI_IFR_GUID_CLASS *) OpCode;\r
 \r
             switch (Class->ExtendOpCode) {\r