May 2024 - Wine-Commits - list.winehq.org

Conor McCarthy : tests/d3d12: Ensure stream output BufferFilledSizeLocation is always valid.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: cc1877dadbc3476751a1946086b78a904228e0ee URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cc1877dadbc3476751a1946086b78… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 15:19:57 2024 +1000 tests/d3d12: Ensure stream output BufferFilledSizeLocation is always valid. --- tests/d3d12.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1100b80b..acd263c9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -30793,7 +30793,7 @@ static void test_domain_shader_inputs(void) bug_if(is_mvk_device(context.device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - so_buffer = create_default_buffer(context.device, 1024, + so_buffer = create_default_buffer(context.device, 2048, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); sobv.SizeInBytes = 1024; @@ -30978,7 +30978,7 @@ static void test_domain_shader_one_patch_constant_input(void) bug_if(is_mvk_device(context.device)) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - so_buffer = create_default_buffer(context.device, 1024, + so_buffer = create_default_buffer(context.device, 2048, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); sobv.SizeInBytes = 1024;

1 0

Conor McCarthy : tests/d3d12: Do not test 3D depth textures in test_get_copyable_footprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 42eee382ec8e4b99c07593fb9051a38c99422abf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/42eee382ec8e4b99c07593fb9051a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 13:20:02 2024 +1000 tests/d3d12: Do not test 3D depth textures in test_get_copyable_footprints(). --- tests/d3d12.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index de7db0d7..2e69cb71 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20229,6 +20229,7 @@ static void test_get_copyable_footprints(void) { DXGI_FORMAT format; bool is_compressed; + bool is_depth; } formats[] = { @@ -20244,8 +20245,8 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_UF16, true}, {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, - {DXGI_FORMAT_D32_FLOAT, false}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, false}, + {DXGI_FORMAT_D32_FLOAT, false, true}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, false, true}, }; static const uint64_t base_offsets[] = { @@ -20328,6 +20329,9 @@ static void test_get_copyable_footprints(void) { if (formats[j].is_compressed && !resources[i].test_with_compressed) continue; + /* Depth formats are not supported for 3D textures in any current feature level including 12.1. */ + if (formats[j].is_depth && resources[i].dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + continue; if (is_buffer && j > 0) continue;

1 0

Conor McCarthy : tests/d3d12: Set the descriptor heaps for the draw call in test_graphics_uav_counters().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 23881bad7a655f02a6d2f20406d5c0d5bbb88e91 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23881bad7a655f02a6d2f20406d5c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue May 21 00:23:53 2024 +1000 tests/d3d12: Set the descriptor heaps for the draw call in test_graphics_uav_counters(). --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2c044322..376538ee 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23962,6 +23962,7 @@ static void test_graphics_uav_counters(void) ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(gpu_heap)); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);

1 0

Conor McCarthy : tests/d3d12: Test format D32_FLOAT_S8X24_UINT in test_get_copyable_footprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: 0daba96025558e2a4b96b00c88ad2a4cff8e6b35 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0daba96025558e2a4b96b00c88ad2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 16:32:21 2024 +1000 tests/d3d12: Test format D32_FLOAT_S8X24_UINT in test_get_copyable_footprints(). --- tests/d3d12.c | 3 ++- tests/d3d12_test_utils.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 820473ee..83990ada 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20248,6 +20248,7 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC7_UNORM, true}, {DXGI_FORMAT_D32_FLOAT, false, true}, {DXGI_FORMAT_D24_UNORM_S8_UINT, false, true}, + {DXGI_FORMAT_D32_FLOAT_S8X24_UINT, false, true}, }; static const uint64_t base_offsets[] = { @@ -20349,7 +20350,7 @@ static void test_get_copyable_footprints(void) sub_resource_count = resource_desc.MipLevels; if (resources[i].dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D) sub_resource_count *= resource_desc.DepthOrArraySize; - if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT) + if (format_plane_count(resource_desc.Format) > 1) { /* FIXME: we require D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL here for DS formats but windows doesn't. */ if (!vkd3d_test_platform_is_windows()) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 408adc4d..28cf2aad 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -314,6 +314,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8_UNORM: return 16; case DXGI_FORMAT_R16G16B16A16_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: return 8; case DXGI_FORMAT_R32_TYPELESS: case DXGI_FORMAT_D32_FLOAT:

1 0

Conor McCarthy : tests/d3d12: Do not clear UAVs via a structured view.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: dcc715b4d1c0e33fcab6aed345bd17b3d4a56e19 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dcc715b4d1c0e33fcab6aed345bd1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 13:21:18 2024 +1000 tests/d3d12: Do not clear UAVs via a structured view. --- tests/d3d12.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e69cb71..2c044322 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23928,15 +23928,13 @@ static void test_graphics_uav_counters(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL); memset(&uav_desc, 0, sizeof(uav_desc)); - uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Format = DXGI_FORMAT_R32_UINT; uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; uav_desc.Buffer.NumElements = 64; - uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, cpu_heap, 0)); - uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; - ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, gpu_heap, 0)); ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); @@ -23947,6 +23945,12 @@ static void test_graphics_uav_counters(void) buffer, clear_value, 0, NULL); uav_barrier(command_list, buffer); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + counter = 0; upload_buffer_data(counter_buffer, uav_desc.Buffer.CounterOffsetInBytes, sizeof(counter), &counter, queue, command_list);

1 0

Conor McCarthy : tests/d3d12: Check the correct depth/stencil plane format and alignment in test_get_copyable_footprints().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: f6db3330c89c60debe3cb10722fcc34fb820641e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f6db3330c89c60debe3cb10722fcc… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Apr 22 16:29:40 2024 +1000 tests/d3d12: Check the correct depth/stencil plane format and alignment in test_get_copyable_footprints(). --- tests/d3d12.c | 57 ++++++++++++++++++++++++------------------------ tests/d3d12_test_utils.h | 34 +++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 28 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 376538ee..820473ee 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -931,26 +931,7 @@ static void test_check_feature_support(void) { vkd3d_test_push_context("format %#x", format); - switch (format) - { - case DXGI_FORMAT_R32G8X24_TYPELESS: - case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: - case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: - case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: - case DXGI_FORMAT_D24_UNORM_S8_UINT: - case DXGI_FORMAT_R24G8_TYPELESS: - case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: - case DXGI_FORMAT_X24_TYPELESS_G8_UINT: - case DXGI_FORMAT_NV12: - case DXGI_FORMAT_P010: - case DXGI_FORMAT_P016: - case DXGI_FORMAT_NV11: - expected_plane_count = 2; - break; - default: - expected_plane_count = 1; - break; - } + expected_plane_count = format_plane_count(format); is_todo = format == DXGI_FORMAT_R9G9B9E5_SHAREDEXP || format == DXGI_FORMAT_R8G8_B8G8_UNORM @@ -20137,32 +20118,46 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D const uint64_t *row_sizes, uint64_t *total_size) { unsigned int miplevel, width, height, depth, row_count, row_size, row_pitch; + unsigned int i, sub_resources_per_plane, plane_count, plane_idx; + DXGI_FORMAT expected_format = desc->Format; uint64_t offset, size, total; - unsigned int i; + bool format_is_ds; + + sub_resources_per_plane = desc->MipLevels + * (desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1); + plane_count = format_plane_count(desc->Format); + format_is_ds = plane_count > 1; offset = total = 0; for (i = 0; i < sub_resource_count; ++i) { + plane_idx = (sub_resource_idx + i) / sub_resources_per_plane; + expected_format = format_get_subresource_plane_format(desc->Format, plane_idx, plane_count); + miplevel = (sub_resource_idx + i) % desc->MipLevels; - width = align(max(1, desc->Width >> miplevel), format_block_width(desc->Format)); - height = align(max(1, desc->Height >> miplevel), format_block_height(desc->Format)); + width = align(max(1, desc->Width >> miplevel), format_block_width(expected_format)); + height = align(max(1, desc->Height >> miplevel), format_block_height(expected_format)); depth = desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1; depth = max(1, depth >> miplevel); - row_count = height / format_block_height(desc->Format); - row_size = (width / format_block_width(desc->Format)) * format_size(desc->Format); - row_pitch = align(row_size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); + row_count = height / format_block_height(expected_format); + row_size = (width / format_block_width(expected_format)) * format_size(expected_format); + /* D3D12 requires double the alignment for dual planes. */ + row_pitch = align(row_size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT * plane_count); if (layouts) { const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *l = &layouts[i]; const D3D12_SUBRESOURCE_FOOTPRINT *f = &l->Footprint; + todo_if(format_is_ds && l->Offset != base_offset + offset) ok_(line)(l->Offset == base_offset + offset, "Got offset %"PRIu64", expected %"PRIu64".\n", l->Offset, base_offset + offset); - ok_(line)(f->Format == desc->Format, "Got format %#x, expected %#x.\n", f->Format, desc->Format); + todo_if(format_is_ds) + ok_(line)(f->Format == expected_format, "Got format %#x, expected %#x.\n", f->Format, expected_format); ok_(line)(f->Width == width, "Got width %u, expected %u.\n", f->Width, width); ok_(line)(f->Height == height, "Got height %u, expected %u.\n", f->Height, height); ok_(line)(f->Depth == depth, "Got depth %u, expected %u.\n", f->Depth, depth); + todo_if(format_is_ds) ok_(line)(f->RowPitch == row_pitch, "Got row pitch %u, expected %u.\n", f->RowPitch, row_pitch); } @@ -20170,17 +20165,23 @@ static void check_copyable_footprints_(unsigned int line, const D3D12_RESOURCE_D ok_(line)(row_counts[i] == row_count, "Got row count %u, expected %u.\n", row_counts[i], row_count); if (row_sizes) + { + todo_if(format_is_ds && (plane_idx || format_size(desc->Format) > 4)) ok_(line)(row_sizes[i] == row_size, "Got row size %"PRIu64", expected %u.\n", row_sizes[i], row_size); + } size = max(0, row_count - 1) * row_pitch + row_size; - size = max(0, depth - 1) * align(size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT) + size; + size = max(0, depth - 1) * align(size, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT * plane_count) + size; total = offset + size; offset = align(total, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); } if (total_size) + { + todo_if(format_is_ds && *total_size != total) ok_(line)(*total_size == total, "Got total size %"PRIu64", expected %"PRIu64".\n", *total_size, total); + } } static void test_get_copyable_footprints(void) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index e24b3fa5..408adc4d 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -337,6 +337,7 @@ static unsigned int format_size(DXGI_FORMAT format) return 2; case DXGI_FORMAT_UNKNOWN: case DXGI_FORMAT_A8_UNORM: + case DXGI_FORMAT_R8_TYPELESS: case DXGI_FORMAT_R8_UINT: case DXGI_FORMAT_R8_UNORM: return 1; @@ -416,6 +417,39 @@ static inline unsigned int format_block_height(DXGI_FORMAT format) } } +static inline unsigned int format_plane_count(DXGI_FORMAT format) +{ + switch (format) + { + case DXGI_FORMAT_R32G8X24_TYPELESS: + case DXGI_FORMAT_D32_FLOAT_S8X24_UINT: + case DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS: + case DXGI_FORMAT_X32_TYPELESS_G8X24_UINT: + case DXGI_FORMAT_D24_UNORM_S8_UINT: + case DXGI_FORMAT_R24G8_TYPELESS: + case DXGI_FORMAT_R24_UNORM_X8_TYPELESS: + case DXGI_FORMAT_X24_TYPELESS_G8_UINT: + case DXGI_FORMAT_NV12: + case DXGI_FORMAT_P010: + case DXGI_FORMAT_P016: + case DXGI_FORMAT_NV11: + return 2; + default: + return 1; + } +} + +static inline DXGI_FORMAT format_get_subresource_plane_format(DXGI_FORMAT format, unsigned int plane_idx, + unsigned int plane_count) +{ + assert(plane_idx < plane_count && plane_count >= 1 && plane_count <= 2); + + if (plane_count < 2) + return format; + + return plane_idx ? DXGI_FORMAT_R8_TYPELESS : DXGI_FORMAT_R32_TYPELESS; +} + struct d3d12_resource_readback { struct resource_readback rb;

1 0

Conor McCarthy : tests/d3d12: Do not test a typed UAV in test_atomic_instructions().
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: vkd3d Branch: master Commit: bb2a79a8fb25bb737e23aa8bd4f92abdd656223f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bb2a79a8fb25bb737e23aa8bd4f92… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sun Apr 21 14:19:33 2024 +1000 tests/d3d12: Do not test a typed UAV in test_atomic_instructions(). A shader typed UAV declaration must not map to a root descriptor UAV. We now have shader runner tests for typed UAV atomics, so there is no need to modify this test to use a descriptor heap. --- tests/d3d12.c | 136 +++++++++++++++++++--------------------------------------- 1 file changed, 45 insertions(+), 91 deletions(-)

1 0

Alexandros Frantzis : server: Fix handling of KEYEVENTF_UNICODE inputs with a non-zero vkey.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: 85f1ad64c42a057d6f3fad30ed745ec63b9039ab URL: https://gitlab.winehq.org/wine/wine/-/commit/85f1ad64c42a057d6f3fad30ed745e… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue May 21 11:08:21 2024 +0300 server: Fix handling of KEYEVENTF_UNICODE inputs with a non-zero vkey. --- dlls/user32/tests/input.c | 4 ++-- server/queue.c | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f332aeddd08..c123f8fa439 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1163,9 +1163,9 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W struct send_input_keyboard_test unicode_vkey[] = { {.scan = 0x3c0, .vkey = vkey, .flags = KEYEVENTF_UNICODE, .expect_state = {/*[vkey] = 0x80*/}, - .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0xc0, vkey, .todo_value = TRUE), WIN_MSG(WM_CHAR, wch, MAKELONG(1, 0xc0), .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0xc0, vkey), KEY_MSG(WM_KEYDOWN, 0xc0, vkey), WIN_MSG(WM_CHAR, wch, MAKELONG(1, 0xc0)), {0}}}, {.scan = 0x3c0, .vkey = vkey, .flags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP, - .expect = {KEY_HOOK(WM_KEYUP, 0xc0, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0xc0, vkey, .todo_value = TRUE), {0}}}, + .expect = {KEY_HOOK(WM_KEYUP, 0xc0, vkey), KEY_MSG(WM_KEYUP, 0xc0, vkey), {0}}}, {0}, }; diff --git a/server/queue.c b/server/queue.c index 629042feb93..6d4396234f2 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2098,6 +2098,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c unsigned char vkey = input->kbd.vkey, hook_vkey = vkey; unsigned int message_code, time; lparam_t lparam = input->kbd.scan << 16; + unsigned int flags = 0; int wait; if (!(time = input->kbd.time)) time = get_tick_count(); @@ -2213,29 +2214,25 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg->win = get_user_full_handle( win ); msg->msg = message_code; - msg->lparam = lparam | 1u; /* repeat count */ if (origin == IMO_INJECTED) msg_data->flags = LLKHF_INJECTED; if (input->kbd.flags & KEYEVENTF_UNICODE && !vkey) { - msg->wparam = VK_PACKET; + vkey = hook_vkey = VK_PACKET; } else { - unsigned int flags = 0; if (input->kbd.flags & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED; /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ if (input->kbd.flags & KEYEVENTF_KEYUP) flags |= KF_REPEAT | KF_UP; else if (desktop->keystate[vkey] & 0x80) flags |= KF_REPEAT; - msg->wparam = vkey; - msg->lparam |= flags << 16; + lparam &= 0xff0000; /* mask off scan code high bits for non-unicode input */ msg_data->flags |= (flags & (KF_EXTENDED | KF_ALTDOWN | KF_UP)) >> 8; } - /* TODO: The following is incorrect (we also need to check for not !vkey), - * but we do it to temporarily retain existing behavior */ - if (input->kbd.flags & KEYEVENTF_UNICODE) hook_vkey = VK_PACKET; + msg->wparam = vkey; + msg->lparam = (flags << 16) | lparam | 1u /* repeat count */; if (!(wait = send_hook_ll_message( desktop, msg, WH_KEYBOARD_LL, lparam | hook_vkey, sender ))) queue_hardware_message( desktop, msg, 1 );

1 0

Rémi Bernon : server: Pass the adjusted vkey to send_hook_ll_message.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: d18bd43ba2c1b6d416c09f61cbbff8a3b85aca8e URL: https://gitlab.winehq.org/wine/wine/-/commit/d18bd43ba2c1b6d416c09f61cbbff8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 17 17:37:33 2024 +0200 server: Pass the adjusted vkey to send_hook_ll_message. --- server/queue.c | 57 +++++++++++++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/server/queue.c b/server/queue.c index c4b9389695f..629042feb93 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1738,13 +1738,12 @@ static void queue_hardware_message( struct desktop *desktop, struct message *msg /* send the low-level hook message for a given hardware message */ static int send_hook_ll_message( struct desktop *desktop, struct message *hardware_msg, - const hw_input_t *input, struct msg_queue *sender ) + int id, lparam_t lparam, struct msg_queue *sender ) { struct thread *hook_thread; struct msg_queue *queue; struct message *msg; timeout_t timeout = 2000 * -10000; /* FIXME: load from registry */ - int id = (input->type == INPUT_MOUSE) ? WH_MOUSE_LL : WH_KEYBOARD_LL; if (!(hook_thread = get_first_global_hook( id ))) return 0; if (!(queue = hook_thread->queue)) return 0; @@ -1756,20 +1755,13 @@ static int send_hook_ll_message( struct desktop *desktop, struct message *hardwa msg->win = 0; msg->msg = id; msg->wparam = hardware_msg->msg; + msg->lparam = lparam; msg->x = hardware_msg->x; msg->y = hardware_msg->y; msg->time = hardware_msg->time; msg->data_size = hardware_msg->data_size; msg->result = NULL; - if (input->type == INPUT_KEYBOARD) - { - unsigned short vkey = input->kbd.vkey & 0xff; - if (input->kbd.flags & KEYEVENTF_UNICODE) vkey = VK_PACKET; - msg->lparam = (input->kbd.scan << 16) | vkey; - } - else msg->lparam = input->mouse.data << 16; - if (!(msg->data = memdup( hardware_msg->data, hardware_msg->data_size )) || !(msg->result = alloc_message_result( sender, queue, msg, timeout ))) { @@ -1996,6 +1988,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons struct thread *foreground; unsigned int i, time, flags; struct hw_msg_source source = { IMDT_MOUSE, origin }; + lparam_t wparam = input->mouse.data << 16; int wait = 0, x, y; static const unsigned int messages[] = @@ -2060,7 +2053,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if ((device = current->process->rawinput_mouse) && (device->flags & RIDEV_NOLEGACY)) { if (flags & MOUSEEVENTF_MOVE) update_desktop_cursor_pos( desktop, win, x, y ); - update_desktop_mouse_state( desktop, flags, input->mouse.data << 16 ); + update_desktop_mouse_state( desktop, flags, wparam ); return 0; } @@ -2075,7 +2068,7 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons msg->win = get_user_full_handle( win ); msg->msg = messages[i]; - msg->wparam = input->mouse.data << 16; + msg->wparam = wparam; msg->lparam = 0; msg->x = x; msg->y = y; @@ -2084,10 +2077,10 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons /* specify a sender only when sending the last message */ if (!(flags & ((1 << ARRAY_SIZE( messages )) - 1))) { - if (!(wait = send_hook_ll_message( desktop, msg, input, sender ))) + if (!(wait = send_hook_ll_message( desktop, msg, WH_MOUSE_LL, wparam, sender ))) queue_hardware_message( desktop, msg, 0 ); } - else if (!send_hook_ll_message( desktop, msg, input, NULL )) + else if (!send_hook_ll_message( desktop, msg, WH_MOUSE_LL, wparam, NULL )) queue_hardware_message( desktop, msg, 0 ); } return wait; @@ -2102,9 +2095,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c struct hardware_msg_data *msg_data; struct message *msg; struct thread *foreground; - unsigned char vkey = input->kbd.vkey; - hw_input_t hook_input = *input; + unsigned char vkey = input->kbd.vkey, hook_vkey = vkey; unsigned int message_code, time; + lparam_t lparam = input->kbd.scan << 16; int wait; if (!(time = input->kbd.time)) time = get_tick_count(); @@ -2179,17 +2172,17 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c { switch (vkey) { - case VK_INSERT: hook_input.kbd.vkey = vkey = VK_NUMPAD0; break; - case VK_END: hook_input.kbd.vkey = vkey = VK_NUMPAD1; break; - case VK_DOWN: hook_input.kbd.vkey = vkey = VK_NUMPAD2; break; - case VK_NEXT: hook_input.kbd.vkey = vkey = VK_NUMPAD3; break; - case VK_LEFT: hook_input.kbd.vkey = vkey = VK_NUMPAD4; break; - case VK_CLEAR: hook_input.kbd.vkey = vkey = VK_NUMPAD5; break; - case VK_RIGHT: hook_input.kbd.vkey = vkey = VK_NUMPAD6; break; - case VK_HOME: hook_input.kbd.vkey = vkey = VK_NUMPAD7; break; - case VK_UP: hook_input.kbd.vkey = vkey = VK_NUMPAD8; break; - case VK_PRIOR: hook_input.kbd.vkey = vkey = VK_NUMPAD9; break; - case VK_DELETE: hook_input.kbd.vkey = vkey = VK_DECIMAL; break; + case VK_INSERT: hook_vkey = vkey = VK_NUMPAD0; break; + case VK_END: hook_vkey = vkey = VK_NUMPAD1; break; + case VK_DOWN: hook_vkey = vkey = VK_NUMPAD2; break; + case VK_NEXT: hook_vkey = vkey = VK_NUMPAD3; break; + case VK_LEFT: hook_vkey = vkey = VK_NUMPAD4; break; + case VK_CLEAR: hook_vkey = vkey = VK_NUMPAD5; break; + case VK_RIGHT: hook_vkey = vkey = VK_NUMPAD6; break; + case VK_HOME: hook_vkey = vkey = VK_NUMPAD7; break; + case VK_UP: hook_vkey = vkey = VK_NUMPAD8; break; + case VK_PRIOR: hook_vkey = vkey = VK_NUMPAD9; break; + case VK_DELETE: hook_vkey = vkey = VK_DECIMAL; break; default: break; } } @@ -2220,7 +2213,7 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg->win = get_user_full_handle( win ); msg->msg = message_code; - msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */ + msg->lparam = lparam | 1u; /* repeat count */ if (origin == IMO_INJECTED) msg_data->flags = LLKHF_INJECTED; if (input->kbd.flags & KEYEVENTF_UNICODE && !vkey) @@ -2240,7 +2233,11 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c msg_data->flags |= (flags & (KF_EXTENDED | KF_ALTDOWN | KF_UP)) >> 8; } - if (!(wait = send_hook_ll_message( desktop, msg, &hook_input, sender ))) + /* TODO: The following is incorrect (we also need to check for not !vkey), + * but we do it to temporarily retain existing behavior */ + if (input->kbd.flags & KEYEVENTF_UNICODE) hook_vkey = VK_PACKET; + + if (!(wait = send_hook_ll_message( desktop, msg, WH_KEYBOARD_LL, lparam | hook_vkey, sender ))) queue_hardware_message( desktop, msg, 1 ); return wait; @@ -2315,7 +2312,7 @@ static void queue_pointer_message( struct pointer *pointer, int repeated ) msg->x = x; msg->y = y; - if (!send_hook_ll_message( desktop, msg, input, NULL )) + if (!send_hook_ll_message( desktop, msg, WH_MOUSE_LL, 0, NULL )) queue_hardware_message( desktop, msg, 0 ); }

1 0

Anton Baskanov : quartz: Use the correct stride when calculating image size in AVIDec.
by Alexandre Julliard May 22, 2024

May 22, 2024

Module: wine Branch: master Commit: e6a6e6545b718de9f04536629b3e58fae0073c68 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6a6e6545b718de9f04536629b3e58… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 16 14:14:48 2024 +0700 quartz: Use the correct stride when calculating image size in AVIDec. --- dlls/quartz/avidec.c | 4 ++-- dlls/quartz/tests/avidec.c | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index f020d618fdb..d7f97e0380c 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -361,8 +361,8 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface format->bmiHeader.biPlanes = sink_format->bmiHeader.biPlanes; format->bmiHeader.biBitCount = formats[index].bpp; format->bmiHeader.biCompression = formats[index].compression; - format->bmiHeader.biSizeImage = format->bmiHeader.biWidth - * format->bmiHeader.biHeight * formats[index].bpp / 8; + format->bmiHeader.biSizeImage = format->bmiHeader.biHeight * (((format->bmiHeader.biWidth + * formats[index].bpp + 31) / 8) & ~3); if (IsEqualGUID(formats[index].subtype, &MEDIASUBTYPE_RGB565)) { diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 6cb67563bcb..ac3a9abf2b1 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -1313,19 +1313,18 @@ static void test_connect_pin(void) const GUID *subtype; DWORD compression; WORD bpp; - BOOL todo; } expect[9] = { - {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8, TRUE}, - {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16, TRUE}, - {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16, TRUE}, - {&MEDIASUBTYPE_RGB32, BI_RGB, 32, FALSE}, - {&MEDIASUBTYPE_RGB24, BI_RGB, 24, TRUE}, - {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16, TRUE}, - {&MEDIASUBTYPE_RGB555, BI_RGB, 16, TRUE}, - {&MEDIASUBTYPE_RGB8, BI_RGB, 8, TRUE}, - {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12, FALSE}, + {&MEDIASUBTYPE_CLJR, mmioFOURCC('C','L','J','R'), 8}, + {&MEDIASUBTYPE_UYVY, mmioFOURCC('U','Y','V','Y'), 16}, + {&MEDIASUBTYPE_YUY2, mmioFOURCC('Y','U','Y','2'), 16}, + {&MEDIASUBTYPE_RGB32, BI_RGB, 32}, + {&MEDIASUBTYPE_RGB24, BI_RGB, 24}, + {&MEDIASUBTYPE_RGB565, BI_BITFIELDS, 16}, + {&MEDIASUBTYPE_RGB555, BI_RGB, 16}, + {&MEDIASUBTYPE_RGB8, BI_RGB, 8}, + {&MEDIASUBTYPE_I420, mmioFOURCC('I','4','2','0'), 12}, }; VIDEOINFOHEADER expect_format = @@ -1351,9 +1350,9 @@ static void test_connect_pin(void) hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); ok(hr == S_OK, "Got hr %#lx.\n", hr); - todo_wine_if(expect[i].todo) ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), + ok(!memcmp(pmt, &expect_mt, offsetof(AM_MEDIA_TYPE, cbFormat)), "%u: Media types didn't match.\n", i); - todo_wine_if(expect[i].todo) ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), + ok(!memcmp(pmt->pbFormat, &expect_format, sizeof(VIDEOINFOHEADER)), "%u: Format blocks didn't match.\n", i); if (i == 5) {

1 0