- gHiiDatabase->RemovePackageList (gHiiDatabase, HiiHandle);\r
- PackageList = HiiLibPreparePackageList (2, &mDeviceManagerGuid, DeviceManagerVfrBin, BdsDxeStrings);\r
- ASSERT (PackageList != NULL);\r
- Status = gHiiDatabase->NewPackageList (\r
- gHiiDatabase,\r
- PackageList,\r
- gDeviceManagerPrivate.DriverHandle,\r
- &gDeviceManagerPrivate.HiiHandle\r
- );\r
- FreePool (PackageList);\r
+ HiiRemovePackages (HiiHandle);\r
+\r
+ gDeviceManagerPrivate.HiiHandle = HiiAddPackages (\r
+ &mDeviceManagerGuid,\r
+ gDeviceManagerPrivate.DriverHandle,\r
+ DeviceManagerVfrBin,\r
+ BdsDxeStrings,\r
+ NULL\r
+ );\r
+ if (gDeviceManagerPrivate.HiiHandle == NULL) {\r
+ Status = EFI_OUT_OF_RESOURCES;\r
+ } else {\r
+ Status = EFI_SUCCESS;\r
+ }\r