system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 18:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

server: Removed the no longer used bare parameter out of get_console_mode request.

Browse source
This commit is contained in:
Eric Pouech 2010-11-07 19:15:01 +01:00 committed by Alexandre Julliard
parent f67b0377ab
commit 91e3a40e41
6 changed files with 17 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dlls/kernel32/console.c
View file

@ -131,23 +131,6 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count )
}
}
static BOOL get_console_mode(HANDLE conin, DWORD* mode, BOOL* bare)
{
BOOL ret;
SERVER_START_REQ( get_console_mode )
{
req->handle = console_handle_unmap(conin);
if ((ret = !wine_server_call_err( req )))
{
if (mode) *mode = reply->mode;
if (bare) *bare = reply->is_bare;
}
}
SERVER_END_REQ;
return ret;
}
static struct termios S_termios; /* saved termios for bare consoles */
static BOOL S_termios_raw /* = FALSE */;
@ -1174,7 +1157,7 @@ static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_R
}
else
{
if (!get_console_mode(handle, NULL, NULL)) return rci_error;
if (!VerifyConsoleIoHandle(handle)) return rci_error;
if (WaitForSingleObject(GetConsoleInputWaitHandle(), timeout) != WAIT_OBJECT_0)
return rci_timeout;
@ -2135,7 +2118,18 @@ BOOL WINAPI SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput)
*/
BOOL WINAPI GetConsoleMode(HANDLE hcon, LPDWORD mode)
{
return get_console_mode(hcon, mode, NULL);
BOOL ret;
SERVER_START_REQ( get_console_mode )
{
req->handle = console_handle_unmap(hcon);
if ((ret = !wine_server_call_err( req )))
{
if (mode) *mode = reply->mode;
}
}
SERVER_END_REQ;
return ret;
}

4
include/wine/server_protocol.h
View file

@ -1550,7 +1550,7 @@ struct get_console_mode_reply
{
struct reply_header __header;
int mode;
int is_bare;
char __pad_12[4];
};
@ -5519,6 +5519,6 @@ union generic_reply
struct set_cursor_reply set_cursor_reply;
};
#define SERVER_PROTOCOL_VERSION 410
#define SERVER_PROTOCOL_VERSION 411
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */

6
server/console.c
View file

@ -565,7 +565,7 @@ static void propagate_console_signal( struct console_input *console,
enum_processes(propagate_console_signal_cb, &csi);
}
static int get_console_mode( obj_handle_t handle, int *bare )
static int get_console_mode( obj_handle_t handle )
{
struct object *obj;
int ret = 0;
@ -575,12 +575,10 @@ static int get_console_mode( obj_handle_t handle, int *bare )
if (obj->ops == &console_input_ops)
{
ret = ((struct console_input *)obj)->mode;
*bare = console_input_is_bare((struct console_input *)obj);
}
else if (obj->ops == &screen_buffer_ops)
{
ret = ((struct screen_buffer *)obj)->mode;
*bare = console_input_is_bare(((struct screen_buffer *)obj)->input);
}
else
set_error( STATUS_OBJECT_TYPE_MISMATCH );
@ -1537,7 +1535,7 @@ DECL_HANDLER(get_console_input_info)
/* get a console mode (input or output) */
DECL_HANDLER(get_console_mode)
{
reply->mode = get_console_mode( req->handle, &reply->is_bare );
reply->mode = get_console_mode( req->handle );
}
/* set a console mode (input or output) */

1
server/protocol.def
View file

@ -1226,7 +1226,6 @@ struct console_renderer_event
obj_handle_t handle; /* handle to the console */
@REPLY
int mode; /* console mode */
int is_bare; /* whether the console has an evt_queue */
@END

1
server/request.h
View file

@ -976,7 +976,6 @@ C_ASSERT( sizeof(struct get_console_wait_event_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_console_mode_request, handle) == 12 );
C_ASSERT( sizeof(struct get_console_mode_request) == 16 );
C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, mode) == 8 );
C_ASSERT( FIELD_OFFSET(struct get_console_mode_reply, is_bare) == 12 );
C_ASSERT( sizeof(struct get_console_mode_reply) == 16 );
C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, handle) == 12 );
C_ASSERT( FIELD_OFFSET(struct set_console_mode_request, mode) == 16 );

1
server/trace.c
View file

@ -1649,7 +1649,6 @@ static void dump_get_console_mode_request( const struct get_console_mode_request
static void dump_get_console_mode_reply( const struct get_console_mode_reply *req )
{
fprintf( stderr, " mode=%d", req->mode );
fprintf( stderr, ", is_bare=%d", req->is_bare );
}
static void dump_set_console_mode_request( const struct set_console_mode_request *req )