Fix the bug that the wrong classguid is compared.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 7dbbe85ce8cc8fbc0fb480a68104e58450f0e59d..30be2b59b5a32a46beb003a7bf64b80ef7148dc1 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -298,7 +298,7 @@ ExtractDisplayedHiiFormFromHiiHandle (
             //\r
             // Find FormSet OpCode\r
             //\r
-            ClassGuidNum = ((EFI_IFR_FORM_SET *) OpCodeData)->Flags;\r
+            ClassGuidNum = ((EFI_IFR_FORM_SET *) OpCodeData)->Flags & 0x3;\r
             ClassGuid = (EFI_GUID *) (VOID *)(OpCodeData + sizeof (EFI_IFR_FORM_SET));\r
             while (ClassGuidNum-- > 0) {\r
               if (CompareGuid (SetupClassGuid, ClassGuid)) {\r
@@ -307,6 +307,7 @@ ExtractDisplayedHiiFormFromHiiHandle (
                 FreePool (HiiPackageList);\r
                 return TRUE;\r
               }\r
+              ClassGuid ++;\r
             }\r
            } else {\r
              CopyMem (FormSetTitle, &((EFI_IFR_FORM_SET *) OpCodeData)->FormSetTitle, sizeof (EFI_STRING_ID));\r