Print real entry point for IPF image.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / Image / ImageFile.c

diff --git a/MdeModulePkg/Core/Dxe/Image/ImageFile.c b/MdeModulePkg/Core/Dxe/Image/ImageFile.c
index 408688c69fd93025c000975ad040bd7dc556e158..31b1443697f1caba8b1ca466633a1647abba8063 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Image/ImageFile.c
+++ b/MdeModulePkg/Core/Dxe/Image/ImageFile.c
@@ -30,7 +30,7 @@ CoreOpenImageFile (
   IN BOOLEAN                        BootPolicy,\r
   IN VOID                           *SourceBuffer   OPTIONAL,\r
   IN UINTN                          SourceSize,\r
-  IN OUT EFI_DEVICE_PATH_PROTOCOL   *FilePath,\r
+  IN EFI_DEVICE_PATH_PROTOCOL       *FilePath,\r
   OUT EFI_HANDLE                    *DeviceHandle,\r
   IN IMAGE_FILE_HANDLE              *ImageFileHandle,\r
   OUT UINT32                        *AuthenticationStatus\r
@@ -74,7 +74,7 @@ Returns:
   EFI_FILE_HANDLE                   FileHandle;\r
   EFI_FILE_HANDLE                   LastHandle;\r
   EFI_LOAD_FILE_PROTOCOL            *LoadFile;\r
-  EFI_FIRMWARE_VOLUME_PROTOCOL      *FwVol;\r
+  EFI_FIRMWARE_VOLUME2_PROTOCOL     *FwVol;\r
   EFI_SECTION_TYPE                  SectionType;\r
   UINT8                             *Pe32Buffer;\r
   UINTN                             Pe32BufferSize;\r
@@ -95,6 +95,7 @@ Returns:
     ImageFileHandle->Source     = SourceBuffer;\r
     ImageFileHandle->SourceSize = SourceSize;\r
     *DeviceHandle     = NULL;\r
+    CoreLocateDevicePath (&gEfiDevicePathProtocolGuid, &FilePath, DeviceHandle);\r
     if (SourceSize > 0) {\r
       Status = EFI_SUCCESS;\r
     } else {\r
@@ -115,7 +116,7 @@ Returns:
   //\r
   FwVolFilePathNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)FilePath;\r
   Status = CoreDevicePathToInterface (\r
-            &gEfiFirmwareVolumeProtocolGuid, \r
+            &gEfiFirmwareVolume2ProtocolGuid, \r
             (EFI_DEVICE_PATH_PROTOCOL **)&FwVolFilePathNode, \r
             (VOID*)&FwVol, \r
             DeviceHandle\r