October 2020 - Wine-commits

Henri Verbeet : wined3d: Only store unique stream output descriptions.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 3d883c640c6309ccadc6757243ea6c150ad4add0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d883c640c6309ccadc67572… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:10 2020 +0330 wined3d: Only store unique stream output descriptions. This allows us to compare them by pointer. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 54 +++++++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 10 +++--- dlls/wined3d/shader.c | 77 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader_spirv.c | 12 ++++--- dlls/wined3d/wined3d_private.h | 16 ++++++--- 5 files changed, 140 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d883c640c6309ccadc6…

1 0

Henri Verbeet : wined3d: Implement vertex shader stream output in the SPIR-V shader backend.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 3ee141b81d1ca9718ae33a8633bcbbca48ee76fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ee141b81d1ca9718ae33a86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:11 2020 +0330 wined3d: Implement vertex shader stream output in the SPIR-V shader backend. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_spirv.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index d729bf5c39..eb2647db12 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -54,6 +54,7 @@ struct shader_spirv_resource_bindings SIZE_T vk_bindings_size, vk_binding_count; size_t binding_base[WINED3D_SHADER_TYPE_COUNT]; + enum wined3d_shader_type so_stage; }; struct shader_spirv_priv @@ -80,6 +81,7 @@ struct shader_spirv_compile_arguments struct shader_spirv_graphics_program_variant_vk { struct shader_spirv_compile_arguments compile_args; + const struct wined3d_stream_output_desc *so_desc; size_t binding_base; VkShaderModule vk_module; @@ -276,17 +278,14 @@ static const char *get_line(const char **ptr) } static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_shader_interface *iface, - struct wined3d_shader *shader, const struct shader_spirv_resource_bindings *b) + struct wined3d_shader *shader, const struct shader_spirv_resource_bindings *b, + const struct wined3d_stream_output_desc *so_desc) { - enum wined3d_shader_type shader_type = shader->reg_maps.shader_version.type; - memset(iface, 0, sizeof(*iface)); iface->vkd3d_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; - if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY && shader->u.gs.so_desc) + if (so_desc) { - const struct wined3d_stream_output_desc *so_desc = shader->u.gs.so_desc; - iface->xfb_info.type = VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO; iface->xfb_info.next = NULL; @@ -307,7 +306,7 @@ static void shader_spirv_init_shader_interface_vk(struct wined3d_shader_spirv_sh static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk, struct wined3d_shader *shader, const struct shader_spirv_compile_arguments *args, - const struct shader_spirv_resource_bindings *bindings) + const struct shader_spirv_resource_bindings *bindings, const struct wined3d_stream_output_desc *so_desc) { struct wined3d_shader_spirv_compile_args compile_args; struct wined3d_shader_spirv_shader_interface iface; @@ -322,7 +321,7 @@ static VkShaderModule shader_spirv_compile(struct wined3d_context_vk *context_vk VkResult vr; int ret; - shader_spirv_init_shader_interface_vk(&iface, shader, bindings); + shader_spirv_init_shader_interface_vk(&iface, shader, bindings, so_desc); shader_type = shader->reg_maps.shader_version.type; shader_spirv_init_compile_args(&compile_args, &iface.vkd3d_interface, VKD3D_SHADER_SPIRV_ENVIRONMENT_VULKAN_1_0, shader_type, args); @@ -383,13 +382,17 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi struct shader_spirv_priv *priv, struct wined3d_context_vk *context_vk, struct wined3d_shader *shader, const struct wined3d_state *state, const struct shader_spirv_resource_bindings *bindings) { - size_t binding_base = bindings->binding_base[shader->reg_maps.shader_version.type]; + enum wined3d_shader_type shader_type = shader->reg_maps.shader_version.type; struct shader_spirv_graphics_program_variant_vk *variant_vk; + size_t binding_base = bindings->binding_base[shader_type]; + const struct wined3d_stream_output_desc *so_desc = NULL; struct shader_spirv_graphics_program_vk *program_vk; struct shader_spirv_compile_arguments args; size_t variant_count, i; shader_spirv_compile_arguments_init(&args, &context_vk->c, shader, state, context_vk->sample_count); + if (bindings->so_stage == shader_type) + so_desc = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]->u.gs.so_desc; if (!(program_vk = shader->backend_data)) return NULL; @@ -398,7 +401,7 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi for (i = 0; i < variant_count; ++i) { variant_vk = &program_vk->variants[i]; - if (variant_vk->binding_base == binding_base + if (variant_vk->so_desc == so_desc && variant_vk->binding_base == binding_base && !memcmp(&variant_vk->compile_args, &args, sizeof(args))) return variant_vk; } @@ -410,7 +413,7 @@ static struct shader_spirv_graphics_program_variant_vk *shader_spirv_find_graphi variant_vk = &program_vk->variants[variant_count]; variant_vk->compile_args = args; variant_vk->binding_base = binding_base; - if (!(variant_vk->vk_module = shader_spirv_compile(context_vk, shader, &args, bindings))) + if (!(variant_vk->vk_module = shader_spirv_compile(context_vk, shader, &args, bindings, so_desc))) return NULL; ++program_vk->variant_count; @@ -434,7 +437,7 @@ static struct shader_spirv_compute_program_vk *shader_spirv_find_compute_program if (program->vk_module) return program; - if (!(program->vk_module = shader_spirv_compile(context_vk, shader, NULL, bindings))) + if (!(program->vk_module = shader_spirv_compile(context_vk, shader, NULL, bindings, NULL))) return NULL; if (!(layout = wined3d_context_vk_get_pipeline_layout(context_vk, @@ -671,6 +674,7 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin bindings->binding_count = 0; bindings->uav_counter_count = 0; bindings->vk_binding_count = 0; + bindings->so_stage = WINED3D_SHADER_TYPE_GEOMETRY; wined3d_bindings->count = 0; for (shader_type = 0; shader_type < WINED3D_SHADER_TYPE_COUNT; ++shader_type) @@ -681,9 +685,15 @@ static bool shader_spirv_resource_bindings_init(struct shader_spirv_resource_bin continue; if (shader_type == WINED3D_SHADER_TYPE_COMPUTE) + { descriptor_info = &((struct shader_spirv_compute_program_vk *)shader->backend_data)->descriptor_info; + } else + { descriptor_info = &((struct shader_spirv_graphics_program_vk *)shader->backend_data)->descriptor_info; + if (shader_type == WINED3D_SHADER_TYPE_GEOMETRY && !shader->function) + bindings->so_stage = WINED3D_SHADER_TYPE_VERTEX; + } vk_stage = vk_shader_stage_from_wined3d(shader_type); shader_visibility = vkd3d_shader_visibility_from_wined3d(shader_type); @@ -829,6 +839,8 @@ static void shader_spirv_select(void *shader_priv, struct wined3d_context *conte ERR("Failed to initialise shader resource bindings.\n"); goto fail; } + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) + context->shader_update_mask |= 1u << bindings->so_stage; layout_vk = wined3d_context_vk_get_pipeline_layout(context_vk, bindings->vk_bindings, bindings->vk_binding_count); context_vk->graphics.vk_set_layout = layout_vk->vk_set_layout; @@ -840,7 +852,7 @@ static void shader_spirv_select(void *shader_priv, struct wined3d_context *conte || binding_base[shader_type] == bindings->binding_base[shader_type])) continue; - if (!(shader = state->shader[shader_type])) + if (!(shader = state->shader[shader_type]) || !shader->function) { context_vk->graphics.vk_modules[shader_type] = VK_NULL_HANDLE; continue;

1 0

Henri Verbeet : wined3d: Implement stream output for the Vulkan adapter.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: cee2e53c3bdb93fb9e9c269c24a8060ac04bc9e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cee2e53c3bdb93fb9e9c269c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:12 2020 +0330 wined3d: Implement stream output for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 86 +++++++++++++++++++++++++++++++++++++++--- dlls/wined3d/buffer.c | 13 ++++++- dlls/wined3d/context_vk.c | 74 ++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++- dlls/wined3d/wined3d_vk.h | 9 +++++ 5 files changed, 181 insertions(+), 8 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cee2e53c3bdb93fb9e9c…

1 0

Henri Verbeet : wined3d: Implement stream output queries for the Vulkan adapter.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: e1e28fe60dc9b4daf31704690734f118f9f5021c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1e28fe60dc9b4daf3170469… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Oct 7 16:45:13 2020 +0330 wined3d: Implement stream output queries for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 10 +++++++++ dlls/wined3d/query.c | 46 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index a4e394e811..fa5aac28fd 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1240,6 +1240,14 @@ bool wined3d_context_vk_allocate_query(struct wined3d_context_vk *context_vk, free_pools = &context_vk->free_pipeline_statistics_query_pools; break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + free_pools = &context_vk->free_stream_output_statistics_query_pools; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1303,6 +1311,7 @@ void wined3d_context_vk_cleanup(struct wined3d_context_vk *context_vk) wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_occlusion_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_timestamp_query_pools); wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_pipeline_statistics_query_pools); + wined3d_context_vk_destroy_query_pools(context_vk, &context_vk->free_stream_output_statistics_query_pools); wine_rb_destroy(&context_vk->bo_slab_available, wined3d_context_vk_destroy_bo_slab, context_vk); heap_free(context_vk->pending_queries.queries); heap_free(context_vk->submitted.buffers); @@ -3159,6 +3168,7 @@ HRESULT wined3d_context_vk_init(struct wined3d_context_vk *context_vk, struct wi list_init(&context_vk->free_occlusion_query_pools); list_init(&context_vk->free_timestamp_query_pools); list_init(&context_vk->free_pipeline_statistics_query_pools); + list_init(&context_vk->free_stream_output_statistics_query_pools); wine_rb_init(&context_vk->render_passes, wined3d_render_pass_vk_compare); wine_rb_init(&context_vk->pipeline_layouts, wined3d_pipeline_layout_vk_compare); diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index bb860db4eb..5aca4a2c5a 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1423,6 +1423,15 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, | VK_QUERY_PIPELINE_STATISTIC_COMPUTE_SHADER_INVOCATIONS_BIT; break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + pool_info.queryType = VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT; + pool_info.pipelineStatistics = 0; + break; + default: FIXME("Unhandled query type %#x.\n", type); return false; @@ -1452,6 +1461,7 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, uint64_t occlusion; uint64_t timestamp; struct wined3d_query_data_pipeline_statistics pipeline_statistics; + struct wined3d_query_data_so_statistics so_statistics; } tmp, *result; if ((vr = VK_CALL(vkGetQueryPoolResults(device_vk->vk_device, pool_idx->pool_vk->vk_query_pool, @@ -1491,6 +1501,15 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, ps_result->cs_invocations += ps_tmp->cs_invocations; break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + result->so_statistics.primitives_written += tmp.so_statistics.primitives_written; + result->so_statistics.primitives_generated += tmp.so_statistics.primitives_generated; + break; + default: FIXME("Unhandled query type %#x.\n", query_vk->q.type); return false; @@ -1516,7 +1535,12 @@ static void wined3d_query_vk_begin(struct wined3d_query_vk *query_vk, idx = query_vk->pool_idx.idx; VK_CALL(vkCmdResetQueryPool(vk_command_buffer, pool_vk->vk_query_pool, idx, 1)); - VK_CALL(vkCmdBeginQuery(vk_command_buffer, pool_vk->vk_query_pool, idx, query_vk->control_flags)); + if (query_vk->q.type >= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 + && query_vk->q.type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) + VK_CALL(vkCmdBeginQueryIndexedEXT(vk_command_buffer, pool_vk->vk_query_pool, idx, + query_vk->control_flags, query_vk->q.type - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0)); + else + VK_CALL(vkCmdBeginQuery(vk_command_buffer, pool_vk->vk_query_pool, idx, query_vk->control_flags)); wined3d_context_vk_reference_query(context_vk, query_vk); } @@ -1530,7 +1554,12 @@ static void wined3d_query_vk_end(struct wined3d_query_vk *query_vk, pool_vk = query_vk->pool_idx.pool_vk; idx = query_vk->pool_idx.idx; - VK_CALL(vkCmdEndQuery(vk_command_buffer, pool_vk->vk_query_pool, idx)); + if (query_vk->q.type >= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1 + && query_vk->q.type <= WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3) + VK_CALL(vkCmdEndQueryIndexedEXT(vk_command_buffer, pool_vk->vk_query_pool, + idx, query_vk->q.type - WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0)); + else + VK_CALL(vkCmdEndQuery(vk_command_buffer, pool_vk->vk_query_pool, idx)); } void wined3d_query_vk_resume(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk) @@ -1803,6 +1832,19 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data_size = sizeof(struct wined3d_query_data_pipeline_statistics); break; + case WINED3D_QUERY_TYPE_SO_STATISTICS: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM0: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM1: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM2: + case WINED3D_QUERY_TYPE_SO_STATISTICS_STREAM3: + if (!wined3d_adapter_vk(device->adapter)->vk_info.supported[WINED3D_VK_EXT_TRANSFORM_FEEDBACK]) + { + WARN("Stream output queries not supported.\n"); + return WINED3DERR_NOTAVAILABLE; + } + data_size = sizeof(struct wined3d_query_data_so_statistics); + break; + default: FIXME("Unhandled query type %#x.\n", type); return WINED3DERR_NOTAVAILABLE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae16545a77..d932f60fa9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2515,6 +2515,7 @@ struct wined3d_context_vk struct list free_occlusion_query_pools; struct list free_timestamp_query_pools; struct list free_pipeline_statistics_query_pools; + struct list free_stream_output_statistics_query_pools; struct wined3d_retired_objects_vk retired; struct wine_rb_tree render_passes;

1 0

Anton Baskanov : amstream: Reference the multimedia stream in ddraw stream sample.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 5d5102f8498413f4b7e11f7da0509e7717fb3735 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d5102f8498413f4b7e11f7d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Oct 7 23:08:16 2020 +0700 amstream: Reference the multimedia stream in ddraw stream sample. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/ddrawstream.c | 6 ++++++ dlls/amstream/tests/amstream.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 6ea99d4915..5e6e1555d7 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -70,6 +70,7 @@ struct ddraw_sample IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; struct ddraw_stream *parent; + IMultiMediaStream *mmstream; IDirectDrawSurface *surface; RECT rect; STREAM_TIME start_time; @@ -1462,6 +1463,8 @@ static ULONG WINAPI ddraw_sample_Release(IDirectDrawStreamSample *iface) --sample->parent->sample_refs; LeaveCriticalSection(&sample->parent->cs); + if (sample->mmstream) + IMultiMediaStream_Release(sample->mmstream); IAMMediaStream_Release(&sample->parent->IAMMediaStream_iface); if (sample->surface) @@ -1678,8 +1681,11 @@ static HRESULT ddrawstreamsample_create(struct ddraw_stream *parent, IDirectDraw object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = parent; + object->mmstream = parent->parent; InitializeConditionVariable(&object->update_cv); IAMMediaStream_AddRef(&parent->IAMMediaStream_iface); + if (object->mmstream) + IMultiMediaStream_AddRef(object->mmstream); ++parent->sample_refs; if (surface) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 285dc0f054..9dda5882a4 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -6904,9 +6904,11 @@ static void test_ddrawstream_create_sample(void) hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, &rect, 0, &sample); ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + EXPECT_REF(mmstream, 1); EXPECT_REF(stream, 3); hr = IDirectDrawMediaStream_CreateSample(ddraw_stream, NULL, NULL, 0, &sample); ok(hr == S_OK, "Got hr %#x.\n", hr); + EXPECT_REF(mmstream, 2); EXPECT_REF(stream, 4); hr = IDirectDrawStreamSample_GetSurface(sample, NULL, NULL);

1 0

Daniel Lehman : tzres: Add Cuba Time Zone.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 3d268f1fdc7798a9b0cce4e1e7f5f279ebc13842 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d268f1fdc7798a9b0cce4e1… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Oct 6 23:13:29 2020 -0700 tzres: Add Cuba Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 18 +++ po/ar.po | 310 ++++++++++++++++++++++++++------------------------- po/ast.po | 310 ++++++++++++++++++++++++++------------------------- po/bg.po | 306 +++++++++++++++++++++++++------------------------- po/ca.po | 310 ++++++++++++++++++++++++++------------------------- po/cs.po | 310 ++++++++++++++++++++++++++------------------------- po/da.po | 310 ++++++++++++++++++++++++++------------------------- po/de.po | 310 ++++++++++++++++++++++++++------------------------- po/el.po | 306 +++++++++++++++++++++++++------------------------- po/en.po | 306 +++++++++++++++++++++++++------------------------- po/en_US.po | 306 +++++++++++++++++++++++++------------------------- po/eo.po | 310 ++++++++++++++++++++++++++------------------------- po/es.po | 310 ++++++++++++++++++++++++++------------------------- po/fa.po | 308 +++++++++++++++++++++++++------------------------- po/fi.po | 310 ++++++++++++++++++++++++++------------------------- po/fr.po | 310 ++++++++++++++++++++++++++------------------------- po/he.po | 310 ++++++++++++++++++++++++++------------------------- po/hi.po | 306 +++++++++++++++++++++++++------------------------- po/hr.po | 310 ++++++++++++++++++++++++++------------------------- po/hu.po | 310 ++++++++++++++++++++++++++------------------------- po/it.po | 310 ++++++++++++++++++++++++++------------------------- po/ja.po | 310 ++++++++++++++++++++++++++------------------------- po/ko.po | 310 ++++++++++++++++++++++++++------------------------- po/lt.po | 310 ++++++++++++++++++++++++++------------------------- po/ml.po | 306 +++++++++++++++++++++++++------------------------- po/nb_NO.po | 310 ++++++++++++++++++++++++++------------------------- po/nl.po | 310 ++++++++++++++++++++++++++------------------------- po/or.po | 306 +++++++++++++++++++++++++------------------------- po/pa.po | 306 +++++++++++++++++++++++++------------------------- po/pl.po | 310 ++++++++++++++++++++++++++------------------------- po/pt_BR.po | 310 ++++++++++++++++++++++++++------------------------- po/pt_PT.po | 310 ++++++++++++++++++++++++++------------------------- po/rm.po | 306 +++++++++++++++++++++++++------------------------- po/ro.po | 310 ++++++++++++++++++++++++++------------------------- po/ru.po | 306 +++++++++++++++++++++++++------------------------- po/si.po | 310 ++++++++++++++++++++++++++------------------------- po/sk.po | 310 ++++++++++++++++++++++++++------------------------- po/sl.po | 310 ++++++++++++++++++++++++++------------------------- po/sr_RS(a)cyrillic.po | 308 +++++++++++++++++++++++++------------------------- po/sr_RS(a)latin.po | 308 +++++++++++++++++++++++++------------------------- po/sv.po | 310 ++++++++++++++++++++++++++------------------------- po/ta.po | 306 +++++++++++++++++++++++++------------------------- po/te.po | 306 +++++++++++++++++++++++++------------------------- po/th.po | 308 +++++++++++++++++++++++++------------------------- po/tr.po | 310 ++++++++++++++++++++++++++------------------------- po/uk.po | 306 +++++++++++++++++++++++++------------------------- po/wa.po | 308 +++++++++++++++++++++++++------------------------- po/wine.pot | 306 +++++++++++++++++++++++++------------------------- po/zh_CN.po | 310 ++++++++++++++++++++++++++------------------------- po/zh_TW.po | 310 ++++++++++++++++++++++++++------------------------- 51 files changed, 7843 insertions(+), 7301 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3d268f1fdc7798a9b0cc…

1 0

Nikolay Sivov : evr/tests: Add some tests for presenter's GetNativeVideoSize().
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: d2beff26236258a9c8853d0a54534a79d595ae7a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2beff26236258a9c8853d0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:19 2020 +0300 evr/tests: Add some tests for presenter's GetNativeVideoSize(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/Makefile.in | 2 +- dlls/evr/tests/evr.c | 55 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/Makefile.in b/dlls/evr/tests/Makefile.in index 5bd82277d1..c5db2226eb 100644 --- a/dlls/evr/tests/Makefile.in +++ b/dlls/evr/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = evr.dll -IMPORTS = dxva2 mfplat mfuuid strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 +IMPORTS = dxva2 mfplat mfuuid mf strmiids uuid dxguid ole32 oleaut32 evr d3d9 user32 C_SRCS = \ evr.c diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 70c7053efd..ce2803bcb3 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1562,6 +1562,8 @@ static void test_presenter_native_video_size(void) IMFTransform *mixer; SIZE size, ratio; HRESULT hr; + IMFVideoMediaType *video_type; + IDirect3DDeviceManager9 *dm; hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); @@ -1594,6 +1596,27 @@ todo_wine { hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Configure mixer primary stream. */ + hr = MFGetService((IUnknown *)presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, (void **)&dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_ProcessMessage(mixer, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)dm); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDirect3DDeviceManager9_Release(dm); + + hr = pMFCreateVideoMediaTypeFromSubtype(&MFVideoFormat_RGB32, &video_type); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)640 << 32 | 480); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + /* Native video size is cached on initialization. */ init_test_host(&host, mixer, presenter); hr = IMFTopologyServiceLookupClient_InitServicePointers(lookup_client, &host.IMFTopologyServiceLookup_iface); @@ -1602,9 +1625,37 @@ todo_wine { hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); - ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + /* Update input type. */ + hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(mixer, 0, (IMFMediaType *)video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); } + /* Negotiating types updates native video size. */ + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); + ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, + "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); +} + IMFVideoMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter); IMFTransform_Release(mixer);

1 0

Nikolay Sivov : evr/presenter: Request original reference frame size when attaching the mixer.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 95dcc559fcd9b5f7e6a492e51781c95a257d2dc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95dcc559fcd9b5f7e6a492e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:20 2020 +0300 evr/presenter: Request original reference frame size when attaching the mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++-- dlls/evr/tests/evr.c | 17 +++++--------- 2 files changed, 68 insertions(+), 13 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 15ebcd80ac..ba9e09c4e3 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -62,6 +62,8 @@ struct video_presenter MFVideoNormalizedRect src_rect; RECT dst_rect; DWORD rendering_prefs; + SIZE native_size; + SIZE native_ratio; unsigned int state; CRITICAL_SECTION cs; }; @@ -377,6 +379,51 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) } } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + +static void video_presenter_get_native_video_size(struct video_presenter *presenter) +{ + IMFMediaType *media_type; + UINT64 frame_size = 0; + + memset(&presenter->native_size, 0, sizeof(presenter->native_size)); + memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); + + if (!presenter->mixer) + return; + + if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) + return; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) + { + unsigned int gcd; + + presenter->native_size.cx = frame_size >> 32; + presenter->native_size.cy = frame_size; + + if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) + { + presenter->native_ratio.cx = presenter->native_size.cx / gcd; + presenter->native_ratio.cy = presenter->native_size.cy / gcd; + } + } + + IMFMediaType_Release(media_type); +} + static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; @@ -410,6 +457,7 @@ static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, I } video_presenter_set_mixer_rect(presenter); + video_presenter_get_native_video_size(presenter); return hr; } @@ -508,9 +556,21 @@ static ULONG WINAPI video_presenter_control_Release(IMFVideoDisplayControl *ifac static HRESULT WINAPI video_presenter_control_GetNativeVideoSize(IMFVideoDisplayControl *iface, SIZE *video_size, SIZE *aspect_ratio) { - FIXME("%p, %p, %p.\n", iface, video_size, aspect_ratio); + struct video_presenter *presenter = impl_from_IMFVideoDisplayControl(iface); - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, video_size, aspect_ratio); + + if (!video_size && !aspect_ratio) + return E_POINTER; + + EnterCriticalSection(&presenter->cs); + if (video_size) + *video_size = presenter->native_size; + if (aspect_ratio) + *aspect_ratio = presenter->native_ratio; + LeaveCriticalSection(&presenter->cs); + + return S_OK; } static HRESULT WINAPI video_presenter_control_GetIdealVideoSize(IMFVideoDisplayControl *iface, SIZE *min_size, diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index ce2803bcb3..39d2ed72a0 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1578,21 +1578,18 @@ static void test_presenter_native_video_size(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, NULL); -todo_wine ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); memset(&size, 0xcc, sizeof(size)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, NULL); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 0 && size.cy == 0, "Unexpected size.\n"); -} + memset(&ratio, 0xcc, sizeof(ratio)); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, NULL, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(ratio.cx == 0 && ratio.cy == 0, "Unexpected ratio.\n"); -} + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1623,12 +1620,11 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + /* Update input type. */ hr = IMFVideoMediaType_SetUINT64(video_type, &MF_MT_FRAME_SIZE, (UINT64)320 << 32 | 240); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1637,24 +1633,23 @@ todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(size.cx == 640 && size.cy == 480, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + /* Negotiating types updates native video size. */ hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy); -} + IMFVideoMediaType_Release(video_type); IMFVideoDisplayControl_Release(display_control); IMFVideoPresenter_Release(presenter);

1 0

Nikolay Sivov : evr/presenter: Update cached native size on format negotiation.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: 59f3337a394271cf729977a77fefb9950cf460d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59f3337a394271cf729977a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 7 11:40:21 2020 +0300 evr/presenter: Update cached native size on format negotiation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 118 +++++++++++++++++++++++++++++++-------------------- dlls/evr/tests/evr.c | 2 - 2 files changed, 71 insertions(+), 49 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index ba9e09c4e3..ecfa923442 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -103,6 +103,58 @@ static struct video_presenter *impl_from_IMFGetService(IMFGetService *iface) return CONTAINING_RECORD(iface, struct video_presenter, IMFGetService_iface); } +static unsigned int get_gcd(unsigned int a, unsigned int b) +{ + unsigned int m; + + while (b) + { + m = a % b; + a = b; + b = m; + } + + return a; +} + +static void video_presenter_get_native_video_size(struct video_presenter *presenter) +{ + IMFMediaType *media_type; + UINT64 frame_size = 0; + + memset(&presenter->native_size, 0, sizeof(presenter->native_size)); + memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); + + if (!presenter->mixer) + return; + + if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) + return; + + if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) + { + unsigned int gcd; + + presenter->native_size.cx = frame_size >> 32; + presenter->native_size.cy = frame_size; + + if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) + { + presenter->native_ratio.cx = presenter->native_size.cx / gcd; + presenter->native_ratio.cy = presenter->native_size.cy / gcd; + } + } + + IMFMediaType_Release(media_type); +} + +static HRESULT video_presenter_invalidate_media_type(struct video_presenter *presenter) +{ + video_presenter_get_native_video_size(presenter); + + return S_OK; +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -277,9 +329,26 @@ static HRESULT WINAPI video_presenter_OnClockSetRate(IMFVideoPresenter *iface, M static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, MFVP_MESSAGE_TYPE message, ULONG_PTR param) { - FIXME("%p, %d, %lu.\n", iface, message, param); + struct video_presenter *presenter = impl_from_IMFVideoPresenter(iface); + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %d, %lu.\n", iface, message, param); + + EnterCriticalSection(&presenter->cs); + + switch (message) + { + case MFVP_MESSAGE_INVALIDATEMEDIATYPE: + hr = video_presenter_invalidate_media_type(presenter); + break; + default: + FIXME("Unsupported message %u.\n", message); + hr = E_NOTIMPL; + } + + LeaveCriticalSection(&presenter->cs); + + return hr; } static HRESULT WINAPI video_presenter_GetCurrentMediaType(IMFVideoPresenter *iface, IMFVideoMediaType **media_type) @@ -379,51 +448,6 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) } } -static unsigned int get_gcd(unsigned int a, unsigned int b) -{ - unsigned int m; - - while (b) - { - m = a % b; - a = b; - b = m; - } - - return a; -} - -static void video_presenter_get_native_video_size(struct video_presenter *presenter) -{ - IMFMediaType *media_type; - UINT64 frame_size = 0; - - memset(&presenter->native_size, 0, sizeof(presenter->native_size)); - memset(&presenter->native_ratio, 0, sizeof(presenter->native_ratio)); - - if (!presenter->mixer) - return; - - if (FAILED(IMFTransform_GetInputCurrentType(presenter->mixer, 0, &media_type))) - return; - - if (SUCCEEDED(IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size))) - { - unsigned int gcd; - - presenter->native_size.cx = frame_size >> 32; - presenter->native_size.cy = frame_size; - - if ((gcd = get_gcd(presenter->native_size.cx, presenter->native_size.cy))) - { - presenter->native_ratio.cx = presenter->native_size.cx / gcd; - presenter->native_ratio.cy = presenter->native_size.cy / gcd; - } - } - - IMFMediaType_Release(media_type); -} - static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 39d2ed72a0..e7eabc5971 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1640,12 +1640,10 @@ static void test_presenter_native_video_size(void) /* Negotiating types updates native video size. */ hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &ratio); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); -todo_wine ok(size.cx == 320 && size.cy == 240, "Unexpected size %u x %u.\n", size.cx, size.cy); ok((ratio.cx == 4 && ratio.cy == 3) || broken(!memcmp(&ratio, &size, sizeof(ratio))) /* < Win10 */, "Unexpected ratio %u x %u.\n", ratio.cx, ratio.cy);

1 0

Jacek Caban : conhost: Scroll window to cursor position when needed.
by Alexandre Julliard 07 Oct '20

07 Oct '20

Module: wine Branch: master Commit: a90017845d2f65ecd8c1bd32c3019bcd2b13ecd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a90017845d2f65ecd8c1bd32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 6 18:53:30 2020 +0200 conhost: Scroll window to cursor position when needed. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index a54238c80f..7d3564a120 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -392,6 +392,24 @@ static void empty_update_rect( struct screen_buffer *screen_buffer, RECT *rect ) SetRect( rect, screen_buffer->width, screen_buffer->height, 0, 0 ); } +static void scroll_to_cursor( struct screen_buffer *screen_buffer ) +{ + int w = screen_buffer->win.right - screen_buffer->win.left + 1; + int h = screen_buffer->win.bottom - screen_buffer->win.top + 1; + + if (screen_buffer->cursor_x < screen_buffer->win.left) + screen_buffer->win.left = min( screen_buffer->cursor_x, screen_buffer->width - w ); + else if (screen_buffer->cursor_x > screen_buffer->win.right) + screen_buffer->win.left = max( screen_buffer->cursor_x, w ) - w + 1; + screen_buffer->win.right = screen_buffer->win.left + w - 1; + + if (screen_buffer->cursor_y < screen_buffer->win.top) + screen_buffer->win.top = min( screen_buffer->cursor_y, screen_buffer->height - h ); + else if (screen_buffer->cursor_y > screen_buffer->win.bottom) + screen_buffer->win.top = max( screen_buffer->cursor_y, h ) - h + 1; + screen_buffer->win.bottom = screen_buffer->win.top + h - 1; +} + static void update_output( struct screen_buffer *screen_buffer, RECT *rect ) { int x, y, size, trailing_spaces; @@ -1237,6 +1255,7 @@ static void update_read_output( struct console *console ) if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, update_rect.left, update_rect.top ); update_output( screen_buffer, &update_rect ); + scroll_to_cursor( screen_buffer ); } if (console->is_unix) set_tty_cursor_relative( screen_buffer->console, screen_buffer->cursor_x, screen_buffer->cursor_y ); @@ -1825,6 +1844,7 @@ static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, { screen_buffer->cursor_x = info->cursor_x; screen_buffer->cursor_y = info->cursor_y; + scroll_to_cursor( screen_buffer ); } } if (params->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) @@ -1972,6 +1992,7 @@ static NTSTATUS write_console( struct screen_buffer *screen_buffer, const WCHAR else screen_buffer->cursor_x = update_rect.left; } + scroll_to_cursor( screen_buffer ); update_output( screen_buffer, &update_rect ); tty_sync( screen_buffer->console ); return STATUS_SUCCESS;

1 0