- adapted kernel32 so that it no longer (directly) manages console
handles as wineserver handles
- console input handle object is no longer waitable (input record
synchronisation is now implemented as a simple semaphore), and removed
FD_TYPE_CONSOLE from fd types in wineserver
- console handles now always have their two lower bit set so one can
distinguish a console handle from a kernel object handle
- implemented some undocumented kernel32 console related APIs
(CloseConsoleHandle, GetConsoleInputWaitHandle, OpenConsoleW,
VerifyConsoleIoHandle, DuplicateConsoleHandle)
- allowed a few kernel32 APIs to take console pseudo-handles
(FlushFileBuffer, GetFileType, WaitFor*Object*)
- simplified the console inheritance at process creation
- in console tests, no longer create a console if one already exists
diff --git a/server/trace.c b/server/trace.c
index 0d43904..ae215d0 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -997,7 +997,8 @@
{
fprintf( stderr, " access=%08x,", req->access );
fprintf( stderr, " inherit=%d,", req->inherit );
- fprintf( stderr, " pid=%04x", req->pid );
+ fprintf( stderr, " pid=%04x,", req->pid );
+ fprintf( stderr, " wait_event=%p", req->wait_event );
}
static void dump_alloc_console_reply( const struct alloc_console_reply *req )
@@ -1034,6 +1035,15 @@
fprintf( stderr, " handle=%p", req->handle );
}
+static void dump_get_console_wait_event_request( const struct get_console_wait_event_request *req )
+{
+}
+
+static void dump_get_console_wait_event_reply( const struct get_console_wait_event_reply *req )
+{
+ fprintf( stderr, " handle=%p", req->handle );
+}
+
static void dump_get_console_mode_request( const struct get_console_mode_request *req )
{
fprintf( stderr, " handle=%p", req->handle );
@@ -2506,6 +2516,7 @@
(dump_func)dump_free_console_request,
(dump_func)dump_get_console_renderer_events_request,
(dump_func)dump_open_console_request,
+ (dump_func)dump_get_console_wait_event_request,
(dump_func)dump_get_console_mode_request,
(dump_func)dump_set_console_mode_request,
(dump_func)dump_set_console_input_info_request,
@@ -2683,6 +2694,7 @@
(dump_func)0,
(dump_func)dump_get_console_renderer_events_reply,
(dump_func)dump_open_console_reply,
+ (dump_func)dump_get_console_wait_event_reply,
(dump_func)dump_get_console_mode_reply,
(dump_func)0,
(dump_func)0,
@@ -2860,6 +2872,7 @@
"free_console",
"get_console_renderer_events",
"open_console",
+ "get_console_wait_event",
"get_console_mode",
"set_console_mode",
"set_console_input_info",