Correct the dummy ConfigAccess Extract and RouteConfig behavior according to UEFI...

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / FrontPage.c

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index bca0555b12a1b0ce016dedffd61a6239730e0d46..9443a65bcdfe9404bcebde3eb42b432e26e9c949 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -94,6 +94,7 @@ FakeExtractConfig (
   OUT EFI_STRING                             *Results\r
   )\r
 {\r
+  *Progress = Request;\r
   return EFI_NOT_FOUND;\r
 }\r
 \r
@@ -121,7 +122,15 @@ FakeRouteConfig (
   OUT EFI_STRING                             *Progress\r
   )\r
 {\r
-  return EFI_SUCCESS;\r
+  if (Configuration == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  if (Progress == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  return EFI_NOT_FOUND;\r
 }\r
 \r
 /**\r
@@ -156,7 +165,6 @@ FrontPageCallback (
   CHAR8                         *LanguageString;\r
   CHAR8                         *LangCode;\r
   CHAR8                         *Lang;\r
-  CHAR8                         OldLang[ISO_639_2_ENTRY_SIZE];\r
   UINTN                         Index;\r
   EFI_STATUS                    Status;\r
   CHAR8                         *PlatformSupportedLanguages;\r
@@ -230,25 +238,12 @@ FrontPageCallback (
                       AsciiStrSize (BestLanguage),\r
                       Lang\r
                       );\r
-\r
-      if (!FeaturePcdGet (PcdUefiVariableDefaultLangDeprecate)) {\r
-        //\r
-        // Set UEFI deprecated variable "Lang" for backwards compatibility\r
-        //\r
-        Status = ConvertRfc3066LanguageToIso639Language (BestLanguage, OldLang);\r
-        if (!EFI_ERROR (Status)) {\r
-          Status = gRT->SetVariable (\r
-                          L"Lang",\r
-                          &gEfiGlobalVariableGuid,\r
-                          EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
-                          ISO_639_2_ENTRY_SIZE,\r
-                          OldLang\r
-                          );\r
-        }\r
-      }\r
+      ASSERT_EFI_ERROR(Status);\r
       FreePool (BestLanguage);\r
+    } else {\r
+      ASSERT (FALSE);\r
     }\r
-  \r
+\r
     FreePool (PlatformSupportedLanguages);\r
     FreePool (Lang);\r
     FreePool (LanguageString);\r
@@ -439,7 +434,7 @@ InitializeFrontPage (
   \r
   if (gFrontPagePrivate.LanguageToken == NULL) {\r
     while (*LangCode != 0) {\r
-      HiiLibGetNextLanguage (&LangCode, Lang);\r
+      GetNextLanguage (&LangCode, Lang);\r
       OptionCount ++;\r
     }\r
     gFrontPagePrivate.LanguageToken = AllocatePool (OptionCount * sizeof (EFI_STRING_ID));\r
@@ -573,7 +568,7 @@ CallFrontPage (
                             gFormBrowser2,\r
                             &gFrontPagePrivate.HiiHandle,\r
                             1,\r
-                            NULL,\r
+                            &mFrontPageGuid,\r
                             0,\r
                             NULL,\r
                             &ActionRequest\r