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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 91e3a40e412a6c04cfaf8f6d0d3d16a1a4c4bfdb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=91e3a40e412a6c04cfaf8f6d0d...

Author: Eric Pouech <eric.pouech(a)orange.fr>
Date:   Sun Nov  7 19:15:01 2010 +0100

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

---

 dlls/kernel32/console.c        |   32 +++++++++++++-------------------
 include/wine/server_protocol.h |    4 ++--
 server/console.c               |    6 ++----
 server/protocol.def            |    1 -
 server/request.h               |    1 -
 server/trace.c                 |    1 -
 6 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 2ea1cd8..d49731f 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -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;
 }
 
 
diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h
index e41d8f7..72f3cde 100644
--- a/include/wine/server_protocol.h
+++ b/include/wine/server_protocol.h
@@ -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 */
diff --git a/server/console.c b/server/console.c
index 4441163..42d985d 100644
--- a/server/console.c
+++ b/server/console.c
@@ -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) */
diff --git a/server/protocol.def b/server/protocol.def
index 321a933..6245f4c 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -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
 
 
diff --git a/server/request.h b/server/request.h
index 55af0e1..e0bffaf 100644
--- a/server/request.h
+++ b/server/request.h
@@ -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 );
diff --git a/server/trace.c b/server/trace.c
index b6155a1..83d5b16 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -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 )