wine-commits June 2023

wine-commits@winehq.org

1 participants
633 discussions

Piotr Caban : msvcr100: Use block_context_for helper in event::wait().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 7bf56117ce3cacb9365f40f49425bb4f56ec7d8e URL: https://gitlab.winehq.org/wine/wine/-/commit/7bf56117ce3cacb9365f40f49425bb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 8 15:43:20 2023 +0200 msvcr100: Use block_context_for helper in event::wait(). --- dlls/msvcrt/concurrency.c | 33 +++------------------------------ 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index aed911a52a3..b96e0cbda6f 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2850,17 +2850,8 @@ static inline int evt_transition(void **state, void *from, void *to) return InterlockedCompareExchangePointer(state, to, from) == from; } -static void WINAPI evt_timeout(TP_CALLBACK_INSTANCE *instance, void *ctx, TP_TIMER *timer) -{ - thread_wait *wait = ctx; - - if(evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) - call_Context_Unblock(wait->ctx); -} - static size_t evt_wait(thread_wait *wait, event **events, int count, bool wait_all, unsigned int timeout) { - TP_TIMER *tp_timer = NULL; int i; wait->signaled = EVT_RUNNING; @@ -2884,30 +2875,12 @@ static size_t evt_wait(thread_wait *wait, event **events, int count, bool wait_a if(!timeout) return evt_end_wait(wait, events, count); - if (timeout != COOPERATIVE_TIMEOUT_INFINITE) - { - FILETIME ft; - - tp_timer = CreateThreadpoolTimer(evt_timeout, wait, NULL); - if(!tp_timer) { - FIXME("throw exception?\n"); - return COOPERATIVE_WAIT_TIMEOUT; - } - set_timeout(&ft, timeout); - SetThreadpoolTimer(tp_timer, &ft, 0, 0); - } - if(!evt_transition(&wait->signaled, EVT_RUNNING, EVT_WAITING)) return evt_end_wait(wait, events, count); - call_Context_Block(wait->ctx); - - if (tp_timer) - { - SetThreadpoolTimer(tp_timer, NULL, 0, 0); - WaitForThreadpoolTimerCallbacks(tp_timer, TRUE); - CloseThreadpoolTimer(tp_timer); - } + if(block_context_for(wait->ctx, timeout) && + !evt_transition(&wait->signaled, EVT_WAITING, EVT_RUNNING)) + call_Context_Block(wait->ctx); return evt_end_wait(wait, events, count); }

1 0

Piotr Caban : msvcr100: Use block_context_for helper in Concurrency::wait().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: d3d9297b60214cc29027d3546f87001b2114b825 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3d9297b60214cc29027d3546f8700… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 8 15:27:00 2023 +0200 msvcr100: Use block_context_for helper in Concurrency::wait(). --- dlls/msvcrt/concurrency.c | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 560159ee00d..aed911a52a3 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2569,7 +2569,6 @@ static void set_timeout(FILETIME *ft, unsigned int timeout) ft->dwLowDateTime = to.QuadPart; } -#if _MSVCR_VER >= 110 struct timeout_unlock { Context *ctx; @@ -2611,6 +2610,7 @@ static BOOL block_context_for(Context *ctx, unsigned int timeout) return tu.timed_out; } +#if _MSVCR_VER >= 110 /* ?try_lock_for@critical_section@Concurrency@@QAE_NI@Z */ /* ?try_lock_for@critical_section@Concurrency@@QEAA_NI@Z */ DEFINE_THISCALL_WRAPPER(critical_section_try_lock_for, 8) @@ -3478,33 +3478,11 @@ bool __thiscall _ReentrantBlockingLock__TryAcquire(_ReentrantBlockingLock *this) return TryEnterCriticalSection(&this->cs); } -static void WINAPI wait_timeout(TP_CALLBACK_INSTANCE *instance, void *arg, TP_TIMER *timer) -{ - Context *ctx = arg; - - call_Context_Unblock(ctx); -} - /* ?wait@Concurrency@@YAXI@Z */ void __cdecl Concurrency_wait(unsigned int time) { - Context *ctx = get_current_context(); - TP_TIMER *tp_timer; - FILETIME ft; - TRACE("(%d)\n", time); - - tp_timer = CreateThreadpoolTimer(wait_timeout, ctx, NULL); - if(!tp_timer) { - FIXME("throw exception?\n"); - Sleep(time); - return; - } - set_timeout(&ft, time); - SetThreadpoolTimer(tp_timer, &ft, 0, 0); - - call_Context_Block(ctx); - CloseThreadpoolTimer(tp_timer); + block_context_for(get_current_context(), time); } #if _MSVCR_VER>=110

1 0

Piotr Caban : msvcr100: Add support for COOPERATIVE_TIMEOUT_INFINITE timeout in critical_section.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 0f69396405fc841839983707b3b768e1dc6ea8cd URL: https://gitlab.winehq.org/wine/wine/-/commit/0f69396405fc841839983707b3b768… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 8 15:34:43 2023 +0200 msvcr100: Add support for COOPERATIVE_TIMEOUT_INFINITE timeout in critical_section. --- dlls/msvcrt/concurrency.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 190d1f31c31..560159ee00d 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2590,6 +2590,11 @@ static BOOL block_context_for(Context *ctx, unsigned int timeout) TP_TIMER *tp_timer; FILETIME ft; + if(timeout == COOPERATIVE_TIMEOUT_INFINITE) { + call_Context_Block(ctx); + return FALSE; + } + tp_timer = CreateThreadpoolTimer(timeout_unlock, &tu, NULL); if(!tp_timer) { FIXME("throw exception?\n");

1 0

Piotr Caban : msvcr100: Fix use after free in critical_section::try_lock_for().
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 684dbfd0c7ce3dbfcb84e428afea82f44b5b43b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/684dbfd0c7ce3dbfcb84e428afea82… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 8 15:24:35 2023 +0200 msvcr100: Fix use after free in critical_section::try_lock_for(). --- dlls/msvcp90/msvcp90.h | 2 +- dlls/msvcrt/concurrency.c | 64 +++++++++++++++++++++++++++++------------------ 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 5b77a8164e8..c9e8e05566c 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -47,7 +47,7 @@ typedef struct cs_queue { void *ctx; struct cs_queue *next; - LONG status; + LONG free; int unknown; } cs_queue; diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 66adef1fa6d..190d1f31c31 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -214,14 +214,12 @@ struct scheduled_chore { }; /* keep in sync with msvcp90/msvcp90.h */ -#define CS_UNLOCK 1 -#define CS_TIMEOUT 2 typedef struct cs_queue { Context *ctx; struct cs_queue *next; #if _MSVCR_VER >= 110 - LONG status; + LONG free; int unknown; #endif } cs_queue; @@ -2533,7 +2531,7 @@ void __thiscall critical_section_unlock(critical_section *this) while(1) { cs_queue *next; - if(!InterlockedCompareExchange(&this->unk_active.next->status, CS_UNLOCK, 0)) + if(!InterlockedExchange(&this->unk_active.next->free, TRUE)) break; next = this->unk_active.next; @@ -2572,12 +2570,40 @@ static void set_timeout(FILETIME *ft, unsigned int timeout) } #if _MSVCR_VER >= 110 +struct timeout_unlock +{ + Context *ctx; + BOOL timed_out; +}; + static void WINAPI timeout_unlock(TP_CALLBACK_INSTANCE *instance, void *ctx, TP_TIMER *timer) { - cs_queue *q = ctx; + struct timeout_unlock *tu = ctx; + tu->timed_out = TRUE; + call_Context_Unblock(tu->ctx); +} + +/* returns TRUE if wait has timed out */ +static BOOL block_context_for(Context *ctx, unsigned int timeout) +{ + struct timeout_unlock tu = { ctx }; + TP_TIMER *tp_timer; + FILETIME ft; + + tp_timer = CreateThreadpoolTimer(timeout_unlock, &tu, NULL); + if(!tp_timer) { + FIXME("throw exception?\n"); + return TRUE; + } + set_timeout(&ft, timeout); + SetThreadpoolTimer(tp_timer, &ft, 0, 0); + + call_Context_Block(ctx); - if(!InterlockedCompareExchange(&q->status, CS_TIMEOUT, 0)) - call_Context_Unblock(q->ctx); + SetThreadpoolTimer(tp_timer, NULL, 0, 0); + WaitForThreadpoolTimerCallbacks(tp_timer, TRUE); + CloseThreadpoolTimer(tp_timer); + return tu.timed_out; } /* ?try_lock_for@critical_section@Concurrency@@QAE_NI@Z */ @@ -2603,27 +2629,15 @@ bool __thiscall critical_section_try_lock_for( last = InterlockedExchangePointer(&this->tail, q); if(last) { - TP_TIMER *tp_timer; - FILETIME ft; - last->next = q; - tp_timer = CreateThreadpoolTimer(timeout_unlock, q, NULL); - if(!tp_timer) { - FIXME("throw exception?\n"); - return FALSE; + if(block_context_for(q->ctx, timeout)) + { + if(!InterlockedExchange(&q->free, TRUE)) + return FALSE; + /* Context was unblocked because of timeout and unlock operation */ + call_Context_Block(ctx); } - set_timeout(&ft, timeout); - SetThreadpoolTimer(tp_timer, &ft, 0, 0); - - call_Context_Block(q->ctx); - - SetThreadpoolTimer(tp_timer, NULL, 0, 0); - WaitForThreadpoolTimerCallbacks(tp_timer, TRUE); - CloseThreadpoolTimer(tp_timer); - - if(q->status == CS_TIMEOUT) - return FALSE; } cs_set_head(this, q);

1 0

Alexandre Julliard : ntdll: Update the reserved range on 64-bit to match the preloader.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: d12b125b4e69ceff51ec67cbe764857939d8bc48 URL: https://gitlab.winehq.org/wine/wine/-/commit/d12b125b4e69ceff51ec67cbe76485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 13:29:39 2023 +0200 ntdll: Update the reserved range on 64-bit to match the preloader. cf. 6b0836e3f157318b00effc1de563da4d4b0d16b8. --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index ff5c22cb2b2..19b595560f1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -554,7 +554,7 @@ static void mmap_init( const struct preload_info *preload_info ) if (preload_info) return; /* if we don't have a preloader, try to reserve the space now */ reserve_area( (void *)0x000000010000, (void *)0x000068000000 ); - reserve_area( (void *)0x00007ff00000, (void *)0x00007fff0000 ); + reserve_area( (void *)0x00007f000000, (void *)0x00007fff0000 ); reserve_area( (void *)0x7ffffe000000, (void *)0x7fffffff0000 ); #endif

1 0

Alexandre Julliard : ntdll: Use the full 4Gb for large address aware applications on Wow64.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: bf1606cf350b5b631c063344a249ec7e0e8b1e6c URL: https://gitlab.winehq.org/wine/wine/-/commit/bf1606cf350b5b631c063344a249ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 13:21:40 2023 +0200 ntdll: Use the full 4Gb for large address aware applications on Wow64. --- dlls/ntdll/unix/virtual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 167203301f1..ff5c22cb2b2 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -567,7 +567,7 @@ static void mmap_init( const struct preload_info *preload_info ) static void *get_wow_user_space_limit(void) { #ifdef _WIN64 - if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) return (void *)0xc0000000; + if (main_image_info.ImageCharacteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE) return (void *)0xffff0000; return (void *)0x7fff0000; #endif return user_space_limit;

1 0

Alexandre Julliard : ntdll: Report the remaining part of the 64K after a view as free.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 78ffde79fe5fe8bbd782bd03590e2ebeff6759c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/78ffde79fe5fe8bbd782bd03590e2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 13:21:10 2023 +0200 ntdll: Report the remaining part of the 64K after a view as free. To avoid returning non-aligned reserved regions. --- dlls/ntdll/unix/virtual.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 5dd03c6cc85..167203301f1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4638,6 +4638,18 @@ static unsigned int fill_basic_memory_info( const void *addr, MEMORY_BASIC_INFOR if (area_end < alloc_end) info->RegionSize = area_end - base; break; } + /* report the remaining part of the 64K after the view as free */ + if ((UINT_PTR)alloc_base & granularity_mask) + { + char *next = (char *)ROUND_ADDR( alloc_base, granularity_mask ) + granularity_mask + 1; + + if (base < next) + { + info->RegionSize = min( next, alloc_end ) - base; + break; + } + else alloc_base = base; + } /* pretend it's allocated */ if (area_start < alloc_end) info->RegionSize = area_start - base; info->State = MEM_RESERVE;

1 0

Alexandre Julliard : ntdll: Reimplement virtual_release_address_space() without using a callback.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 8b992fecad9a5a12b5993f73fddc68a402dd0655 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b992fecad9a5a12b5993f73fddc68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 13:20:20 2023 +0200 ntdll: Reimplement virtual_release_address_space() without using a callback. --- dlls/ntdll/unix/virtual.c | 79 +++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 50 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6c64163b323..5dd03c6cc85 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -354,11 +354,9 @@ static void mmap_remove_reserved_area( void *addr, SIZE_T size ) static int mmap_is_in_reserved_area( void *addr, SIZE_T size ) { struct reserved_area *area; - struct list *ptr; - LIST_FOR_EACH( ptr, &reserved_areas ) + LIST_FOR_EACH_ENTRY( area, &reserved_areas, struct reserved_area, entry ) { - area = LIST_ENTRY( ptr, struct reserved_area, entry ); if (area->base > addr) break; if ((char *)area->base + area->size <= (char *)addr) continue; /* area must contain block completely */ @@ -368,31 +366,6 @@ static int mmap_is_in_reserved_area( void *addr, SIZE_T size ) return 0; } -static int mmap_enum_reserved_areas( int (*enum_func)(void *base, SIZE_T size, void *arg), - void *arg, int top_down ) -{ - int ret = 0; - struct list *ptr; - - if (top_down) - { - for (ptr = reserved_areas.prev; ptr != &reserved_areas; ptr = ptr->prev) - { - struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry ); - if ((ret = enum_func( area->base, area->size, arg ))) break; - } - } - else - { - for (ptr = reserved_areas.next; ptr != &reserved_areas; ptr = ptr->next) - { - struct reserved_area *area = LIST_ENTRY( ptr, struct reserved_area, entry ); - if ((ret = enum_func( area->base, area->size, arg ))) break; - } - } - return ret; -} - /*********************************************************************** * unmap_area_above_user_limit @@ -4068,21 +4041,30 @@ struct free_range char *limit; }; -/* free reserved areas above the limit; callback for mmap_enum_reserved_areas */ -static int free_reserved_memory( void *base, SIZE_T size, void *arg ) +/* free reserved areas within a given range */ +static void free_reserved_memory( char *base, char *limit ) { - struct free_range *range = arg; + struct reserved_area *area; - if ((char *)base >= range->limit) return 0; - if ((char *)base + size <= range->base) return 0; - if ((char *)base < range->base) + for (;;) { - size -= range->base - (char *)base; - base = range->base; + int removed = 0; + + LIST_FOR_EACH_ENTRY( area, &reserved_areas, struct reserved_area, entry ) + { + char *area_base = area->base; + char *area_end = area_base + area->size; + + if (area_end <= base) continue; + if (area_base >= limit) return; + if (area_base < base) area_base = base; + if (area_end > limit) area_end = limit; + remove_reserved_area( area_base, (char *)area_end - (char *)area_base ); + removed = 1; + break; + } + if (!removed) return; } - if ((char *)base + size > range->limit) size = range->limit - (char *)base; - remove_reserved_area( base, size ); - return 1; /* stop enumeration since the list has changed */ } /*********************************************************************** @@ -4092,27 +4074,24 @@ static int free_reserved_memory( void *base, SIZE_T size, void *arg ) */ static void virtual_release_address_space(void) { - struct free_range range; - - range.base = (char *)0x82000000; - range.limit = get_wow_user_space_limit(); + char *base = (char *)0x82000000; + char *limit = get_wow_user_space_limit(); - if (range.limit > (char *)0xfffff000) return; /* 64-bit limit, nothing to do */ + if (limit > (char *)0xfffff000) return; /* 64-bit limit, nothing to do */ - if (range.limit > range.base) + if (limit > base) { - while (mmap_enum_reserved_areas( free_reserved_memory, &range, 1 )) /* nothing */; + free_reserved_memory( base, limit ); #ifdef __APPLE__ /* On macOS, we still want to free some of low memory, for OpenGL resources */ - range.base = (char *)0x40000000; + base = (char *)0x40000000; #else return; #endif } - else range.base = (char *)0x20000000; + else base = (char *)0x20000000; - range.limit = (char *)0x7f000000; - while (mmap_enum_reserved_areas( free_reserved_memory, &range, 0 )) /* nothing */; + free_reserved_memory( base, (char *)0x7f000000 ); }

1 0

Alexandre Julliard : ntdll: Reimplement fill_basic_memory_info() without using a callback.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: 800fc4164f9d4ef4af23c2249b5c8ee92f48c673 URL: https://gitlab.winehq.org/wine/wine/-/commit/800fc4164f9d4ef4af23c2249b5c8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 13:19:51 2023 +0200 ntdll: Reimplement fill_basic_memory_info() without using a callback. And merge reported free areas. --- dlls/ntdll/unix/virtual.c | 93 +++++++++++++++++------------------------------ 1 file changed, 33 insertions(+), 60 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 3597935fd00..6c64163b323 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4589,50 +4589,6 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T } -/* retrieve state for a free memory area; callback for mmap_enum_reserved_areas */ -static int get_free_mem_state_callback( void *start, SIZE_T size, void *arg ) -{ - MEMORY_BASIC_INFORMATION *info = arg; - void *end = (char *)start + size; - - if ((char *)info->BaseAddress + info->RegionSize <= (char *)start) return 0; - - if (info->BaseAddress >= end) - { - if (info->AllocationBase < end) info->AllocationBase = end; - return 0; - } - - if (info->BaseAddress >= start || start <= address_space_start) - { - /* it's a real free area */ - info->State = MEM_FREE; - info->Protect = PAGE_NOACCESS; - info->AllocationBase = 0; - info->AllocationProtect = 0; - info->Type = 0; - if ((char *)info->BaseAddress + info->RegionSize > (char *)end) - info->RegionSize = (char *)end - (char *)info->BaseAddress; - } - else /* outside of the reserved area, pretend it's allocated */ - { - info->RegionSize = (char *)start - (char *)info->BaseAddress; -#ifdef __i386__ - info->State = MEM_RESERVE; - info->Protect = PAGE_NOACCESS; - info->AllocationProtect = PAGE_NOACCESS; - info->Type = MEM_PRIVATE; -#else - info->State = MEM_FREE; - info->Protect = PAGE_NOACCESS; - info->AllocationBase = 0; - info->AllocationProtect = 0; - info->Type = 0; -#endif - } - return 1; -} - static unsigned int fill_basic_memory_info( const void *addr, MEMORY_BASIC_INFORMATION *info ) { char *base, *alloc_base = 0, *alloc_end = working_set_limit; @@ -4671,38 +4627,55 @@ static unsigned int fill_basic_memory_info( const void *addr, MEMORY_BASIC_INFOR /* Fill the info structure */ - info->AllocationBase = alloc_base; - info->BaseAddress = base; - info->RegionSize = alloc_end - base; + info->BaseAddress = base; + info->RegionSize = alloc_end - base; if (!ptr) { - if (!mmap_enum_reserved_areas( get_free_mem_state_callback, info, 0 )) - { - /* not in a reserved area at all, pretend it's allocated */ + info->State = MEM_FREE; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; + info->AllocationProtect = 0; + info->Type = 0; + #ifdef __i386__ - if (base >= (char *)address_space_start) + /* on i386, pretend that space outside of a reserved area is allocated, + * so that the app doesn't believe it's fully available */ + { + struct reserved_area *area; + + LIST_FOR_EACH_ENTRY( area, &reserved_areas, struct reserved_area, entry ) { + char *area_start = area->base; + char *area_end = (char *)area_start + area->size; + + if (area_end <= base) + { + if (alloc_base < area_end) alloc_base = area_end; + continue; + } + if (area_start <= base || area_start <= (char *)address_space_start) + { + if (area_end < alloc_end) info->RegionSize = area_end - base; + break; + } + /* pretend it's allocated */ + if (area_start < alloc_end) info->RegionSize = area_start - base; info->State = MEM_RESERVE; info->Protect = PAGE_NOACCESS; + info->AllocationBase = alloc_base; info->AllocationProtect = PAGE_NOACCESS; info->Type = MEM_PRIVATE; - } - else -#endif - { - info->State = MEM_FREE; - info->Protect = PAGE_NOACCESS; - info->AllocationBase = 0; - info->AllocationProtect = 0; - info->Type = 0; + break; } } +#endif } else { BYTE vprot; + info->AllocationBase = alloc_base; info->RegionSize = get_committed_size( view, base, &vprot, ~VPROT_WRITEWATCH ); info->State = (vprot & VPROT_COMMITTED) ? MEM_COMMIT : MEM_RESERVE; info->Protect = (vprot & VPROT_COMMITTED) ? get_win32_prot( vprot, view->protect ) : 0;

1 0

Alexandre Julliard : ntdll: Reimplement allocation of the virtual heap without using a callback.
by Alexandre Julliard 08 Jun '23

08 Jun '23

Module: wine Branch: master Commit: b0aaa2f869dbdf0346650efe6b7f6a0257899be6 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0aaa2f869dbdf0346650efe6b7f6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 8 13:04:31 2023 +0200 ntdll: Reimplement allocation of the virtual heap without using a callback. --- dlls/ntdll/unix/virtual.c | 69 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 0de7619ff86..3597935fd00 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3013,34 +3013,37 @@ done: } -struct alloc_virtual_heap +/* allocate some space for the virtual heap, if possible from a reserved area */ +static void *alloc_virtual_heap( SIZE_T size ) { - void *base; - size_t size; -}; - -/* callback for mmap_enum_reserved_areas to allocate space for the virtual heap */ -static int alloc_virtual_heap( void *base, SIZE_T size, void *arg ) -{ - struct alloc_virtual_heap *alloc = arg; - void *end = (char *)base + size; + struct reserved_area *area; + void *ret; - if (is_beyond_limit( base, size, address_space_limit )) address_space_limit = (char *)base + size; - if (is_win64 && base < (void *)0x80000000) return 0; - if (preload_reserve_end >= end) - { - if (preload_reserve_start <= base) return 0; /* no space in that area */ - if (preload_reserve_start < end) end = preload_reserve_start; - } - else if (preload_reserve_end > base) + LIST_FOR_EACH_ENTRY_REV( area, &reserved_areas, struct reserved_area, entry ) { - if (preload_reserve_start <= base) base = preload_reserve_end; - else if ((char *)end - (char *)preload_reserve_end >= alloc->size) base = preload_reserve_end; - else end = preload_reserve_start; + void *base = area->base; + void *end = (char *)base + area->size; + + if (is_beyond_limit( base, area->size, address_space_limit )) address_space_limit = end; + if (is_win64 && base < (void *)0x80000000) break; + if (preload_reserve_end >= end) + { + if (preload_reserve_start <= base) continue; /* no space in that area */ + if (preload_reserve_start < end) end = preload_reserve_start; + } + else if (preload_reserve_end > base) + { + if (preload_reserve_start <= base) base = preload_reserve_end; + else if ((char *)end - (char *)preload_reserve_end >= size) base = preload_reserve_end; + else end = preload_reserve_start; + } + if ((char *)end - (char *)base < size) continue; + ret = anon_mmap_fixed( (char *)end - size, size, PROT_READ | PROT_WRITE, 0 ); + if (ret == MAP_FAILED) continue; + mmap_remove_reserved_area( ret, size ); + return ret; } - if ((char *)end - (char *)base < alloc->size) return 0; - alloc->base = anon_mmap_fixed( (char *)end - alloc->size, alloc->size, PROT_READ|PROT_WRITE, 0 ); - return (alloc->base != MAP_FAILED); + return anon_mmap_alloc( size, PROT_READ | PROT_WRITE ); } /*********************************************************************** @@ -3050,7 +3053,6 @@ void virtual_init(void) { const struct preload_info **preload_info = dlsym( RTLD_DEFAULT, "wine_main_preload_info" ); const char *preload = getenv( "WINEPRELOADRESERVE" ); - struct alloc_virtual_heap alloc_views; size_t size; int i; pthread_mutexattr_t attr; @@ -3082,20 +3084,15 @@ void virtual_init(void) /* try to find space in a reserved area for the views and pages protection table */ #ifdef _WIN64 pages_vprot_size = ((size_t)address_space_limit >> page_shift >> pages_vprot_shift) + 1; - alloc_views.size = 2 * view_block_size + pages_vprot_size * sizeof(*pages_vprot); + size = 2 * view_block_size + pages_vprot_size * sizeof(*pages_vprot); #else - alloc_views.size = 2 * view_block_size + (1U << (32 - page_shift)); + size = 2 * view_block_size + (1U << (32 - page_shift)); #endif - if (mmap_enum_reserved_areas( alloc_virtual_heap, &alloc_views, 1 )) - mmap_remove_reserved_area( alloc_views.base, alloc_views.size ); - else - alloc_views.base = anon_mmap_alloc( alloc_views.size, PROT_READ | PROT_WRITE ); - - assert( alloc_views.base != MAP_FAILED ); - view_block_start = alloc_views.base; + view_block_start = alloc_virtual_heap( size ); + assert( view_block_start != MAP_FAILED ); view_block_end = view_block_start + view_block_size / sizeof(*view_block_start); - free_ranges = (void *)((char *)alloc_views.base + view_block_size); - pages_vprot = (void *)((char *)alloc_views.base + 2 * view_block_size); + free_ranges = (void *)((char *)view_block_start + view_block_size); + pages_vprot = (void *)((char *)view_block_start + 2 * view_block_size); wine_rb_init( &views_tree, compare_view ); free_ranges[0].base = (void *)0;

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2023