January 2022 - Wine-commits

Zebediah Figura : vkd3d-shader: Trace tiled resource opcodes.
by Alexandre Julliard 13 Jan '22

13 Jan '22

Module: vkd3d Branch: master Commit: 4fdd6f09355fcb1c2162c6c45a42089f4969d951 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4fdd6f09355fcb1c2162c6c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jan 10 19:03:36 2022 -0600 vkd3d-shader: Trace tiled resource opcodes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 20 +++++++++++++++++++- libs/vkd3d-shader/trace.c | 16 ++++++++++++++++ libs/vkd3d-shader/vkd3d_shader_private.h | 16 ++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index d26ed54..4d37731 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -91,7 +91,7 @@ struct vkd3d_shader_sm4_parser unsigned int output_map[MAX_REG_OUTPUT]; - struct vkd3d_shader_src_param src_param[5]; + struct vkd3d_shader_src_param src_param[6]; struct vkd3d_shader_dst_param dst_param[2]; struct list src_free; struct list src; @@ -841,6 +841,22 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DTOU, VKD3DSIH_DTOU, "u", "d"}, {VKD3D_SM5_OP_ITOD, VKD3DSIH_ITOD, "d", "i"}, {VKD3D_SM5_OP_UTOD, VKD3DSIH_UTOD, "d", "u"}, + {VKD3D_SM5_OP_GATHER4_S, VKD3DSIH_GATHER4_S, "uu", "fRS"}, + {VKD3D_SM5_OP_GATHER4_C_S, VKD3DSIH_GATHER4_C_S, "fu", "fRSf"}, + {VKD3D_SM5_OP_GATHER4_PO_S, VKD3DSIH_GATHER4_PO_S, "fu", "fiRS"}, + {VKD3D_SM5_OP_GATHER4_PO_C_S, VKD3DSIH_GATHER4_PO_C_S, "fu", "fiRSf"}, + {VKD3D_SM5_OP_LD_S, VKD3DSIH_LD_S, "uu", "iR"}, + {VKD3D_SM5_OP_LD2DMS_S, VKD3DSIH_LD2DMS_S, "uu", "iRi"}, + {VKD3D_SM5_OP_LD_UAV_TYPED_S, VKD3DSIH_LD_UAV_TYPED_S, "uu", "iU"}, + {VKD3D_SM5_OP_LD_RAW_S, VKD3DSIH_LD_RAW_S, "uu", "iU"}, + {VKD3D_SM5_OP_LD_STRUCTURED_S, VKD3DSIH_LD_STRUCTURED_S, "uu", "iiR"}, + {VKD3D_SM5_OP_SAMPLE_LOD_S, VKD3DSIH_SAMPLE_LOD_S, "uu", "fRSf"}, + {VKD3D_SM5_OP_SAMPLE_C_LZ_S, VKD3DSIH_SAMPLE_C_LZ_S, "fu", "fRSf"}, + {VKD3D_SM5_OP_SAMPLE_CL_S, VKD3DSIH_SAMPLE_CL_S, "uu", "fRSf"}, + {VKD3D_SM5_OP_SAMPLE_B_CL_S, VKD3DSIH_SAMPLE_B_CL_S, "uu", "fRSff"}, + {VKD3D_SM5_OP_SAMPLE_GRAD_CL_S, VKD3DSIH_SAMPLE_GRAD_CL_S, "uu", "fRSfff"}, + {VKD3D_SM5_OP_SAMPLE_C_CL_S, VKD3DSIH_SAMPLE_C_CL_S, "fu", "fRSff"}, + {VKD3D_SM5_OP_CHECK_ACCESS_FULLY_MAPPED, VKD3DSIH_CHECK_ACCESS_FULLY_MAPPED, "u", "u"}, }; static const enum vkd3d_shader_register_type register_type_table[] = @@ -1501,6 +1517,8 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru ins->dst = sm4->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = sm4->src_param; + assert(ins->dst_count <= ARRAY_SIZE(sm4->dst_param)); + assert(ins->src_count <= ARRAY_SIZE(sm4->src_param)); ins->resource_type = VKD3D_SHADER_RESOURCE_NONE; ins->resource_stride = 0; ins->resource_data_type[0] = VKD3D_DATA_FLOAT; diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index e4a1884..f6ecf9e 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -51,6 +51,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_CALL ] = "call", [VKD3DSIH_CALLNZ ] = "callnz", [VKD3DSIH_CASE ] = "case", + [VKD3DSIH_CHECK_ACCESS_FULLY_MAPPED ] = "check_access_fully_mapped", [VKD3DSIH_CMP ] = "cmp", [VKD3DSIH_CND ] = "cnd", [VKD3DSIH_CONTINUE ] = "continue", @@ -155,8 +156,12 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_FTOU ] = "ftou", [VKD3DSIH_GATHER4 ] = "gather4", [VKD3DSIH_GATHER4_C ] = "gather4_c", + [VKD3DSIH_GATHER4_C_S ] = "gather4_c_s", [VKD3DSIH_GATHER4_PO ] = "gather4_po", [VKD3DSIH_GATHER4_PO_C ] = "gather4_po_c", + [VKD3DSIH_GATHER4_PO_C_S ] = "gather4_po_c_s", + [VKD3DSIH_GATHER4_PO_S ] = "gather4_po_s", + [VKD3DSIH_GATHER4_S ] = "gather4_s", [VKD3DSIH_GE ] = "ge", [VKD3DSIH_HS_CONTROL_POINT_PHASE ] = "hs_control_point_phase", [VKD3DSIH_HS_DECLS ] = "hs_decls", @@ -194,9 +199,14 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_LABEL ] = "label", [VKD3DSIH_LD ] = "ld", [VKD3DSIH_LD2DMS ] = "ld2dms", + [VKD3DSIH_LD2DMS_S ] = "ld2dms_s", [VKD3DSIH_LD_RAW ] = "ld_raw", + [VKD3DSIH_LD_RAW_S ] = "ld_raw_s", + [VKD3DSIH_LD_S ] = "ld_s", [VKD3DSIH_LD_STRUCTURED ] = "ld_structured", + [VKD3DSIH_LD_STRUCTURED_S ] = "ld_structured_s", [VKD3DSIH_LD_UAV_TYPED ] = "ld_uav_typed", + [VKD3DSIH_LD_UAV_TYPED_S ] = "ld_uav_typed_s", [VKD3DSIH_LIT ] = "lit", [VKD3DSIH_LOD ] = "lod", [VKD3DSIH_LOG ] = "log", @@ -235,11 +245,17 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_RSQ ] = "rsq", [VKD3DSIH_SAMPLE ] = "sample", [VKD3DSIH_SAMPLE_B ] = "sample_b", + [VKD3DSIH_SAMPLE_B_CL_S ] = "sample_b_cl_s", [VKD3DSIH_SAMPLE_C ] = "sample_c", + [VKD3DSIH_SAMPLE_C_CL_S ] = "sample_c_cl_s", [VKD3DSIH_SAMPLE_C_LZ ] = "sample_c_lz", + [VKD3DSIH_SAMPLE_C_LZ_S ] = "sample_c_lz_s", + [VKD3DSIH_SAMPLE_CL_S ] = "sample_cl_s", [VKD3DSIH_SAMPLE_GRAD ] = "sample_d", + [VKD3DSIH_SAMPLE_GRAD_CL_S ] = "sample_d_cl_s", [VKD3DSIH_SAMPLE_INFO ] = "sample_info", [VKD3DSIH_SAMPLE_LOD ] = "sample_l", + [VKD3DSIH_SAMPLE_LOD_S ] = "sample_l_s", [VKD3DSIH_SAMPLE_POS ] = "sample_pos", [VKD3DSIH_SETP ] = "setp", [VKD3DSIH_SGE ] = "sge", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 6f0c57c..57633cd 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -151,6 +151,7 @@ enum vkd3d_shader_opcode VKD3DSIH_CALL, VKD3DSIH_CALLNZ, VKD3DSIH_CASE, + VKD3DSIH_CHECK_ACCESS_FULLY_MAPPED, VKD3DSIH_CMP, VKD3DSIH_CND, VKD3DSIH_CONTINUE, @@ -255,8 +256,12 @@ enum vkd3d_shader_opcode VKD3DSIH_FTOU, VKD3DSIH_GATHER4, VKD3DSIH_GATHER4_C, + VKD3DSIH_GATHER4_C_S, VKD3DSIH_GATHER4_PO, VKD3DSIH_GATHER4_PO_C, + VKD3DSIH_GATHER4_PO_C_S, + VKD3DSIH_GATHER4_PO_S, + VKD3DSIH_GATHER4_S, VKD3DSIH_GE, VKD3DSIH_HS_CONTROL_POINT_PHASE, VKD3DSIH_HS_DECLS, @@ -294,9 +299,14 @@ enum vkd3d_shader_opcode VKD3DSIH_LABEL, VKD3DSIH_LD, VKD3DSIH_LD2DMS, + VKD3DSIH_LD2DMS_S, VKD3DSIH_LD_RAW, + VKD3DSIH_LD_RAW_S, + VKD3DSIH_LD_S, VKD3DSIH_LD_STRUCTURED, + VKD3DSIH_LD_STRUCTURED_S, VKD3DSIH_LD_UAV_TYPED, + VKD3DSIH_LD_UAV_TYPED_S, VKD3DSIH_LIT, VKD3DSIH_LOD, VKD3DSIH_LOG, @@ -335,11 +345,17 @@ enum vkd3d_shader_opcode VKD3DSIH_RSQ, VKD3DSIH_SAMPLE, VKD3DSIH_SAMPLE_B, + VKD3DSIH_SAMPLE_B_CL_S, VKD3DSIH_SAMPLE_C, + VKD3DSIH_SAMPLE_C_CL_S, VKD3DSIH_SAMPLE_C_LZ, + VKD3DSIH_SAMPLE_C_LZ_S, + VKD3DSIH_SAMPLE_CL_S, VKD3DSIH_SAMPLE_GRAD, + VKD3DSIH_SAMPLE_GRAD_CL_S, VKD3DSIH_SAMPLE_INFO, VKD3DSIH_SAMPLE_LOD, + VKD3DSIH_SAMPLE_LOD_S, VKD3DSIH_SAMPLE_POS, VKD3DSIH_SETP, VKD3DSIH_SGE,

1 0

Conor McCarthy : vkd3d/tests: Enable on vkd3d the tests for ID3D12CommandQueue::Wait().
by Alexandre Julliard 13 Jan '22

13 Jan '22

Module: vkd3d Branch: master Commit: 41230b6e763980ad02930213a11336e1358197e3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=41230b6e763980ad0293021… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 11 00:00:49 2022 +1000 vkd3d/tests: Enable on vkd3d the tests for ID3D12CommandQueue::Wait(). The Wait() implementation was added some time ago and these tests succeed. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3b0c424..c1956fa 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33268,12 +33268,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); - if (!vkd3d_test_platform_is_windows()) - { - skip("Wait() is not implemented yet.\n"); /* FIXME */ - goto skip_tests; - } - /* Wait() before CPU signal */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_wait(queue, fence, 2); @@ -33349,7 +33343,6 @@ static void test_queue_wait(void) check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); release_resource_readback(&rb); -skip_tests: /* Signal() and Wait() in the same command queue */ update_buffer_data(cb, 0, sizeof(blue), &blue); queue_signal(queue, fence, 7);

1 0

Conor McCarthy : vkd3d/tests: Add tests for GetCopyableFootprints() depth/stencil planes.
by Alexandre Julliard 13 Jan '22

13 Jan '22

Module: vkd3d Branch: master Commit: c6e46f84df974b5103e6771901083211d2419970 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c6e46f84df974b5103e6771… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 11 00:01:33 2022 +1000 vkd3d/tests: Add tests for GetCopyableFootprints() depth/stencil planes. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 19 +++++++++++++++++++ tests/d3d12_test_utils.h | 1 + 2 files changed, 20 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index c1956fa..13748f1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19454,6 +19454,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}, }; static const uint64_t base_offsets[] = { @@ -19499,6 +19501,14 @@ static void test_get_copyable_footprints(void) {D3D12_RESOURCE_DIMENSION_TEXTURE3D, 3, 2, 2, 2, 2, DXGI_FORMAT_BC1_UNORM, {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_NONE}, 0, 1, }, + { + {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 4, 4, 1, 1, DXGI_FORMAT_D32_FLOAT, + {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL}, 0, 2, + }, + { + {D3D12_RESOURCE_DIMENSION_TEXTURE2D, 0, 4, 4, 1, 1, DXGI_FORMAT_D24_UNORM_S8_UINT, + {1, 0}, D3D12_TEXTURE_LAYOUT_UNKNOWN, D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL}, 0, 3, + }, }; if (!(device = create_device())) @@ -19538,6 +19548,15 @@ 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 (!vkd3d_test_platform_is_windows()) + { + skip("Depth/stencil planes are not supported.\n"); + continue; + } + sub_resource_count *= 2; + } assert(sub_resource_count <= ARRAY_SIZE(layouts)); for (k = 0; k < ARRAY_SIZE(base_offsets); ++k) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index f2ce922..46dcd87 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -345,6 +345,7 @@ static unsigned int format_size(DXGI_FORMAT format) case DXGI_FORMAT_R8G8B8A8_UNORM_SRGB: case DXGI_FORMAT_R8G8B8A8_UINT: case DXGI_FORMAT_B8G8R8A8_UNORM: + case DXGI_FORMAT_D24_UNORM_S8_UINT: return 4; case DXGI_FORMAT_R16_FLOAT: case DXGI_FORMAT_R16_UNORM:

1 0

Conor McCarthy : vkd3d: Handle depth/stencil planes in GetCopyableFootprints().
by Alexandre Julliard 13 Jan '22

13 Jan '22

Module: vkd3d Branch: master Commit: 2566b8dd8cdd750df7558e37ed64dfe7cf12498f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2566b8dd8cdd750df7558e3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 11 00:01:34 2022 +1000 vkd3d: Handle depth/stencil planes in GetCopyableFootprints(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 10 ++++++---- tests/d3d12.c | 6 ++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4ce3ed8..661ca1d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3660,7 +3660,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; - unsigned int width, height, depth, array_size; + unsigned int width, height, depth, plane_count, sub_resources_per_plane; const struct vkd3d_format *format; uint64_t offset, size, total; @@ -3694,9 +3694,11 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - array_size = d3d12_resource_desc_get_layer_count(desc); + plane_count = ((format->vk_aspect_mask & VK_IMAGE_ASPECT_DEPTH_BIT) + && (format->vk_aspect_mask & VK_IMAGE_ASPECT_STENCIL_BIT)) ? 2 : 1; + sub_resources_per_plane = d3d12_resource_desc_get_sub_resource_count(desc); - if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, desc->MipLevels * array_size)) + if (!vkd3d_bound_range(first_sub_resource, sub_resource_count, sub_resources_per_plane * plane_count)) { WARN("Invalid sub-resource range %u-%u for resource.\n", first_sub_resource, sub_resource_count); return; @@ -3706,7 +3708,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i total = 0; for (i = 0; i < sub_resource_count; ++i) { - sub_resource_idx = first_sub_resource + i; + sub_resource_idx = (first_sub_resource + i) % sub_resources_per_plane; miplevel_idx = sub_resource_idx % desc->MipLevels; width = align(d3d12_resource_desc_get_width(desc, miplevel_idx), format->block_width); height = align(d3d12_resource_desc_get_height(desc, miplevel_idx), format->block_height); diff --git a/tests/d3d12.c b/tests/d3d12.c index 13748f1..2507974 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19550,11 +19550,9 @@ static void test_get_copyable_footprints(void) sub_resource_count *= resource_desc.DepthOrArraySize; if (resource_desc.Format == DXGI_FORMAT_D24_UNORM_S8_UINT) { + /* FIXME: we require D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL here for DS formats but windows doesn't. */ if (!vkd3d_test_platform_is_windows()) - { - skip("Depth/stencil planes are not supported.\n"); - continue; - } + resource_desc.Flags |= D3D12_RESOURCE_FLAG_ALLOW_DEPTH_STENCIL; sub_resource_count *= 2; } assert(sub_resource_count <= ARRAY_SIZE(layouts));

1 0

Dmitry Timoshkov : ntdll: Use full registry key name in NtQueryLicenseValue.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: 58bf1112dff524ec0f06d1446897bdc8052757ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=58bf1112dff524ec0f06d144… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 12 10:41:25 2022 +0300 ntdll: Use full registry key name in NtQueryLicenseValue. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 265ed39bd17..6628454440a 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -780,7 +780,8 @@ NTSTATUS WINAPI NtReplaceKey( OBJECT_ATTRIBUTES *attr, HANDLE key, OBJECT_ATTRIB NTSTATUS WINAPI NtQueryLicenseValue( const UNICODE_STRING *name, ULONG *type, void *data, ULONG length, ULONG *retlen ) { - static const WCHAR nameW[] = {'M','a','c','h','i','n','e','\\', + static const WCHAR nameW[] = {'\\','R','e','g','i','s','t','r','y','\\', + 'M','a','c','h','i','n','e','\\', 'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\','L','i','c','e','n','s','e', 'I','n','f','o','r','m','a','t','i','o','n',0};

1 0

Alex Henrie : gdi32/tests: Mark a GetTextExtentPointW test as broken on Windows 10.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: 524dbe4bef5bb373941f884a9cd7c5db8571cb4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=524dbe4bef5bb373941f884a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 9 20:45:04 2022 -0700 gdi32/tests: Mark a GetTextExtentPointW test as broken on Windows 10. Fixes a testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 0c346fa5e6b..269151a1e1a 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2457,7 +2457,8 @@ static void testJustification(const char *context, HDC hdc, PCSTR str, RECT *cli { /* The width returned by GetTextExtentPoint32() is exactly the same returned by GetTextExtentExPointW() - see dlls/gdi32/font.c */ - ok(error[e].GetTextExtentExPointWWidth == areaWidth, + ok(error[e].GetTextExtentExPointWWidth == areaWidth || + broken(abs(areaWidth - error[e].GetTextExtentExPointWWidth) <= 2) /* win10 */, "%s: GetTextExtentPointW() for \"%.*s\" should have returned a width of %d, not %d.\n", context, error[e].len, error[e].start, areaWidth, error[e].GetTextExtentExPointWWidth); }

1 0

Alex Henrie : gdi32/tests: Drop font test workarounds for Windows <= 2000.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: ec72025cff2c4e46adc78bf8b648af779adef2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec72025cff2c4e46adc78bf8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 9 22:03:52 2022 -0700 gdi32/tests: Drop font test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 445 ++++++++++++++---------------------------------- 1 file changed, 132 insertions(+), 313 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec72025cff2c4e46adc7…

1 0

Alexandre Julliard : include: Move the ITextRange2 definition to avoid an undefined reference.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: 048f5436fa447b325964c6d2247a94eff521339c URL: https://source.winehq.org/git/wine.git/?a=commit;h=048f5436fa447b325964c6d2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 12 17:14:01 2022 +0100 include: Move the ITextRange2 definition to avoid an undefined reference. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52381 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/tom.idl | 128 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 63 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index 940b1f2e52c..d987aecaf9c 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -269,6 +269,8 @@ interface ITextDocument2Old : ITextDocument interface ITextDisplays; interface ITextFont2; interface ITextPara2; +interface ITextRange2; +interface ITextSelection2; interface ITextStory; interface ITextStoryRanges2; interface ITextStrings; @@ -331,69 +333,6 @@ interface ITextRow : IDispatch HRESULT SetProperty([in] LONG type, [in] LONG value); } -[ - object, - uuid(c241f5e2-7206-11d8-a2c7-00a0d1d6c6b3) -] -interface ITextRange2 : ITextSelection -{ - HRESULT GetCch([retval, out] LONG *count); - HRESULT GetCells([retval, out] IUnknown **cells); - HRESULT GetColumn([retval, out] IUnknown **column); - HRESULT GetCount([retval, out] LONG *count); - HRESULT GetDuplicate2([retval, out] ITextRange2 **range); - HRESULT GetFont2([retval, out] ITextFont2 **font); - HRESULT SetFont2([in] ITextFont2 *font); - HRESULT GetFormattedText2([retval, out] ITextRange2 **range); - HRESULT SetFormattedText2([in] ITextRange2 *range); - HRESULT GetGravity([retval, out] LONG *value); - HRESULT SetGravity([in] LONG value); - HRESULT GetPara2([retval, out] ITextPara2 **para); - HRESULT SetPara2([in] ITextPara2 *para); - HRESULT GetRow([retval, out] ITextRow **row); - HRESULT GetStartPara([retval, out] LONG *value); - HRESULT GetTable([retval, out] IUnknown **table); - HRESULT GetURL([retval, out] BSTR *url); - HRESULT SetURL([in] BSTR url); - HRESULT AddSubrange([in] LONG cp1, [in] LONG cp2, [in] LONG activate); - HRESULT BuildUpMath([in] LONG flags); - HRESULT DeleteSubrange([in] LONG first, [in] LONG lim); - HRESULT Find([in] ITextRange2 *range, [in] LONG count, [in] LONG flags, [out] LONG *delta); - HRESULT GetChar2([out] LONG *ch, [in] LONG offset); - HRESULT GetDropCap([out] LONG *line, [out] LONG *pos); - HRESULT GetInlineObject([out] LONG *type, [out] LONG *align, [out] LONG *ch, - [out] LONG *ch1, [out] LONG *ch2, [out] LONG *count, [out] LONG *texstyle, - [out] LONG *ccol, [out] LONG *level); - HRESULT GetProperty([in] LONG type, [out] LONG *value); - HRESULT GetRect([in] LONG type, [out] LONG *left, [out] LONG *top, - [out] LONG *right, [out] LONG *bottom, [out] LONG *hit); - HRESULT GetSubrange([in] LONG subrange, [out] LONG *first, [out] LONG *limit); - HRESULT GetText2([in] LONG flags, [out] BSTR *str); - HRESULT HexToUnicode(); - HRESULT InsertTable([in] LONG col, [in] LONG row, [in] LONG autofit); - HRESULT Linearize([in] LONG flags); - HRESULT SetActiveSubrange([in] LONG anchor, [in] LONG active); - HRESULT SetDropCap([in] LONG line, [in] LONG pos); - HRESULT SetProperty([in] LONG type, [in] LONG value); - HRESULT SetText2([in] LONG flags, [in] BSTR str); - HRESULT UnicodeToHex(); - HRESULT SetInlineObject([in] LONG type, [in] LONG align, [in] LONG ch, - [in] LONG ch1, [in] LONG ch2, [in] LONG count, [in] LONG texstyle, - [in] LONG ccol); - HRESULT GetMathFunctionType([in] BSTR str, [out] LONG *value); - HRESULT InsertImage([in] LONG width, [in] LONG height, [in] LONG ascent, - [in] LONG type, [in] BSTR alttext, [in] IStream *stream); -} - -[ - object, - uuid(c241f5e1-7206-11d8-a2c7-00a0d1d6c6b3) -] -interface ITextSelection2 : ITextRange2 -{ -} - - [ object, uuid(c241f5e0-7206-11d8-a2c7-00a0d1d6c6b3) @@ -527,6 +466,69 @@ interface ITextSelection : ITextRange HRESULT TypeText([in]BSTR bstr); } +[ + object, + uuid(c241f5e2-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextRange2 : ITextSelection +{ + HRESULT GetCch([retval, out] LONG *count); + HRESULT GetCells([retval, out] IUnknown **cells); + HRESULT GetColumn([retval, out] IUnknown **column); + HRESULT GetCount([retval, out] LONG *count); + HRESULT GetDuplicate2([retval, out] ITextRange2 **range); + HRESULT GetFont2([retval, out] ITextFont2 **font); + HRESULT SetFont2([in] ITextFont2 *font); + HRESULT GetFormattedText2([retval, out] ITextRange2 **range); + HRESULT SetFormattedText2([in] ITextRange2 *range); + HRESULT GetGravity([retval, out] LONG *value); + HRESULT SetGravity([in] LONG value); + HRESULT GetPara2([retval, out] ITextPara2 **para); + HRESULT SetPara2([in] ITextPara2 *para); + HRESULT GetRow([retval, out] ITextRow **row); + HRESULT GetStartPara([retval, out] LONG *value); + HRESULT GetTable([retval, out] IUnknown **table); + HRESULT GetURL([retval, out] BSTR *url); + HRESULT SetURL([in] BSTR url); + HRESULT AddSubrange([in] LONG cp1, [in] LONG cp2, [in] LONG activate); + HRESULT BuildUpMath([in] LONG flags); + HRESULT DeleteSubrange([in] LONG first, [in] LONG lim); + HRESULT Find([in] ITextRange2 *range, [in] LONG count, [in] LONG flags, [out] LONG *delta); + HRESULT GetChar2([out] LONG *ch, [in] LONG offset); + HRESULT GetDropCap([out] LONG *line, [out] LONG *pos); + HRESULT GetInlineObject([out] LONG *type, [out] LONG *align, [out] LONG *ch, + [out] LONG *ch1, [out] LONG *ch2, [out] LONG *count, [out] LONG *texstyle, + [out] LONG *ccol, [out] LONG *level); + HRESULT GetProperty([in] LONG type, [out] LONG *value); + HRESULT GetRect([in] LONG type, [out] LONG *left, [out] LONG *top, + [out] LONG *right, [out] LONG *bottom, [out] LONG *hit); + HRESULT GetSubrange([in] LONG subrange, [out] LONG *first, [out] LONG *limit); + HRESULT GetText2([in] LONG flags, [out] BSTR *str); + HRESULT HexToUnicode(); + HRESULT InsertTable([in] LONG col, [in] LONG row, [in] LONG autofit); + HRESULT Linearize([in] LONG flags); + HRESULT SetActiveSubrange([in] LONG anchor, [in] LONG active); + HRESULT SetDropCap([in] LONG line, [in] LONG pos); + HRESULT SetProperty([in] LONG type, [in] LONG value); + HRESULT SetText2([in] LONG flags, [in] BSTR str); + HRESULT UnicodeToHex(); + HRESULT SetInlineObject([in] LONG type, [in] LONG align, [in] LONG ch, + [in] LONG ch1, [in] LONG ch2, [in] LONG count, [in] LONG texstyle, + [in] LONG ccol); + HRESULT GetMathFunctionType([in] BSTR str, [out] LONG *value); + HRESULT InsertImage([in] LONG width, [in] LONG height, [in] LONG ascent, + [in] LONG type, [in] BSTR alttext, [in] IStream *stream); +} + +[ + object, + uuid(c241f5e1-7206-11d8-a2c7-00a0d1d6c6b3) +] +interface ITextSelection2 : ITextRange2 +{ +} + + [ object, uuid(8cc497c3-a1df-11ce-8098-00aa0047be5d)

1 0

Rémi Bernon : dinput/tests: Check that InputReportByteLength bytes are read.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: 352cfbcf1bb0ccaa3e887bae9178ef5c693edb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=352cfbcf1bb0ccaa3e887bae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 12 17:23:57 2022 +0100 dinput/tests: Check that InputReportByteLength bytes are read. Regardless of how long the driver packet is. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hid.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index f8e8a275b09..d6232d578ca 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -2110,6 +2110,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; send_hid_input( file, expect, sizeof(expect) ); @@ -2190,6 +2200,21 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle value, (report_id ? 3 : 4) ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + send_hid_input( file, expect_small, sizeof(expect_small) ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == report_id ? 2 : caps.InputReportByteLength - 1, + "got length %u, expected %u\n", value, report_id ? 2 : caps.InputReportByteLength - 1 ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } @@ -2212,6 +2237,16 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle .ret_status = STATUS_SUCCESS, }, }; + struct hid_expect expect_small[] = + { + { + .code = IOCTL_HID_READ_REPORT, + .report_len = report_id ? 2 : caps.InputReportByteLength - 1, + .report_buf = {report_id ? report_id + 1 : 0x5a,0x5a,0x5a}, + .ret_length = report_id ? 2 : caps.InputReportByteLength - 1, + .ret_status = STATUS_SUCCESS, + }, + }; overlapped.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); overlapped2.hEvent = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2269,6 +2304,19 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle ok( !memcmp( buffer + off, buffer + caps.InputReportByteLength, caps.InputReportByteLength - off ), "expected identical reports\n" ); + SetLastError( 0xdeadbeef ); + memset( report, 0, sizeof(report) ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + ok( !ret, "ReadFile succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + send_hid_input( file, expect_small, sizeof(expect_small) ); + + ret = GetOverlappedResult( async_file, &overlapped, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + todo_wine_if( report_id ) + ok( value == caps.InputReportByteLength, "got length %u, expected %u\n", value, caps.InputReportByteLength ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); }

1 0

Rémi Bernon : user32: Increase the default message buffer size.
by Alexandre Julliard 12 Jan '22

12 Jan '22

Module: wine Branch: master Commit: d416f1c4ce8b5ef6487db2ba60f9cee37f4764cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d416f1c4ce8b5ef6487db2ba… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 12 17:23:58 2022 +0100 user32: Increase the default message buffer size. The DS4 controllers are sending 563 bytes HID reports by default, this translates to WM_INPUT messages larger than the default message size. We would otherwise need an additional server roundtrip on each message, and these devices are also known to be very verbose and continuously send HID reports, so we really don't want it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d7dbc64d796..44b08da79dd 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2665,7 +2665,7 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, struct received_message_info info, *old_info; unsigned int hw_id = 0; /* id of previous hardware message */ void *buffer; - size_t buffer_size = 256; + size_t buffer_size = 1024; if (!(buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ))) return -1;

1 0