system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 05:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Streamline a bit the console allocation code.

Browse source
This commit is contained in:
Eric Pouech 2010-08-28 13:14:55 +02:00 committed by Alexandre Julliard
parent 465f3d1a85
commit 1f25534628
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server/console.c
View file

@ -1295,7 +1295,6 @@ DECL_HANDLER(alloc_console)
obj_handle_t in = 0;
obj_handle_t evt = 0;
struct process *process;
struct process *renderer = current->process;
struct console_input *console;
if (req->pid)
@ -1304,7 +1303,7 @@ DECL_HANDLER(alloc_console)
}
else
{
if (!(process = renderer->parent))
if (!(process = current->process->parent))
{
set_error( STATUS_ACCESS_DENIED );
return;
@ -1312,18 +1311,15 @@ DECL_HANDLER(alloc_console)
grab_object( process );
}
if (process != renderer && process->console)
{
if (process != current->process && process->console)
set_error( STATUS_ACCESS_DENIED );
goto the_end;
}
if ((console = (struct console_input*)create_console_input( current )))
else if ((console = (struct console_input*)create_console_input( current )))
{
if ((in = alloc_handle( renderer, console, req->access, req->attributes )))
if ((in = alloc_handle( current->process, console, req->access, req->attributes )))
{
if ((evt = alloc_handle( renderer, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, 0 )))
if ((evt = alloc_handle( current->process, console->evt, SYNCHRONIZE|GENERIC_READ|GENERIC_WRITE, 0 )))
{
if (process != renderer)
if (process != current->process)
{
process->console = (struct console_input*)grab_object( console );
console->num_proc++;
@ -1333,7 +1329,7 @@ DECL_HANDLER(alloc_console)
release_object( console );
goto the_end;
}
close_handle( renderer, in );
close_handle( current->process, in );
}
free_console( process );
}