Skip to content

W
wine-cw
Commit 93a5dce0 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

server: Remove some leftover code from a failed rebase.

parent 41ab207c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
server/mapping.c
View file @ 93a5dce0
......@@ -833,11 +833,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s
!(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED));
if (nt.opt.hdr64.SectionAlignment & page_mask)
mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat;
else if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_BASERELOC &&
nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].VirtualAddress &&
nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC].Size &&
!(nt.FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED))
mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated;
else if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) &&
(has_relocs || mapping->image.contains_code) && !(clr_va && clr_size))
mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated;
......
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