January 2024 - Wine-Commits

Alexandre Julliard : ntdll: Determine the available address space dynamically on ARM64.
by Alexandre Julliard Jan. 5, 2024

Jan. 5, 2024

Module: wine Branch: master Commit: 0900d919e2fd5ce12e02375cfcbfa5ab7c283515 URL: https://gitlab.winehq.org/wine/wine/-/commit/0900d919e2fd5ce12e02375cfcbfa5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 5 18:30:58 2024 +0100 ntdll: Determine the available address space dynamically on ARM64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56130 --- dlls/ntdll/unix/virtual.c | 57 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index e805c349eac..abe1b4dc4ec 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -162,23 +162,18 @@ static void *address_space_start = (void *)0x110000; /* keep DOS area clear */ #else static void *address_space_start = (void *)0x10000; #endif - -#ifdef __aarch64__ -static void *address_space_limit = (void *)0xffffffff0000; /* top of the total available address space */ -#elif defined(_WIN64) -static void *address_space_limit = (void *)0x7fffffff0000; -#else -static void *address_space_limit = (void *)0xc0000000; -#endif - #ifdef _WIN64 +static void *address_space_limit = (void *)0x7fffffff0000; /* top of the total available address space */ static void *user_space_limit = (void *)0x7fffffff0000; /* top of the user address space */ static void *working_set_limit = (void *)0x7fffffff0000; /* top of the current working set */ #else +static void *address_space_limit = (void *)0xc0000000; static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +static void *host_addr_space_limit; /* top of the host virtual address space */ + static struct file_view *arm64ec_view; ULONG_PTR user_space_wow_limit = 0; @@ -2009,6 +2004,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, if (is_beyond_limit( base, size, address_space_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; if (limit_low && base < (void *)limit_low) return STATUS_CONFLICTING_ADDRESSES; if (limit_high && is_beyond_limit( base, size, (void *)limit_high )) return STATUS_CONFLICTING_ADDRESSES; + if (is_beyond_limit( base, size, host_addr_space_limit )) return STATUS_CONFLICTING_ADDRESSES; if ((status = map_fixed_area( base, size, vprot ))) return status; if (is_beyond_limit( base, size, working_set_limit )) working_set_limit = address_space_limit; ptr = base; @@ -2016,7 +2012,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, else { void *start = address_space_start; - void *end = user_space_limit; + void *end = min( user_space_limit, host_addr_space_limit ); size_t view_size, unmap_size; if (!align_mask) align_mask = granularity_mask; @@ -2031,7 +2027,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, goto done; } - if (start > address_space_start || end < address_space_limit || top_down) + if (start > address_space_start || end < host_addr_space_limit || top_down) { if (!(ptr = map_free_area( start, end, size, top_down, get_unix_prot(vprot), align_mask ))) return STATUS_NO_MEMORY; @@ -2442,6 +2438,33 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) #ifdef __aarch64__ +/*********************************************************************** + * get_host_addr_space_limit + */ +static void *get_host_addr_space_limit(void) +{ + unsigned int flags = MAP_PRIVATE | MAP_ANON; + UINT_PTR addr = (UINT_PTR)1 << 63; + +#ifdef MAP_FIXED_NOREPLACE + flags |= MAP_FIXED_NOREPLACE; +#endif + + while (addr >> 32) + { + void *ret = mmap( (void *)addr, page_size, PROT_NONE, flags, -1, 0 ); + if (ret != MAP_FAILED) + { + munmap( ret, page_size ); + if (ret >= (void *)addr) break; + } + else if (errno == EEXIST) break; + addr >>= 1; + } + return (void *)((addr << 1) - (granularity_mask + 1)); +} + + /*********************************************************************** * alloc_arm64ec_map */ @@ -3223,7 +3246,8 @@ static void *alloc_virtual_heap( SIZE_T size ) 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_beyond_limit( base, area->size, address_space_limit )) + address_space_limit = host_addr_space_limit = end; if (is_win64 && base < (void *)0x80000000) break; if (preload_reserve_end >= end) { @@ -3261,6 +3285,13 @@ void virtual_init(void) pthread_mutex_init( &virtual_mutex, &attr ); pthread_mutexattr_destroy( &attr ); +#ifdef __aarch64__ + host_addr_space_limit = get_host_addr_space_limit(); + TRACE( "host addr space limit: %p\n", host_addr_space_limit ); +#else + host_addr_space_limit = address_space_limit; +#endif + if (preload_info && *preload_info) for (i = 0; (*preload_info)[i].size; i++) mmap_add_reserved_area( (*preload_info)[i].addr, (*preload_info)[i].size ); @@ -3282,7 +3313,7 @@ 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; + pages_vprot_size = ((size_t)host_addr_space_limit >> page_shift >> pages_vprot_shift) + 1; size = 2 * view_block_size + pages_vprot_size * sizeof(*pages_vprot); #else size = 2 * view_block_size + (1U << (32 - page_shift));

1 0

Bernhard Kölbl : windows.media.speech/tests: Remove obsolete workarounds.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: wine Branch: master Commit: def5e1a61d8c565c646f2a900059e6cf42f05c96 URL: https://gitlab.winehq.org/wine/wine/-/commit/def5e1a61d8c565c646f2a900059e6… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Thu Jan 4 20:46:19 2024 +0100 windows.media.speech/tests: Remove obsolete workarounds. These got obsolete with eaca0f44be41e0543dd2f3909012cdcf041328a7. Signed-off-by: Bernhard Kölbl <bkoelbl(a)codeweavers.com> --- dlls/windows.media.speech/tests/speech.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index feeeda58be4..ea1487d379c 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -1472,17 +1472,6 @@ static void test_SpeechRecognitionListConstraint(void) hr = ISpeechRecognitionListConstraintFactory_CreateWithTag(listconstraint_factory, NULL, NULL, &listconstraint); ok(hr == E_POINTER, "ISpeechRecognitionListConstraintFactory_Create failed, hr %#lx.\n", hr); - /* - * The create functions break on Win10 <= 1709 x32 with the given iterator. - * Seems like a Windows bug, but if you see an issue in the test's code, please FIXME. - * Skipping these tests. - */ - if (broken((is_win10_1507 || is_win10_1709) && (sizeof(void*) == 4))) - { - win_skip("SpeechRecognitionListConstraint object creation broken on Win10 <= 1709 x32!\n"); - goto skip_create; - } - iterator_hstring_create_static(&iterator_hstring, commands, ARRAY_SIZE(commands)); iterable_hstring_create_static(&iterable_hstring, &iterator_hstring); @@ -1553,7 +1542,6 @@ skip_tests: ref = ISpeechRecognitionListConstraint_Release(listconstraint); ok(ref == 0, "Got unexpected ref %lu.\n", ref); -skip_create: ref = ISpeechRecognitionListConstraintFactory_Release(listconstraint_factory); ok(ref == 2, "Got unexpected ref %lu.\n", ref); @@ -1628,17 +1616,6 @@ static void test_Recognition(void) ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); } - /* - * The create functions break on Win10 <= 1709 x32 with the given iterator. - * Seems like a Windows bug, but if you see an issue in the test's code, please FIXME. - * Skipping these tests. - */ - if (broken((is_win10_1507 || is_win10_1709) && (sizeof(void*) == 4))) - { - win_skip("SpeechRecognitionListConstraint object creation broken on Win10 <= 1709 x32!\n"); - goto done; - } - hr = WindowsCreateString(recognizer_name, wcslen(recognizer_name), &hstr); ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr);

1 0

Rémi Bernon : dmime: Avoid leaking track references in segment Clone and Load.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: wine Branch: master Commit: e7ded5ddc15ce539e09de99d8a95c7d839e2d6b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7ded5ddc15ce539e09de99d8a95c7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 3 19:34:15 2024 +0100 dmime: Avoid leaking track references in segment Clone and Load. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56117 --- dlls/dmime/segment.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 4708b4c5a6f..75e8d706ed4 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -442,7 +442,9 @@ static HRESULT WINAPI segment_Clone(IDirectMusicSegment8 *iface, MUSIC_TIME star LIST_FOR_EACH_ENTRY(entry, &This->tracks, struct track_entry, entry) { if (FAILED(hr = IDirectMusicTrack_Clone(entry->pTrack, start, end, &track))) break; - if (FAILED(hr = segment_append_track(clone, track, entry->dwGroupBits, entry->flags))) break; + hr = segment_append_track(clone, track, entry->dwGroupBits, entry->flags); + IDirectMusicTrack_Release(track); + if (FAILED(hr)) break; } *segment = (IDirectMusicSegment *)&clone->IDirectMusicSegment8_iface; @@ -822,6 +824,7 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream This->header.mtLength = 1; if (FAILED(hr = wave_track_create_from_chunk(stream, &chunk, &track))) break; hr = segment_append_track(This, (IDirectMusicTrack *)track, 1, 0); + IDirectMusicTrack8_Release(track); break; }

1 0

Zebediah Figura : wined3d: Do not remove invalid BO users from the list when destroying views.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: wine Branch: master Commit: f377723773c8f0c3786eff111e218ea5a8af193d URL: https://gitlab.winehq.org/wine/wine/-/commit/f377723773c8f0c3786eff111e218e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 29 19:07:39 2023 -0600 wined3d: Do not remove invalid BO users from the list when destroying views. Fixes: b2f13103d7d96fc082b91b8e808599836ed4a2b1 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55540 --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 4bc7312ea8f..1d622c298cb 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4887,7 +4887,7 @@ static void wined3d_view_gl_destroy_object(void *object) checkGLcall("delete resources"); context_release(context); } - if (ctx->bo_user) + if (ctx->bo_user && ctx->bo_user->valid) list_remove(&ctx->bo_user->entry); heap_free(ctx->object); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d6f4449ce06..3e6604c035e 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1467,7 +1467,7 @@ static void wined3d_view_vk_destroy_object(void *object) TRACE("Destroyed image view 0x%s.\n", wine_dbgstr_longlong(*ctx->vk_image_view)); } } - if (ctx->bo_user) + if (ctx->bo_user && ctx->bo_user->valid) list_remove(&ctx->bo_user->entry); if (ctx->vk_counter_bo && ctx->vk_counter_bo->vk_buffer) wined3d_context_vk_destroy_bo(wined3d_context_vk(context), ctx->vk_counter_bo);

1 0

Rémi Bernon : dmloader: Avoid caching DMUS_OBJ_STREAM objects we can't load from cache.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: wine Branch: master Commit: 68325b385847fd4619fb90b7a64b8b66b894f134 URL: https://gitlab.winehq.org/wine/wine/-/commit/68325b385847fd4619fb90b7a64b8b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 3 19:37:00 2024 +0100 dmloader: Avoid caching DMUS_OBJ_STREAM objects we can't load from cache. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56117 --- dlls/dmloader/loader.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 78b9790dff3..2ebbbe7ffca 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -271,6 +271,7 @@ static struct cache_entry *find_cache_object(struct loader *This, DMUS_OBJECTDES static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDESC *pDesc, REFIID riid, void **ppv) { + static const DWORD source_flags = DMUS_OBJ_STREAM | DMUS_OBJ_FILENAME | DMUS_OBJ_URL | DMUS_OBJ_STREAM; struct loader *This = impl_from_IDirectMusicLoader8(iface); HRESULT result = S_OK; HRESULT ret = S_OK; /* used at the end of function, to determine whether everything went OK */ @@ -426,6 +427,11 @@ static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDE /* add object to cache/overwrite existing info (if cache is enabled) */ bCache = is_cache_enabled(This, &pDesc->guidClass); if (!bCache) TRACE(": caching disabled\n"); + else if ((pDesc->dwValidData & source_flags) == DMUS_OBJ_STREAM) + { + FIXME("Skipping cache for DMUS_OBJ_STREAM object\n"); + bCache = FALSE; + } else { if (!pObjectEntry)

1 0

Zebediah Figura : wined3d: Reference FFP resources in reference_shader_resources().
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: wine Branch: master Commit: a0669a276172db149556be8afc1ce96aed2c1cf7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0669a276172db149556be8afc1ce9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 28 23:18:58 2023 -0600 wined3d: Reference FFP resources in reference_shader_resources(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56110 --- dlls/wined3d/cs.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0f5d77d93c9..37d160d8f25 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -889,7 +889,17 @@ static void reference_shader_resources(struct wined3d_device_context *context, u continue; if (!(shader = state->shader[i])) + { + if (i == WINED3D_SHADER_TYPE_PIXEL) + { + for (j = 0; j < WINED3D_MAX_FFP_TEXTURES; ++j) + { + if ((view = state->shader_resource_view[WINED3D_SHADER_TYPE_PIXEL][j])) + wined3d_device_context_reference_resource(context, view->resource); + } + } continue; + } for (j = 0; j < WINED3D_MAX_CBS; ++j) {

1 0

Henri Verbeet : vkd3d: Slightly simplify debug_vk_memory_property_flags().
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 50cebc72780dada0822a1d081f3247f7d1dbc728 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/50cebc72780dada0822a1d081f324… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:28:49 2024 +0100 vkd3d: Slightly simplify debug_vk_memory_property_flags(). VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD and VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD were introduced by Vulkan-Headers 1.1.121; we currently require version 1.2.148. --- libs/vkd3d/utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 285df1a0..75197122 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -733,10 +733,8 @@ const char *debug_vk_memory_property_flags(VkMemoryPropertyFlags flags) FLAG_TO_STR(VK_MEMORY_PROPERTY_HOST_CACHED_BIT) FLAG_TO_STR(VK_MEMORY_PROPERTY_LAZILY_ALLOCATED_BIT) FLAG_TO_STR(VK_MEMORY_PROPERTY_PROTECTED_BIT) -#undef FLAG_TO_STR -#define FLAG_TO_STR(f, n) if (flags & f) { strcat(buffer, " | "#n); flags &= ~f; } - FLAG_TO_STR(0x40, VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD) - FLAG_TO_STR(0x80, VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD) + FLAG_TO_STR(VK_MEMORY_PROPERTY_DEVICE_COHERENT_BIT_AMD) + FLAG_TO_STR(VK_MEMORY_PROPERTY_DEVICE_UNCACHED_BIT_AMD) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags);

1 0

Henri Verbeet : vkd3d-shader/ir: Store destination parameter shifts as an unsigned int.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 5b9a0dfaeac4898d53067d83d99aae0801b1cc16 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5b9a0dfaeac4898d53067d83d99aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Dec 6 00:22:37 2023 +0100 vkd3d-shader/ir: Store destination parameter shifts as an unsigned int. --- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f9918b26..199a47a7 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -872,7 +872,7 @@ struct vkd3d_shader_dst_param struct vkd3d_shader_register reg; uint32_t write_mask; uint32_t modifiers; - DWORD shift; + unsigned int shift; }; struct vkd3d_shader_src_param

1 0

Henri Verbeet : vkd3d: Recognise VK_QUEUE_PROTECTED_BIT in debug_vk_queue_flags().
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 659c870edc5d2048308f69d371d1728cacd11859 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/659c870edc5d2048308f69d371d17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 3 16:11:50 2024 +0100 vkd3d: Recognise VK_QUEUE_PROTECTED_BIT in debug_vk_queue_flags(). --- libs/vkd3d/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 5ebe1b63..2541690e 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -683,7 +683,7 @@ const char *debug_vk_extent_3d(VkExtent3D extent) const char *debug_vk_queue_flags(VkQueueFlags flags) { - char buffer[120]; + char buffer[127]; buffer[0] = '\0'; #define FLAG_TO_STR(f) if (flags & f) { strcat(buffer, " | "#f); flags &= ~f; } @@ -691,6 +691,7 @@ const char *debug_vk_queue_flags(VkQueueFlags flags) FLAG_TO_STR(VK_QUEUE_COMPUTE_BIT) FLAG_TO_STR(VK_QUEUE_TRANSFER_BIT) FLAG_TO_STR(VK_QUEUE_SPARSE_BINDING_BIT) + FLAG_TO_STR(VK_QUEUE_PROTECTED_BIT) #undef FLAG_TO_STR if (flags) FIXME("Unrecognized flag(s) %#x.\n", flags);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate source swizzles depending on the dimension.
by Alexandre Julliard Jan. 4, 2024

Jan. 4, 2024

Module: vkd3d Branch: master Commit: 15e7711786e9f83e7087200bb9e08795e21b4431 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/15e7711786e9f83e7087200bb9e08… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Dec 21 15:58:46 2023 +0100 vkd3d-shader/ir: Validate source swizzles depending on the dimension. --- libs/vkd3d-shader/ir.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index a21af2fe..35a95c2b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1679,6 +1679,10 @@ static void vsir_validate_src_param(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SWIZZLE, "Source has invalid swizzle %#x.", src->swizzle); + if (src->reg.dimension != VSIR_DIMENSION_VEC4 && src->swizzle != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SWIZZLE, "Source of dimension %u has invalid swizzle %#x.", + src->reg.dimension, src->swizzle); + if (src->modifiers >= VKD3DSPSM_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Source has invalid modifiers %#x.", src->modifiers);

1 0