- Wine-Commits - list.winehq.org

Alexandre Julliard : krnl386: Use the IMAGE_FIRST_SECTION helper macro.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 176a6ca279f0c257655526a9b9ab76ab05652094 URL: https://gitlab.winehq.org/wine/wine/-/commit/176a6ca279f0c257655526a9b9ab76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 13:01:45 2023 +0200 krnl386: Use the IMAGE_FIRST_SECTION helper macro. --- dlls/krnl386.exe16/vxd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/vxd.c b/dlls/krnl386.exe16/vxd.c index 599ebb32edb..966ac272303 100644 --- a/dlls/krnl386.exe16/vxd.c +++ b/dlls/krnl386.exe16/vxd.c @@ -983,10 +983,7 @@ void WINAPI __wine_vxd_win32s( CONTEXT *context ) struct Win32sModule *module = moduleTable + context->Ecx; IMAGE_NT_HEADERS *nt_header = RtlImageNtHeader( (HMODULE)module->baseAddr ); - IMAGE_SECTION_HEADER *pe_seg = (IMAGE_SECTION_HEADER*)((char *)&nt_header->OptionalHeader + - nt_header->FileHeader.SizeOfOptionalHeader); - - + IMAGE_SECTION_HEADER *pe_seg = IMAGE_FIRST_SECTION( nt_header ); HFILE image = _lopen(module->pathName, OF_READ); BOOL error = (image == HFILE_ERROR); UINT i;

1 0

Alexandre Julliard : dbghelp: Consistently use the IMAGE_FIRST_SECTION helper macro.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 0ee4bec912bd18719b750ba52264f8821bd12173 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ee4bec912bd18719b750ba52264f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 13:01:13 2023 +0200 dbghelp: Consistently use the IMAGE_FIRST_SECTION helper macro. --- dlls/dbghelp/pe_module.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index 6c07bf5826a..fc3542b4db5 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -282,8 +282,7 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) } fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature)); - section = (IMAGE_SECTION_HEADER*) - ((char*)&nthdr->OptionalHeader + nthdr->FileHeader.SizeOfOptionalHeader); + section = IMAGE_FIRST_SECTION( nthdr ); fmap->u.pe.sect = HeapAlloc(GetProcessHeap(), 0, nthdr->FileHeader.NumberOfSections * sizeof(fmap->u.pe.sect[0])); if (!fmap->u.pe.sect) goto error; @@ -630,9 +629,8 @@ static BOOL pe_load_msc_debug_info(const struct process* pcs, struct module* mod } else { - const IMAGE_SECTION_HEADER *sectp = (const IMAGE_SECTION_HEADER*)((const char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); /* Debug info is embedded into PE module */ - ret = pe_load_debug_directory(pcs, module, mapping, sectp, + ret = pe_load_debug_directory(pcs, module, mapping, IMAGE_FIRST_SECTION( nth ), nth->FileHeader.NumberOfSections, dbg, nDbg); } done: @@ -668,10 +666,8 @@ static BOOL pe_load_export_debug_info(const struct process* pcs, struct module* #if 0 /* FIXME: we'd better store addresses linked to sections rather than absolute values */ - IMAGE_SECTION_HEADER* section; + IMAGE_SECTION_HEADER *section = IMAGE_FIRST_SECTION( nth ); /* Add start of sections */ - section = (IMAGE_SECTION_HEADER*) - ((char*)&nth->OptionalHeader + nth->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nth->FileHeader.NumberOfSections; i++, section++) { symt_new_public(module, NULL, section->Name, FALSE,

1 0

Alexandre Julliard : ntdll: Consistently use the IMAGE_FIRST_SECTION helper macro.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: db3af1b238c3fe5f1fa7566787eb2afe292e0277 URL: https://gitlab.winehq.org/wine/wine/-/commit/db3af1b238c3fe5f1fa7566787eb2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 13:00:43 2023 +0200 ntdll: Consistently use the IMAGE_FIRST_SECTION helper macro. --- dlls/ntdll/loader.c | 9 +++------ dlls/ntdll/tests/virtual.c | 3 +-- dlls/ntdll/unix/loader.c | 4 ++-- dlls/ntdll/unix/virtual.c | 10 +++++----- include/winnt.h | 3 +-- 5 files changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 67104e63286..5b2f9bdce0d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2059,8 +2059,7 @@ static NTSTATUS perform_relocations( void *module, IMAGE_NT_HEADERS *nt, SIZE_T if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( protect_old )) return STATUS_INVALID_IMAGE_FORMAT; - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { void *addr = get_rva( module, sec[i].VirtualAddress ); @@ -2216,8 +2215,8 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in IMAGE_OPTIONAL_HEADER32 hdr32 = { IMAGE_NT_OPTIONAL_HDR32_MAGIC }; IMAGE_OPTIONAL_HEADER64 hdr64 = { IMAGE_NT_OPTIONAL_HDR64_MAGIC }; IMAGE_NT_HEADERS *nt = RtlImageNtHeader( module ); + IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); SIZE_T hdr_size = min( sizeof(hdr32), nt->FileHeader.SizeOfOptionalHeader ); - IMAGE_SECTION_HEADER *sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + hdr_size); SIZE_T size = min( nt->OptionalHeader.SizeOfHeaders, nt->OptionalHeader.SizeOfImage ); void *addr = module; ULONG i, old_prot; @@ -4361,10 +4360,8 @@ PIMAGE_SECTION_HEADER WINAPI RtlImageRvaToSection( const IMAGE_NT_HEADERS *nt, HMODULE module, DWORD rva ) { int i; - const IMAGE_SECTION_HEADER *sec; + const IMAGE_SECTION_HEADER *sec = IMAGE_FIRST_SECTION( nt ); - sec = (const IMAGE_SECTION_HEADER*)((const char*)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) { if ((sec->VirtualAddress <= rva) && (sec->VirtualAddress + sec->SizeOfRawData > rva)) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 609d702a359..a9dec1b5a8a 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -2053,8 +2053,7 @@ static void perform_relocations( void *module, INT_PTR delta ) nt = RtlImageNtHeader( module ); relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC]; if (!relocs->VirtualAddress || !relocs->Size) return; - sec = (const IMAGE_SECTION_HEADER *)((const char *)&nt->OptionalHeader + - nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { void *addr = (char *)module + sec[i].VirtualAddress; diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 38aaf778ff5..7bf3ca22566 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1125,7 +1125,7 @@ static void relocate_ntdll( void *module ) if (!(rel = get_module_data_dir( module, IMAGE_DIRECTORY_ENTRY_BASERELOC, &size ))) return; - sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { void *addr = get_rva( module, sec[i].VirtualAddress ); @@ -1991,7 +1991,7 @@ static void load_apiset_dll(void) if (!status) { nt = get_rva( ptr, ((IMAGE_DOS_HEADER *)ptr)->e_lfanew ); - sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++, sec++) { diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 078fe1c30a9..94e68edab77 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2608,7 +2608,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena int i; off_t pos; struct stat st; - char *header_end, *header_start; + char *header_end; char *ptr = view->base; SIZE_T header_size, total_size = view->size; @@ -2626,12 +2626,12 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena header_end = ptr + ROUND_SIZE( 0, header_size ); memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) return status; - header_start = (char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader; if (nt->FileHeader.NumberOfSections > ARRAY_SIZE( sections )) return status; - if (header_start + sizeof(*sections) * nt->FileHeader.NumberOfSections > header_end) return status; + sec = IMAGE_FIRST_SECTION( nt ); + if ((char *)(sec + nt->FileHeader.NumberOfSections) > header_end) return status; /* Some applications (e.g. the Steam version of Borderlands) map over the top of the section headers, * copying the headers into local memory is necessary to properly load such applications. */ - memcpy(sections, header_start, sizeof(*sections) * nt->FileHeader.NumberOfSections); + memcpy(sections, sec, sizeof(*sections) * nt->FileHeader.NumberOfSections); sec = sections; imports = nt->OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_IMPORT; @@ -3297,7 +3297,7 @@ NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_nam /* The PE header is always read-only, no write, no execute. */ set_page_vprot( base, page_size, VPROT_COMMITTED | VPROT_READ ); - sec = (IMAGE_SECTION_HEADER *)((char *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader); + sec = IMAGE_FIRST_SECTION( nt ); for (i = 0; i < nt->FileHeader.NumberOfSections; i++) { BYTE flags = VPROT_COMMITTED; diff --git a/include/winnt.h b/include/winnt.h index d4137a64aea..df0c3282f8c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2927,8 +2927,7 @@ typedef struct _IMAGE_SECTION_HEADER { #define IMAGE_SIZEOF_SECTION_HEADER 40 #define IMAGE_FIRST_SECTION(ntheader) \ - ((PIMAGE_SECTION_HEADER)(ULONG_PTR)((const BYTE *)&((const IMAGE_NT_HEADERS *)(ntheader))->OptionalHeader + \ - ((const IMAGE_NT_HEADERS *)(ntheader))->FileHeader.SizeOfOptionalHeader)) + ((PIMAGE_SECTION_HEADER)((ULONG_PTR)&(ntheader)->OptionalHeader + (ntheader)->FileHeader.SizeOfOptionalHeader)) /* These defines are for the Characteristics bitfield. */ /* #define IMAGE_SCN_TYPE_REG 0x00000000 - Reserved */

1 0

Alexandre Julliard : winedump: Don't zero out the PE optional header regardless of specified size.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: af25f29cd2406e524b0c5f4aecddfc095de34d2e URL: https://gitlab.winehq.org/wine/wine/-/commit/af25f29cd2406e524b0c5f4aecddfc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:37:31 2023 +0200 winedump: Don't zero out the PE optional header regardless of specified size. --- tools/winedump/lib.c | 2 +- tools/winedump/pe.c | 17 ++++++++--------- tools/winedump/winedump.h | 2 +- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tools/winedump/lib.c b/tools/winedump/lib.c index e2d25b04d24..0b94adb9b33 100644 --- a/tools/winedump/lib.c +++ b/tools/winedump/lib.c @@ -264,7 +264,7 @@ void lib_dump(void) if (fh->SizeOfOptionalHeader) { const IMAGE_OPTIONAL_HEADER32 *oh = (const IMAGE_OPTIONAL_HEADER32 *)((const char *)fh + sizeof(*fh)); - dump_optional_header(oh, fh->SizeOfOptionalHeader); + dump_optional_header(oh); } } /* Sanity check */ diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index fbcd9f5c6a5..f361e1d86bd 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -275,14 +275,14 @@ static inline void print_datadirectory(DWORD n, const IMAGE_DATA_DIRECTORY *dire } } -static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *image_oh, UINT header_size) +static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *image_oh) { IMAGE_OPTIONAL_HEADER32 oh; const IMAGE_OPTIONAL_HEADER32 *optionalHeader; /* in case optional header is missing or partial */ memset(&oh, 0, sizeof(oh)); - memcpy(&oh, image_oh, min(header_size, sizeof(oh))); + memcpy(&oh, image_oh, min(dump_total_len - ((char *)image_oh - (char *)dump_base), sizeof(oh))); optionalHeader = &oh; print_word("Magic", optionalHeader->Magic); @@ -320,14 +320,14 @@ static void dump_optional_header32(const IMAGE_OPTIONAL_HEADER32 *image_oh, UINT printf("\n"); } -static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *image_oh, UINT header_size) +static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *image_oh) { IMAGE_OPTIONAL_HEADER64 oh; const IMAGE_OPTIONAL_HEADER64 *optionalHeader; /* in case optional header is missing or partial */ memset(&oh, 0, sizeof(oh)); - memcpy(&oh, image_oh, min(header_size, sizeof(oh))); + memcpy(&oh, image_oh, min(dump_total_len - ((char *)image_oh - (char *)dump_base), sizeof(oh))); optionalHeader = &oh; print_word("Magic", optionalHeader->Magic); @@ -364,16 +364,16 @@ static void dump_optional_header64(const IMAGE_OPTIONAL_HEADER64 *image_oh, UINT printf("\n"); } -void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *optionalHeader, UINT header_size) +void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *optionalHeader) { printf("Optional Header (%s)\n", get_magic_type(optionalHeader->Magic)); switch(optionalHeader->Magic) { case IMAGE_NT_OPTIONAL_HDR32_MAGIC: - dump_optional_header32(optionalHeader, header_size); + dump_optional_header32(optionalHeader); break; case IMAGE_NT_OPTIONAL_HDR64_MAGIC: - dump_optional_header64((const IMAGE_OPTIONAL_HEADER64 *)optionalHeader, header_size); + dump_optional_header64((const IMAGE_OPTIONAL_HEADER64 *)optionalHeader); break; default: printf(" Unknown optional header magic: 0x%-4X\n", optionalHeader->Magic); @@ -428,8 +428,7 @@ void dump_file_header(const IMAGE_FILE_HEADER *fileHeader, BOOL is_hybrid) static void dump_pe_header(void) { dump_file_header(&PE_nt_headers->FileHeader, get_hybrid_metadata() != NULL); - dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader, - PE_nt_headers->FileHeader.SizeOfOptionalHeader); + dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader); } void dump_section_characteristics(DWORD characteristics, const char* sep) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index fe1acca7976..e2b3f7b1ca6 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -233,7 +233,7 @@ const char* get_unicode_str( const WCHAR *str, int len ); const char* get_symbol_str(const char* symname); void print_fake_dll(void); void dump_file_header(const IMAGE_FILE_HEADER *, BOOL); -void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); +void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *); void dump_section(const IMAGE_SECTION_HEADER *, const char* strtable); void dump_section_characteristics(DWORD characteristics, const char* sep);

1 0

Alexandre Julliard : server: Don't zero out the PE optional header regardless of specified size.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 4d417076e4378efb613f8519fdc57119fb1df635 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d417076e4378efb613f8519fdc571… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 11:01:29 2023 +0200 server: Don't zero out the PE optional header regardless of specified size. --- dlls/kernel32/tests/loader.c | 17 ++++++++--------- server/mapping.c | 27 ++++++++++++++------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e360c24ee63..0d611990fd4 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -144,13 +144,13 @@ static const IMAGE_NT_HEADERS nt_header_template = sizeof(dos_header) + sizeof(nt_header_template), /* SizeOfHeaders */ 0, /* CheckSum */ IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ - 0, /* DllCharacteristics */ - 0, /* SizeOfStackReserve */ - 0, /* SizeOfStackCommit */ - 0, /* SizeOfHeapReserve */ - 0, /* SizeOfHeapCommit */ + IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | IMAGE_DLLCHARACTERISTICS_NX_COMPAT, /* DllCharacteristics */ + 0x100000, /* SizeOfStackReserve */ + 0x1000, /* SizeOfStackCommit */ + 0x100000, /* SizeOfHeapReserve */ + 0x1000, /* SizeOfHeapCommit */ 0, /* LoaderFlags */ - 0, /* NumberOfRvaAndSizes */ + IMAGE_NUMBEROF_DIRECTORY_ENTRIES, /* NumberOfRvaAndSizes */ { { 0 } } /* DataDirectory[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] */ } }; @@ -401,7 +401,6 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE "%u: MaximumStackSize wrong %Ix / %Ix\n", id, image.MaximumStackSize, max_stack ); ok( image.CommittedStackSize == commit_stack, "%u: CommittedStackSize wrong %Ix / %Ix\n", id, image.CommittedStackSize, commit_stack ); - todo_wine_if( truncated ) ok( image.SubSystemType == nt_header->OptionalHeader.Subsystem, "%u: SubSystemType wrong %08lx / %08x\n", id, image.SubSystemType, nt_header->OptionalHeader.Subsystem ); @@ -481,7 +480,7 @@ static BOOL query_image_section( int id, const char *dll_name, const IMAGE_NT_HE if (!(nt_header->OptionalHeader.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE)) ok( !image.ImageDynamicallyRelocated || broken( image.ComPlusILOnly ), /* <= win7 */ "%u: wrong ImageDynamicallyRelocated flags %02x\n", id, image.ImageFlags ); - else if (image.ImageContainsCode && !cor_header) + else if (image.ImageContainsCode && !image.ImageMappedFlat && !cor_header) ok( image.ImageDynamicallyRelocated, "%u: wrong ImageDynamicallyRelocated flags %02x\n", id, image.ImageFlags ); else @@ -866,7 +865,7 @@ static void test_Loader(void) { 0x04, 0, 0x08, 0x04 /* also serves as e_lfanew in the truncated MZ header */, 0x04, - 0x200000, + 0x2000, 0x40, { ERROR_SUCCESS } } diff --git a/server/mapping.c b/server/mapping.c index 5d4df2050e4..0a69261c0ee 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -695,8 +695,8 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } opt; } nt; off_t pos; - int size, opt_size; - size_t mz_size, clr_va, clr_size; + int size; + size_t mz_size, clr_va = 0, clr_size = 0; unsigned int i; /* load the headers */ @@ -710,9 +710,6 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; - /* zero out Optional header in the case it's not present or partial */ - opt_size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof( IMAGE_OPTIONAL_HEADER32, CheckSum )); - size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + opt_size ); if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size ); if (nt.Signature != IMAGE_NT_SIGNATURE) { @@ -729,9 +726,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!is_machine_32bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; - clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; - clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; - + if (nt.opt.hdr32.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR) + { + clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; + clr_size = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + } mapping->image.base = nt.opt.hdr32.ImageBase; mapping->image.entry_point = nt.opt.hdr32.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr32.SizeOfImage ); @@ -751,7 +750,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags = 0; if (nt.opt.hdr32.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; - if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && + else if ((nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && mapping->image.contains_code && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break; @@ -761,9 +760,11 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!is_machine_64bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; - clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; - clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; - + if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR) + { + clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; + clr_size = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + } mapping->image.base = nt.opt.hdr64.ImageBase; mapping->image.entry_point = nt.opt.hdr64.AddressOfEntryPoint; mapping->image.map_size = ROUND_SIZE( nt.opt.hdr64.SizeOfImage ); @@ -783,7 +784,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s mapping->image.image_flags = 0; if (nt.opt.hdr64.SectionAlignment & page_mask) mapping->image.image_flags |= IMAGE_FLAGS_ImageMappedFlat; - if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && + else if ((nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE) && mapping->image.contains_code && !(clr_va && clr_size)) mapping->image.image_flags |= IMAGE_FLAGS_ImageDynamicallyRelocated; break;

1 0

Jactry Zeng : cabinet/tests: Initialize CURR_DIR globally.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 316b5bc9b3e5aa39da05397523bd8e26e0b17170 URL: https://gitlab.winehq.org/wine/wine/-/commit/316b5bc9b3e5aa39da05397523bd8e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Sep 25 02:15:09 2023 -0500 cabinet/tests: Initialize CURR_DIR globally. So that we can run each test function independently. --- dlls/cabinet/tests/fdi.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/cabinet/tests/fdi.c b/dlls/cabinet/tests/fdi.c index a44f9eeae2d..9cd7a1e93bf 100644 --- a/dlls/cabinet/tests/fdi.c +++ b/dlls/cabinet/tests/fdi.c @@ -409,13 +409,6 @@ static void createTestFile(const CHAR *name) static void create_test_files(void) { - DWORD len; - - len = GetCurrentDirectoryA(MAX_PATH, CURR_DIR); - - if(len && (CURR_DIR[len-1] == '\\')) - CURR_DIR[len-1] = 0; - createTestFile("a.txt"); createTestFile("b.txt"); CreateDirectoryA("testdir", NULL); @@ -944,6 +937,12 @@ static void test_FDICopy(void) START_TEST(fdi) { + int len; + + len = GetCurrentDirectoryA(MAX_PATH, CURR_DIR); + if (len && (CURR_DIR[len - 1] == '\\')) + CURR_DIR[len - 1] = 0; + test_FDICreate(); test_FDIDestroy(); test_FDIIsCabinet();

1 0

Alex Henrie : wpcap: Use the strdup function instead of reimplementing it.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 535123c96365420d7780ed624ee0e40d3bb383ab URL: https://gitlab.winehq.org/wine/wine/-/commit/535123c96365420d7780ed624ee0e4… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 11:54:03 2023 -0600 wpcap: Use the strdup function instead of reimplementing it. --- dlls/wpcap/wpcap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index b96e940c024..6ad4fc5f04f 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -859,7 +859,7 @@ char * CDECL pcap_lookupdev( char *errbuf ) if (!ret) { if (pcap_findalldevs( &devs, errbuf ) == PCAP_ERROR || !devs) return NULL; - if ((ret = malloc( strlen(devs->name) + 1 ))) strcpy( ret, devs->name ); + ret = strdup( devs->name ); pcap_freealldevs( devs ); } return ret;

1 0

Alex Henrie : avifil32: Use CRT allocation functions.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 6b7689cbae1322638ed9eda207f6056586208e1f URL: https://gitlab.winehq.org/wine/wine/-/commit/6b7689cbae1322638ed9eda207f605… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Aug 22 21:49:38 2023 -0600 avifil32: Use CRT allocation functions. --- dlls/avifil32/acmstream.c | 36 ++++++-------- dlls/avifil32/api.c | 68 ++++++++++++------------- dlls/avifil32/avifile.c | 121 ++++++++++++++++++--------------------------- dlls/avifil32/editstream.c | 24 +++++---- dlls/avifil32/extrachunk.c | 12 +---- dlls/avifil32/factory.c | 4 +- dlls/avifil32/getframe.c | 17 +++---- dlls/avifil32/icmstream.c | 32 ++++++------ dlls/avifil32/tmpfile.c | 8 +-- dlls/avifil32/wavfile.c | 24 ++++----- 10 files changed, 151 insertions(+), 195 deletions(-)

1 0

Alex Henrie : sc: Use CRT allocation functions.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: e130ef40a12cb3040a4b6c62f22c75ce2bdb0da8 URL: https://gitlab.winehq.org/wine/wine/-/commit/e130ef40a12cb3040a4b6c62f22c75… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:26:44 2023 -0600 sc: Use CRT allocation functions. --- programs/sc/sc.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index bd7e093b61d..d1954da1493 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -135,10 +135,9 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f unsigned int i, count; WCHAR *actions, *p; - actions = HeapAlloc( GetProcessHeap(), 0, (lstrlenW( arg ) + 1) * sizeof(WCHAR) ); + actions = wcsdup( arg ); if (!actions) return FALSE; - lstrcpyW( actions, arg ); for (p = actions, count = 0; *p; p++) { if (*p == '/') @@ -150,10 +149,10 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f count = count / 2 + 1; fa->cActions = count; - fa->lpsaActions = HeapAlloc( GetProcessHeap(), 0, fa->cActions * sizeof(SC_ACTION) ); + fa->lpsaActions = malloc( fa->cActions * sizeof(SC_ACTION) ); if (!fa->lpsaActions) { - HeapFree( GetProcessHeap(), 0, actions ); + free( actions ); return FALSE; } @@ -170,7 +169,7 @@ static BOOL parse_failure_actions( const WCHAR *arg, SERVICE_FAILURE_ACTIONSW *f p += lstrlenW( p ) + 1; } - HeapFree( GetProcessHeap(), 0, actions ); + free( actions ); return TRUE; } @@ -333,7 +332,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) { ret = ChangeServiceConfig2W( service, SERVICE_CONFIG_FAILURE_ACTIONS, &sfa ); if (!ret) WINE_ERR("failed to set service failure actions %lu\n", GetLastError()); - HeapFree( GetProcessHeap(), 0, sfa.lpsaActions ); + free( sfa.lpsaActions ); } else WINE_ERR("failed to parse failure parameters\n");

1 0

Alex Henrie : wordpad: Use the wcsdup function instead of reimplementing it.
by Alexandre Julliard Sept. 25, 2023

Sept. 25, 2023

Module: wine Branch: master Commit: 4059c6ece270f565248da25549c4ced51bcd03b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/4059c6ece270f565248da25549c4ce… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Sep 24 12:31:24 2023 -0600 wordpad: Use the wcsdup function instead of reimplementing it. --- programs/wordpad/wordpad.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index ed55a1d2268..042cc04f4ad 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -627,8 +627,7 @@ static void add_font(struct font_array *fonts, LPCWSTR fontName, DWORD fontType, fontHeight = ntmc->ntmTm.tmHeight - ntmc->ntmTm.tmInternalLeading; idx = fonts->count; - fonts->fonts[idx].name = malloc((lstrlenW(fontName) + 1)*sizeof(WCHAR) ); - lstrcpyW( fonts->fonts[idx].name, fontName ); + fonts->fonts[idx].name = wcsdup(fontName); fonts->fonts[idx].lParam = MAKELONG(fontType, fontHeight); fonts->count++;

1 0