IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
+ EFI_STATUS Status;\r
+\r
//\r
- // Retrieve the pointer to the UEFI HII Font Protocol \r
+ // Retrieve the pointer to the UEFI HII String Protocol \r
//\r
- gBS->LocateProtocol (&gEfiHiiFontProtocolGuid, NULL, (VOID **) &gHiiFont);\r
+ Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gHiiString);\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
- // Retrieve the pointer to the UEFI HII String Protocol \r
+ // Retrieve the pointer to the UEFI HII Database Protocol \r
//\r
- gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &gHiiString);\r
+ Status = gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
- // Retrieve the pointer to the UEFI HII Image Protocol \r
+ // Retrieve the pointer to the UEFI HII Config Routing Protocol \r
//\r
- gBS->LocateProtocol (&gEfiHiiImageProtocolGuid, NULL, (VOID **) &gHiiImage);\r
+ Status = gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &gHiiConfigRouting);\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
- // Retrieve the pointer to the UEFI HII Database Protocol \r
+ // Retrieve the pointer to the optional UEFI HII Font Protocol \r
//\r
- gBS->LocateProtocol (&gEfiHiiDatabaseProtocolGuid, NULL, (VOID **) &gHiiDatabase);\r
+ gBS->LocateProtocol (&gEfiHiiFontProtocolGuid, NULL, (VOID **) &gHiiFont);\r
\r
//\r
- // Retrieve the pointer to the UEFI HII Config Routing Protocol \r
+ // Retrieve the pointer to the optional UEFI HII Image Protocol \r
//\r
- gBS->LocateProtocol (&gEfiHiiConfigRoutingProtocolGuid, NULL, (VOID **) &gHiiConfigRouting);\r
+ gBS->LocateProtocol (&gEfiHiiImageProtocolGuid, NULL, (VOID **) &gHiiImage);\r
\r
return EFI_SUCCESS;\r
}\r