MdeModulePkg: Fix use-after-free error in InstallConfigurationTable()

[mirror_edk2.git] / MdeModulePkg / Core / Pei / PeiMain.inf

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index 2cf9df7ce10ef4c47cc1d665e2c379e89854d2dd..39a464f32633a35343fed10c533f80c022d9c903 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -1,10 +1,12 @@
 ## @file\r
-# PeiMain module is core module in PEI phase. It takes responsibilities of:\r
+# PeiMain module is core module in PEI phase.\r
+#\r
+# It takes responsibilities of:\r
 # 1) Initialize memory, PPI, image services etc, to establish PEIM runtime environment.\r
 # 2) Dispatch PEIM from discovered FV.\r
 # 3) Handoff control to DxeIpl to load DXE core and enter DXE phase.\r
 #\r
-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -19,6 +21,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = PeiCore\r
+  MODULE_UNI_FILE                = PeiCore.uni\r
   FILE_GUID                      = 52C05B14-0B98-496c-BC3B-04B50211D680\r
   MODULE_TYPE                    = PEI_CORE\r
   VERSION_STRING                 = 1.0\r
@@ -70,32 +73,62 @@
   PcdLib\r
 \r
 [Guids]\r
-  gPeiAprioriFileNameGuid       ## CONSUMES ## GUID\r
-  gEfiFirmwareFileSystem2Guid   ## CONSUMES ## FV\r
-  gEfiFirmwareFileSystem3Guid   ## CONSUMES ## FV\r
+  gPeiAprioriFileNameGuid       ## SOMETIMES_CONSUMES   ## File\r
+  ## PRODUCES   ## UNDEFINED # Install ppi\r
+  ## CONSUMES   ## UNDEFINED # Locate ppi\r
+  gEfiFirmwareFileSystem2Guid\r
+  ## PRODUCES   ## UNDEFINED # Install ppi\r
+  ## CONSUMES   ## UNDEFINED # Locate ppi\r
+  ## CONSUMES   ## GUID      # Used to compare with FV's file system guid and get the FV's file system format\r
+  gEfiFirmwareFileSystem3Guid\r
   \r
 [Ppis]\r
-  gEfiPeiStatusCodePpiGuid                      ## SOMETIMES_CONSUMES (PeiReportStatusService is not ready if this PPI doesn't exist)\r
-  gEfiPeiResetPpiGuid                           ## SOMETIMES_CONSUMES (PeiResetService is not ready if this PPI doesn't exist) \r
+  gEfiPeiStatusCodePpiGuid                      ## SOMETIMES_CONSUMES # PeiReportStatusService is not ready if this PPI doesn't exist\r
+  gEfiPeiResetPpiGuid                           ## SOMETIMES_CONSUMES # PeiResetService is not ready if this PPI doesn't exist \r
   gEfiDxeIplPpiGuid                             ## CONSUMES\r
   gEfiPeiMemoryDiscoveredPpiGuid                ## PRODUCES\r
-  gEfiPeiDecompressPpiGuid                      ## CONSUMES\r
-  gEfiPeiFirmwareVolumeInfoPpiGuid              ## NOTIFY   ## SOMETIMES_PRODUCES (Produce FvInfoPpi if the encapsulated FvImage is found) \r
-  gEfiPeiLoadFilePpiGuid                        ## PRODUCES ## SOMETIMES_CONSUMES (The default load PeImage logic will be used when this PPI doesn't exist)\r
+  gEfiPeiDecompressPpiGuid                      ## SOMETIMES_CONSUMES\r
+  ## NOTIFY\r
+  ## SOMETIMES_PRODUCES # Produce FvInfoPpi if the encapsulated FvImage is found\r
+  gEfiPeiFirmwareVolumeInfoPpiGuid\r
+  ## NOTIFY\r
+  ## SOMETIMES_PRODUCES # Produce FvInfoPpi2 if the encapsulated FvImage is found\r
+  gEfiPeiFirmwareVolumeInfo2PpiGuid\r
+  ## PRODUCES\r
+  ## CONSUMES\r
+  gEfiPeiLoadFilePpiGuid\r
   gEfiPeiSecurity2PpiGuid                       ## NOTIFY\r
-  gEfiTemporaryRamSupportPpiGuid                ## CONSUMES\r
+  gEfiTemporaryRamSupportPpiGuid                ## SOMETIMES_CONSUMES\r
+  gEfiTemporaryRamDonePpiGuid                   ## SOMETIMES_CONSUMES\r
+  gEfiPeiReset2PpiGuid                          ## SOMETIMES_CONSUMES\r
 \r
-[FixedPcd]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported             ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv               ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported            ## CONSUMES\r
- \r
 [Pcd]  \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize                   ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst   ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport            ## CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressPeiCodePageNumber          ## SOMETIMES_CONSUMES\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber     ## SOMETIMES_CONSUMES \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber      ## SOMETIMES_CONSUMES \r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable             ## CONSUMES  \r
-  \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxFvSupported                   ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeimPerFv                     ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported                  ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize                  ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst  ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport           ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressPeiCodePageNumber         ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressBootTimeCodePageNumber    ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadFixAddressRuntimeCodePageNumber     ## SOMETIMES_CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdLoadModuleAtFixAddressEnable            ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnS3Boot                      ## CONSUMES \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdShadowPeimOnBoot                        ## CONSUMES \r
+\r
+# [BootMode]\r
+# S3_RESUME             ## SOMETIMES_CONSUMES\r
+\r
+# [Hob]\r
+# PHIT                  ## PRODUCES\r
+# RESOURCE_DESCRIPTOR   ## SOMETIMES_PRODUCES\r
+# RESOURCE_DESCRIPTOR   ## SOMETIMES_CONSUMES\r
+# MEMORY_ALLOCATION     ## SOMETIMES_CONSUMES\r
+# FIRMWARE_VOLUME       ## SOMETIMES_PRODUCES\r
+# FIRMWARE_VOLUME       ## SOMETIMES_CONSUMES\r
+# MEMORY_ALLOCATION     ## SOMETIMES_PRODUCES\r
+# MEMORY_ALLOCATION     ## PRODUCES # MEMORY_ALLOCATION_STACK\r
+# UNDEFINED             ## PRODUCES # MEMORY_POOL\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  PeiCoreExtra.uni\r