server: Remove no longer used console renderer object.

include/wine/condrv.h

@@ -56,10 +56,6 @@
 /* console server ioctls */
 #define IOCTL_CONDRV_SETUP_INPUT           CTL_CODE(FILE_DEVICE_CONSOLE, 60, METHOD_BUFFERED, FILE_ANY_ACCESS)
 
-/* console renderer ioctls */
-#define IOCTL_CONDRV_GET_RENDERER_EVENTS   CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_ACCESS)
-#define IOCTL_CONDRV_ATTACH_RENDERER       CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_ACCESS)
-
 /* ioctls used for communication between driver and host */
 #define IOCTL_CONDRV_INIT_OUTPUT           CTL_CODE(FILE_DEVICE_CONSOLE, 90, METHOD_BUFFERED, 0)
 #define IOCTL_CONDRV_CLOSE_OUTPUT          CTL_CODE(FILE_DEVICE_CONSOLE, 91, METHOD_BUFFERED, 0)
@@ -188,54 +184,6 @@ struct condrv_scroll_params
     char_info_t  fill;                /* empty character info */
 };
 
-/* IOCTL_CONDRV_GET_RENDERER_EVENTS result */
-struct condrv_renderer_event
-{
-    short event;
-    union
-    {
-        struct
-        {
-            short top;
-            short bottom;
-        } update;
-        struct
-        {
-            short width;
-            short height;
-        } resize;
-        struct
-        {
-            short x;
-            short y;
-        } cursor_pos;
-        struct
-        {
-            short visible;
-            short size;
-        } cursor_geom;
-        struct
-        {
-            short left;
-            short top;
-            short width;
-            short height;
-        } display;
-    } u;
-};
-
-enum condrv_renderer_event_type
-{
-    CONSOLE_RENDERER_NONE_EVENT,
-    CONSOLE_RENDERER_TITLE_EVENT,
-    CONSOLE_RENDERER_SB_RESIZE_EVENT,
-    CONSOLE_RENDERER_UPDATE_EVENT,
-    CONSOLE_RENDERER_CURSOR_POS_EVENT,
-    CONSOLE_RENDERER_CURSOR_GEOM_EVENT,
-    CONSOLE_RENDERER_DISPLAY_EVENT,
-    CONSOLE_RENDERER_EXIT_EVENT,
-};
-
 /* IOCTL_CONDRV_CTRL_EVENT params */
 struct condrv_ctrl_event
 {

programs/conhost/conhost.c

@@ -2111,10 +2111,7 @@ static NTSTATUS fill_output( struct screen_buffer *screen_buffer, const struct c
     dest = screen_buffer->data + min( params->y * screen_buffer->width + params->x,
                                       screen_buffer->height * screen_buffer->width );
 
-    if (params->wrap)
-        end = screen_buffer->data + screen_buffer->height * screen_buffer->width;
-    else
-        end = screen_buffer->data + (params->y + 1) * screen_buffer->width;
+    end = screen_buffer->data + screen_buffer->height * screen_buffer->width;
 
     count = params->count;
     if (count > end - dest) count = end - dest;

server/trace.c

@@ -115,16 +115,15 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code )
     {
 #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break
         CASE(IOCTL_CONDRV_ACTIVATE);
-        CASE(IOCTL_CONDRV_ATTACH_RENDERER);
         CASE(IOCTL_CONDRV_BIND_PID);
         CASE(IOCTL_CONDRV_CTRL_EVENT);
         CASE(IOCTL_CONDRV_FILL_OUTPUT);
         CASE(IOCTL_CONDRV_GET_INPUT_INFO);
         CASE(IOCTL_CONDRV_GET_MODE);
         CASE(IOCTL_CONDRV_GET_OUTPUT_INFO);
-        CASE(IOCTL_CONDRV_GET_RENDERER_EVENTS);
         CASE(IOCTL_CONDRV_GET_TITLE);
         CASE(IOCTL_CONDRV_PEEK);
+        CASE(IOCTL_CONDRV_READ_CONSOLE);
         CASE(IOCTL_CONDRV_READ_INPUT);
         CASE(IOCTL_CONDRV_READ_OUTPUT);
         CASE(IOCTL_CONDRV_SET_MODE);