January 2024 - Wine-commits

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_resource_decref().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 201fab7d5df3867cdbbb3e145ff832efefb2a230 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/201fab7d5df3867cdbbb3e145ff83… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:19:30 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_resource_decref(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f607b178..c44f3ef6 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1012,7 +1012,7 @@ static ULONG d3d12_resource_incref(struct d3d12_resource *resource) static ULONG d3d12_resource_decref(struct d3d12_resource *resource) { - unsigned int refcount = InterlockedDecrement((LONG *)&resource->internal_refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&resource->internal_refcount); TRACE("%p decreasing refcount to %u.\n", resource, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_resource_AddRef().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 84234a8875259a6c93a756a7e540805267b5ca3a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/84234a8875259a6c93a756a7e5408… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:23:49 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_resource_AddRef(). --- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c44f3ef6..9da9d19a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1284,7 +1284,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_resource_QueryInterface(ID3D12Resource1 * static ULONG STDMETHODCALLTYPE d3d12_resource_AddRef(ID3D12Resource1 *iface) { struct d3d12_resource *resource = impl_from_ID3D12Resource1(iface); - ULONG refcount = InterlockedIncrement(&resource->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&resource->refcount); TRACE("%p increasing refcount to %u.\n", resource, refcount); @@ -1302,7 +1302,7 @@ static ULONG STDMETHODCALLTYPE d3d12_resource_AddRef(ID3D12Resource1 *iface) static ULONG STDMETHODCALLTYPE d3d12_resource_Release(ID3D12Resource1 *iface) { struct d3d12_resource *resource = impl_from_ID3D12Resource1(iface); - ULONG refcount = InterlockedDecrement(&resource->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&resource->refcount); TRACE("%p decreasing refcount to %u.\n", resource, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 68941537..47709ffc 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -721,7 +721,7 @@ struct d3d12_resource_tile_info struct d3d12_resource { ID3D12Resource1 ID3D12Resource1_iface; - LONG refcount; + unsigned int refcount; unsigned int internal_refcount; D3D12_RESOURCE_DESC desc;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_resource_Release().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 886c1fdcc41e730e1116a15894cdbe5fa822163b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/886c1fdcc41e730e1116a15894cdb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:25:32 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_resource_Release(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 9da9d19a..e95c90dc 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1302,7 +1302,7 @@ static ULONG STDMETHODCALLTYPE d3d12_resource_AddRef(ID3D12Resource1 *iface) static ULONG STDMETHODCALLTYPE d3d12_resource_Release(ID3D12Resource1 *iface) { struct d3d12_resource *resource = impl_from_ID3D12Resource1(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&resource->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&resource->refcount); TRACE("%p decreasing refcount to %u.\n", resource, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_descriptor_heap_AddRef().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: db37be2a702e14a5eb986efaedcb8acb3c2b4941 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/db37be2a702e14a5eb986efaedcb8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:28:25 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_descriptor_heap_AddRef(). --- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e95c90dc..ccc2affc 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4010,7 +4010,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_QueryInterface(ID3D12Desc static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_AddRef(ID3D12DescriptorHeap *iface) { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - ULONG refcount = InterlockedIncrement(&heap->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&heap->refcount); TRACE("%p increasing refcount to %u.\n", heap, refcount); @@ -4020,7 +4020,7 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_AddRef(ID3D12DescriptorHeap static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHeap *iface) { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - ULONG refcount = InterlockedDecrement(&heap->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&heap->refcount); TRACE("%p decreasing refcount to %u.\n", heap, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 47709ffc..731afe0a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1046,7 +1046,7 @@ struct d3d12_descriptor_heap_vk_set struct d3d12_descriptor_heap { ID3D12DescriptorHeap ID3D12DescriptorHeap_iface; - LONG refcount; + unsigned int refcount; uint64_t serial_id; D3D12_DESCRIPTOR_HEAP_DESC desc;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_descriptor_heap_Release().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 334f60c281506e7edce0ef35182903e3cddf7c1f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/334f60c281506e7edce0ef3518290… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:30:42 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_descriptor_heap_Release(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index ccc2affc..dbf84016 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4020,7 +4020,7 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_AddRef(ID3D12DescriptorHeap static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHeap *iface) { struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&heap->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&heap->refcount); TRACE("%p decreasing refcount to %u.\n", heap, refcount);

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_query_heap_AddRef().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: d66f61cd5f46fda30c3c3f02a9223f1838a60daa URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d66f61cd5f46fda30c3c3f02a9223… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:33:23 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_query_heap_AddRef(). --- libs/vkd3d/resource.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index dbf84016..a6c12002 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4429,7 +4429,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_query_heap_QueryInterface(ID3D12QueryHeap static ULONG STDMETHODCALLTYPE d3d12_query_heap_AddRef(ID3D12QueryHeap *iface) { struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - ULONG refcount = InterlockedIncrement(&heap->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&heap->refcount); TRACE("%p increasing refcount to %u.\n", heap, refcount); @@ -4439,7 +4439,7 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_AddRef(ID3D12QueryHeap *iface) static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) { struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - ULONG refcount = InterlockedDecrement(&heap->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&heap->refcount); TRACE("%p decreasing refcount to %u.\n", heap, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 731afe0a..bfe4d514 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1085,7 +1085,7 @@ HRESULT d3d12_descriptor_heap_create(struct d3d12_device *device, struct d3d12_query_heap { ID3D12QueryHeap ID3D12QueryHeap_iface; - LONG refcount; + unsigned int refcount; VkQueryPool vk_query_pool;

1 0

Henri Verbeet : vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_query_heap_Release().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 920f5293e9b9f685131b628ccac1e9c7cc611664 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/920f5293e9b9f685131b628ccac1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 29 17:34:15 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_query_heap_Release(). --- libs/vkd3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a6c12002..cd2f9af0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -4439,7 +4439,7 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_AddRef(ID3D12QueryHeap *iface) static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) { struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&heap->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&heap->refcount); TRACE("%p decreasing refcount to %u.\n", heap, refcount);

1 0

Henri Verbeet : vkd3d: Use debugstr_hresult() in d3d12_device_mark_as_removed().
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: vkd3d Branch: master Commit: 6dea3d08b1e9453bfc51dfec827cf1a25c2729df URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6dea3d08b1e9453bfc51dfec827cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 30 13:27:51 2024 +0100 vkd3d: Use debugstr_hresult() in d3d12_device_mark_as_removed(). --- libs/vkd3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3f63e604..e45072b9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -4473,8 +4473,8 @@ void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, va_list args; va_start(args, message); - WARN("Device %p is lost (reason %#x, \"%s\").\n", - device, reason, vkd3d_dbg_vsprintf(message, args)); + WARN("Device %p is lost (reason %s, \"%s\").\n", + device, debugstr_hresult(reason), vkd3d_dbg_vsprintf(message, args)); va_end(args); device->removed_reason = reason;

1 0

Jacek Caban : mfmediaengine/tests: Use MF_MEDIA_ENGINE_CANPLAY type in IMFMediaEngine_CanPlayType call.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: 2bbc4e17a5f2e0d188b7ce58068c7df2992cec66 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bbc4e17a5f2e0d188b7ce58068c7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:10:13 2023 +0100 mfmediaengine/tests: Use MF_MEDIA_ENGINE_CANPLAY type in IMFMediaEngine_CanPlayType call. --- dlls/mfmediaengine/tests/mfmediaengine.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 66a1f0b79e9..87db94ce18d 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -435,6 +435,7 @@ static void test_CreateInstance(void) static void test_Shutdown(void) { + MF_MEDIA_ENGINE_CANPLAY can_play_state; struct media_engine_notify *notify; IMFMediaEngineEx *media_engine_ex; IMFMediaTimeRange *time_range; @@ -492,7 +493,7 @@ static void test_Shutdown(void) ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); str = SysAllocString(L"video/mp4"); - hr = IMFMediaEngine_CanPlayType(media_engine, str, &state); + hr = IMFMediaEngine_CanPlayType(media_engine, str, &can_play_state); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); SysFreeString(str);

1 0

Jacek Caban : mfmediaengine: Avoid implicit casts in IMFAttributes_GetUINT32 calls.
by Alexandre Julliard 31 Jan '24

31 Jan '24

Module: wine Branch: master Commit: e3af07501af97e824da6da6fecaa984ed977016a URL: https://gitlab.winehq.org/wine/wine/-/commit/e3af07501af97e824da6da6fecaa98… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 12:12:40 2023 +0100 mfmediaengine: Avoid implicit casts in IMFAttributes_GetUINT32 calls. --- dlls/mfmediaengine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d8694cf6011..0e16305ddda 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -1110,9 +1110,9 @@ static HRESULT media_engine_create_audio_renderer(struct media_engine *engine, I static HRESULT media_engine_create_video_renderer(struct media_engine *engine, IMFTopologyNode **node) { - DXGI_FORMAT output_format; IMFMediaType *media_type; IMFActivate *activate; + UINT32 output_format; GUID subtype; HRESULT hr; @@ -3255,7 +3255,7 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct media_engine *engine) { - DXGI_FORMAT output_format; + UINT32 output_format; UINT64 playback_hwnd; IMFClock *clock; HRESULT hr;

1 0