Jacek Caban : server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events.

Alexandre Julliard julliard at winehq.org
Wed Jul 29 15:47:00 CDT 2020


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Jul 29 12:38:04 2020 +0200

server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events.

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

---

 include/wine/condrv.h              |  1 -
 programs/wineconsole/wineconsole.c | 18 ------------------
 server/console.c                   |  4 ----
 3 files changed, 23 deletions(-)

diff --git a/include/wine/condrv.h b/include/wine/condrv.h
index a6df63155c..d42128f810 100644
--- a/include/wine/condrv.h
+++ b/include/wine/condrv.h
@@ -206,7 +206,6 @@ enum condrv_renderer_event_type
 {
     CONSOLE_RENDERER_NONE_EVENT,
     CONSOLE_RENDERER_TITLE_EVENT,
-    CONSOLE_RENDERER_ACTIVE_SB_EVENT,
     CONSOLE_RENDERER_SB_RESIZE_EVENT,
     CONSOLE_RENDERER_UPDATE_EVENT,
     CONSOLE_RENDERER_CURSOR_POS_EVENT,
diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c
index 63fdb7e72f..a61aad5293 100644
--- a/programs/wineconsole/wineconsole.c
+++ b/programs/wineconsole/wineconsole.c
@@ -199,7 +199,6 @@ void	WINECON_GrabChanges(struct inner_data* data)
     struct condrv_renderer_event *evts = data->events;
     int i, ev_found;
     DWORD num;
-    HANDLE h;
 
     if (data->in_grab_changes) return;
 
@@ -267,23 +266,6 @@ void	WINECON_GrabChanges(struct inner_data* data)
 	    WINE_TRACE("%u/%u: title()\n", i+1, num);
 	    data->fnSetTitle(data);
 	    break;
-	case CONSOLE_RENDERER_ACTIVE_SB_EVENT:
-	    SERVER_START_REQ( open_console )
-	    {
-                req->from       = wine_server_obj_handle( data->hConIn );
-                req->access     = GENERIC_READ | GENERIC_WRITE;
-                req->attributes = 0;
-                req->share      = FILE_SHARE_READ | FILE_SHARE_WRITE;
-                h = wine_server_call_err( req ) ? 0 : wine_server_ptr_handle(reply->handle);
-	    }
-	    SERVER_END_REQ;
-	    WINE_TRACE("%u/%u: active(%p)\n", i+1, num, h);
-	    if (h)
-	    {
-		CloseHandle(data->hConOut);
-		data->hConOut = h;
-	    }
-	    break;
 	case CONSOLE_RENDERER_SB_RESIZE_EVENT:
 	    if (data->curcfg.sb_width != evts[i].u.resize.width ||
 		data->curcfg.sb_height != evts[i].u.resize.height)
diff --git a/server/console.c b/server/console.c
index add8b1278d..46d43e7832 100644
--- a/server/console.c
+++ b/server/console.c
@@ -496,10 +496,6 @@ static void generate_sb_initial_events( struct console_input *console_input )
     struct screen_buffer *screen_buffer = console_input->active;
     struct condrv_renderer_event evt;
 
-    evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT;
-    memset(&evt.u, 0, sizeof(evt.u));
-    console_input_events_append( console_input, &evt );
-
     evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT;
     evt.u.resize.width  = screen_buffer->width;
     evt.u.resize.height = screen_buffer->height;




More information about the wine-cvs mailing list