Commit 13b2587d authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

server: Remove no longer needed support for opening current console in open_console request.

parent be2443e0
...@@ -1902,7 +1902,6 @@ struct open_console_request ...@@ -1902,7 +1902,6 @@ struct open_console_request
{ {
struct request_header __header; struct request_header __header;
obj_handle_t from; obj_handle_t from;
unsigned int access; unsigned int access;
unsigned int attributes; unsigned int attributes;
int share; int share;
......
...@@ -1664,19 +1664,8 @@ DECL_HANDLER(open_console) ...@@ -1664,19 +1664,8 @@ DECL_HANDLER(open_console)
{ {
struct object *obj = NULL; struct object *obj = NULL;
reply->handle = 0; if ((obj = get_handle_obj( current->process, req->from,
if (!req->from) FILE_READ_PROPERTIES|FILE_WRITE_PROPERTIES, &console_input_ops )))
{
if (current->process->console)
obj = grab_object( (struct object*)current->process->console );
}
else if (req->from == (obj_handle_t)1)
{
if (current->process->console && current->process->console->active)
obj = grab_object( (struct object*)current->process->console->active );
}
else if ((obj = get_handle_obj( current->process, req->from,
FILE_READ_PROPERTIES|FILE_WRITE_PROPERTIES, &console_input_ops )))
{ {
struct console_input *console = (struct console_input *)obj; struct console_input *console = (struct console_input *)obj;
obj = (console->active) ? grab_object( console->active ) : NULL; obj = (console->active) ? grab_object( console->active ) : NULL;
......
...@@ -1523,8 +1523,7 @@ struct console_renderer_event ...@@ -1523,8 +1523,7 @@ struct console_renderer_event
/* Open a handle to the process console */ /* Open a handle to the process console */
@REQ(open_console) @REQ(open_console)
obj_handle_t from; /* 0 (resp 1) input (resp output) of current process console */ obj_handle_t from; /* console_in handle to get active screen buffer */
/* otherwise console_in handle to get active screen buffer? */
unsigned int access; /* wanted access rights */ unsigned int access; /* wanted access rights */
unsigned int attributes; /* object attributes */ unsigned int attributes; /* object attributes */
int share; /* share mask (only for output handles) */ int share; /* share mask (only for output handles) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment