Commit 658e35be authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

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

have relocation records.
parent 298ea099
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment