Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

A necessary hack for PE relocation within physical address space (in FreeLdr).

Browse source 
Using it removes code duplication from FreeLdr / winldr.

To get rid of this hack, either freeldr should be fully switched to virtual paged mode (which is not good) or code must be duplicated inside freeldr.

svn path=/trunk/; revision=25070
This commit is contained in:
Aleksey Bragin 2006-12-05 18:28:08 +00:00
parent 4ecce0d21b
commit 35d9339017
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/lib/rtl/image.c
View file

@ -226,6 +226,10 @@ LdrProcessRelocationBlockLongLong(
return (PIMAGE_BASE_RELOCATION)TypeOffset; return (PIMAGE_BASE_RELOCATION)TypeOffset;
} }
/* NOTE: When this function is called with LoaderName == "FLx86"
it's going to behave differently: it will perform all
relocations as needed, but will access only valid physical
addresses (not virtual addresses) */
ULONG ULONG
NTAPI NTAPI
LdrRelocateImageWithBias( LdrRelocateImageWithBias(
@ -250,10 +254,10 @@ LdrRelocateImageWithBias(
if (NtHeaders == NULL) if (NtHeaders == NULL)
return Invalid; return Invalid;
if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED) /*if (NtHeaders->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
{ {
return Conflict; return Conflict;
} }*/
RelocationDDir = &NtHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; RelocationDDir = &NtHeaders->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC];
@ -262,7 +266,19 @@ LdrRelocateImageWithBias(
return Success; return Success;
} }
/* ROS/FreeLoader/arch-specific stuff, for relocating while being in PA mode */
if ((LoaderName != NULL) && (!strncmp(LoaderName, "FLx86", 5)))
{
/* Calculate it, converting BaseAddress to a virtual address */
Delta = ((ULONG_PTR)BaseAddress | 0x80000000) -
NtHeaders->OptionalHeader.ImageBase + AdditionalBias;
}
else
{
/* Calculate it as usual */
Delta = (ULONG_PTR)BaseAddress - NtHeaders->OptionalHeader.ImageBase + AdditionalBias; Delta = (ULONG_PTR)BaseAddress - NtHeaders->OptionalHeader.ImageBase + AdditionalBias;
}
RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)BaseAddress + RelocationDDir->VirtualAddress); RelocationDir = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)BaseAddress + RelocationDDir->VirtualAddress);
RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size); RelocationEnd = (PIMAGE_BASE_RELOCATION)((ULONG_PTR)RelocationDir + RelocationDDir->Size);