January 2024 - Wine-commits

Jacek Caban : kernelbase: Silence -Wsometimes-uninitialized clang warning.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 2765825c9e99fd97c9c77ff928570606de99b005 URL: https://gitlab.winehq.org/wine/wine/-/commit/2765825c9e99fd97c9c77ff9285706… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 11:28:13 2023 +0100 kernelbase: Silence -Wsometimes-uninitialized clang warning. --- dlls/kernelbase/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index edb6d321a46..43714c3be2e 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1428,7 +1428,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE mod WCHAR *name, DWORD size ) { BOOL wow64, found = FALSE; - DWORD len; + DWORD len = 0; if (!size) return 0;

1 0

Jacek Caban : kernelbase: Silence -Warray-bounds clang warning.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 91d7b084ba09f0f639517486cafc1990725e23c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/91d7b084ba09f0f639517486cafc19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 11:35:01 2023 +0100 kernelbase: Silence -Warray-bounds clang warning. --- dlls/kernelbase/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 42c47707582..e1ba92a6448 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -1488,9 +1488,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH FindNextFileW( HANDLE handle, WIN32_FIND_DATAW *da /* don't return '.' and '..' in the root of the drive */ if (info->is_root) { - if (dir_info->FileNameLength == sizeof(WCHAR) && dir_info->FileName[0] == '.') continue; + const WCHAR *file_name = dir_info->FileName; + if (dir_info->FileNameLength == sizeof(WCHAR) && file_name[0] == '.') continue; if (dir_info->FileNameLength == 2 * sizeof(WCHAR) && - dir_info->FileName[0] == '.' && dir_info->FileName[1] == '.') continue; + file_name[0] == '.' && file_name[1] == '.') continue; } if (info->mask)

1 0

Rémi Bernon : user32/tests: Add an optional hwnd to input messages tests.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 2b3b900490f0870aa68d1ec109ab21417046bb1e URL: https://gitlab.winehq.org/wine/wine/-/commit/2b3b900490f0870aa68d1ec109ab21… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 17:10:07 2024 +0100 user32/tests: Add an optional hwnd to input messages tests. And rename keyboard tests to avoid conflicts with mouse tests. --- dlls/user32/tests/input.c | 212 +++++++++++++++++++++++----------------------- 1 file changed, 108 insertions(+), 104 deletions(-)

1 0

Rémi Bernon : user32/tests: Cleanup the mouse input WM_NCHITTEST / SetCapture tests.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 07d522426afeda2e6a7d25830dbbebd83c535062 URL: https://gitlab.winehq.org/wine/wine/-/commit/07d522426afeda2e6a7d25830dbbeb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 18:49:56 2024 +0100 user32/tests: Cleanup the mouse input WM_NCHITTEST / SetCapture tests. And run them in the dedicated desktop. --- dlls/user32/tests/input.c | 695 +++++++++++++++++++++++++++------------------- 1 file changed, 409 insertions(+), 286 deletions(-)

1 0

Rémi Bernon : user32/tests: Run the mouse hook tests in the separate desktop.
by Alexandre Julliard 25 Jan '24

25 Jan '24

Module: wine Branch: master Commit: 6ba584d1e0d3ee31dbb8f9545a0f5745aa5dc0e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ba584d1e0d3ee31dbb8f9545a0f57… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 24 10:40:06 2024 +0100 user32/tests: Run the mouse hook tests in the separate desktop. And run SetCursorPos / ClipCursor tests in a separate function, they don't need hooks or windows. --- dlls/user32/tests/input.c | 425 ++++++++++++++++++++++++---------------------- 1 file changed, 223 insertions(+), 202 deletions(-)

1 0

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

25 Jan '24

Module: vkd3d Branch: master Commit: c8122ff47eefb58d9b2e9d3c437b435acd1008fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8122ff47eefb58d9b2e9d3c437b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:26:16 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_fence_incref(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5df15b64..f7880ab2 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -935,7 +935,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_AddRef(ID3D12Fence1 *iface) static void d3d12_fence_incref(struct d3d12_fence *fence) { - InterlockedIncrement(&fence->internal_refcount); + vkd3d_atomic_increment_u32(&fence->internal_refcount); } static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) @@ -953,7 +953,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) static void d3d12_fence_decref(struct d3d12_fence *fence) { - ULONG internal_refcount = InterlockedDecrement(&fence->internal_refcount); + ULONG internal_refcount = InterlockedDecrement((LONG *)&fence->internal_refcount); if (!internal_refcount) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 763606fd..56b43052 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -621,7 +621,7 @@ struct vkd3d_signaled_semaphore struct d3d12_fence { ID3D12Fence1 ID3D12Fence1_iface; - LONG internal_refcount; + unsigned int internal_refcount; unsigned int refcount; D3D12_FENCE_FLAGS flags;

1 0

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

25 Jan '24

Module: vkd3d Branch: master Commit: 78bb7b67600817061eac388e87698adc9217a886 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/78bb7b67600817061eac388e87698… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:30:55 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_fence_decref(). --- libs/vkd3d/command.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f7880ab2..d4af9d01 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -953,24 +953,24 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence1 *iface) static void d3d12_fence_decref(struct d3d12_fence *fence) { - ULONG internal_refcount = InterlockedDecrement((LONG *)&fence->internal_refcount); + struct d3d12_device *device; - if (!internal_refcount) - { - struct d3d12_device *device = fence->device; + if (vkd3d_atomic_decrement_u32(&fence->internal_refcount)) + return; - vkd3d_private_store_destroy(&fence->private_store); + device = fence->device; - d3d12_fence_destroy_vk_objects(fence); + vkd3d_private_store_destroy(&fence->private_store); - vkd3d_free(fence->events); - vkd3d_free(fence->semaphores); - vkd3d_mutex_destroy(&fence->mutex); - vkd3d_cond_destroy(&fence->null_event_cond); - vkd3d_free(fence); + d3d12_fence_destroy_vk_objects(fence); - d3d12_device_release(device); - } + vkd3d_free(fence->events); + vkd3d_free(fence->semaphores); + vkd3d_mutex_destroy(&fence->mutex); + vkd3d_cond_destroy(&fence->null_event_cond); + vkd3d_free(fence); + + d3d12_device_release(device); } static HRESULT STDMETHODCALLTYPE d3d12_fence_GetPrivateData(ID3D12Fence1 *iface,

1 0

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

25 Jan '24

Module: vkd3d Branch: master Commit: 315fce8ac5f13db7d9c0e36c89d2a51be26931ca URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/315fce8ac5f13db7d9c0e36c89d2a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:50:07 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_allocator_AddRef(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d4af9d01..f6d405f8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1635,7 +1635,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_allocator_QueryInterface(ID3D12Co static ULONG STDMETHODCALLTYPE d3d12_command_allocator_AddRef(ID3D12CommandAllocator *iface) { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - ULONG refcount = InterlockedIncrement(&allocator->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&allocator->refcount); TRACE("%p increasing refcount to %u.\n", allocator, refcount); @@ -1645,7 +1645,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_AddRef(ID3D12CommandAlloc static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllocator *iface) { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - ULONG refcount = InterlockedDecrement(&allocator->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&allocator->refcount); TRACE("%p decreasing refcount to %u.\n", allocator, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 56b43052..709b969f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1365,7 +1365,7 @@ struct vkd3d_buffer struct d3d12_command_allocator { ID3D12CommandAllocator ID3D12CommandAllocator_iface; - LONG refcount; + unsigned int refcount; D3D12_COMMAND_LIST_TYPE type; VkQueueFlags vk_queue_flags;

1 0

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

25 Jan '24

Module: vkd3d Branch: master Commit: d891e5c2a0f9f80ac087dc3207305db1ff105c94 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d891e5c2a0f9f80ac087dc3207305… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 11 20:51:07 2024 +0100 vkd3d: Use vkd3d_atomic_decrement_u32() in d3d12_command_allocator_Release(). --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f6d405f8..a0e88382 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1645,7 +1645,7 @@ static ULONG STDMETHODCALLTYPE d3d12_command_allocator_AddRef(ID3D12CommandAlloc static ULONG STDMETHODCALLTYPE d3d12_command_allocator_Release(ID3D12CommandAllocator *iface) { struct d3d12_command_allocator *allocator = impl_from_ID3D12CommandAllocator(iface); - unsigned int refcount = InterlockedDecrement((LONG *)&allocator->refcount); + unsigned int refcount = vkd3d_atomic_decrement_u32(&allocator->refcount); TRACE("%p decreasing refcount to %u.\n", allocator, refcount);

1 0

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

25 Jan '24

Module: vkd3d Branch: master Commit: 87f3a606d7d409263fa4709577ca76416b7c3de6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/87f3a606d7d409263fa4709577ca7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jan 23 18:27:21 2024 +0100 vkd3d: Use vkd3d_atomic_increment_u32() in d3d12_command_list_AddRef(). --- libs/vkd3d/command.c | 4 ++-- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index a0e88382..9648a9f4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2320,7 +2320,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_list_QueryInterface(ID3D12Graphic static ULONG STDMETHODCALLTYPE d3d12_command_list_AddRef(ID3D12GraphicsCommandList5 *iface) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); - ULONG refcount = InterlockedIncrement(&list->refcount); + unsigned int refcount = vkd3d_atomic_increment_u32(&list->refcount); TRACE("%p increasing refcount to %u.\n", list, refcount); @@ -2335,7 +2335,7 @@ static void vkd3d_pipeline_bindings_cleanup(struct vkd3d_pipeline_bindings *bind static ULONG STDMETHODCALLTYPE d3d12_command_list_Release(ID3D12GraphicsCommandList5 *iface) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList5(iface); - ULONG refcount = InterlockedDecrement(&list->refcount); + unsigned int refcount = InterlockedDecrement((LONG *)&list->refcount); TRACE("%p decreasing refcount to %u.\n", list, refcount); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 709b969f..de7a129a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1466,7 +1466,7 @@ enum vkd3d_pipeline_bind_point struct d3d12_command_list { ID3D12GraphicsCommandList5 ID3D12GraphicsCommandList5_iface; - LONG refcount; + unsigned int refcount; D3D12_COMMAND_LIST_TYPE type; VkQueueFlags vk_queue_flags;

1 0