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

2 files changed, 4 insertions, 37 deletions

diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc
index ddd29b43cb..52b9b4e63b 100644
--- a/Nt32Pkg/Nt32Pkg.dsc
+++ b/Nt32Pkg/Nt32Pkg.dsc
@@ -243,7 +243,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE

   gEfiMdePkgTokenSpaceGuid.PcdUefiVariableDefaultLangDeprecate|FALSE

-  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVariableCollectStatistics|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollationSupport|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdUnicodeCollation2Support|TRUE

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE

@@ -491,6 +491,7 @@
     <LibraryClasses>

       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf

   }

+  MdeModulePkg\Universal\Variable\Application\VariableInfo.inf

   

 [BuildOptions]

   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/GraphicsLite/Graphics.inf

 

-

diff --git a/Nt32Pkg/Sec/SecMain.c b/Nt32Pkg/Sec/SecMain.c
index 56753fd421..e503ecf2c3 100644
--- a/Nt32Pkg/Sec/SecMain.c
+++ b/Nt32Pkg/Sec/SecMain.c
@@ -1058,37 +1058,7 @@ SecNt32PeCoffGetImageInfo (
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT         *ImageContext

   )

 {

-  EFI_STATUS  Status;

-

-  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;

+  return PeCoffLoaderGetImageInfo (ImageContext);

 }

 

 EFI_STATUS

@@ -1098,10 +1068,7 @@ SecNt32PeCoffLoadImage (
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT         *ImageContext

   )

 {

-  EFI_STATUS  Status;

-

-  Status = PeCoffLoaderLoadImage (ImageContext);

-  return Status;

+  return PeCoffLoaderLoadImage (ImageContext);

 }

 

 EFI_STATUS