\r
IfrOptionList = NULL;\r
VideoOption = NULL;\r
+ HiiHandles = NULL;\r
HandleBufferLength = 0;\r
\r
//\r
CreateSubTitleOpCode (STR_EMPTY_STRING, &UpdateData->Data);\r
Hii->UpdateForm (Hii, FPCallbackInfo.DevMgrHiiHandle, (EFI_FORM_LABEL) Count, TRUE, UpdateData);\r
\r
- HiiHandles = AllocateZeroPool (HandleBufferLength);\r
- Hii->FindHandles (Hii, &HandleBufferLength, HiiHandles);\r
+ //\r
+ // Get all the Hii handles\r
+ //\r
+ Status = BdsLibGetHiiHandles (Hii, &HandleBufferLength, &HiiHandles);\r
+ ASSERT_EFI_ERROR (Status);\r
\r
for (Index = 1, BufferSize = 0; Index < HandleBufferLength; Index++) {\r
//\r
}\r
\r
gBS->FreePool (UpdateData);\r
+ gBS->FreePool (HiiHandles);\r
\r
return Status;\r
}\r