November 2022 - Wine-commits

Alex Henrie : wininet: Simplify memory allocation in HTTP_InsertCustomHeader.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 6905b76b9400209ded97983ceca9f9c15de22d98 URL: https://gitlab.winehq.org/wine/wine/-/commit/6905b76b9400209ded97983ceca9f9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 28 08:44:34 2022 -0700 wininet: Simplify memory allocation in HTTP_InsertCustomHeader. --- dlls/wininet/http.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 18f61f108fc..b42f823208c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -6280,15 +6280,7 @@ static DWORD HTTP_InsertCustomHeader(http_request_t *request, LPHTTPHEADERW lpHd TRACE("--> %s: %s\n", debugstr_w(lpHdr->lpszField), debugstr_w(lpHdr->lpszValue)); count = request->nCustHeaders + 1; - if (count > 1) - { - lph = realloc(request->custHeaders, sizeof(HTTPHEADERW) * count); - memset(lph + request->nCustHeaders, 0, sizeof(HTTPHEADERW)); - } - else - { - lph = calloc(count, sizeof(HTTPHEADERW)); - } + lph = realloc(request->custHeaders, sizeof(HTTPHEADERW) * count); if (!lph) return ERROR_OUTOFMEMORY;

1 0

Jacek Caban : ntdll: Detect ntdll module also by module path comparison.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: ac5e7fab1fe3a54bdc256079f0a20900c655eb36 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac5e7fab1fe3a54bdc256079f0a209… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Nov 27 19:20:15 2022 +0100 ntdll: Detect ntdll module also by module path comparison. --- dlls/ntdll/unix/virtual.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 8087a12785c..17ab6ae9622 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -640,7 +640,7 @@ void *get_builtin_so_handle( void *module ) */ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **funcs ) { - const char *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; + const char *p, *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; sigset_t sigset; NTSTATUS status = STATUS_DLL_NOT_FOUND; struct builtin_module *builtin; @@ -655,6 +655,12 @@ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **fun LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; + if (builtin->unix_path && (p = strrchr( builtin->unix_path, '/' )) && !strcmp( p, "/ntdll.so" )) + { + *funcs = wow ? __wine_unix_call_wow64_funcs : __wine_unix_call_funcs; + status = STATUS_SUCCESS; + break; + } if (builtin->unix_path && !builtin->unix_handle) builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW ); if (builtin->unix_handle)

1 0

Eric Pouech : winedump: Don't crash when dumping .dbg files.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 944edd5068ab46e1682f9a3943976268fcc58a4d URL: https://gitlab.winehq.org/wine/wine/-/commit/944edd5068ab46e1682f9a39439762… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 28 16:03:57 2022 +0100 winedump: Don't crash when dumping .dbg files. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index d901290be35..7ec378a19b8 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -468,7 +468,7 @@ static void dump_sections(const void *base, const void* addr, unsigned num_sect) unsigned i; const char* strtable; - if (PE_nt_headers->FileHeader.PointerToSymbolTable && PE_nt_headers->FileHeader.NumberOfSymbols) + if (PE_nt_headers && PE_nt_headers->FileHeader.PointerToSymbolTable && PE_nt_headers->FileHeader.NumberOfSymbols) { strtable = (const char*)base + PE_nt_headers->FileHeader.PointerToSymbolTable +

1 0

Jacek Caban : ntdll: Get TEB from signal stack pointer in init_handler.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: e7accd7c0f9d8aa7c8c52a7d48c3374da49e32f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7accd7c0f9d8aa7c8c52a7d48c337… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 18:06:18 2022 +0100 ntdll: Get TEB from signal stack pointer in init_handler. We can't use NtCurrentTeb before setting %fs base. --- dlls/ntdll/unix/signal_x86_64.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index cc070dda5ae..8541dc9ccaf 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -440,6 +440,13 @@ static inline struct amd64_thread_data *amd64_thread_data(void) return (struct amd64_thread_data *)ntdll_get_thread_data()->cpu_data; } +static inline TEB *get_current_teb(void) +{ + unsigned long rsp; + __asm__( "movq %%rsp,%0" : "=r" (rsp) ); + return (TEB *)(rsp & ~signal_stack_mask); +} + static BOOL is_inside_syscall( const ucontext_t *sigcontext ) { return ((char *)RSP_sig(sigcontext) >= (char *)ntdll_get_thread_data()->kernel_stack && @@ -806,7 +813,11 @@ static inline void set_sigcontext( const CONTEXT *context, ucontext_t *sigcontex static inline void init_handler( const ucontext_t *sigcontext ) { #ifdef __linux__ - if (fs32_sel) arch_prctl( ARCH_SET_FS, amd64_thread_data()->pthread_teb ); + if (fs32_sel) + { + struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&get_current_teb()->GdiTebBatch; + arch_prctl( ARCH_SET_FS, ((struct amd64_thread_data *)thread_data->cpu_data)->pthread_teb ); + } #endif }

1 0

Jacek Caban : ntdll: Call init_handler in usr1_handler.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 68eee4053c419c0b7979931d61453895c9cc5e6b URL: https://gitlab.winehq.org/wine/wine/-/commit/68eee4053c419c0b7979931d614538… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 28 18:10:51 2022 +0100 ntdll: Call init_handler in usr1_handler. It's needed before is_inside_syscall accesses TEB. --- dlls/ntdll/unix/signal_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 8541dc9ccaf..e22654f6d29 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2158,6 +2158,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *ucontext ) { struct xcontext context; + init_handler( ucontext ); if (is_inside_syscall( ucontext )) { DECLSPEC_ALIGN(64) XSTATE xs;

1 0

Rémi Bernon : ntdll: Keep the region base offset in the block header.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: fd8e52b4e7604e85924afd70482282efd583e74c URL: https://gitlab.winehq.org/wine/wine/-/commit/fd8e52b4e7604e85924afd70482282… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Nov 20 14:45:08 2022 +0100 ntdll: Keep the region base offset in the block header. --- dlls/ntdll/heap.c | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index cb1ff12c679..f661a05ed65 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -82,7 +82,8 @@ struct block WORD block_size; /* block size in multiple of BLOCK_ALIGN */ BYTE block_flags; BYTE tail_size; /* unused size (used block) / high size bits (free block) */ - DWORD block_type; + WORD base_offset; /* offset to the region base in multiple of REGION_ALIGN */ + WORD block_type; }; C_ASSERT( sizeof(struct block) == 8 ); @@ -123,10 +124,10 @@ typedef struct C_ASSERT( sizeof(ARENA_LARGE) == offsetof(ARENA_LARGE, block) + sizeof(struct block) ); C_ASSERT( sizeof(ARENA_LARGE) == 4 * BLOCK_ALIGN ); -#define BLOCK_TYPE_USED 0x455355 -#define BLOCK_TYPE_DEAD 0xbedead -#define BLOCK_TYPE_FREE 0x45455246 -#define BLOCK_TYPE_LARGE 0x6752614c +#define BLOCK_TYPE_USED 0x5355 +#define BLOCK_TYPE_DEAD 0xdead +#define BLOCK_TYPE_FREE 0x5246 +#define BLOCK_TYPE_LARGE 0x614c #define BLOCK_FILL_USED 0x55 #define BLOCK_FILL_TAIL 0xab @@ -134,14 +135,26 @@ C_ASSERT( sizeof(ARENA_LARGE) == 4 * BLOCK_ALIGN ); #define ROUND_ADDR(addr, mask) ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) #define ROUND_SIZE(size, mask) ((((SIZE_T)(size) + (mask)) & ~(SIZE_T)(mask))) +#define FIELD_MAX(type, field) (((SIZE_T)1 << (sizeof(((type *)0)->field) * 8)) - 1) #define HEAP_MIN_BLOCK_SIZE ROUND_SIZE(sizeof(struct entry) + BLOCK_ALIGN, BLOCK_ALIGN - 1) C_ASSERT( sizeof(struct block) <= HEAP_MIN_BLOCK_SIZE ); C_ASSERT( sizeof(struct entry) <= HEAP_MIN_BLOCK_SIZE ); +/* used block size is coded into block_size */ +#define HEAP_MAX_USED_BLOCK_SIZE (FIELD_MAX( struct block, block_size ) * BLOCK_ALIGN) +/* free block size is coded into block_size + tail_size */ +#define HEAP_MAX_FREE_BLOCK_SIZE (HEAP_MAX_USED_BLOCK_SIZE + (FIELD_MAX( struct block, tail_size ) << 16) * BLOCK_ALIGN) +/* subheap distance is coded into base_offset */ +#define HEAP_MAX_BLOCK_REGION_SIZE (FIELD_MAX( struct block, base_offset ) * REGION_ALIGN) + +C_ASSERT( HEAP_MAX_USED_BLOCK_SIZE == 512 * 1024 * (sizeof(void *) / 4) - BLOCK_ALIGN ); +C_ASSERT( HEAP_MAX_FREE_BLOCK_SIZE == 128 * 1024 * 1024 * (sizeof(void *) / 4) - BLOCK_ALIGN ); +C_ASSERT( HEAP_MAX_BLOCK_REGION_SIZE >= HEAP_MAX_FREE_BLOCK_SIZE ); + /* minimum size to start allocating large blocks */ -#define HEAP_MIN_LARGE_BLOCK_SIZE (0x10000 * BLOCK_ALIGN - 0x1000) +#define HEAP_MIN_LARGE_BLOCK_SIZE (HEAP_MAX_USED_BLOCK_SIZE - 0x1000) /* There will be a free list bucket for every arena size up to and including this value */ #define HEAP_MAX_SMALL_FREE_LIST 0x100 @@ -233,6 +246,12 @@ static inline UINT block_get_type( const struct block *block ) return block->block_type; } +static inline void block_set_base( struct block *block, const void *base ) +{ + const char *offset = ROUND_ADDR( block, REGION_ALIGN - 1 ); + block->base_offset = (offset - (char *)base) / REGION_ALIGN; +} + static inline void block_set_type( struct block *block, UINT type ) { block->block_type = type; @@ -689,6 +708,7 @@ static void create_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, valgrind_make_writable( block, sizeof(*entry) ); block_set_type( block, BLOCK_TYPE_FREE ); + block_set_base( block, subheap_base( subheap ) ); block_set_flags( block, ~0, BLOCK_FLAG_FREE ); block_set_size( block, block_size ); @@ -812,6 +832,7 @@ static struct block *allocate_large_block( struct heap *heap, DWORD flags, SIZE_ arena->block_size = (char *)address + total_size - (char *)block; block_set_type( block, BLOCK_TYPE_LARGE ); + block_set_base( block, arena ); block_set_flags( block, ~0, BLOCK_FLAG_LARGE | BLOCK_USER_FLAGS( flags ) ); block_set_size( block, 0 ); list_add_tail( &heap->large_list, &arena->entry ); @@ -980,6 +1001,7 @@ static SUBHEAP *HEAP_CreateSubHeap( struct heap **heap_ptr, LPVOID address, DWOR block_set_flags( &pEntry->block, ~0, BLOCK_FLAG_FREE_LINK ); block_set_size( &pEntry->block, 0 ); block_set_type( &pEntry->block, BLOCK_TYPE_FREE ); + block_set_base( &pEntry->block, heap ); if (i) list_add_after( &pEntry[-1].entry, &pEntry->entry ); } @@ -1049,7 +1071,7 @@ static struct block *find_free_block( struct heap *heap, ULONG flags, SIZE_T blo if ((*subheap = HEAP_CreateSubHeap( &heap, NULL, flags, total_size, max( heap->grow_size, total_size ) ))) { - if (heap->grow_size < 128 * 1024 * 1024) heap->grow_size *= 2; + if (heap->grow_size <= HEAP_MAX_FREE_BLOCK_SIZE / 2) heap->grow_size *= 2; } else while (!*subheap) /* shrink the grow size again if we are running out of space */ {

1 0

Rémi Bernon : ntdll: Find heap block region from its base offset.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 2f6b763fa90dd2ab622c583e2bf56392973e971e URL: https://gitlab.winehq.org/wine/wine/-/commit/2f6b763fa90dd2ab622c583e2bf563… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 11:17:12 2022 +0100 ntdll: Find heap block region from its base offset. --- dlls/ntdll/heap.c | 114 +++++++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 53 deletions(-)

1 0

Rémi Bernon : ntdll: Avoid clearing BLOCK_FLAG_USER_INFO in heap_reallocate.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: 708462f6aaad3880c1336f881c7452480655e7b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/708462f6aaad3880c1336f881c7452… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 13:30:20 2022 +0100 ntdll: Avoid clearing BLOCK_FLAG_USER_INFO in heap_reallocate. --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ea1821aa674..21b284d2a0c 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1682,7 +1682,7 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, void *ptr, } valgrind_notify_resize( block + 1, old_size, size ); - block_set_flags( block, BLOCK_FLAG_USER_MASK, BLOCK_USER_FLAGS( flags ) ); + block_set_flags( block, BLOCK_FLAG_USER_MASK & ~BLOCK_FLAG_USER_INFO, BLOCK_USER_FLAGS( flags ) ); shrink_used_block( heap, flags, block, old_block_size, block_size, size ); initialize_block( block, old_size, size, flags );

1 0

Rémi Bernon : ntdll: Stop locking heap to access block-local data.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: efc6a8f42c120beaeb747e69c38fc7914a1a40e6 URL: https://gitlab.winehq.org/wine/wine/-/commit/efc6a8f42c120beaeb747e69c38fc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 15:08:40 2022 +0100 ntdll: Stop locking heap to access block-local data. This moves unsafe_block_from_ptr calls outside of the heap lock. We assume here that concurrent call to another heap function on a block being freed is undefined, and it should then be safe to do so: * The block type or base offset never change after a block has been allocated and until it is freed. * Block flags such as BLOCK_FLAG_LARGE, or BLOCK_FLAG_USER_INFO also never change after a block has been allocated. * Other block flags are only read and modified inside the heap lock. --- dlls/ntdll/heap.c | 86 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 45 insertions(+), 41 deletions(-)

1 0

Rémi Bernon : ntdll: Inverse the control flow in heap_reallocate.
by Alexandre Julliard 28 Nov '22

28 Nov '22

Module: wine Branch: master Commit: d0b46b2a1857e9ed5e5d41cc66a486f4be4a7d9f URL: https://gitlab.winehq.org/wine/wine/-/commit/d0b46b2a1857e9ed5e5d41cc66a486… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Nov 25 00:06:15 2022 +0100 ntdll: Inverse the control flow in heap_reallocate. --- dlls/ntdll/heap.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0a8694704d3..4326199a07b 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1640,7 +1640,6 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b SIZE_T block_size, SIZE_T size, void **ret ) { SIZE_T old_block_size, old_size; - struct block *next; NTSTATUS status; if (block_get_flags( block ) & BLOCK_FLAG_LARGE) @@ -1658,17 +1657,12 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b if (block_size > old_block_size) { SUBHEAP *subheap = block_get_subheap( heap, block ); + struct entry *entry; + struct block *next; - if ((next = next_block( subheap, block )) && (block_get_flags( next ) & BLOCK_FLAG_FREE) && - block_size < HEAP_MIN_LARGE_BLOCK_SIZE && block_size <= old_block_size + block_get_size( next )) - { - /* The next block is free and large enough */ - struct entry *entry = (struct entry *)next; - list_remove( &entry->entry ); - old_block_size += block_get_size( next ); - if (!subheap_commit( heap, subheap, block, block_size )) return STATUS_NO_MEMORY; - } - else + if (!(next = next_block( subheap, block )) || !(block_get_flags( next ) & BLOCK_FLAG_FREE) || + block_size >= HEAP_MIN_LARGE_BLOCK_SIZE || + block_size > old_block_size + block_get_size( next )) { if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, block_size, size, ret ))) return status; @@ -1679,6 +1673,12 @@ static NTSTATUS heap_reallocate( struct heap *heap, ULONG flags, struct block *b free_used_block( heap, flags, block ); return STATUS_SUCCESS; } + + /* The next block is free and large enough */ + entry = (struct entry *)next; + list_remove( &entry->entry ); + old_block_size += block_get_size( next ); + if (!subheap_commit( heap, subheap, block, block_size )) return STATUS_NO_MEMORY; } valgrind_notify_resize( block + 1, old_size, size );

1 0