Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / Pei / PeiLib / PeCoffLoader.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeCoffLoader.c b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeCoffLoader.c
index bc4ca8ee6689c6a119b3c8bf8b277fc8e3a9095d..1904902c7878c8868fbd8cbb34a5a306a806b2bb 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeCoffLoader.c
+++ b/EdkCompatibilityPkg/Foundation/Library/Pei/PeiLib/PeCoffLoader.c
@@ -70,7 +70,7 @@ PeCoffLoaderLoadImage (
 EFI_STATUS\r
 EFIAPI\r
 PeCoffLoaderUnloadImage (\r
-  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT   *ImageContext\r
+  IN EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT   *ImageContext\r
   );\r
 \r
 #if defined (EFI_DEBUG_ITP_BREAK) && !defined (_CONSOLE)\r
@@ -565,7 +565,10 @@ Returns:
     // Pe image and in Te image header there is not a field to describe the imagesize,\r
     // we use the largest VirtualAddress plus Size in each directory entry to describe the imagesize\r
     //\r
-    ImageContext->ImageSize         = (UINT64) (Hdr.Te->DataDirectory[0].VirtualAddress + Hdr.Te->DataDirectory[0].Size);\r
+    ImageContext->ImageSize = (UINT64) (Hdr.Te->DataDirectory[0].VirtualAddress + Hdr.Te->DataDirectory[0].Size);\r
+    if(Hdr.Te->DataDirectory[1].VirtualAddress > Hdr.Te->DataDirectory[0].VirtualAddress) {\r
+      ImageContext->ImageSize = (UINT64) (Hdr.Te->DataDirectory[1].VirtualAddress + Hdr.Te->DataDirectory[1].Size);\r
+    }\r
     ImageContext->SectionAlignment  = 4096;\r
     ImageContext->SizeOfHeaders     = sizeof (EFI_TE_IMAGE_HEADER) + (UINTN) Hdr.Te->BaseOfCode - (UINTN) Hdr.Te->StrippedSize;\r
 \r
@@ -1013,6 +1016,12 @@ Returns:
   UINT32                                TempDebugEntryRva;\r
   UINT32                                NumberOfRvaAndSizes;\r
   UINT16                                Magic;\r
+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
+  EFI_IMAGE_RESOURCE_DIRECTORY          *ResourceDirectory;\r
+  EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY    *ResourceDirectoryEntry;\r
+  EFI_IMAGE_RESOURCE_DIRECTORY_STRING   *ResourceDirectoryString;\r
+  EFI_IMAGE_RESOURCE_DATA_ENTRY         *ResourceDataEntry;\r
+#endif\r
 \r
   if (NULL == ImageContext) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1368,6 +1377,73 @@ Returns:
     }\r
   }\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x0002000A)\r
+  //\r
+  // Get Image's HII resource section\r
+  //\r
+  if (!(ImageContext->IsTeImage)) {\r
+    if (Magic == EFI_IMAGE_NT_OPTIONAL_HDR32_MAGIC) {\r
+      //\r
+      // Use PE32 offset\r
+      //\r
+      DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&Hdr.Pe32->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE];\r
+    } else {\r
+      //\r
+      // Use PE32+ offset\r
+      //\r
+      DirectoryEntry = (EFI_IMAGE_DATA_DIRECTORY *)&Hdr.Pe32Plus->OptionalHeader.DataDirectory[EFI_IMAGE_DIRECTORY_ENTRY_RESOURCE];\r
+    }\r
+\r
+    if (DirectoryEntry->Size != 0) {\r
+      Base = PeCoffLoaderImageAddress (ImageContext, DirectoryEntry->VirtualAddress);\r
+\r
+      ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) Base;\r
+      ResourceDirectoryEntry = (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY *) (ResourceDirectory + 1);\r
+\r
+      for (Index = 0; Index < ResourceDirectory->NumberOfNamedEntries; Index++) {\r
+        if (ResourceDirectoryEntry->u1.s.NameIsString) {\r
+          ResourceDirectoryString = (EFI_IMAGE_RESOURCE_DIRECTORY_STRING *) (Base + ResourceDirectoryEntry->u1.s.NameOffset);\r
+\r
+          if (ResourceDirectoryString->Length == 3 &&\r
+              ResourceDirectoryString->String[0] == L'H' &&\r
+              ResourceDirectoryString->String[1] == L'I' &&\r
+              ResourceDirectoryString->String[2] == L'I') {\r
+            //\r
+            // Resource Type "HII" found\r
+            //\r
+            if (ResourceDirectoryEntry->u2.s.DataIsDirectory) {\r
+              //\r
+              // Move to next level - resource Name\r
+              //\r
+              ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) (Base + ResourceDirectoryEntry->u2.s.OffsetToDirectory);\r
+              ResourceDirectoryEntry = (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY *) (ResourceDirectory + 1);\r
+\r
+              if (ResourceDirectoryEntry->u2.s.DataIsDirectory) {\r
+                //\r
+                // Move to next level - resource Language\r
+                //\r
+                ResourceDirectory = (EFI_IMAGE_RESOURCE_DIRECTORY *) (Base + ResourceDirectoryEntry->u2.s.OffsetToDirectory);\r
+                ResourceDirectoryEntry = (EFI_IMAGE_RESOURCE_DIRECTORY_ENTRY *) (ResourceDirectory + 1);\r
+              }\r
+            }\r
+\r
+            //\r
+            // Now it ought to be resource Data\r
+            //\r
+            if (!ResourceDirectoryEntry->u2.s.DataIsDirectory) {\r
+              ResourceDataEntry = (EFI_IMAGE_RESOURCE_DATA_ENTRY *) (Base + ResourceDirectoryEntry->u2.OffsetToData);\r
+              ImageContext->HiiResourceData = (EFI_PHYSICAL_ADDRESS) (UINTN) PeCoffLoaderImageAddress (ImageContext, ResourceDataEntry->OffsetToData);\r
+              break;\r
+            }\r
+          }\r
+        }\r
+\r
+        ResourceDirectoryEntry++;\r
+      }\r
+    }\r
+  }\r
+#endif\r
+\r
 #if defined (EFI_DEBUG_ITP_BREAK) && !defined (_CONSOLE)\r
   AsmEfiSetBreakSupport ((UINTN)(ImageContext->ImageAddress));\r
 #endif\r
@@ -1378,7 +1454,7 @@ Returns:
 EFI_STATUS\r
 EFIAPI\r
 PeCoffLoaderUnloadImage (\r
-  IN OUT EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT   *ImageContext\r
+  IN EFI_PEI_PE_COFF_LOADER_IMAGE_CONTEXT   *ImageContext\r
   )\r
 /*++\r
 \r