January 2024 - Wine-Commits

Francisco Casas : tests/shader_runner: Free runner->input_elements in parse_test_directive() (valgrind).
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 70e1924e6e0563d0cd81ad7a5a319424522610cd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/70e1924e6e0563d0cd81ad7a5a319… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 19:44:47 2024 -0300 tests/shader_runner: Free runner->input_elements in parse_test_directive() (valgrind). --- tests/shader_runner.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 00f13fec..5b141100 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -666,6 +666,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) { struct resource_params params; struct input_element *element; + unsigned int i; /* For simplicity, draw a large triangle instead. */ static const struct vec2 quad[] = @@ -696,6 +697,9 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) set_resource(runner, runner->ops->create_resource(runner, &params)); } + for (i = 0; i < runner->input_element_count; ++i) + free(runner->input_elements[i].name); + vkd3d_array_reserve((void **)&runner->input_elements, &runner->input_element_capacity, 1, sizeof(*runner->input_elements)); element = &runner->input_elements[0];

1 0

Francisco Casas : tests/shader_runner: Pass a pointer to the data when creating uav buffers in d3d12.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 8f9b48c4550d8644cf22342ac063258ab7616bee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f9b48c4550d8644cf22342ac0632… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 17:49:22 2024 -0300 tests/shader_runner: Pass a pointer to the data when creating uav buffers in d3d12. The implementation of upload_buffer_data_with_states(), unlike the implementation of upload_texture_data_with_states(), does not expect a pointer to a D3D12_SUBRESOURCE_DATA, but rather, a direct pointer to the data. --- tests/shader_runner_d3d12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index c151b85b..c6154cd1 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -205,7 +205,7 @@ static struct resource *d3d12_runner_create_resource(struct shader_runner *r, co resource->resource = create_default_buffer(device, params->data_size, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_DEST); - upload_buffer_data_with_states(resource->resource, 0, params->data_size, resource_data, + upload_buffer_data_with_states(resource->resource, 0, params->data_size, resource_data[0].pData, test_context->queue, test_context->list, RESOURCE_STATE_DO_NOT_CHANGE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); reset_command_list(test_context->list, test_context->allocator);

1 0

Francisco Casas : vkd3d-shader/ir: Update flatten_control_flow_constructs() comment.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: cec45da45b411954d42b892a9729f905b28c715c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cec45da45b411954d42b892a9729f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 17:25:38 2024 -0300 vkd3d-shader/ir: Update flatten_control_flow_constructs() comment. --- libs/vkd3d-shader/ir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 45ccea45..9079be48 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -2343,7 +2343,7 @@ static enum vkd3d_result flatten_control_flow_constructs(struct vkd3d_shader_par } vkd3d_free(flattener.control_flow_info); - /* Simpler to always free these in free_shader_desc(). */ + /* Simpler to always free these in vsir_program_cleanup(). */ program->block_names = flattener.block_names; program->block_name_count = flattener.block_name_count;

1 0

Francisco Casas : tests/shader_runner: Free extensions pointer on vulkan runner (valgrind).
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 8379e5337cbbef6d468baafa2f42c8a6ce0bf074 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8379e5337cbbef6d468baafa2f42c… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 19:01:36 2024 -0300 tests/shader_runner: Free extensions pointer on vulkan runner (valgrind). --- tests/shader_runner_vulkan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index e1271e75..0aa61107 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -1252,10 +1252,12 @@ static bool check_device_extensions(struct vulkan_shader_runner *runner) if (!has_extension(extensions, count, required_device_extensions[i])) { skip("The selected Vulkan device does not support %s.\n", required_device_extensions[i]); + free(extensions); return false; } } + free(extensions); return true; }

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle thread group UAV barriers.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 8ae69c745b133f2d0b2a737ec336bdf48c9ac7ae URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ae69c745b133f2d0b2a737ec336b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 16 13:46:10 2023 +1000 vkd3d-shader/spirv: Handle thread group UAV barriers. --- libs/vkd3d-shader/d3d_asm.c | 5 +++++ libs/vkd3d-shader/spirv.c | 15 ++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 ++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 6ec7a9c9..7f67be8c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -445,6 +445,11 @@ static void shader_dump_sync_flags(struct vkd3d_d3d_asm_compiler *compiler, uint vkd3d_string_buffer_printf(&compiler->buffer, "_uglobal"); sync_flags &= ~VKD3DSSF_GLOBAL_UAV; } + if (sync_flags & VKD3DSSF_THREAD_GROUP_UAV) + { + vkd3d_string_buffer_printf(&compiler->buffer, "_ugroup"); + sync_flags &= ~VKD3DSSF_THREAD_GROUP_UAV; + } if (sync_flags & VKD3DSSF_GROUP_SHARED_MEMORY) { vkd3d_string_buffer_printf(&compiler->buffer, "_g"); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 04ef128e..185b93c0 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9343,11 +9343,20 @@ static void spirv_compiler_emit_sync(struct spirv_compiler *compiler, flags &= ~VKD3DSSF_THREAD_GROUP; } - if (flags & VKD3DSSF_GLOBAL_UAV) + if (flags & (VKD3DSSF_THREAD_GROUP_UAV | VKD3DSSF_GLOBAL_UAV)) { - memory_scope = SpvScopeDevice; + bool group_uav = flags & VKD3DSSF_THREAD_GROUP_UAV; + bool global_uav = flags & VKD3DSSF_GLOBAL_UAV; + + if (group_uav && global_uav) + { + WARN("Invalid UAV sync flag combination; assuming global.\n"); + spirv_compiler_warning(compiler, VKD3D_SHADER_WARNING_SPV_INVALID_UAV_FLAGS, + "The flags for a UAV sync instruction are contradictory; assuming global sync."); + } + memory_scope = global_uav ? SpvScopeDevice : SpvScopeWorkgroup; memory_semantics |= SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsImageMemoryMask; - flags &= ~VKD3DSSF_GLOBAL_UAV; + flags &= ~(VKD3DSSF_THREAD_GROUP_UAV | VKD3DSSF_GLOBAL_UAV); } if (flags) diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index f6dd12ff..b16a69f0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -99,6 +99,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_SPV_INVALID_SHADER = 2009, VKD3D_SHADER_WARNING_SPV_INVALID_SWIZZLE = 2300, + VKD3D_SHADER_WARNING_SPV_INVALID_UAV_FLAGS = 2301, VKD3D_SHADER_ERROR_RS_OUT_OF_MEMORY = 3000, VKD3D_SHADER_ERROR_RS_INVALID_VERSION = 3001, @@ -730,6 +731,7 @@ enum vkd3d_shader_sync_flags { VKD3DSSF_THREAD_GROUP = 0x1, VKD3DSSF_GROUP_SHARED_MEMORY = 0x2, + VKD3DSSF_THREAD_GROUP_UAV = 0x4, VKD3DSSF_GLOBAL_UAV = 0x8, };

1 0

Conor McCarthy : vkd3d-shader/spirv: Handle globally coherent UAVs.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: adfbecef3c8fcbfea488920c99fb8a76d0b66450 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/adfbecef3c8fcbfea488920c99fb8… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 16 00:09:11 2023 +1000 vkd3d-shader/spirv: Handle globally coherent UAVs. --- libs/vkd3d-shader/spirv.c | 3 +++ libs/vkd3d-shader/vkd3d_shader_main.c | 10 ++++++---- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 299b4e96..e50b35ac 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6237,6 +6237,9 @@ static void spirv_compiler_emit_resource_declaration(struct spirv_compiler *comp if (!(d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ)) vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationNonReadable, NULL, 0); + if (d->uav_flags & VKD3DSUF_GLOBALLY_COHERENT) + vkd3d_spirv_build_op_decorate(builder, var_id, SpvDecorationCoherent, NULL, 0); + if (d->flags & VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_COUNTER) { assert(structure_stride); /* counters are valid only for structured buffers */ diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 00f2f5d3..9b7d5d22 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -1016,7 +1016,7 @@ static void vkd3d_shader_scan_combined_sampler_usage(struct vkd3d_shader_scan_co static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_context *context, const struct vkd3d_shader_resource *resource, enum vkd3d_shader_resource_type resource_type, enum vkd3d_shader_resource_data_type resource_data_type, - unsigned int sample_count, unsigned int structure_stride, bool raw) + unsigned int sample_count, unsigned int structure_stride, bool raw, uint32_t flags) { struct vkd3d_shader_descriptor_info1 *d; enum vkd3d_shader_descriptor_type type; @@ -1032,6 +1032,8 @@ static void vkd3d_shader_scan_resource_declaration(struct vkd3d_shader_scan_cont d->structure_stride = structure_stride; if (raw) d->flags |= VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_RAW_BUFFER; + if (type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) + d->uav_flags = flags; } static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_scan_context *context, @@ -1090,7 +1092,7 @@ static void vkd3d_shader_scan_typed_resource_declaration(struct vkd3d_shader_sca } vkd3d_shader_scan_resource_declaration(context, &semantic->resource, - semantic->resource_type, resource_data_type, semantic->sample_count, 0, false); + semantic->resource_type, resource_data_type, semantic->sample_count, 0, false, instruction->flags); } static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *context, @@ -1126,13 +1128,13 @@ static int vkd3d_shader_scan_instruction(struct vkd3d_shader_scan_context *conte case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_UAV_RAW: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.raw_resource.resource, - VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, 0, true); + VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, 0, true, instruction->flags); break; case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_UAV_STRUCTURED: vkd3d_shader_scan_resource_declaration(context, &instruction->declaration.structured_resource.resource, VKD3D_SHADER_RESOURCE_BUFFER, VKD3D_SHADER_RESOURCE_DATA_UINT, 0, - instruction->declaration.structured_resource.byte_stride, false); + instruction->declaration.structured_resource.byte_stride, false, instruction->flags); break; case VKD3DSIH_IF: cf_info = vkd3d_shader_scan_push_cf_info(context); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 51daf215..f6dd12ff 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -1339,6 +1339,7 @@ struct vkd3d_shader_descriptor_info1 unsigned int buffer_size; unsigned int structure_stride; unsigned int count; + uint32_t uav_flags; }; struct vkd3d_shader_scan_descriptor_info1

1 0

Conor McCarthy : vkd3d-shader/spirv: Include Uniform in the memory semantics for UAV barriers.
by Alexandre Julliard Jan. 25, 2024

Jan. 25, 2024

Module: vkd3d Branch: master Commit: 18e9148f5891085e962ff8c6a8a6ac5957548c0e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/18e9148f5891085e962ff8c6a8a6a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 16 13:25:35 2023 +1000 vkd3d-shader/spirv: Include Uniform in the memory semantics for UAV barriers. The UniformMemory semantic applies the constraints to Uniform storage class memory, which matches how UAV variables are declared. --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e50b35ac..04ef128e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -9346,7 +9346,7 @@ static void spirv_compiler_emit_sync(struct spirv_compiler *compiler, if (flags & VKD3DSSF_GLOBAL_UAV) { memory_scope = SpvScopeDevice; - memory_semantics |= SpvMemorySemanticsImageMemoryMask; + memory_semantics |= SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsImageMemoryMask; flags &= ~VKD3DSSF_GLOBAL_UAV; }

1 0

Bernhard Übelacker : ntdll: Fix structure layout in RtlQueryProcessDebugInformation for 64-bit.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: ab28825aceec92775fd570fc3a42c154366eceea URL: https://gitlab.winehq.org/wine/wine/-/commit/ab28825aceec92775fd570fc3a42c1… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Jan 22 13:39:22 2024 +0100 ntdll: Fix structure layout in RtlQueryProcessDebugInformation for 64-bit. This is to avoid crash in Process Explorer 17.05. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56235 --- dlls/ntdll/debugbuffer.c | 4 ++-- dlls/ntdll/tests/rtl.c | 15 +++++++++++++++ include/winternl.h | 6 +++--- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/debugbuffer.c b/dlls/ntdll/debugbuffer.c index f073207ac06..aa35651bb40 100644 --- a/dlls/ntdll/debugbuffer.c +++ b/dlls/ntdll/debugbuffer.c @@ -77,8 +77,8 @@ static void dump_DEBUG_BUFFER(const DEBUG_BUFFER *iBuf) TRACE( "EventPairHandle:%p\n", iBuf->EventPairHandle); TRACE( "RemoteThreadHandle:%p\n", iBuf->RemoteThreadHandle); TRACE( "InfoClassMask:%lx\n", iBuf->InfoClassMask); - TRACE( "SizeOfInfo:%ld\n", iBuf->SizeOfInfo); - TRACE( "AllocatedSize:%ld\n", iBuf->AllocatedSize); + TRACE( "SizeOfInfo:%Iu\n", iBuf->SizeOfInfo); + TRACE( "AllocatedSize:%Iu\n", iBuf->AllocatedSize); TRACE( "SectionSize:%ld\n", iBuf->SectionSize); TRACE( "BackTraceInfo:%p\n", iBuf->BackTraceInformation); dump_DEBUG_MODULE_INFORMATION(iBuf->ModuleInformation); diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 03c31d7bf6b..754f5b711dd 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -157,6 +157,7 @@ static void test_RtlQueryProcessDebugInformation(void) DEBUG_BUFFER *buffer; NTSTATUS status; + /* PDI_HEAPS | PDI_HEAP_BLOCKS */ buffer = RtlCreateQueryDebugBuffer( 0, 0 ); ok( buffer != NULL, "RtlCreateQueryDebugBuffer returned NULL" ); @@ -165,6 +166,20 @@ static void test_RtlQueryProcessDebugInformation(void) status = RtlQueryProcessDebugInformation( GetCurrentProcessId(), PDI_HEAPS | PDI_HEAP_BLOCKS, buffer ); ok( !status, "RtlQueryProcessDebugInformation returned %lx\n", status ); + ok( buffer->InfoClassMask == (PDI_HEAPS | PDI_HEAP_BLOCKS), "unexpected InfoClassMask %ld\n", buffer->InfoClassMask); + ok( buffer->HeapInformation != NULL, "unexpected HeapInformation %p\n", buffer->HeapInformation); + + status = RtlDestroyQueryDebugBuffer( buffer ); + ok( !status, "RtlDestroyQueryDebugBuffer returned %lx\n", status ); + + /* PDI_MODULES */ + buffer = RtlCreateQueryDebugBuffer( 0, 0 ); + ok( buffer != NULL, "RtlCreateQueryDebugBuffer returned NULL" ); + + status = RtlQueryProcessDebugInformation( GetCurrentProcessId(), PDI_MODULES, buffer ); + ok( !status, "RtlQueryProcessDebugInformation returned %lx\n", status ); + ok( buffer->InfoClassMask == PDI_MODULES, "unexpected InfoClassMask %ld\n", buffer->InfoClassMask); + ok( buffer->ModuleInformation != NULL, "unexpected ModuleInformation %p\n", buffer->ModuleInformation); status = RtlDestroyQueryDebugBuffer( buffer ); ok( !status, "RtlDestroyQueryDebugBuffer returned %lx\n", status ); diff --git a/include/winternl.h b/include/winternl.h index 48eac76c4d6..52af87320a5 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3040,11 +3040,11 @@ typedef struct _DEBUG_BUFFER { PVOID RemoteSectionBase; ULONG SectionBaseDelta; HANDLE EventPairHandle; - ULONG Unknown[2]; + SIZE_T Unknown[2]; HANDLE RemoteThreadHandle; ULONG InfoClassMask; - ULONG SizeOfInfo; - ULONG AllocatedSize; + SIZE_T SizeOfInfo; + SIZE_T AllocatedSize; ULONG SectionSize; PVOID ModuleInformation; PVOID BackTraceInformation;

1 0

Alexandre Julliard : configure: Only check for libunwind on x86-64.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: 976e715b8679ef21218d40adba98b47ef0a36b42 URL: https://gitlab.winehq.org/wine/wine/-/commit/976e715b8679ef21218d40adba98b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 24 15:20:11 2024 +0100 configure: Only check for libunwind on x86-64. --- configure | 17 ++++++++--------- configure.ac | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/configure b/configure index a8993e6c5c8..e6d9f185a54 100755 --- a/configure +++ b/configure @@ -6322,7 +6322,6 @@ printf "%s\n" "$wine_cv_cc_m32" >&6; } TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_LIBDIR - with_unwind=${with_unwind:-no} else CC="$CC -m64" CXX="$CXX -m64" @@ -6419,9 +6418,6 @@ printf "%s\n" "$wine_cv_float_abi" >&6; } CFLAGS="$CFLAGS -mfloat-abi=$float_abi" TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; - i[3456789]86*) - with_unwind=${with_unwind:-no} - ;; esac enable_win16=${enable_win16:-i386} @@ -17862,8 +17858,10 @@ esac fi -if test "x$with_unwind" != xno +if test $HOST_ARCH = x86_64 then + if test "x$with_unwind" != xno + then rm -f conftest.err if ${UNWIND_CFLAGS:+false} : then : @@ -17965,9 +17963,9 @@ printf "%s\n" "#define HAVE_LIBUNWIND 1" >>confdefs.h fi CPPFLAGS=$ac_save_CPPFLAGS -fi -case $host in - aarch64*|*-darwin*) + fi + case $host in + *-darwin*) if test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" = xnono then : case "x$with_unwind" in @@ -17978,7 +17976,8 @@ This is an error since --with-unwind was requested." "$LINENO" 5 ;; esac fi ;; -esac + esac +fi if test "x$with_sdl" != "xno" then diff --git a/configure.ac b/configure.ac index 9e550559589..475743bc121 100644 --- a/configure.ac +++ b/configure.ac @@ -131,7 +131,6 @@ case $host in TARGETFLAGS="$TARGETFLAGS -m32" PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib32/pkgconfig:/usr/lib/pkgconfig} export PKG_CONFIG_LIBDIR - with_unwind=${with_unwind:-no} else CC="$CC -m64" CXX="$CXX -m64" @@ -177,9 +176,6 @@ case $host in CFLAGS="$CFLAGS -mfloat-abi=$float_abi" TARGETFLAGS="$TARGETFLAGS -mfloat-abi=$float_abi" ;; - i[[3456789]]86*) - with_unwind=${with_unwind:-no} - ;; esac enable_win16=${enable_win16:-i386} @@ -1698,8 +1694,10 @@ WINE_NOTICE_WITH(udev,[test "x$UDEV_LIBS" = "x"], [libudev ${notice_platform}development files not found, plug and play won't be supported.]) dnl **** Check for libunwind **** -if test "x$with_unwind" != xno +if test $HOST_ARCH = x86_64 then + if test "x$with_unwind" != xno + then WINE_PACKAGE_FLAGS(UNWIND,[libunwind],[-lunwind],,, [AC_CACHE_CHECK([for unw_step],wine_cv_have_unw_step, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define UNW_LOCAL_ONLY @@ -1725,12 +1723,13 @@ then then AC_DEFINE(HAVE_LIBUNWIND,1,[Define to 1 if you have the `unwind' library (-lunwind).]) fi]) -fi -case $host in - aarch64*|*-darwin*) + fi + case $host in + *-darwin*) WINE_NOTICE_WITH(unwind,[test "x$wine_cv_have_unw_step$wine_cv_have_libunwind_unw_step" = xnono], [libunwind ${notice_platform}development files not found, stack unwinding won't work.]) ;; -esac + esac +fi dnl **** Check for libSDL2 **** if test "x$with_sdl" != "xno"

1 0

Martin Storsjö : ntdll: Reduce fixme logging for large numbers of cores.
by Alexandre Julliard Jan. 24, 2024

Jan. 24, 2024

Module: wine Branch: master Commit: e7721130712fe28503f03b0406337cc78586bb7e URL: https://gitlab.winehq.org/wine/wine/-/commit/e7721130712fe28503f03b0406337c… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Jan 24 13:37:35 2024 +0200 ntdll: Reduce fixme logging for large numbers of cores. Once we've reached the condition for skipping a core, we will skip all other cores in the same range as well - don't print a fixme message for each of them. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- dlls/ntdll/unix/system.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index e55ec9e1137..d2df1dd50c2 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -931,11 +931,7 @@ static NTSTATUS create_logical_proc_info(void) unsigned int phys_core = 0; ULONG_PTR thread_mask = 0; - if (i > 8 * sizeof(ULONG_PTR)) - { - FIXME("skipping logical processor %d\n", i); - continue; - } + if (i > 8 * sizeof(ULONG_PTR)) break; snprintf(name, sizeof(name), core_info, i, "physical_package_id"); f = fopen(name, "r");

1 0