while (!IsNull (&Private->ThunkContextListHead, Link)) {\r
ThunkContext = HII_THUNK_CONTEXT_FROM_LINK (Link);\r
\r
- if (CompareGuid (Guid, &ThunkContext->TagGuid) && (ThunkContext->IfrPackageCount != 0)) {\r
+ if (CompareMem (Guid, &ThunkContext->TagGuid, sizeof (EFI_GUID) == 0) && (ThunkContext->IfrPackageCount != 0)) {\r
return ThunkContext->UefiHiiHandle;\r
}\r
\r
\r
case EFI_IFR_GUID_OP:\r
Class = (EFI_IFR_GUID_CLASS*) OpCode;\r
- if (CompareGuid (&Class->Guid, &gTianoHiiIfrGuid)) {\r
+ if (CompareMem (&Class->Guid, &gTianoHiiIfrGuid, sizeof (EFI_GUID)) == 0) {\r
Class = (EFI_IFR_GUID_CLASS *) OpCode;\r
\r
switch (Class->ExtendOpCode) {\r
\r
case EFI_IFR_GUID_OP:\r
OptionMap = (EFI_IFR_GUID_OPTIONKEY *) OpCode;\r
- if (CompareGuid (&OptionMap->Guid, &gFrameworkHiiCompatbilityGuid)) {\r
+ if (CompareMem (&OptionMap->Guid, &gFrameworkHiiCompatbilityGuid, sizeof (EFI_GUID)) == 0) {\r
if (OptionMap->ExtendOpCode == EFI_IFR_EXTEND_OP_OPTIONKEY) {\r
OneOfOptinMapEntryListHead = GetOneOfOptionMapEntryListHead (ThunkContext, OptionMap->QuestionId);\r
if (OneOfOptinMapEntryListHead == NULL) {\r
\r
InsertTailList (OneOfOptinMapEntryListHead, &OneOfOptionMapEntry->Link);\r
}\r
- }else if (CompareMem (&OptionMap->Guid, &gTianoHiiIfrGuid, sizeof (EFI_GUID))) {\r
+ } else if (CompareMem (&OptionMap->Guid, &gTianoHiiIfrGuid, sizeof (EFI_GUID)) == 0) {\r
Class = (EFI_IFR_GUID_CLASS *) OpCode;\r
\r
switch (Class->ExtendOpCode) {\r