September 2010 - Wine-Commits

Eric Pouech : ntdll: Allocate a console (without renderer) when starting a program from unix console.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 45ade6c2f57adaa9bde009063d3d5b9294dc5d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45ade6c2f57adaa9bde009063… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:19:18 2010 +0200 ntdll: Allocate a console (without renderer) when starting a program from unix console. --- dlls/kernel32/console.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/kernel_main.c | 21 +---------------- dlls/kernel32/kernel_private.h | 5 ++++ dlls/kernel32/process.c | 2 +- dlls/ntdll/thread.c | 14 ++++++----- 5 files changed, 63 insertions(+), 26 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d760b65..e575d17 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -2715,3 +2715,50 @@ DWORD WINAPI GetConsoleProcessList(LPDWORD processlist, DWORD processcount) return 0; } + +BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params) +{ + if (params->ConsoleHandle == KERNEL32_CONSOLE_SHELL) + { + HANDLE conin; + + /* FIXME: to be done even if program is a GUI ? */ + /* This is wine specific: we have no parent (we're started from unix) + * so, create a simple console with bare handles + */ + SERVER_START_REQ( alloc_console ) + { + req->access = GENERIC_READ | GENERIC_WRITE; + req->attributes = OBJ_INHERIT; + req->pid = 0xffffffff; + wine_server_call( req ); + conin = wine_server_ptr_handle( reply->handle_in ); + /* reply->event shouldn't be created by server */ + } + SERVER_END_REQ; + + if (!params->hStdInput) + params->hStdInput = conin; + } + + /* convert value from server: + * + 0 => INVALID_HANDLE_VALUE + * + console handle needs to be mapped + */ + if (!params->hStdInput) + params->hStdInput = INVALID_HANDLE_VALUE; + else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) + params->hStdInput = console_handle_map(params->hStdInput); + + if (!params->hStdOutput) + params->hStdOutput = INVALID_HANDLE_VALUE; + else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) + params->hStdOutput = console_handle_map(params->hStdOutput); + + if (!params->hStdError) + params->hStdError = INVALID_HANDLE_VALUE; + else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) + params->hStdError = console_handle_map(params->hStdError); + + return TRUE; +} diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 2308d60..41647dd 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -96,24 +96,7 @@ static BOOL process_attach( HMODULE module ) /* Setup computer name */ COMPUTERNAME_Init(); - /* convert value from server: - * + 0 => INVALID_HANDLE_VALUE - * + console handle needs to be mapped - */ - if (!params->hStdInput) - params->hStdInput = INVALID_HANDLE_VALUE; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdInput))) - params->hStdInput = console_handle_map(params->hStdInput); - - if (!params->hStdOutput) - params->hStdOutput = INVALID_HANDLE_VALUE; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdOutput))) - params->hStdOutput = console_handle_map(params->hStdOutput); - - if (!params->hStdError) - params->hStdError = INVALID_HANDLE_VALUE; - else if (VerifyConsoleIoHandle(console_handle_map(params->hStdError))) - params->hStdError = console_handle_map(params->hStdError); + CONSOLE_Init(params); /* copy process information from ntdll */ ENV_CopyStartupInformation(); @@ -128,7 +111,7 @@ static BOOL process_attach( HMODULE module ) /* finish the process initialisation for console bits, if needed */ __wine_set_signal_handler(SIGINT, CONSOLE_HandleCtrlC); - if (params->ConsoleHandle == (HANDLE)1) /* FIXME */ + if (params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC) { HMODULE mod = GetModuleHandleA(0); if (RtlImageNtHeader(mod)->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) diff --git a/dlls/kernel32/kernel_private.h b/dlls/kernel32/kernel_private.h index 4b295e7..f741a92 100644 --- a/dlls/kernel32/kernel_private.h +++ b/dlls/kernel32/kernel_private.h @@ -28,6 +28,7 @@ BOOL WINAPI VerifyConsoleIoHandle(HANDLE); HANDLE WINAPI DuplicateConsoleHandle(HANDLE, DWORD, BOOL, DWORD); BOOL WINAPI CloseConsoleHandle(HANDLE handle); HANDLE WINAPI GetConsoleInputWaitHandle(void); +BOOL CONSOLE_Init(RTL_USER_PROCESS_PARAMETERS *params); static inline BOOL is_console_handle(HANDLE h) { @@ -46,6 +47,10 @@ static inline obj_handle_t console_handle_unmap(HANDLE h) return wine_server_obj_handle( h != INVALID_HANDLE_VALUE ? (HANDLE)((UINT_PTR)h ^ 3) : INVALID_HANDLE_VALUE ); } +/* Some Wine specific values for Console inheritance (params->ConsoleHandle) */ +#define KERNEL32_CONSOLE_ALLOC ((HANDLE)1) +#define KERNEL32_CONSOLE_SHELL ((HANDLE)2) + extern HMODULE kernel32_handle; extern const WCHAR *DIR_Windows; diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ef65a86..c1816a8 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1527,7 +1527,7 @@ static startup_info_t *create_startup_info( LPCWSTR filename, LPCWSTR cmdline, info->console_flags = cur_params->ConsoleFlags; if (flags & CREATE_NEW_PROCESS_GROUP) info->console_flags = 1; - if (flags & CREATE_NEW_CONSOLE) info->console = (obj_handle_t)1; /* FIXME: cf. kernel_main.c */ + if (flags & CREATE_NEW_CONSOLE) info->console = wine_server_obj_handle(KERNEL32_CONSOLE_ALLOC); if (startup->dwFlags & STARTF_USESTDHANDLES) { diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 36f1499..df6c3e2 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -276,12 +276,14 @@ HANDLE thread_init(void) } else { - /* This is wine specific: we have no parent (we're started from unix) - * so, create a simple console with bare handles to unix stdio - */ - wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params.hStdInput ); - wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdOutput ); - wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); + if (isatty(0) || isatty(1) || isatty(2)) + params.ConsoleHandle = (HANDLE)2; /* see kernel32/kernel_private.h */ + if (!isatty(0)) + wine_server_fd_to_handle( 0, GENERIC_READ|SYNCHRONIZE, OBJ_INHERIT, &params.hStdInput ); + if (!isatty(1)) + wine_server_fd_to_handle( 1, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdOutput ); + if (!isatty(2)) + wine_server_fd_to_handle( 2, GENERIC_WRITE|SYNCHRONIZE, OBJ_INHERIT, &params.hStdError ); } /* initialize time values in user_shared_data */

1 0

Eric Pouech : server: Properly return the errors for bare console objects.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: daaee9e50feee79abe03f7eba7fc2b0dfa930f40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daaee9e50feee79abe03f7eba… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:19:12 2010 +0200 server: Properly return the errors for bare console objects. --- server/console.c | 59 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 48 insertions(+), 11 deletions(-) diff --git a/server/console.c b/server/console.c index 954c51d..2ca6bd4 100644 --- a/server/console.c +++ b/server/console.c @@ -731,6 +731,13 @@ static int set_console_input_info( const struct set_console_input_info_request * struct console_renderer_event evt; if (!(console = console_input_get( req->handle, FILE_WRITE_PROPERTIES ))) goto error; + if (console_input_is_bare(console) && + (req->mask & (SET_CONSOLE_INPUT_INFO_ACTIVE_SB| + SET_CONSOLE_INPUT_INFO_WIN))) + { + set_error( STATUS_UNSUCCESSFUL ); + goto error; + } memset(&evt.u, 0, sizeof(evt.u)); if (req->mask & SET_CONSOLE_INPUT_INFO_ACTIVE_SB) @@ -1339,17 +1346,13 @@ static void read_console_output( struct screen_buffer *screen_buffer, int x, int } /* scroll parts of a screen buffer */ -static void scroll_console_output( obj_handle_t handle, int xsrc, int ysrc, int xdst, int ydst, +static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc, int ysrc, int xdst, int ydst, int w, int h ) { - struct screen_buffer *screen_buffer; int j; char_info_t *psrc, *pdst; struct console_renderer_event evt; - if (!(screen_buffer = (struct screen_buffer *)get_handle_obj( current->process, handle, - FILE_WRITE_DATA, &screen_buffer_ops ))) - return; if (xsrc < 0 || ysrc < 0 || xdst < 0 || ydst < 0 || xsrc + w > screen_buffer->width || xdst + w > screen_buffer->width || @@ -1358,7 +1361,6 @@ static void scroll_console_output( obj_handle_t handle, int xsrc, int ysrc, int w == 0 || h == 0) { set_error( STATUS_INVALID_PARAMETER ); - release_object( screen_buffer ); return; } @@ -1396,8 +1398,6 @@ static void scroll_console_output( obj_handle_t handle, int xsrc, int ysrc, int evt.u.update.top = min(ysrc, ydst); evt.u.update.bottom = max(ysrc, ydst) + h - 1; console_input_events_append( screen_buffer->input, &evt ); - - release_object( screen_buffer ); } /* allocate a console for the renderer */ @@ -1615,7 +1615,7 @@ DECL_HANDLER(create_console_output) { if ((fd = thread_get_inflight_fd( current, req->fd )) == -1) { - set_error( STATUS_INVALID_HANDLE ); /* FIXME */ + set_error( STATUS_INVALID_HANDLE ); return; } } @@ -1625,6 +1625,12 @@ DECL_HANDLER(create_console_output) close(fd); return; } + if (console_input_is_bare( console ) ^ (fd != -1)) + { + close( fd ); + set_error( STATUS_INVALID_HANDLE ); + return; + } screen_buffer = create_console_output( console, fd ); if (screen_buffer) @@ -1683,6 +1689,12 @@ DECL_HANDLER(read_console_output) if ((screen_buffer = (struct screen_buffer*)get_handle_obj( current->process, req->handle, FILE_READ_DATA, &screen_buffer_ops ))) { + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + release_object( screen_buffer ); + return; + } read_console_output( screen_buffer, req->x, req->y, req->mode, req->wrap ); reply->width = screen_buffer->width; reply->height = screen_buffer->height; @@ -1698,6 +1710,12 @@ DECL_HANDLER(write_console_output) if ((screen_buffer = (struct screen_buffer*)get_handle_obj( current->process, req->handle, FILE_WRITE_DATA, &screen_buffer_ops))) { + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + release_object( screen_buffer ); + return; + } reply->written = write_console_output( screen_buffer, get_req_data_size(), get_req_data(), req->mode, req->x, req->y, req->wrap ); reply->width = screen_buffer->width; @@ -1714,6 +1732,12 @@ DECL_HANDLER(fill_console_output) if ((screen_buffer = (struct screen_buffer*)get_handle_obj( current->process, req->handle, FILE_WRITE_DATA, &screen_buffer_ops))) { + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + release_object( screen_buffer ); + return; + } reply->written = fill_console_output( screen_buffer, req->data, req->mode, req->x, req->y, req->count, req->wrap ); release_object( screen_buffer ); @@ -1723,8 +1747,21 @@ DECL_HANDLER(fill_console_output) /* move a rect of data in a screen buffer */ DECL_HANDLER(move_console_output) { - scroll_console_output( req->handle, req->x_src, req->y_src, req->x_dst, req->y_dst, - req->w, req->h ); + struct screen_buffer *screen_buffer; + + if ((screen_buffer = (struct screen_buffer*)get_handle_obj( current->process, req->handle, + FILE_WRITE_DATA, &screen_buffer_ops))) + { + if (console_input_is_bare( screen_buffer->input )) + { + set_error( STATUS_OBJECT_TYPE_MISMATCH ); + release_object( screen_buffer ); + return; + } + scroll_console_output( screen_buffer, req->x_src, req->y_src, req->x_dst, req->y_dst, + req->w, req->h ); + release_object( screen_buffer ); + } } /* sends a signal to a console (process, group...) */

1 0

Eric Pouech : server: Simplify the wineconsole event notification code.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 2f7af56d4111402e20fa40bc0672324cb4f179f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7af56d4111402e20fa40bc0… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:19:06 2010 +0200 server: Simplify the wineconsole event notification code. --- server/console.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/server/console.c b/server/console.c index 1fbf736..954c51d 100644 --- a/server/console.c +++ b/server/console.c @@ -231,12 +231,13 @@ static int console_input_events_signaled( struct object *obj, struct thread *thr } /* add an event to the console's renderer events list */ -static void console_input_events_append( struct console_input_events* evts, +static void console_input_events_append( struct console_input* console, struct console_renderer_event* evt) { + struct console_input_events* evts; int collapsed = FALSE; - if (!evts) return; + if (!(evts = console->evt)) return; /* to be done even when evt has been generated by the renderer ? */ /* try to collapse evt into current queue's events */ @@ -372,34 +373,34 @@ static void generate_sb_initial_events( struct console_input *console_input ) evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT; memset(&evt.u, 0, sizeof(evt.u)); - console_input_events_append( console_input->evt, &evt ); + console_input_events_append( console_input, &evt ); evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; evt.u.resize.width = screen_buffer->width; evt.u.resize.height = screen_buffer->height; - console_input_events_append( console_input->evt, &evt ); + console_input_events_append( console_input, &evt ); evt.event = CONSOLE_RENDERER_DISPLAY_EVENT; evt.u.display.left = screen_buffer->win.left; evt.u.display.top = screen_buffer->win.top; evt.u.display.width = screen_buffer->win.right - screen_buffer->win.left + 1; evt.u.display.height = screen_buffer->win.bottom - screen_buffer->win.top + 1; - console_input_events_append( console_input->evt, &evt ); + console_input_events_append( console_input, &evt ); evt.event = CONSOLE_RENDERER_UPDATE_EVENT; evt.u.update.top = 0; evt.u.update.bottom = screen_buffer->height - 1; - console_input_events_append( console_input->evt, &evt ); + console_input_events_append( console_input, &evt ); evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT; evt.u.cursor_geom.size = screen_buffer->cursor_size; evt.u.cursor_geom.visible = screen_buffer->cursor_visible; - console_input_events_append( console_input->evt, &evt ); + console_input_events_append( console_input, &evt ); evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; evt.u.cursor_pos.x = screen_buffer->cursor_x; evt.u.cursor_pos.y = screen_buffer->cursor_y; - console_input_events_append( console_input->evt, &evt ); + console_input_events_append( console_input, &evt ); } static struct screen_buffer *create_console_output( struct console_input *console_input, int fd ) @@ -473,7 +474,7 @@ int free_console( struct process *process ) struct console_renderer_event evt; evt.event = CONSOLE_RENDERER_EXIT_EVENT; memset(&evt.u, 0, sizeof(evt.u)); - console_input_events_append( console->evt, &evt ); + console_input_events_append( console, &evt ); } release_object( console ); @@ -764,7 +765,7 @@ static int set_console_input_info( const struct set_console_input_info_request * free( console->title ); console->title = new_title; evt.event = CONSOLE_RENDERER_TITLE_EVENT; - console_input_events_append( console->evt, &evt ); + console_input_events_append( console, &evt ); } } if (req->mask & SET_CONSOLE_INPUT_INFO_HISTORY_MODE) @@ -898,7 +899,7 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, evt.event = CONSOLE_RENDERER_CURSOR_GEOM_EVENT; evt.u.cursor_geom.size = req->cursor_size; evt.u.cursor_geom.visible = req->cursor_visible; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); } } if (req->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_POS) @@ -916,7 +917,7 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; evt.u.cursor_pos.x = req->cursor_x; evt.u.cursor_pos.y = req->cursor_y; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); } } if (req->mask & SET_CONSOLE_OUTPUT_INFO_SIZE) @@ -936,12 +937,12 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; evt.u.resize.width = req->width; evt.u.resize.height = req->height; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); evt.event = CONSOLE_RENDERER_UPDATE_EVENT; evt.u.update.top = 0; evt.u.update.bottom = screen_buffer->height - 1; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); /* scroll window to display sb */ if (screen_buffer->win.right >= req->width) @@ -973,7 +974,7 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, evt.event = CONSOLE_RENDERER_CURSOR_POS_EVENT; evt.u.cursor_pos.x = req->cursor_x; evt.u.cursor_pos.y = req->cursor_y; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); } if (screen_buffer == screen_buffer->input->active && @@ -1012,7 +1013,7 @@ static int set_console_output_info( struct screen_buffer *screen_buffer, evt.u.display.top = req->win_top; evt.u.display.width = req->win_right - req->win_left + 1; evt.u.display.height = req->win_bottom - req->win_top + 1; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); } } if (req->mask & SET_CONSOLE_OUTPUT_INFO_MAX_SIZE) @@ -1229,7 +1230,7 @@ static int write_console_output( struct screen_buffer *screen_buffer, data_size_ memset(&evt.u, 0, sizeof(evt.u)); evt.u.update.top = y + x / screen_buffer->width; evt.u.update.bottom = y + (x + i - 1) / screen_buffer->width; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); } return i; } @@ -1280,7 +1281,7 @@ static int fill_console_output( struct screen_buffer *screen_buffer, char_info_t memset(&evt.u, 0, sizeof(evt.u)); evt.u.update.top = y; evt.u.update.bottom = (y * screen_buffer->width + x + count - 1) / screen_buffer->width; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); } return i; } @@ -1394,7 +1395,7 @@ static void scroll_console_output( obj_handle_t handle, int xsrc, int ysrc, int memset(&evt.u, 0, sizeof(evt.u)); evt.u.update.top = min(ysrc, ydst); evt.u.update.bottom = max(ysrc, ydst) + h - 1; - console_input_events_append( screen_buffer->input->evt, &evt ); + console_input_events_append( screen_buffer->input, &evt ); release_object( screen_buffer ); }

1 0

Eric Pouech : server: Report in get_console_mode request whether it' s a bare console or not.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 4fdcdefccf5b7df13b9ee1b7460ceff452f074f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fdcdefccf5b7df13b9ee1b74… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:19:00 2010 +0200 server: Report in get_console_mode request whether it's a bare console or not. --- include/wine/server_protocol.h | 4 ++-- server/console.c | 15 +++++++++++++-- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 77c13e8..6a9c1de 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1548,7 +1548,7 @@ struct get_console_mode_reply { struct reply_header __header; int mode; - char __pad_12[4]; + int is_bare; }; @@ -5506,6 +5506,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 406 +#define SERVER_PROTOCOL_VERSION 407 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/console.c b/server/console.c index 905cc50..1fbf736 100644 --- a/server/console.c +++ b/server/console.c @@ -188,6 +188,11 @@ static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); static const char_info_t empty_char_info = { ' ', 0x000f }; /* white on black space */ +static int console_input_is_bare( struct console_input* cin ) +{ + return cin->evt == NULL; +} + static struct fd *console_input_get_fd( struct object* obj ) { struct console_input *console_input = (struct console_input*)obj; @@ -582,7 +587,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 ) +static int get_console_mode( obj_handle_t handle, int *bare ) { struct object *obj; int ret = 0; @@ -590,9 +595,15 @@ static int get_console_mode( obj_handle_t handle ) if ((obj = get_handle_obj( current->process, handle, FILE_READ_PROPERTIES, NULL ))) { 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 ); release_object( obj ); @@ -1542,7 +1553,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->mode = get_console_mode( req->handle, &reply->is_bare ); } /* set a console mode (input or output) */ diff --git a/server/protocol.def b/server/protocol.def index ceebba1..c3d2c1d 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1224,6 +1224,7 @@ 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 b16dbe9..cb3f2d9 100644 --- a/server/request.h +++ b/server/request.h @@ -976,6 +976,7 @@ 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 c7c12f6..408fe14 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1641,6 +1641,7 @@ 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 )

1 0

Eric Pouech : server: Allow a screen buffer to be attached to a given fd ( for bare consoles).
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 6f32644aa07dc9a42044df0fc9b924727707d60e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f32644aa07dc9a42044df0fc… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:18:52 2010 +0200 server: Allow a screen buffer to be attached to a given fd (for bare consoles). --- dlls/kernel32/console.c | 1 + include/wine/server_protocol.h | 4 +- programs/wineconsole/wineconsole.c | 1 + server/console.c | 48 +++++++++++++++++++++++++++++++---- server/protocol.def | 1 + server/request.h | 1 + server/trace.c | 1 + 7 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index f682ca1..d760b65 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1809,6 +1809,7 @@ HANDLE WINAPI CreateConsoleScreenBuffer(DWORD dwDesiredAccess, DWORD dwShareMode req->access = dwDesiredAccess; req->attributes = (sa && sa->bInheritHandle) ? OBJ_INHERIT : 0; req->share = dwShareMode; + req->fd = -1; if (!wine_server_call_err( req )) ret = console_handle_map( wine_server_ptr_handle( reply->handle_out )); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 3b0a583..77c13e8 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1654,7 +1654,7 @@ struct create_console_output_request unsigned int access; unsigned int attributes; unsigned int share; - char __pad_28[4]; + int fd; }; struct create_console_output_reply { @@ -5506,6 +5506,6 @@ union generic_reply struct set_cursor_reply set_cursor_reply; }; -#define SERVER_PROTOCOL_VERSION 405 +#define SERVER_PROTOCOL_VERSION 406 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 3842303..52edfb3 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -612,6 +612,7 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna req->access = GENERIC_WRITE|GENERIC_READ; req->attributes = 0; req->share = FILE_SHARE_READ|FILE_SHARE_WRITE; + req->fd = -1; ret = !wine_server_call_err( req ); data->hConOut = wine_server_ptr_handle( reply->handle_out ); } diff --git a/server/console.c b/server/console.c index 9d84491..905cc50 100644 --- a/server/console.c +++ b/server/console.c @@ -143,10 +143,12 @@ struct screen_buffer unsigned short attr; /* default attribute for screen buffer */ rectangle_t win; /* current visible window on the screen buffer * * as seen in wineconsole */ + struct fd *fd; /* for bare console, attached output fd */ }; static void screen_buffer_dump( struct object *obj, int verbose ); static void screen_buffer_destroy( struct object *obj ); +static struct fd *screen_buffer_get_fd( struct object *obj ); static const struct object_ops screen_buffer_ops = { @@ -158,7 +160,7 @@ static const struct object_ops screen_buffer_ops = NULL, /* signaled */ NULL, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + screen_buffer_get_fd, /* get_fd */ default_fd_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -395,7 +397,7 @@ static void generate_sb_initial_events( struct console_input *console_input ) console_input_events_append( console_input->evt, &evt ); } -static struct screen_buffer *create_console_output( struct console_input *console_input ) +static struct screen_buffer *create_console_output( struct console_input *console_input, int fd ) { struct screen_buffer *screen_buffer; int i; @@ -416,6 +418,18 @@ static struct screen_buffer *create_console_output( struct console_input *consol screen_buffer->win.right = screen_buffer->max_width - 1; screen_buffer->win.top = 0; screen_buffer->win.bottom = screen_buffer->max_height - 1; + if (fd == -1) + screen_buffer->fd = NULL; + else + { + if (!(screen_buffer->fd = create_anonymous_fd( &console_fd_ops, fd, &screen_buffer->obj, + FILE_SYNCHRONOUS_IO_NONALERT ))) + { + release_object( screen_buffer ); + return NULL; + } + allow_fd_caching(screen_buffer->fd); + } list_add_head( &screen_buffer_list, &screen_buffer->entry ); @@ -1136,9 +1150,17 @@ static void screen_buffer_destroy( struct object *obj ) } } } + if (screen_buffer->fd) release_object( screen_buffer->fd ); free( screen_buffer->data ); } +static struct fd *screen_buffer_get_fd( struct object *obj ) +{ + struct screen_buffer *screen_buffer = (struct screen_buffer*)obj; + assert( obj->ops == &screen_buffer_ops ); + return screen_buffer->fd ? (struct fd*)grab_object( screen_buffer->fd ) : NULL; +} + /* write data into a screen buffer */ static int write_console_output( struct screen_buffer *screen_buffer, data_size_t size, const void* data, enum char_info_mode mode, @@ -1468,8 +1490,8 @@ DECL_HANDLER(open_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 ); + 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 ))) @@ -1575,10 +1597,24 @@ DECL_HANDLER(create_console_output) { struct console_input* console; struct screen_buffer* screen_buffer; + int fd; - if (!(console = console_input_get( req->handle_in, FILE_WRITE_PROPERTIES ))) return; + if (req->fd != -1) + { + if ((fd = thread_get_inflight_fd( current, req->fd )) == -1) + { + set_error( STATUS_INVALID_HANDLE ); /* FIXME */ + return; + } + } + else fd = -1; + if (!(console = console_input_get( req->handle_in, FILE_WRITE_PROPERTIES ))) + { + close(fd); + return; + } - screen_buffer = create_console_output( console ); + screen_buffer = create_console_output( console, fd ); if (screen_buffer) { /* FIXME: should store sharing and test it when opening the CONOUT$ device diff --git a/server/protocol.def b/server/protocol.def index 7ed3886..ceebba1 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1295,6 +1295,7 @@ struct console_renderer_event unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ unsigned int share; /* sharing credentials */ + int fd; /* for bare consoles, fd the screen-buffer is attached to */ @REPLY obj_handle_t handle_out; /* handle to the screen buffer */ @END diff --git a/server/request.h b/server/request.h index 1f90278..b16dbe9 100644 --- a/server/request.h +++ b/server/request.h @@ -1011,6 +1011,7 @@ C_ASSERT( FIELD_OFFSET(struct create_console_output_request, handle_in) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_console_output_request, access) == 16 ); C_ASSERT( FIELD_OFFSET(struct create_console_output_request, attributes) == 20 ); C_ASSERT( FIELD_OFFSET(struct create_console_output_request, share) == 24 ); +C_ASSERT( FIELD_OFFSET(struct create_console_output_request, fd) == 28 ); C_ASSERT( sizeof(struct create_console_output_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_console_output_reply, handle_out) == 8 ); C_ASSERT( sizeof(struct create_console_output_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 8c2418c..c7c12f6 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1704,6 +1704,7 @@ static void dump_create_console_output_request( const struct create_console_outp fprintf( stderr, ", access=%08x", req->access ); fprintf( stderr, ", attributes=%08x", req->attributes ); fprintf( stderr, ", share=%08x", req->share ); + fprintf( stderr, ", fd=%d", req->fd ); } static void dump_create_console_output_reply( const struct create_console_output_reply *req )

1 0

Eric Pouech : kernel32: Remove old bare-console code.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: a63e0fac751fcd7f4f8b15ea1feb8268b68e9b10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a63e0fac751fcd7f4f8b15ea1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:19:39 2010 +0200 kernel32: Remove old bare-console code. --- dlls/kernel32/console.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index cd2de5d..9ac7018 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -332,20 +332,7 @@ HANDLE WINAPI OpenConsoleW(LPCWSTR name, DWORD access, BOOL inherit, DWORD creat SERVER_END_REQ; if (ret) ret = console_handle_map(ret); - else - { - /* likely, we're not attached to wineconsole - * let's try to return a handle to the unix-console - */ - int fd = open("/dev/tty", output ? O_WRONLY : O_RDONLY); - ret = INVALID_HANDLE_VALUE; - if (fd != -1) - { - DWORD access = (output ? GENERIC_WRITE : GENERIC_READ) | SYNCHRONIZE; - wine_server_fd_to_handle(fd, access, inherit ? OBJ_INHERIT : 0, &ret); - close(fd); - } - } + return ret; } @@ -1417,8 +1404,6 @@ BOOL WINAPI AllocConsole(void) CloseHandle(handle_in); return FALSE; } - /* happens when we're running on a Unix console */ - if (handle_in != INVALID_HANDLE_VALUE) CloseHandle(handle_in); /* invalidate local copy of input event handle */ console_wait_event = 0;

1 0

Hwang YunSong : shlwapi: Update Korean resource.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 4069da56249dc546861d8a7a20dfbeafa4188d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4069da56249dc546861d8a7a2… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Wed Sep 1 17:40:05 2010 +0900 shlwapi: Update Korean resource. --- dlls/shlwapi/shlwapi_Ko.rc | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Ko.rc b/dlls/shlwapi/shlwapi_Ko.rc index b209496..1f926e8 100644 --- a/dlls/shlwapi/shlwapi_Ko.rc +++ b/dlls/shlwapi/shlwapi_Ko.rc @@ -20,27 +20,29 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT IDD_ERR_DIALOG DIALOG 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "��!" +CAPTION "에러!" FONT 9, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 - CHECKBOX "�� ޼�� ٽô� �� ÿ�(&I)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Ȯ��(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "��(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "�ƴϿ�(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "이 메세지를 다시는 보여주지 마십시시오(&I)", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "확인(&O)", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "취소(&C)", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "예(&Y)", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "아니오(&N)", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE { - IDS_BYTES_FORMAT "%ld ��Ʈ" - IDS_TIME_INTERVAL_HOURS "��" - IDS_TIME_INTERVAL_MINUTES " ��" - IDS_TIME_INTERVAL_SECONDS " ��" + IDS_BYTES_FORMAT "%ld 바이트" + IDS_TIME_INTERVAL_HOURS "시" + IDS_TIME_INTERVAL_MINUTES " 분" + IDS_TIME_INTERVAL_SECONDS " 초" }

1 0

Jacek Caban : widl: Define _WIN32 by default.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: 06f3b94584fd064d5714e49e39ef648cc2330f85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f3b94584fd064d5714e49e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 1 11:53:58 2010 +0200 widl: Define _WIN32 by default. --- tools/widl/widl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index cc25201..c4aa91f 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -694,6 +694,7 @@ int main(int argc,char *argv[]) if (do_server) server_token = dup_basename_token(server_name,"_s.c"); add_widl_version_define(); + wpp_add_define("_WIN32", NULL); atexit(rm_tempfile); if (!no_preprocess)

1 0

Eric Pouech : server: Enhanced the console input object so that it doesn' t require a wineconsole to be running.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: b39a8d9ea2879f079b4daa9832b1c01deb5b56a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39a8d9ea2879f079b4daa983… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:18:44 2010 +0200 server: Enhanced the console input object so that it doesn't require a wineconsole to be running. --- include/wine/server_protocol.h | 4 +- programs/wineconsole/wineconsole.c | 1 + server/console.c | 153 +++++++++++++++++++++++++++++------ server/debugger.c | 8 ++- server/protocol.def | 1 + server/request.h | 3 +- server/trace.c | 1 + 7 files changed, 140 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b39a8d9ea2879f079b4da…

1 0

Eric Pouech : kernel32: Modify editline logic so that it also work with bare consoles.
by Alexandre Julliard Sept. 1, 2010

Sept. 1, 2010

Module: wine Branch: master Commit: efecd9c3377ec1e945ea967bfdb25fc8214f48cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=efecd9c3377ec1e945ea967bf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Aug 30 22:19:31 2010 +0200 kernel32: Modify editline logic so that it also work with bare consoles. --- dlls/kernel32/console.c | 5 ++- dlls/kernel32/console_private.h | 2 +- dlls/kernel32/editline.c | 63 ++++++++++++++++++++++++++++++++++----- 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 3b6dec0..cd2de5d 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1523,11 +1523,12 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD charsread; LPWSTR xbuf = lpBuffer; DWORD mode; + BOOL is_bare; TRACE("(%p,%p,%d,%p,%p)\n", hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, lpReserved); - if (!GetConsoleMode(hConsoleInput, &mode)) + if (!get_console_mode(hConsoleInput, &mode, &is_bare)) return FALSE; if (mode & ENABLE_LINE_INPUT) @@ -1535,7 +1536,7 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, if (!S_EditString || S_EditString[S_EditStrPos] == 0) { HeapFree(GetProcessHeap(), 0, S_EditString); - if (!(S_EditString = CONSOLE_Readline(hConsoleInput))) + if (!(S_EditString = CONSOLE_Readline(hConsoleInput, !is_bare))) return FALSE; S_EditStrPos = 0; } diff --git a/dlls/kernel32/console_private.h b/dlls/kernel32/console_private.h index f8d5958..06a8bd6 100644 --- a/dlls/kernel32/console_private.h +++ b/dlls/kernel32/console_private.h @@ -31,6 +31,6 @@ extern void CONSOLE_FillLineUniform(HANDLE hConsoleOutput, int i, int j, int extern BOOL CONSOLE_GetEditionMode(HANDLE, int*); /* editline.c */ -extern WCHAR* CONSOLE_Readline(HANDLE); +extern WCHAR* CONSOLE_Readline(HANDLE, BOOL); #endif /* __WINE_CONSOLE_PRIVATE_H */ diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index ab70916..b79c5cb 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -53,6 +53,10 @@ typedef struct WCEL_Context { WCHAR* line; /* the line being edited */ size_t alloc; /* number of WCHAR in line */ unsigned len; /* number of chars in line */ + unsigned last_rub; /* number of chars to rub to get to start + (for consoles that can't change cursor pos) */ + unsigned last_max; /* max number of chars written + (for consoles that can't change cursor pos) */ unsigned ofs; /* offset for cursor in current line */ WCHAR* yanked; /* yanked line */ unsigned mark; /* marked point (emacs mode only) */ @@ -61,7 +65,8 @@ typedef struct WCEL_Context { HANDLE hConOut; unsigned done : 1, /* to 1 when we're done with editing */ error : 1, /* to 1 when an error occurred in the editing */ - can_wrap : 1; /* to 1 when multi-line edition can take place */ + can_wrap : 1, /* to 1 when multi-line edition can take place */ + can_pos_cursor : 1; /* to 1 when console can (re)position cursor */ unsigned histSize; unsigned histPos; WCHAR* histCurr; @@ -123,10 +128,33 @@ static inline COORD WCEL_GetCoord(WCEL_Context* ctx, int ofs) static inline void WCEL_Update(WCEL_Context* ctx, int beg, int len) { - WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[beg], len, - WCEL_GetCoord(ctx, beg), NULL); - FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, len, - WCEL_GetCoord(ctx, beg), NULL); + if (ctx->can_pos_cursor) + { + WriteConsoleOutputCharacterW(ctx->hConOut, &ctx->line[beg], len, + WCEL_GetCoord(ctx, beg), NULL); + FillConsoleOutputAttribute(ctx->hConOut, ctx->csbi.wAttributes, len, + WCEL_GetCoord(ctx, beg), NULL); + } + else + { + char ch; + unsigned i; + DWORD dw; + + /* erase previous chars */ + ch = '\b'; + for (i = beg; i < ctx->last_rub; i++) + WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); + beg = min(beg, ctx->last_rub); + + /* write new chars */ + WriteConsoleW(ctx->hConOut, &ctx->line[beg], ctx->len - beg, &dw, NULL); + /* clean rest of line (if any) */ + ch = ' '; + for (i = ctx->len; i < ctx->last_max; i++) + WriteFile(ctx->hConOut, &ch, 1, &dw, NULL); + ctx->last_rub = max(ctx->last_max, ctx->len); + } } /* ==================================================================== @@ -765,7 +793,7 @@ static const KeyMap Win32KeyMap[] = * * ====================================================================*/ -WCHAR* CONSOLE_Readline(HANDLE hConsoleIn) +WCHAR* CONSOLE_Readline(HANDLE hConsoleIn, BOOL can_pos_cursor) { WCEL_Context ctx; INPUT_RECORD ir; @@ -788,6 +816,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn) !GetConsoleScreenBufferInfo(ctx.hConOut, &ctx.csbi)) return NULL; ctx.can_wrap = (GetConsoleMode(ctx.hConOut, &ks) && (ks & ENABLE_WRAP_AT_EOL_OUTPUT)) ? 1 : 0; + ctx.can_pos_cursor = can_pos_cursor; if (!WCEL_Grow(&ctx, 1)) { @@ -842,8 +871,26 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn) else TRACE("Dropped event\n"); /* EPP WCEL_Dump(&ctx, "after func"); */ - if (ctx.ofs != ofs) - SetConsoleCursorPosition(ctx.hConOut, WCEL_GetCoord(&ctx, ctx.ofs)); + if (ctx.can_pos_cursor) + { + if (ctx.ofs != ofs) + SetConsoleCursorPosition(ctx.hConOut, WCEL_GetCoord(&ctx, ctx.ofs)); + } + else if (!ctx.done && !ctx.error) + { + char ch; + unsigned i; + DWORD dw; + + /* erase previous chars */ + ch = '\b'; + for (i = 0; i < ctx.last_rub; i++) + WriteFile(ctx.hConOut, &ch, 1, &dw, NULL); + + /* write chars up to cursor */ + WriteConsoleW(ctx.hConOut, ctx.line, ctx.ofs, &dw, NULL); + if ((ctx.last_rub = ctx.ofs) > ctx.last_max) ctx.last_max = ctx.ofs; + } } if (ctx.error) {

1 0