Module: wine Branch: master Commit: 93a5dce013a0b992e18ff6b923dcbb6535577ab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/93a5dce013a0b992e18ff6b923dcbb6...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Oct 6 11:23:46 2023 +0200
server: Remove some leftover code from a failed rebase.
---
server/mapping.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/server/mapping.c b/server/mapping.c index c570bcf8f94..a795dc4b38b 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -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;