From ba39e316c957ed69301693606e17e6891985607a Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 26 Feb 2008 08:38:29 +0000
Subject: 1. Add EFI LOADED IMAGE DEVICE PATH Protocol in LoadImage() service,
 per UEFI 2.1b. 2. Update comments for DHCP.transmitreceive(). 2. Update
 UefiPxeBcDxe.inf and PxeBcDxe.inf to assign correct protocol usages.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4758 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Core/Dxe/Image/Image.c | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

(limited to 'MdeModulePkg/Core/Dxe/Image')

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 56c5fe5ea2..125134dea7 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -74,7 +74,7 @@ LOADED_IMAGE_PRIVATE_DATA mCorePrivateImage  = {
   0,                          // Machine
   NULL,                       // Ebc
   NULL,                       // RuntimeData
-  NULL,                       // DeviceHandleDevicePath
+  NULL                        // LoadedImageDevicePath
 };
 
 
@@ -714,7 +714,6 @@ Returns:
   if (!EFI_ERROR (Status)) {
     FilePathSize = CoreDevicePathSize (HandleFilePath) - sizeof(EFI_DEVICE_PATH_PROTOCOL);
     FilePath = (EFI_DEVICE_PATH_PROTOCOL *) ( ((UINT8 *)FilePath) + FilePathSize );
-    Image->DeviceHandleDevicePath = CoreDuplicateDevicePath (HandleFilePath);
   }
 
   //
@@ -782,6 +781,26 @@ Returns:
     goto Done;
   }
 
+  //
+  // If DevicePath parameter to the LoadImage() is not NULL, then make a copy of DevicePath,
+  // otherwise Loaded Image Device Path Protocol is installed with a NULL interface pointer.
+  //
+  if (OriginalFilePath != NULL) {
+    Image->LoadedImageDevicePath = CoreDuplicateDevicePath (OriginalFilePath);
+  }
+
+  //
+  // Install Loaded Image Device Path Protocol onto the image handle of a PE/COFE image
+  //
+  Status = CoreInstallProtocolInterface (
+            &Image->Handle,
+            &gEfiLoadedImageDevicePathProtocolGuid,
+            EFI_NATIVE_INTERFACE,
+            Image->LoadedImageDevicePath
+            );
+  if (EFI_ERROR (Status)) {
+    goto Done;
+  }
 
   //
   // Success.  Return the image handle
@@ -1208,11 +1227,18 @@ Returns:
 
     CoreRemoveDebugImageInfoEntry (Image->Handle);
 
+    Status = CoreUninstallProtocolInterface (
+               Image->Handle,
+               &gEfiLoadedImageDevicePathProtocolGuid,
+               Image->LoadedImageDevicePath
+               );
+
     Status = CoreUninstallProtocolInterface (
                Image->Handle,
                &gEfiLoadedImageProtocolGuid,
                &Image->Info
                );
+
   }
 
   if (Image->RuntimeData != NULL) {
@@ -1239,8 +1265,8 @@ Returns:
     CoreFreePool (Image->Info.FilePath);
   }
 
-  if (Image->DeviceHandleDevicePath != NULL) {
-    CoreFreePool (Image->DeviceHandleDevicePath);
+  if (Image->LoadedImageDevicePath != NULL) {
+    CoreFreePool (Image->LoadedImageDevicePath);
   }
 
   if (Image->FixupData != NULL) {
-- 
cgit v1.2.3