wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

Alex Henrie : advapi32/tests: Accept more broken values in another RegEnumValue name overflow test.
by Alexandre Julliard 15 Dec '21

15 Dec '21

Module: wine Branch: master Commit: 8efa9f7604bb2f613c9a795cd69ccf3b28fcb8ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=8efa9f7604bb2f613c9a795c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Dec 14 23:14:11 2021 -0700 advapi32/tests: Accept more broken values in another RegEnumValue name overflow test. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c4f63c6cd27..ca371f73d65 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -534,7 +534,8 @@ static void test_enum_value(void) res = RegEnumValueA( test_key, 0, value, &val_count, NULL, &type, (LPBYTE)data, &data_count ); ok( res == ERROR_MORE_DATA, "expected ERROR_MORE_DATA, got %d\n", res ); ok( val_count == 2, "val_count set to %d\n", val_count ); - ok( data_count == 7 || broken( data_count == 8 ), "data_count set to %d instead of 7\n", data_count ); + /* Chinese, Japanese, and Korean editions of Windows 10 sometimes set data_count to a higher value */ + ok( data_count == 7 || broken( data_count > 7 ), "data_count set to %d instead of 7\n", data_count ); ok( type == REG_SZ, "type %d is not REG_SZ\n", type ); ok( !strcmp( value, "xxxxxxxxxx" ), "value set to '%s'\n", value ); ok( !strcmp( data, "xxxxxxxxxx" ), "data set to '%s'\n", data );

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

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: 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-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: 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

Alexandre Julliard : ntdll: Fix the RtlCreateTimer() argument order.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 8125687441923e11ffb8918b89f3c0d85040b8e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8125687441923e11ffb8918b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 21:48:44 2021 +0100 ntdll: Fix the RtlCreateTimer() argument order. Found by Dávid Török. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/sync.c | 2 +- dlls/ntdll/threadpool.c | 4 ++-- include/winternl.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/sync.c b/dlls/kernelbase/sync.c index ab963c62221..1ae72c770eb 100644 --- a/dlls/kernelbase/sync.c +++ b/dlls/kernelbase/sync.c @@ -818,7 +818,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH CreateTimerQueueTimer( PHANDLE timer, HANDLE queue WAITORTIMERCALLBACK callback, PVOID arg, DWORD when, DWORD period, ULONG flags ) { - return set_ntstatus( RtlCreateTimer( timer, queue, callback, arg, when, period, flags )); + return set_ntstatus( RtlCreateTimer( queue, timer, callback, arg, when, period, flags )); } diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index ca323919d05..827232b2143 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -887,8 +887,8 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue) * Creates a new timer associated with the given queue. * * PARAMS - * NewTimer [O] The newly created timer. * TimerQueue [I] The queue to hold the timer. + * NewTimer [O] The newly created timer. * Callback [I] The callback to fire. * Parameter [I] The argument for the callback. * DueTime [I] The delay, in milliseconds, before first firing the @@ -906,7 +906,7 @@ static struct timer_queue *get_timer_queue(HANDLE TimerQueue) * Success: STATUS_SUCCESS. * Failure: Any NTSTATUS code. */ -NTSTATUS WINAPI RtlCreateTimer(PHANDLE NewTimer, HANDLE TimerQueue, +NTSTATUS WINAPI RtlCreateTimer(HANDLE TimerQueue, HANDLE *NewTimer, RTL_WAITORTIMERCALLBACKFUNC Callback, PVOID Parameter, DWORD DueTime, DWORD Period, ULONG Flags) diff --git a/include/winternl.h b/include/winternl.h index 7c3a0c3cf57..0e23fdd97bf 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4200,7 +4200,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCreateProcessParameters(RTL_USER_PROCESS_PARAMETERS NTSYSAPI NTSTATUS WINAPI RtlCreateProcessParametersEx(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,ULONG); NTSYSAPI NTSTATUS WINAPI RtlCreateSecurityDescriptor(PSECURITY_DESCRIPTOR,DWORD); NTSYSAPI NTSTATUS WINAPI RtlCreateTimerQueue(PHANDLE); -NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(PHANDLE, HANDLE, RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); +NTSYSAPI NTSTATUS WINAPI RtlCreateTimer(HANDLE,HANDLE*,RTL_WAITORTIMERCALLBACKFUNC, PVOID, DWORD, DWORD, ULONG); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeString(PUNICODE_STRING,LPCWSTR); NTSYSAPI BOOLEAN WINAPI RtlCreateUnicodeStringFromAsciiz(PUNICODE_STRING,LPCSTR); NTSYSAPI NTSTATUS WINAPI RtlCreateUserProcess(UNICODE_STRING*,ULONG,RTL_USER_PROCESS_PARAMETERS*,SECURITY_DESCRIPTOR*,SECURITY_DESCRIPTOR*,HANDLE,BOOLEAN,HANDLE,HANDLE,RTL_USER_PROCESS_INFORMATION*);

1 0

Alexandre Julliard : winebrowser: Try xdg-open before /usr/bin/open.
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: 2e569060081467361fe32a139366391e0c1734fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e569060081467361fe32a13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 21:28:58 2021 +0100 winebrowser: Try xdg-open before /usr/bin/open. /usr/bin/open may be something different on Linux. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52206 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winebrowser/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index 14ce00bf518..913c0a8d672 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -115,13 +115,11 @@ static LSTATUS get_commands( HKEY key, const WCHAR *value, WCHAR *buffer, DWORD static int open_http_url( const WCHAR *url ) { static const WCHAR defaultbrowsers[] = - L"/usr/bin/open\0" - "xdg-open\0" + L"xdg-open\0" + "/usr/bin/open\0" "firefox\0" "konqueror\0" "mozilla\0" - "netscape\0" - "galeon\0" "opera\0" "dillo\0"; WCHAR browsers[256];

1 0

Paul Gofman : mountmgr.sys: Avoid use after free in dhcp4_config_request().
by Alexandre Julliard 14 Dec '21

14 Dec '21

Module: wine Branch: master Commit: b65ed8fa9b24709284a310328f97633df80f58ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=b65ed8fa9b24709284a31032… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 14 21:53:46 2021 +0300 mountmgr.sys: Avoid use after free in dhcp4_config_request(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/dbus.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 28b229f03d0..581d45e7702 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -635,11 +635,15 @@ static DBusMessage *dhcp4_config_request( const char *iface ) p_dbus_message_iter_init( reply, &iter ); if (p_dbus_message_iter_get_arg_type( &iter ) == DBUS_TYPE_OBJECT_PATH) p_dbus_message_iter_get_basic( &iter, &path ); - p_dbus_message_unref( reply ); - if (!path) return NULL; + if (!path) + { + p_dbus_message_unref( reply ); + return NULL; + } request = p_dbus_message_new_method_call( "org.freedesktop.NetworkManager", path, "org.freedesktop.DBus.Properties", "Get" ); + p_dbus_message_unref( reply ); if (!request) return NULL; p_dbus_message_iter_init_append( request, &iter );

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

← Newer
1
...
15
16
17
18
19
20
21
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021