From 5055709a2cf1863f32b806c249f16f9435246b21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marvin=20Ha=CC=88user?=
 <8659494+mhaeuser@users.noreply.github.com>
Date: Thu, 15 Jun 2023 10:48:01 +0200
Subject: [PATCH] MdePkg/UefiImageLib: Deprecate GetImageSizeInplace()

---
 MdePkg/Include/Library/PeCoffLib2.h             | 13 -------------
 MdePkg/Include/Library/UefiImageLib.h           |  6 ------
 MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c      | 10 ----------
 .../Library/BaseUefiImageLib/ExecutionSupport.c |  2 +-
 MdePkg/Library/BaseUefiImageLib/PeSupport.c     |  9 ---------
 .../Library/BaseUefiImageLib/UefiImageFormat.h  |  1 -
 MdePkg/Library/BaseUefiImageLib/UefiImageLib.c  | 17 -----------------
 7 files changed, 1 insertion(+), 57 deletions(-)

diff --git a/MdePkg/Include/Library/PeCoffLib2.h b/MdePkg/Include/Library/PeCoffLib2.h
index 95222dfdef..d1438b8a6a 100644
--- a/MdePkg/Include/Library/PeCoffLib2.h
+++ b/MdePkg/Include/Library/PeCoffLib2.h
@@ -497,19 +497,6 @@ PeCoffGetSizeOfImage (
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *Context
   );
 
-/**
-  Retrieves the size, in Bytes, of the Image memory space for in-place loading.
-
-  @param[in,out] Context  The context describing the Image. Must have been
-                          initialised by PeCoffInitializeContext().
-
-  @returns  The size of the Image memory space for in-place loading.
-**/
-UINT32
-PeCoffGetSizeOfImageInplace (
-  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *Context
-  );
-
 /**
   Retrieves the Image preferred load address.
 
diff --git a/MdePkg/Include/Library/UefiImageLib.h b/MdePkg/Include/Library/UefiImageLib.h
index b86f6927a7..d61e3f837d 100644
--- a/MdePkg/Include/Library/UefiImageLib.h
+++ b/MdePkg/Include/Library/UefiImageLib.h
@@ -533,12 +533,6 @@ UefiImageGetImageSize (
   IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *Context
   );
 
-// FIXME: Docs
-UINT32
-UefiImageGetImageSizeInplace (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *Context
-  );
-
 /**
   Retrieves the Image preferred load address.
 
diff --git a/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c b/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
index 5b36cf2794..b6e76b923b 100644
--- a/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
+++ b/MdePkg/Library/BasePeCoffLib2/PeCoffInfo.c
@@ -70,16 +70,6 @@ PeCoffGetSizeOfImage (
   return Context->SizeOfImage;
 }
 
-UINT32
-PeCoffGetSizeOfImageInplace (
-  IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *Context
-  )
-{
-  ASSERT (Context != NULL);
-
-  return Context->SizeOfImage;
-}
-
 UINT64
 PeCoffGetImageBase (
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *Context
diff --git a/MdePkg/Library/BaseUefiImageLib/ExecutionSupport.c b/MdePkg/Library/BaseUefiImageLib/ExecutionSupport.c
index 63f5b00466..a4a576d3fd 100644
--- a/MdePkg/Library/BaseUefiImageLib/ExecutionSupport.c
+++ b/MdePkg/Library/BaseUefiImageLib/ExecutionSupport.c
@@ -30,7 +30,7 @@ UefiImageRelocateImageInplaceForExecution (
   }
 
   ImageAddress = UefiImageLoaderGetImageAddress (Context);
-  ImageSize    = UefiImageGetImageSizeInplace (Context);
+  ImageSize    = UefiImageGetImageSize (Context);
   //
   // Flush the instruction cache so the image data is written before
   // execution.
diff --git a/MdePkg/Library/BaseUefiImageLib/PeSupport.c b/MdePkg/Library/BaseUefiImageLib/PeSupport.c
index 5a18b0dc18..180297784f 100644
--- a/MdePkg/Library/BaseUefiImageLib/PeSupport.c
+++ b/MdePkg/Library/BaseUefiImageLib/PeSupport.c
@@ -212,14 +212,6 @@ UefiImageGetImageSizePe (
   return PeCoffGetSizeOfImage (&Context->Ctx.Pe);
 }
 
-UINT32
-UefiImageGetImageSizeInplacePe (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *Context
-  )
-{
-  return PeCoffGetSizeOfImageInplace (&Context->Ctx.Pe);
-}
-
 UINT64
 UefiImageGetPreferredAddressPe (
   IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *Context
@@ -763,7 +755,6 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST UEFI_IMAGE_FORMAT_SUPPORT mPeSupport = {
   UefiImageGetSubsystemPe,
   UefiImageGetSegmentAlignmentPe,
   UefiImageGetImageSizePe,
-  UefiImageGetImageSizeInplacePe,
   UefiImageGetPreferredAddressPe,
   UefiImageGetRelocsStrippedPe,
   UefiImageLoaderGetImageAddressPe,
diff --git a/MdePkg/Library/BaseUefiImageLib/UefiImageFormat.h b/MdePkg/Library/BaseUefiImageLib/UefiImageFormat.h
index 3ade95a9ea..0d5c603b33 100644
--- a/MdePkg/Library/BaseUefiImageLib/UefiImageFormat.h
+++ b/MdePkg/Library/BaseUefiImageLib/UefiImageFormat.h
@@ -229,7 +229,6 @@ typedef struct {
   UEFI_IMAGE_GET_SUBSYSTEM                    GetSubsystem;
   UEFI_IMAGE_GET_SEGMENT_ALIGNMENT            GetSegmentAlignment;
   UEFI_IMAGE_GET_IMAGE_SIZE                   GetImageSize;
-  UEFI_IMAGE_GET_IMAGE_SIZE_INPLACE           GetImageSizeInplace;
   UEFI_IMAGE_GET_PREFERRED_ADDRESS            GetPreferredAddress;
   UEFI_IMAGE_GET_RELOCS_STRIPPED              GetRelocsStripped;
   UEFI_IMAGE_LOADER_GET_IMAGE_ADDRESS         LoaderGetImageAddress;
diff --git a/MdePkg/Library/BaseUefiImageLib/UefiImageLib.c b/MdePkg/Library/BaseUefiImageLib/UefiImageLib.c
index c2eb99f3f0..a313ef8510 100644
--- a/MdePkg/Library/BaseUefiImageLib/UefiImageLib.c
+++ b/MdePkg/Library/BaseUefiImageLib/UefiImageLib.c
@@ -514,23 +514,6 @@ UefiImageGetImageSize (
   return Result;
 }
 
-UINT32
-UefiImageGetImageSizeInplace (
-  IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *Context
-  )
-{
-  UINT32  Result;
-
-  UEFI_IMAGE_EXEC (
-    Result,
-    Context->FormatIndex,
-    GetImageSizeInplace,
-    Context
-    );
-
-  return Result;
-}
-
 UINT64
 UefiImageGetPreferredAddress (
   IN OUT UEFI_IMAGE_LOADER_IMAGE_CONTEXT  *Context