Jacek Caban : conhost: Remove unused extra_size argument from set_output_info.

Alexandre Julliard julliard at winehq.org
Tue Dec 14 15:34:33 CST 2021


Module: wine
Branch: master
Commit: 288093229d4b4fd9db9b12c7a8c950d2049944cf
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=288093229d4b4fd9db9b12c7a8c950d2049944cf

Author: Jacek Caban <jacek at 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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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))




More information about the wine-cvs mailing list