condrv: Rename condrv_write_output_params to condrv_output_params.

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;

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;
 

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;

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: