December 2021 - Wine-commits

Rémi Bernon : user32: Throttle device list updates from GetRawInputDeviceList.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: a80f76819cf0e173ba17808336c0feb45254f9d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a80f76819cf0e173ba178083… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Dec 14 21:24:23 2021 +0100 user32: Throttle device list updates from GetRawInputDeviceList. Up to once every 2s. This fixes a regression from c2c78a2fe0ac13e4fca7ab4c17977b65e358485c, which caused severe FPS drop in Samurai Shodown. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51282 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 2660874d12c..f3dc4ae67de 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -418,7 +418,8 @@ BOOL rawinput_from_hardware_message(RAWINPUT *rawinput, const struct hardware_ms */ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_count, UINT size) { - UINT i; + static UINT last_check; + UINT i, ticks = GetTickCount(); TRACE("devices %p, device_count %p, size %u.\n", devices, device_count, size); @@ -434,7 +435,11 @@ UINT WINAPI GetRawInputDeviceList(RAWINPUTDEVICELIST *devices, UINT *device_coun return ~0U; } - rawinput_update_device_list(); + if (ticks - last_check > 2000) + { + last_check = ticks; + rawinput_update_device_list(); + } if (!devices) {

1 0

Conor McCarthy : vkd3d: Initialise root signature descriptor offset buffer to NULL.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: vkd3d Branch: master Commit: f65884f6b4199688395ad54298d9ee2edf7bdd28 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f65884f6b4199688395ad54… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 3 18:58:57 2021 +1000 vkd3d: Initialise root signature descriptor offset buffer to NULL. 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/state.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index cb3f99a..7c9575f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1141,6 +1141,7 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->parameters = NULL; root_signature->flags = desc->Flags; root_signature->descriptor_mapping = NULL; + root_signature->descriptor_offsets = NULL; root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; root_signature->device = device;

1 0

Conor McCarthy : vkd3d-shader/spirv: Support runtime descriptor array offsets using push constants.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: vkd3d Branch: master Commit: 3816fa403f33aae5f110f7e62e907363c75a35e9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3816fa403f33aae5f110f7e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 3 18:58:58 2021 +1000 vkd3d-shader/spirv: Support runtime descriptor array offsets using push constants. 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> --- include/vkd3d_shader.h | 36 +++++++++++++--- libs/vkd3d-shader/spirv.c | 102 ++++++++++++++++++++++++++++++++++++--------- libs/vkd3d/state.c | 16 ++++++- libs/vkd3d/vkd3d_private.h | 2 +- 4 files changed, 128 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=3816fa403f33aae5f11…

1 0

Conor McCarthy : vkd3d: Simplify checking if a descriptor has a view.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: vkd3d Branch: master Commit: 7d609770c481a5762d8fa8bc7d130f31a3c2afc8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7d609770c481a5762d8fa8b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Dec 9 01:00:20 2021 +1000 vkd3d: Simplify checking if a descriptor has a view. Saves a few CPU cycles on a potentially very hot code path. Based on a vkd3d-proton patch by Philip Rebohle. 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/resource.c | 10 ++-------- libs/vkd3d/vkd3d_private.h | 16 ++++++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 2887779..1991223 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2130,9 +2130,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr pthread_mutex_lock(mutex); /* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */ - if ((dst->magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || dst->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - || dst->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) + if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) && !InterlockedDecrement(&dst->u.view->refcount)) destroy_desc = *dst; @@ -2165,12 +2163,8 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, mutex = d3d12_device_get_descriptor_mutex(device, src); pthread_mutex_lock(mutex); - if (src->magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - || src->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) - { + if (src->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) vkd3d_view_incref(src->u.view); - } tmp = *src; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e963131..f83fd1a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -41,13 +41,17 @@ #define VK_CALL(f) (vk_procs->f) +#define MAKE_MAGIC(a,b,c,f) (((uint32_t)a) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | f) + +#define VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW 0x01000000u + #define VKD3D_DESCRIPTOR_MAGIC_FREE 0x00000000u -#define VKD3D_DESCRIPTOR_MAGIC_CBV 0x00564243u -#define VKD3D_DESCRIPTOR_MAGIC_SRV 0x00565253u -#define VKD3D_DESCRIPTOR_MAGIC_UAV 0x00564155u -#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER 0x504d4153u -#define VKD3D_DESCRIPTOR_MAGIC_DSV 0x00565344u -#define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u +#define VKD3D_DESCRIPTOR_MAGIC_CBV MAKE_MAGIC('C', 'B', 'V', 0) +#define VKD3D_DESCRIPTOR_MAGIC_SRV MAKE_MAGIC('S', 'R', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) +#define VKD3D_DESCRIPTOR_MAGIC_UAV MAKE_MAGIC('U', 'A', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) +#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER MAKE_MAGIC('S', 'M', 'P', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) +#define VKD3D_DESCRIPTOR_MAGIC_DSV MAKE_MAGIC('D', 'S', 'V', 0) +#define VKD3D_DESCRIPTOR_MAGIC_RTV MAKE_MAGIC('R', 'T', 'V', 0) #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u

1 0

Conor McCarthy : vkd3d: Change strip cut value FIXMEs to FIXME_ONCE.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: vkd3d Branch: master Commit: ff6e9300045df6f36b2d7a7ad6ec6ace475af3f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ff6e9300045df6f36b2d7a7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 10 15:07:09 2021 +1000 vkd3d: Change strip cut value FIXMEs to FIXME_ONCE. These can generate many messages per frame in some games, e.g. Control. 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/command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 1db624e..37159a7 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3070,7 +3070,7 @@ static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_c case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFF: if (list->index_buffer_format != DXGI_FORMAT_R16_UINT) { - FIXME("Strip cut value 0xffff is not supported with index buffer format %#x.\n", + FIXME_ONCE("Strip cut value 0xffff is not supported with index buffer format %#x.\n", list->index_buffer_format); } break; @@ -3078,7 +3078,7 @@ static void d3d12_command_list_check_index_buffer_strip_cut_value(struct d3d12_c case D3D12_INDEX_BUFFER_STRIP_CUT_VALUE_0xFFFFFFFF: if (list->index_buffer_format != DXGI_FORMAT_R32_UINT) { - FIXME("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", + FIXME_ONCE("Strip cut value 0xffffffff is not supported with index buffer format %#x.\n", list->index_buffer_format); } break;

1 0

Conor McCarthy : vkd3d: Convert the descriptor handle to a pointer when the descriptor table is set.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: vkd3d Branch: master Commit: ffbbee92470e2826a6ffb3c2674c54ce227f4889 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ffbbee92470e2826a6ffb3c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Dec 10 15:07:11 2021 +1000 vkd3d: Convert the descriptor handle to a pointer when the descriptor table is set. Saves a couple of conversion calls later, and more when Vulkan-backed heaps are added. 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/command.c | 6 +++--- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 37159a7..9fbde80 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2605,7 +2605,7 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li if (unbounded_offset != UINT_MAX /* Descriptors may not be set, eg. WoW. */ - && (base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[table_index]))) + && (base_descriptor = bindings->descriptor_tables[table_index])) { heap_size = vkd3d_gpu_descriptor_allocator_range_size_from_descriptor( &device->gpu_descriptor_allocator, base_descriptor); @@ -2981,7 +2981,7 @@ static void d3d12_command_list_update_descriptors(struct d3d12_command_list *lis { if (bindings->descriptor_table_dirty_mask & ((uint64_t)1 << i)) { - if ((base_descriptor = d3d12_desc_from_gpu_handle(bindings->descriptor_tables[i]))) + if ((base_descriptor = bindings->descriptor_tables[i])) d3d12_command_list_update_descriptor_table(list, bind_point, i, base_descriptor); else WARN("Descriptor table %u is not set.\n", i); @@ -4182,7 +4182,7 @@ static void d3d12_command_list_set_descriptor_table(struct d3d12_command_list *l assert(root_signature_get_descriptor_table(root_signature, index)); assert(index < ARRAY_SIZE(bindings->descriptor_tables)); - bindings->descriptor_tables[index] = base_descriptor; + bindings->descriptor_tables[index] = d3d12_desc_from_gpu_handle(base_descriptor); bindings->descriptor_table_dirty_mask |= (uint64_t)1 << index; bindings->descriptor_table_active_mask |= (uint64_t)1 << index; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f83fd1a..1bccb35 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -957,7 +957,7 @@ struct vkd3d_pipeline_bindings VkDescriptorSet descriptor_sets[VKD3D_MAX_DESCRIPTOR_SETS]; bool in_use; - D3D12_GPU_DESCRIPTOR_HANDLE descriptor_tables[D3D12_MAX_ROOT_COST]; + struct d3d12_desc *descriptor_tables[D3D12_MAX_ROOT_COST]; uint64_t descriptor_table_dirty_mask; uint64_t descriptor_table_active_mask;

1 0

Matteo Bruni : ddraw: Pass the sub resource count to ddraw_surface_reserve_memory().
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 91916619922c96bbeedbd4b9fb233b467b62b3b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91916619922c96bbeedbd4b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 10 20:03:39 2021 +0100 ddraw: Pass the sub resource count to ddraw_surface_reserve_memory(). Mostly to avoid triggering the WARN() from wined3d_texture_get_sub_resource_desc() every time this function is called. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 25aa2be41bb..d4fddcc8d06 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5923,7 +5923,8 @@ static HRESULT CDECL ddraw_reset_enum_callback(struct wined3d_resource *resource return DD_OK; } -static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_texture) +static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_texture, + unsigned int sub_resource_count) { static const unsigned int extra_size = 0x10000; @@ -5931,9 +5932,8 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text struct wined3d_resource_desc resource_desc; struct wined3d_sub_resource_desc desc; unsigned int pitch, slice_pitch; - unsigned int sub_resource_idx; HRESULT hr = WINED3D_OK; - unsigned int offset; + unsigned int offset, i; wined3d_resource_get_desc(wined3d_texture_get_resource(wined3d_texture), &resource_desc); if (!(texture->texture_memory = heap_alloc_zero(resource_desc.size + extra_size))) @@ -5944,13 +5944,18 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text TRACE("texture->texture_memory %p.\n", texture->texture_memory); offset = 0; - sub_resource_idx = 0; - while (wined3d_texture_get_sub_resource_desc(wined3d_texture, sub_resource_idx, &desc) - == WINED3D_OK) + for (i = 0; i < sub_resource_count; ++i) { - wined3d_texture_get_pitch(wined3d_texture, sub_resource_idx, &pitch, &slice_pitch); + if (FAILED(hr = wined3d_texture_get_sub_resource_desc(wined3d_texture, i, &desc))) + { + ERR("Subresource %u not found.\n", i); + heap_free(texture->texture_memory); + texture->texture_memory = NULL; + return hr; + } + wined3d_texture_get_pitch(wined3d_texture, i, &pitch, &slice_pitch); - if (FAILED(hr = wined3d_texture_update_desc(wined3d_texture, sub_resource_idx, + if (FAILED(hr = wined3d_texture_update_desc(wined3d_texture, i, desc.width, desc.height, resource_desc.format, desc.multisample_type, desc.multisample_quality, (BYTE *)texture->texture_memory + offset, pitch))) @@ -5959,7 +5964,6 @@ static HRESULT ddraw_surface_reserve_memory(struct wined3d_texture *wined3d_text texture->texture_memory = NULL; break; } - ++sub_resource_idx; offset += desc.size; } return hr; @@ -6641,7 +6645,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ && desc->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY && wined3d_display_mode_format.u1.dwRGBBitCount <= 16; - if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture))) + if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture, layers * levels))) { ERR("Failed to reserve surface memory, hr %#x.\n", hr); goto fail; @@ -6700,7 +6704,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ wined3d_texture_set_color_key(wined3d_texture, DDCKEY_SRCBLT, (struct wined3d_color_key *)&desc->ddckCKSrcBlt); - if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture))) + if (reserve_memory && FAILED(hr = ddraw_surface_reserve_memory(wined3d_texture, 1))) { hr = hr_ddraw_from_wined3d(hr); goto fail;

1 0

Matteo Bruni : ddraw: Add a trace to ddraw_surface_update_frontbuffer().
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 029297fabd1231427398ed33bbbd5f3fd91f708e URL: https://source.winehq.org/git/wine.git/?a=commit;h=029297fabd1231427398ed33… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 10 20:03:41 2021 +0100 ddraw: Add a trace to ddraw_surface_update_frontbuffer(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d4fddcc8d06..09f52b85aed 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -64,6 +64,9 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, BOOL ret; RECT r; + TRACE("surface %p, rect %s, read %#x, swap_interval %u.\n", + surface, wine_dbgstr_rect(rect), read, swap_interval); + if (ddraw->flags & DDRAW_SWAPPED && !read) { ddraw->flags &= ~DDRAW_SWAPPED;

1 0

Matteo Bruni : ddraw: Fix typo in a comment.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 1e992a430beaa73a85313a81fd0cd1df61d91c4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e992a430beaa73a85313a81… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Dec 10 20:03:42 2021 +0100 ddraw: Fix typo in a comment. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 09f52b85aed..65e24b0bbcf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -97,7 +97,7 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, * while in exclusive mode, since it would get obscured by the popup * window. On the other hand, if the current frontbuffer *is* the GDI * frontbuffer, that's what's supposed to happen; the popup should obscure - * (oart of) the ddraw swapchain window. + * (part of) the ddraw swapchain window. * * This affects the "Deer Hunter" demo, which uses a popup window and GDI * draws to draw part of the user interface. See also the "fswindow"

1 0

Jacek Caban : conhost: Remove unused extra_size argument from set_output_info.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 288093229d4b4fd9db9b12c7a8c950d2049944cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=288093229d4b4fd9db9b12c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Dec 14 19:23:27 2021 +0100 conhost: Remove unused extra_size argument from set_output_info. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/conhost.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 94dd050fd2f..78f6e345170 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1826,15 +1826,13 @@ NTSTATUS change_screen_buffer_size( struct screen_buffer *screen_buffer, int new } static NTSTATUS set_output_info( struct screen_buffer *screen_buffer, - const struct condrv_output_info_params *params, size_t extra_size ) + const struct condrv_output_info_params *params ) { const struct condrv_output_info *info = &params->info; NTSTATUS status; TRACE( "%p\n", screen_buffer ); - extra_size -= sizeof(*params); - if (params->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM) { if (info->cursor_size < 1 || info->cursor_size > 100) return STATUS_INVALID_PARAMETER; @@ -2427,8 +2425,8 @@ static NTSTATUS screen_buffer_ioctl( struct screen_buffer *screen_buffer, unsign return get_output_info( screen_buffer, out_size ); case IOCTL_CONDRV_SET_OUTPUT_INFO: - if (in_size < sizeof(struct condrv_output_info) || *out_size) return STATUS_INVALID_PARAMETER; - return set_output_info( screen_buffer, in_data, in_size ); + if (in_size != sizeof(struct condrv_output_info_params) || *out_size) return STATUS_INVALID_PARAMETER; + return set_output_info( screen_buffer, in_data ); case IOCTL_CONDRV_FILL_OUTPUT: if (in_size != sizeof(struct condrv_fill_output_params) || *out_size != sizeof(DWORD))

1 0