reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-26 05:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Warn if two .exes conflict with each other and the second does not

Browse Source 
have relocation records.
This commit is contained in:
Marcus Meissner 1998-12-10 09:53:41 +00:00 committed by Alexandre Julliard
parent 298ea099cd
commit 658e35be81
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
loader/pe_image.c
View File

@ -724,7 +724,18 @@ static BOOL32 PE_MapImage( PDB32 *process,WINE_MODREF *wm, OFSTRUCT *ofs, DWORD
if(nt_header->OptionalHeader.DataDirectory[15].Size)
FIXME(win32,"Unknown directory 15 ignored\n");
if(pem->pe_reloc) do_relocations(wm);
if(wm->module!=nt_header->OptionalHeader.ImageBase) {
if (pem->pe_reloc)
do_relocations(wm);
else {
/* FIXME: we could return before the second VirtualAlloc ... */
FIXME(win32,
"Had to relocate %s, but without relocation records (%s), continuing. (But expect crash now).\n",
ofs->szPathName,
(nt_header->FileHeader.Characteristics&IMAGE_FILE_RELOCS_STRIPPED)?"stripped during link":"unknown reason"
);
}
}
if(pem->pe_export) {
dump_exports(wm->module);