Fix the issue that BootOrder can't be set

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

diff --git a/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h b/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h
index 3e98785c2ba309c2a48b6549ac190b31e61a2f76..610443c54b15e9289a5ae3e030f2521257528e01 100644 (file)
--- a/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h
+++ b/IntelFrameworkModulePkg/Include/Guid/CustomDecompress.h
@@ -20,4 +20,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 extern GUID gTianoCustomDecompressGuid;\r
 \r
-#endif // #ifndef _EFI_CAPSULE_VENDOR_GUID_H_\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index e30e98968609dcbc94447fcedb09f1da83c2f811..1a6f076ecc0c80d9ad9a6bacbebdfb6f27726df6 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -64,6 +64,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 extern EFI_GUID mBootMaintGuid;\r
 extern EFI_GUID mFileExplorerGuid;\r
 extern CHAR16   mFileExplorerStorageName[];\r
+extern CHAR16   mBootMaintStorageName[];\r
 //\r
 // These are the VFR compiler generated data representing our VFR data.\r
 //\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 9443a65bcdfe9404bcebde3eb42b432e26e9c949..5a3443bbe3b49d3bff72de6c46fec4981affd020 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -94,6 +94,9 @@ FakeExtractConfig (
   OUT EFI_STRING                             *Results\r
   )\r
 {\r
+  if (Request == NULL || Progress == NULL || Results == NULL) {\r
+    return EFI_INVALID_PARAMETER;\r
+  }\r
   *Progress = Request;\r
   return EFI_NOT_FOUND;\r
 }\r
@@ -122,15 +125,18 @@ FakeRouteConfig (
   OUT EFI_STRING                             *Progress\r
   )\r
 {\r
-  if (Configuration == NULL) {\r
+  if (Configuration == NULL || Progress == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  if (Progress == NULL) {\r
-    return EFI_INVALID_PARAMETER;\r
+  *Progress = Configuration;\r
+  if (!HiiIsConfigHdrMatch (Configuration, &mBootMaintGuid, mBootMaintStorageName)\r
+      && !HiiIsConfigHdrMatch (Configuration, &mFileExplorerGuid, mFileExplorerStorageName)) {\r
+    return EFI_NOT_FOUND;\r
   }\r
 \r
-  return EFI_NOT_FOUND;\r
+  *Progress = Configuration + StrLen (Configuration);\r
+  return EFI_SUCCESS;\r
 }\r
 \r
 /**\r