Update SecMain code to remove unused logic.

Add VariableInfo application into Nt32Pkg.dsc

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7604 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4 2009-02-23 14:36:37 +00:00
parent 15cd6a822c
commit 842b46a4b6
2 changed files with 4 additions and 37 deletions

View File

@ -243,7 +243,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE
gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate|FALSE gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate|FALSE
gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
@ -491,6 +491,7 @@
<LibraryClasses> <LibraryClasses>
PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
} }
MdeModulePkg\Universal\Variable\Application\VariableInfo.inf
[BuildOptions] [BuildOptions]
DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /ALIGN:4096 /SUBSYSTEM:CONSOLE DEBUG_*_IA32_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /ALIGN:4096 /SUBSYSTEM:CONSOLE
@ -551,4 +552,3 @@
# EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf # EdkCompatibilityPkg/Foundation/Library/Dxe/PrintLite/PrintLib.inf
# EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf # EdkCompatibilityPkg/Foundation/Library/Dxe/GraphicsLite/Graphics.inf

View File

@ -1058,37 +1058,7 @@ SecNt32PeCoffGetImageInfo (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
) )
{ {
EFI_STATUS Status; return PeCoffLoaderGetImageInfo (ImageContext);
Status = PeCoffLoaderGetImageInfo (ImageContext);
if (EFI_ERROR (Status)) {
return Status;
}
switch (ImageContext->ImageType) {
case EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION:
ImageContext->ImageCodeMemoryType = EfiLoaderCode;
ImageContext->ImageDataMemoryType = EfiLoaderData;
break;
case EFI_IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER:
ImageContext->ImageCodeMemoryType = EfiBootServicesCode;
ImageContext->ImageDataMemoryType = EfiBootServicesData;
break;
case EFI_IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER:
case EFI_IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER:
ImageContext->ImageCodeMemoryType = EfiRuntimeServicesCode;
ImageContext->ImageDataMemoryType = EfiRuntimeServicesData;
break;
default:
ImageContext->ImageError = IMAGE_ERROR_INVALID_SUBSYSTEM;
return RETURN_UNSUPPORTED;
}
return Status;
} }
EFI_STATUS EFI_STATUS
@ -1098,10 +1068,7 @@ SecNt32PeCoffLoadImage (
IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext IN OUT PE_COFF_LOADER_IMAGE_CONTEXT *ImageContext
) )
{ {
EFI_STATUS Status; return PeCoffLoaderLoadImage (ImageContext);
Status = PeCoffLoaderLoadImage (ImageContext);
return Status;
} }
EFI_STATUS EFI_STATUS