Module: wine Branch: master Commit: 7a31d401391c9c66173a599cadbbb6946f607927 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a31d401391c9c66173a599ca...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Jul 28 17:09:57 2020 +0200
condrv: Rename condrv_write_output_params to condrv_output_params.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/kernel32/console.c | 2 +- dlls/kernelbase/console.c | 6 +++--- include/wine/condrv.h | 2 +- server/console.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 8fc158ac22..c4583d1d9c 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -691,7 +691,7 @@ LONG CALLBACK CONSOLE_HandleCtrlC( EXCEPTION_POINTERS *eptr ) */ static int CONSOLE_WriteChars(HANDLE handle, const WCHAR *str, size_t length, COORD *coord) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; DWORD written = 0, size;
if (!length) return 0; diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index b7443ce9ae..23f0696124 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1486,7 +1486,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputA( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INFO *buffer, COORD size, COORD coord, SMALL_RECT *region ) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; unsigned int width, height, y; size_t params_size; BOOL ret; @@ -1533,7 +1533,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputW( HANDLE handle, const CHAR_INF BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputAttribute( HANDLE handle, const WORD *attr, DWORD length, COORD coord, DWORD *written ) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; size_t size; BOOL ret;
@@ -1600,7 +1600,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterA( HANDLE handle, LPCST BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWSTR str, DWORD length, COORD coord, DWORD *written ) { - struct condrv_write_output_params *params; + struct condrv_output_params *params; size_t size; BOOL ret;
diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 922550f6f5..a47a4f2775 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -84,7 +84,7 @@ struct condrv_input_info_params };
/* IOCTL_CONDRV_WRITE_OUTPUT */ -struct condrv_write_output_params +struct condrv_output_params { unsigned int x; /* destination position */ unsigned int y; diff --git a/server/console.c b/server/console.c index e74340d122..14fbd67e22 100644 --- a/server/console.c +++ b/server/console.c @@ -1249,7 +1249,7 @@ static struct fd *screen_buffer_get_fd( struct object *obj ) }
/* write data into a screen buffer */ -static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_write_output_params *params, +static void write_console_output( struct screen_buffer *screen_buffer, const struct condrv_output_params *params, data_size_t size ) { unsigned int i, entry_size, entry_cnt, x, y; @@ -1677,7 +1677,7 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * return 1;
case IOCTL_CONDRV_WRITE_OUTPUT: - if (get_req_data_size() < sizeof(struct condrv_write_output_params) || + if (get_req_data_size() < sizeof(struct condrv_output_params) || (get_reply_max_size() != sizeof(SMALL_RECT) && get_reply_max_size() != sizeof(unsigned int))) { set_error( STATUS_INVALID_PARAMETER ); @@ -1688,7 +1688,7 @@ static int screen_buffer_ioctl( struct fd *fd, ioctl_code_t code, struct async * set_error( STATUS_OBJECT_TYPE_MISMATCH ); return 0; } - write_console_output( screen_buffer, get_req_data(), get_req_data_size() - sizeof(struct condrv_write_output_params) ); + write_console_output( screen_buffer, get_req_data(), get_req_data_size() - sizeof(struct condrv_output_params) ); return !get_error();
case IOCTL_CONDRV_GET_OUTPUT_INFO: