Jacek Caban : server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Fri Jul 17 13:56:09 2020 +0200

server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB.

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/wine/server_protocol.h |  5 ++---
 server/console.c               | 26 +-------------------------
 server/protocol.def            |  2 --
 server/request.h               |  1 -
 server/trace.c                 |  1 -
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index 1176d9cbea..f50e6a213c 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -1833,7 +1833,7 @@ struct alloc_console_reply
 {
     struct reply_header __header;
     obj_handle_t handle_in;
-    obj_handle_t event;
+    char __pad_12[4];
 };
 
 
@@ -1916,7 +1916,6 @@ struct set_console_input_info_reply
 {
     struct reply_header __header;
 };
-#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB        0x01
 #define SET_CONSOLE_INPUT_INFO_TITLE            0x02
 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE     0x04
 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE     0x08
@@ -6452,7 +6451,7 @@ union generic_reply
 
 /* ### protocol_version begin ### */
 
-#define SERVER_PROTOCOL_VERSION 628
+#define SERVER_PROTOCOL_VERSION 629
 
 /* ### protocol_version end ### */
 
diff --git a/server/console.c b/server/console.c
index 149a31dd57..3c562cb507 100644
--- a/server/console.c
+++ b/server/console.c
@@ -830,37 +830,13 @@ static int set_console_input_info( const struct set_console_input_info_request *
     struct condrv_renderer_event evt;
 
     if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) goto error;
-    if (console_input_is_bare(console) &&
-        (req->mask & (SET_CONSOLE_INPUT_INFO_ACTIVE_SB|
-                      SET_CONSOLE_INPUT_INFO_WIN)))
+    if (console_input_is_bare(console) && (req->mask & SET_CONSOLE_INPUT_INFO_WIN))
     {
         set_error( STATUS_UNSUCCESSFUL );
         goto error;
     }
 
     memset(&evt.u, 0, sizeof(evt.u));
-    if (req->mask & SET_CONSOLE_INPUT_INFO_ACTIVE_SB)
-    {
-	struct screen_buffer *screen_buffer;
-
-	screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, req->active_sb,
-								FILE_WRITE_PROPERTIES, &screen_buffer_ops );
-	if (!screen_buffer || screen_buffer->input != console)
-	{
-	    set_error( STATUS_INVALID_HANDLE );
-	    if (screen_buffer) release_object( screen_buffer );
-	    goto error;
-	}
-
-	if (screen_buffer != console->active)
-	{
-	    if (console->active) release_object( console->active );
-	    console->active = screen_buffer;
-	    generate_sb_initial_events( console );
-	}
-	else
-	    release_object( screen_buffer );
-    }
     if (req->mask & SET_CONSOLE_INPUT_INFO_TITLE)
     {
         WCHAR *new_title = NULL;
diff --git a/server/protocol.def b/server/protocol.def
index 4a59c32728..a121c371c1 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1464,7 +1464,6 @@ enum server_fd_type
     int          input_fd;      /* if pid=-1 (bare console to current process), fd for input */
 @REPLY
     obj_handle_t handle_in;     /* handle to console input */
-    obj_handle_t event;         /* handle to renderer events change notification */
 @END
 
 
@@ -1515,7 +1514,6 @@ enum server_fd_type
     user_handle_t win;           /* console window if backend supports it */
     VARARG(title,unicode_str);   /* console title */
 @END
-#define SET_CONSOLE_INPUT_INFO_ACTIVE_SB        0x01
 #define SET_CONSOLE_INPUT_INFO_TITLE            0x02
 #define SET_CONSOLE_INPUT_INFO_HISTORY_MODE     0x04
 #define SET_CONSOLE_INPUT_INFO_HISTORY_SIZE     0x08
diff --git a/server/request.h b/server/request.h
index 31ca632669..1ddf21496b 100644
--- a/server/request.h
+++ b/server/request.h
@@ -1116,7 +1116,6 @@ C_ASSERT( FIELD_OFFSET(struct alloc_console_request, pid) == 20 );
 C_ASSERT( FIELD_OFFSET(struct alloc_console_request, input_fd) == 24 );
 C_ASSERT( sizeof(struct alloc_console_request) == 32 );
 C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, handle_in) == 8 );
-C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, event) == 12 );
 C_ASSERT( sizeof(struct alloc_console_reply) == 16 );
 C_ASSERT( sizeof(struct free_console_request) == 16 );
 C_ASSERT( FIELD_OFFSET(struct open_console_request, from) == 12 );
diff --git a/server/trace.c b/server/trace.c
index c3cfd7de12..21468abd73 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -2033,7 +2033,6 @@ static void dump_alloc_console_request( const struct alloc_console_request *req
 static void dump_alloc_console_reply( const struct alloc_console_reply *req )
 {
     fprintf( stderr, " handle_in=%04x", req->handle_in );
-    fprintf( stderr, ", event=%04x", req->event );
 }
 
 static void dump_free_console_request( const struct free_console_request *req )