February 2024 - Wine-commits

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_pipeline_state_AddRef().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: c71fa87522cff2a14ae18d76bb72d94b71e04b8c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c71fa87522cff2a14ae18d76bb72d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:19:52 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_pipeline_state_AddRef(). --- libs/vkd3d/state.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4d8fdcb3..b818feb5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1984,7 +1984,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_QueryInterface(ID3D12Pipel static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_AddRef(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - ULONG refcount = InterlockedIncrement(&state->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&state->refcount); TRACE("%p increasing refcount to %u.\n", state, refcount); @@ -2027,7 +2027,7 @@ static void d3d12_pipeline_uav_counter_state_cleanup(struct d3d12_pipeline_uav_c static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - ULONG refcount = InterlockedDecrement(&state->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 7567a7fc..d46f434d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1288,7 +1288,7 @@ struct d3d12_pipeline_uav_counter_state struct d3d12_pipeline_state { ID3D12PipelineState ID3D12PipelineState_iface; - LONG refcount; + unsigned int refcount; union {

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_pipeline_state_Release().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: 9434687c5b98b8150cc1fa35a8fa0e6477593e04 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9434687c5b98b8150cc1fa35a8fa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:21:37 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_pipeline_state_Release(). --- libs/vkd3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b818feb5..3428742d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2027,7 +2027,7 @@ static void d3d12_pipeline_uav_counter_state_cleanup(struct d3d12_pipeline_uav_c static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&state->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_root_signature_deserializer_AddRef().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: c2e82cf06abf630ba139377f907b75df5cdbc9c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c2e82cf06abf630ba139377f907b7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 12:38:41 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_root_signature_deserializer_AddRef(). --- libs/vkd3d/vkd3d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 29c74018..df38e1a1 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -82,7 +82,7 @@ HRESULT vkd3d_create_device(const struct vkd3d_device_create_info *create_info, struct d3d12_root_signature_deserializer { ID3D12RootSignatureDeserializer ID3D12RootSignatureDeserializer_iface; - LONG refcount; + unsigned int refcount; union { @@ -123,7 +123,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_root_signature_deserializer_QueryInterfac static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_AddRef(ID3D12RootSignatureDeserializer *iface) { struct d3d12_root_signature_deserializer *deserializer = impl_from_ID3D12RootSignatureDeserializer(iface); - ULONG refcount = InterlockedIncrement(&deserializer->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&deserializer->refcount); TRACE("%p increasing refcount to %u.\n", deserializer, refcount); @@ -133,7 +133,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_AddRef(ID3D12Ro static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12RootSignatureDeserializer *iface) { struct d3d12_root_signature_deserializer *deserializer = impl_from_ID3D12RootSignatureDeserializer(iface); - ULONG refcount = InterlockedDecrement(&deserializer->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&deserializer->refcount); TRACE("%p decreasing refcount to %u.\n", deserializer, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_root_signature_deserializer_Release().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: afd0e45cd6634be3395ada4e21da1c07f9d466e9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/afd0e45cd6634be3395ada4e21da1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 12:41:05 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_root_signature_deserializer_Release(). --- libs/vkd3d/vkd3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index df38e1a1..e965cad4 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -133,7 +133,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_AddRef(ID3D12Ro static ULONG STDMETHODCALLTYPE d3d12_root_signature_deserializer_Release(ID3D12RootSignatureDeserializer *iface) { struct d3d12_root_signature_deserializer *deserializer = impl_from_ID3D12RootSignatureDeserializer(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&deserializer->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&deserializer->refcount); TRACE("%p decreasing refcount to %u.\n", deserializer, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_versioned_root_signature_deserializer_AddRef().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: f42411fe4a3e2db449d6366e9b74affdec121107 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f42411fe4a3e2db449d6366e9b74a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 12:43:51 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_versioned_root_signature_deserializer_AddRef(). --- libs/vkd3d/vkd3d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index e965cad4..fd5a4e60 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -242,7 +242,7 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s struct d3d12_versioned_root_signature_deserializer { ID3D12VersionedRootSignatureDeserializer ID3D12VersionedRootSignatureDeserializer_iface; - LONG refcount; + unsigned int refcount; union { @@ -284,7 +284,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Que static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_AddRef(ID3D12VersionedRootSignatureDeserializer *iface) { struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); - ULONG refcount = InterlockedIncrement(&deserializer->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&deserializer->refcount); TRACE("%p increasing refcount to %u.\n", deserializer, refcount); @@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_AddRe static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Release(ID3D12VersionedRootSignatureDeserializer *iface) { struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); - ULONG refcount = InterlockedDecrement(&deserializer->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&deserializer->refcount); TRACE("%p decreasing refcount to %u.\n", deserializer, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_versioned_root_signature_deserializer_Release().
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: feca006d6a8c47918adfb55b05c8e152fc436055 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/feca006d6a8c47918adfb55b05c8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 12:45:03 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_versioned_root_signature_deserializer_Release(). --- libs/vkd3d/vkd3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index fd5a4e60..f71b3701 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -294,7 +294,7 @@ static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_AddRe static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Release(ID3D12VersionedRootSignatureDeserializer *iface) { struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&deserializer->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&deserializer->refcount); TRACE("%p decreasing refcount to %u.\n", deserializer, refcount);

1 0

Henri Verbeet : vkd3d: Introduce a debug helper for CPU descriptor handles.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: 06ddb10c4008adde7d81e1ece4fdce7a2b267870 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/06ddb10c4008adde7d81e1ece4fdc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 14:50:03 2024 +0100 vkd3d: Introduce a debug helper for CPU descriptor handles. --- libs/vkd3d/command.c | 16 ++++++++-------- libs/vkd3d/device.c | 28 ++++++++++++++-------------- libs/vkd3d/utils.c | 5 +++++ libs/vkd3d/vkd3d_private.h | 1 + 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3cf58e06..f9940b3d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5132,8 +5132,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra struct VkAttachmentDescription attachment_desc; struct VkAttachmentReference ds_reference; - TRACE("iface %p, dsv %#lx, flags %#x, depth %.8e, stencil 0x%02x, rect_count %u, rects %p.\n", - iface, dsv.ptr, flags, depth, stencil, rect_count, rects); + TRACE("iface %p, dsv %s, flags %#x, depth %.8e, stencil 0x%02x, rect_count %u, rects %p.\n", + iface, debug_cpu_handle(dsv), flags, depth, stencil, rect_count, rects); d3d12_command_list_track_resource_usage(list, dsv_desc->resource); @@ -5180,8 +5180,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12Gra struct VkAttachmentReference color_reference; VkClearValue clear_value; - TRACE("iface %p, rtv %#lx, color %p, rect_count %u, rects %p.\n", - iface, rtv.ptr, color, rect_count, rects); + TRACE("iface %p, rtv %s, color %p, rect_count %u, rects %p.\n", + iface, debug_cpu_handle(rtv), color, rect_count, rects); d3d12_command_list_track_resource_usage(list, rtv_desc->resource); @@ -5432,8 +5432,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID struct d3d12_resource *resource_impl; VkClearColorValue colour; - TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", - iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); + TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %s, resource %p, values %p, rect_count %u, rects %p.\n", + iface, gpu_handle.ptr, debug_cpu_handle(cpu_handle), resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); if (!(descriptor = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view)) @@ -5496,8 +5496,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(I VkClearColorValue colour; struct vkd3d_view *view; - TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", - iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); + TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %s, resource %p, values %p, rect_count %u, rects %p.\n", + iface, gpu_handle.ptr, debug_cpu_handle(cpu_handle), resource, values, rect_count, rects); resource_impl = unsafe_impl_from_ID3D12Resource(resource); if (!(view = d3d12_desc_from_cpu_handle(cpu_handle)->s.u.view)) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 81386df9..cf8b506f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3420,7 +3420,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateConstantBufferView(ID3D12Device struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); + TRACE("iface %p, desc %p, descriptor %s.\n", iface, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_cbv(&tmp, device, desc); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); @@ -3433,8 +3433,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateShaderResourceView(ID3D12Device struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", - iface, resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, desc %p, descriptor %s.\n", + iface, resource, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_srv(&tmp, device, unsafe_impl_from_ID3D12Resource(resource), desc); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); @@ -3447,8 +3447,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateUnorderedAccessView(ID3D12Devic struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %#lx.\n", - iface, resource, counter_resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, counter_resource %p, desc %p, descriptor %s.\n", + iface, resource, counter_resource, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_uav(&tmp, device, unsafe_impl_from_ID3D12Resource(resource), unsafe_impl_from_ID3D12Resource(counter_resource), desc); @@ -3459,8 +3459,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateRenderTargetView(ID3D12Device7 ID3D12Resource *resource, const D3D12_RENDER_TARGET_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor) { - TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", - iface, resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, desc %p, descriptor %s.\n", + iface, resource, desc, debug_cpu_handle(descriptor)); d3d12_rtv_desc_create_rtv(d3d12_rtv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device7(iface), unsafe_impl_from_ID3D12Resource(resource), desc); @@ -3470,8 +3470,8 @@ static void STDMETHODCALLTYPE d3d12_device_CreateDepthStencilView(ID3D12Device7 ID3D12Resource *resource, const D3D12_DEPTH_STENCIL_VIEW_DESC *desc, D3D12_CPU_DESCRIPTOR_HANDLE descriptor) { - TRACE("iface %p, resource %p, desc %p, descriptor %#lx.\n", - iface, resource, desc, descriptor.ptr); + TRACE("iface %p, resource %p, desc %p, descriptor %s.\n", + iface, resource, desc, debug_cpu_handle(descriptor)); d3d12_dsv_desc_create_dsv(d3d12_dsv_desc_from_cpu_handle(descriptor), impl_from_ID3D12Device7(iface), unsafe_impl_from_ID3D12Resource(resource), desc); @@ -3483,7 +3483,7 @@ static void STDMETHODCALLTYPE d3d12_device_CreateSampler(ID3D12Device7 *iface, struct d3d12_device *device = impl_from_ID3D12Device7(iface); struct d3d12_desc tmp = {0}; - TRACE("iface %p, desc %p, descriptor %#lx.\n", iface, desc, descriptor.ptr); + TRACE("iface %p, desc %p, descriptor %s.\n", iface, desc, debug_cpu_handle(descriptor)); d3d12_desc_create_sampler(&tmp, device, desc); d3d12_desc_write_atomic(d3d12_desc_from_cpu_handle(descriptor), &tmp, device); @@ -3557,10 +3557,10 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptorsSimple(ID3D12Device7 * const D3D12_CPU_DESCRIPTOR_HANDLE src_descriptor_range_offset, D3D12_DESCRIPTOR_HEAP_TYPE descriptor_heap_type) { - TRACE("iface %p, descriptor_count %u, dst_descriptor_range_offset %#lx, " - "src_descriptor_range_offset %#lx, descriptor_heap_type %#x.\n", - iface, descriptor_count, dst_descriptor_range_offset.ptr, src_descriptor_range_offset.ptr, - descriptor_heap_type); + TRACE("iface %p, descriptor_count %u, dst_descriptor_range_offset %s, " + "src_descriptor_range_offset %s, descriptor_heap_type %#x.\n", + iface, descriptor_count, debug_cpu_handle(dst_descriptor_range_offset), + debug_cpu_handle(src_descriptor_range_offset), descriptor_heap_type); d3d12_device_CopyDescriptors(iface, 1, &dst_descriptor_range_offset, &descriptor_count, 1, &src_descriptor_range_offset, &descriptor_count, descriptor_heap_type); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 75197122..28913a83 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -632,6 +632,11 @@ HRESULT return_interface(void *iface, REFIID iface_iid, return hr; } +const char *debug_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE handle) +{ + return vkd3d_dbg_sprintf("{%#"PRIxPTR"}", (uintptr_t)handle.ptr); +} + const char *debug_d3d12_box(const D3D12_BOX *box) { if (!box) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d46f434d..bb78ba77 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1960,6 +1960,7 @@ bool is_write_resource_state(D3D12_RESOURCE_STATES state); HRESULT return_interface(void *iface, REFIID iface_iid, REFIID requested_iid, void **object); +const char *debug_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE handle); const char *debug_d3d12_box(const D3D12_BOX *box); const char *debug_d3d12_shader_component_mapping(unsigned int mapping); const char *debug_vk_extent_3d(VkExtent3D extent);

1 0

Vibhav Pant : configure: Correctly derive the target from CC if it's set to an absolute path.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 36fa4da337b6a2c585ac20e4228c562dfb45af62 URL: https://gitlab.winehq.org/wine/wine/-/commit/36fa4da337b6a2c585ac20e4228c56… Author: Vibhav Pant <vibhavp(a)gmail.com> Date: Thu Feb 1 19:21:44 2024 +0530 configure: Correctly derive the target from CC if it's set to an absolute path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56279 --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure b/configure index ca82387287a..e87495c42d9 100755 --- a/configure +++ b/configure @@ -10657,6 +10657,8 @@ then : while test $# -ge 1 do case "$1" in + */*-gcc) target=`expr "$1" : '.*/$.*$-gcc'` ;; + */*-clang) target=`expr "$1" : '.*/$.*$-clang'` ;; *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; *-clang) target=`expr "$1" : '$.*$-clang'` ;; esac diff --git a/configure.ac b/configure.ac index 4bf9f76848e..ba1be1bf9d3 100644 --- a/configure.ac +++ b/configure.ac @@ -882,6 +882,8 @@ do while test $# -ge 1 do case "$1" in + */*-gcc) target=`expr "$1" : '.*/$.*$-gcc'` ;; + */*-clang) target=`expr "$1" : '.*/$.*$-clang'` ;; *-gcc) target=`expr "$1" : '$.*$-gcc'` ;; *-clang) target=`expr "$1" : '$.*$-clang'` ;; esac

1 0

Nikolay Sivov : d3d10/effect: Clarify constant buffer flags field meaning.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 68ab4c48493f2a777f011f6d8e391de720c98109 URL: https://gitlab.winehq.org/wine/wine/-/commit/68ab4c48493f2a777f011f6d8e391d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 1 14:21:23 2024 +0100 d3d10/effect: Clarify constant buffer flags field meaning. It makes more sense to have it matching fx_5_0 format, which uses the same flag for TBUFFER case, and also keeps 'single' modifier in there. This modifier is ignored on fx_4_x, so it's only needed to be implemented in the compiler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 534eadb2659..26394510945 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3796,10 +3796,13 @@ static HRESULT create_buffer_object(struct d3d10_effect_variable *v) static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char **ptr, BOOL local, struct d3d10_effect_variable *l) { + enum buffer_flags + { + IS_TBUFFER = 1, + }; const char *prefix = local ? "Local" : "Shared"; + uint32_t offset, flags; unsigned int i; - uint32_t offset; - D3D10_CBUFFER_TYPE d3d10_cbuffer_type; HRESULT hr; unsigned int stride = 0; @@ -3826,32 +3829,30 @@ static HRESULT parse_fx10_buffer(const char *data, size_t data_size, const char l->data_size = read_u32(ptr); TRACE("%s buffer data size: %#x.\n", prefix, l->data_size); - d3d10_cbuffer_type = read_u32(ptr); - TRACE("%s buffer type: %#x.\n", prefix, d3d10_cbuffer_type); + flags = read_u32(ptr); + TRACE("%s buffer flags: %#x.\n", prefix, flags); - switch(d3d10_cbuffer_type) + if (flags & IS_TBUFFER) { - case D3D10_CT_CBUFFER: - l->type->basetype = D3D10_SVT_CBUFFER; - if (!copy_name("cbuffer", &l->type->name)) - { - ERR("Failed to copy name.\n"); - return E_OUTOFMEMORY; - } - break; - - case D3D10_CT_TBUFFER: - l->type->basetype = D3D10_SVT_TBUFFER; - if (!copy_name("tbuffer", &l->type->name)) - { - ERR("Failed to copy name.\n"); - return E_OUTOFMEMORY; - } - break; + l->type->basetype = D3D10_SVT_TBUFFER; + copy_name("tbuffer", &l->type->name); + } + else + { + l->type->basetype = D3D10_SVT_CBUFFER; + copy_name("cbuffer", &l->type->name); + } + if (!l->type->name) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } - default: - ERR("Unexpected D3D10_CBUFFER_TYPE %#x!\n", d3d10_cbuffer_type); - return E_FAIL; + flags &= ~IS_TBUFFER; + if (flags) + { + ERR("Unexpected buffer flags %#x.\n", flags); + return E_FAIL; } l->type->member_count = read_u32(ptr);

1 0

Louis Lenders : shcore: Add stub for RegisterScaleChangeNotifications.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: c3918f2a82fd67301cf5fe1b35894506a34a2135 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3918f2a82fd67301cf5fe1b358945… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Feb 1 21:15:39 2024 +0100 shcore: Add stub for RegisterScaleChangeNotifications. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56244 --- dlls/shcore/main.c | 12 ++++++++++++ dlls/shcore/shcore.spec | 2 +- include/shellscalingapi.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 653694a04dc..a64b6661d23 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2531,6 +2531,18 @@ HRESULT WINAPI RegisterScaleChangeEvent(HANDLE handle, DWORD_PTR *cookie) return E_NOTIMPL; } +/************************************************************************* + * RegisterScaleChangeNotifications [SHCORE.@] + */ +HRESULT WINAPI RegisterScaleChangeNotifications(DISPLAY_DEVICE_TYPE display_device, HWND hwnd, UINT msg, DWORD *cookie) +{ + FIXME("(%d, %p, %u, %p) stub\n", display_device, hwnd, msg, cookie); + + if (cookie) *cookie = 0; + + return E_NOTIMPL; +} + /************************************************************************* * CreateRandomAccessStreamOverStream [SHCORE.@] */ diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index fc265d8215a..102e3014bce 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -33,7 +33,7 @@ # @ stub RecordFeatureError # @ stub RecordFeatureUsage @ stdcall RegisterScaleChangeEvent(ptr ptr) -@ stub RegisterScaleChangeNotifications +@ stdcall RegisterScaleChangeNotifications(long ptr long ptr) @ stub RevokeScaleChangeNotifications @ stdcall SHAnsiToAnsi(str ptr long) @ stdcall SHAnsiToUnicode(str ptr long) diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h index 4689d83e7d9..147195d2cba 100644 --- a/include/shellscalingapi.h +++ b/include/shellscalingapi.h @@ -46,6 +46,7 @@ HRESULT WINAPI GetDpiForMonitor(HMONITOR,MONITOR_DPI_TYPE,UINT*,UINT*); HRESULT WINAPI GetProcessDpiAwareness(HANDLE,PROCESS_DPI_AWARENESS*); DEVICE_SCALE_FACTOR WINAPI GetScaleFactorForDevice(DISPLAY_DEVICE_TYPE device_type); HRESULT WINAPI GetScaleFactorForMonitor(HMONITOR,DEVICE_SCALE_FACTOR*); +HRESULT WINAPI RegisterScaleChangeNotifications(DISPLAY_DEVICE_TYPE,HWND,UINT,DWORD*); HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS); #endif /* __WINE_SHELLSCALINGAPI_H */

1 0