July 2020 - Wine-Commits - list.winehq.org

Jacek Caban : server: Use weak reference between console input and renderer objects.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: e7c9a0e1511641961a69babe2ab7aca75c636672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7c9a0e1511641961a69babe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:01 2020 +0200 server: Use weak reference between console input and renderer objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/console.c b/server/console.c index 2316b8eafb..7a10b611c5 100644 --- a/server/console.c +++ b/server/console.c @@ -131,6 +131,7 @@ struct console_input_events { struct object obj; /* object header */ struct fd *fd; /* pseudo-fd for ioctls */ + struct console_input *console; /* attached console */ int num_alloc; /* number of allocated events */ int num_used; /* number of actually used events */ struct condrv_renderer_event *events; @@ -321,6 +322,7 @@ static void console_input_events_destroy( struct object *obj ) { struct console_input_events *evts = (struct console_input_events *)obj; assert( obj->ops == &console_input_events_ops ); + if (evts->console) evts->console->evt = NULL; free_async_queue( &evts->read_q ); if (evts->fd) release_object( evts->fd ); free( evts->events ); @@ -419,6 +421,7 @@ static struct object *create_console_input_events(void) struct console_input_events* evt; if (!(evt = alloc_object( &console_input_events_ops ))) return NULL; + evt->console = NULL; evt->num_alloc = evt->num_used = 0; evt->events = NULL; init_async_queue( &evt->read_q ); @@ -1177,10 +1180,7 @@ static void console_input_destroy( struct object *obj ) free_async_queue( &console_in->read_q ); if (console_in->evt) - { - release_object( console_in->evt ); - console_in->evt = NULL; - } + console_in->evt->console = NULL; if (console_in->event) release_object( console_in->event ); if (console_in->fd) @@ -1898,10 +1898,11 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct 0, &console_input_ops ); if (!console_input) return 0; - if (!console_input->evt) + if (!console_input->evt && !evts->console) { - console_input->evt = (struct console_input_events *)grab_object( evts ); + console_input->evt = evts; console_input->renderer = current; + evts->console = console_input; } else set_error( STATUS_INVALID_HANDLE );

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_SCROLL in ScrollConsoleScreenBufferW.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: 3609406308110f93f11c6045da5734f038ef727c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3609406308110f93f11c6045… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:36:23 2020 +0200 kernelbase: Use IOCTL_CONDRV_SCROLL in ScrollConsoleScreenBufferW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 114 ++++------------------------------------------ 1 file changed, 10 insertions(+), 104 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f59010b334..10b52df4e9 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -74,12 +74,6 @@ static BOOL WINAPI default_ctrl_handler( DWORD type ) static struct ctrl_handler default_handler = { default_ctrl_handler, NULL }; static struct ctrl_handler *ctrl_handlers = &default_handler; -/* map a kernel32 console handle onto a real wineserver handle */ -static inline obj_handle_t console_handle_unmap( HANDLE h ) -{ - return wine_server_obj_handle( console_handle_map( h ) ); -} - static BOOL console_ioctl( HANDLE handle, DWORD code, void *in_buff, DWORD in_count, void *out_buff, DWORD out_count, DWORD *read ) { @@ -160,21 +154,6 @@ static void char_info_AtoW( CHAR_INFO *buffer, int count ) } } -/* helper function for ScrollConsoleScreenBufferW */ -static void fill_console_output( HANDLE handle, int i, int j, int len, CHAR_INFO *fill ) -{ - struct condrv_fill_output_params params; - - params.mode = CHAR_INFO_MODE_TEXTATTR; - params.x = i; - params.y = j; - params.count = len; - params.wrap = FALSE; - params.ch = fill->Char.UnicodeChar; - params.attr = fill->Attributes; - console_ioctl( handle, IOCTL_CONDRV_FILL_OUTPUT, &params, sizeof(params), NULL, 0, NULL ); -} - /* helper function for GetLargestConsoleWindowSize */ static COORD get_largest_console_window_size( HANDLE handle ) { @@ -964,12 +943,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ScrollConsoleScreenBufferW( HANDLE handle, SMALL_R SMALL_RECT *clip_rect, COORD origin, CHAR_INFO *fill ) { - CONSOLE_SCREEN_BUFFER_INFO info; - SMALL_RECT dst, clip; - int i, j, start = -1; - DWORD ret; - BOOL inside; - COORD src; + struct condrv_scroll_params params; if (clip_rect) TRACE( "(%p,(%d,%d-%d,%d),(%d,%d-%d,%d),%d-%d,%p)\n", handle, @@ -981,85 +955,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH ScrollConsoleScreenBufferW( HANDLE handle, SMALL_R scroll->Left, scroll->Top, scroll->Right, scroll->Bottom, origin.X, origin.Y, fill ); - if (!GetConsoleScreenBufferInfo( handle, &info )) return FALSE; - - src.X = scroll->Left; - src.Y = scroll->Top; - - /* step 1: get dst rect */ - dst.Left = origin.X; - dst.Top = origin.Y; - dst.Right = dst.Left + (scroll->Right - scroll->Left); - dst.Bottom = dst.Top + (scroll->Bottom - scroll->Top); - - /* step 2a: compute the final clip rect (optional passed clip and screen buffer limits */ - if (clip_rect) - { - clip.Left = max(0, clip_rect->Left); - clip.Right = min(info.dwSize.X - 1, clip_rect->Right); - clip.Top = max(0, clip_rect->Top); - clip.Bottom = min(info.dwSize.Y - 1, clip_rect->Bottom); - } - else + params.scroll = *scroll; + params.origin = origin; + params.fill.ch = fill->Char.UnicodeChar; + params.fill.attr = fill->Attributes; + if (!clip_rect) { - clip.Left = 0; - clip.Right = info.dwSize.X - 1; - clip.Top = 0; - clip.Bottom = info.dwSize.Y - 1; + params.clip.Left = params.clip.Top = 0; + params.clip.Right = params.clip.Bottom = SHRT_MAX; } - if (clip.Left > clip.Right || clip.Top > clip.Bottom) return FALSE; - - /* step 2b: clip dst rect */ - if (dst.Left < clip.Left ) {src.X += clip.Left - dst.Left; dst.Left = clip.Left;} - if (dst.Top < clip.Top ) {src.Y += clip.Top - dst.Top; dst.Top = clip.Top;} - if (dst.Right > clip.Right ) dst.Right = clip.Right; - if (dst.Bottom > clip.Bottom) dst.Bottom = clip.Bottom; - - /* step 3: transfer the bits */ - SERVER_START_REQ( move_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x_src = src.X; - req->y_src = src.Y; - req->x_dst = dst.Left; - req->y_dst = dst.Top; - req->w = dst.Right - dst.Left + 1; - req->h = dst.Bottom - dst.Top + 1; - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - - if (!ret) return FALSE; - - /* step 4: clean out the exposed part */ - - /* have to write cell [i,j] if it is not in dst rect (because it has already - * been written to by the scroll) and is in clip (we shall not write - * outside of clip) - */ - for (j = max(scroll->Top, clip.Top); j <= min(scroll->Bottom, clip.Bottom); j++) - { - inside = dst.Top <= j && j <= dst.Bottom; - start = -1; - for (i = max(scroll->Left, clip.Left); i <= min(scroll->Right, clip.Right); i++) - { - if (inside && dst.Left <= i && i <= dst.Right) - { - if (start != -1) - { - fill_console_output( handle, start, j, i - start, fill ); - start = -1; - } - } - else - { - if (start == -1) start = i; - } - } - if (start != -1) fill_console_output( handle, start, j, i - start, fill ); - } - - return TRUE; + else params.clip = *clip_rect; + return console_ioctl( handle, IOCTL_CONDRV_SCROLL, (void *)&params, sizeof(params), NULL, 0, NULL ); }

1 0

Jacek Caban : server: Remove no longer used move_console_output request.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: b6b2667482a14e4cd76da48940ead142ce207b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b2667482a14e4cd76da489… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:36:33 2020 +0200 server: Remove no longer used move_console_output request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 24 +------------- server/console.c | 75 ------------------------------------------ server/protocol.def | 12 ------- server/request.h | 10 ------ server/trace.c | 14 -------- 5 files changed, 1 insertion(+), 134 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 957f97eb36..d4bb5c9ab3 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1995,25 +1995,6 @@ struct create_console_output_reply -struct move_console_output_request -{ - struct request_header __header; - obj_handle_t handle; - short int x_src; - short int y_src; - short int x_dst; - short int y_dst; - short int w; - short int h; - char __pad_28[4]; -}; -struct move_console_output_reply -{ - struct reply_header __header; -}; - - - struct send_console_signal_request { struct request_header __header; @@ -5599,7 +5580,6 @@ enum request REQ_append_console_input_history, REQ_get_console_input_history, REQ_create_console_output, - REQ_move_console_output, REQ_send_console_signal, REQ_read_directory_changes, REQ_read_change, @@ -5891,7 +5871,6 @@ union generic_request struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; struct create_console_output_request create_console_output_request; - struct move_console_output_request move_console_output_request; struct send_console_signal_request send_console_signal_request; struct read_directory_changes_request read_directory_changes_request; struct read_change_request read_change_request; @@ -6181,7 +6160,6 @@ union generic_reply struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; struct create_console_output_reply create_console_output_reply; - struct move_console_output_reply move_console_output_reply; struct send_console_signal_reply send_console_signal_reply; struct read_directory_changes_reply read_directory_changes_reply; struct read_change_reply read_change_reply; @@ -6398,7 +6376,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 631 +#define SERVER_PROTOCOL_VERSION 632 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index f924ddc06b..2316b8eafb 100644 --- a/server/console.c +++ b/server/console.c @@ -1522,61 +1522,6 @@ static void scroll_console_output( struct screen_buffer *screen_buffer, int xsrc console_input_events_append( screen_buffer->input, &evt ); } -/* scroll parts of a screen buffer */ -static void scroll_console_output_req( struct screen_buffer *screen_buffer, int xsrc, int ysrc, int xdst, int ydst, - int w, int h ) -{ - int j; - char_info_t *psrc, *pdst; - struct condrv_renderer_event evt; - - if (xsrc < 0 || ysrc < 0 || xdst < 0 || ydst < 0 || - xsrc + w > screen_buffer->width || - xdst + w > screen_buffer->width || - ysrc + h > screen_buffer->height || - ydst + h > screen_buffer->height || - w == 0 || h == 0) - { - set_error( STATUS_INVALID_PARAMETER ); - return; - } - - if (ysrc < ydst) - { - psrc = &screen_buffer->data[(ysrc + h - 1) * screen_buffer->width + xsrc]; - pdst = &screen_buffer->data[(ydst + h - 1) * screen_buffer->width + xdst]; - - for (j = h; j > 0; j--) - { - memcpy(pdst, psrc, w * sizeof(*pdst) ); - pdst -= screen_buffer->width; - psrc -= screen_buffer->width; - } - } - else - { - psrc = &screen_buffer->data[ysrc * screen_buffer->width + xsrc]; - pdst = &screen_buffer->data[ydst * screen_buffer->width + xdst]; - - for (j = 0; j < h; j++) - { - /* we use memmove here because when psrc and pdst are the same, - * copies are done on the same row, so the dst and src blocks - * can overlap */ - memmove( pdst, psrc, w * sizeof(*pdst) ); - pdst += screen_buffer->width; - psrc += screen_buffer->width; - } - } - - /* FIXME: this could be enhanced, by signalling scroll */ - evt.event = CONSOLE_RENDERER_UPDATE_EVENT; - 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 ); -} - static int console_input_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_input *console = get_fd_user( fd ); @@ -2280,26 +2225,6 @@ DECL_HANDLER(create_console_output) release_object( console ); } -/* move a rect of data in a screen buffer */ -DECL_HANDLER(move_console_output) -{ - 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_req( 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...) */ DECL_HANDLER(send_console_signal) { diff --git a/server/protocol.def b/server/protocol.def index c8014d920d..b48cf70e48 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1567,18 +1567,6 @@ enum server_fd_type @END -/* move a rect (of data) in screen buffer content */ -(a)REQ(move_console_output) - obj_handle_t handle; /* handle to the console output */ - short int x_src; /* position (x, y) of rect to start moving from */ - short int y_src; - short int x_dst; /* position (x, y) of rect to move to */ - short int y_dst; - short int w; /* size of the rect (width, height) to move */ - short int h; -(a)END - - /* Sends a signal to a process group */ @REQ(send_console_signal) int signal; /* the signal to send */ diff --git a/server/request.h b/server/request.h index 87593d1373..fd5141d6cb 100644 --- a/server/request.h +++ b/server/request.h @@ -191,7 +191,6 @@ DECL_HANDLER(get_console_input_info); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); DECL_HANDLER(create_console_output); -DECL_HANDLER(move_console_output); DECL_HANDLER(send_console_signal); DECL_HANDLER(read_directory_changes); DECL_HANDLER(read_change); @@ -482,7 +481,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, (req_handler)req_create_console_output, - (req_handler)req_move_console_output, (req_handler)req_send_console_signal, (req_handler)req_read_directory_changes, (req_handler)req_read_change, @@ -1166,14 +1164,6 @@ 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 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, x_src) == 16 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, y_src) == 18 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, x_dst) == 20 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, y_dst) == 22 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, w) == 24 ); -C_ASSERT( FIELD_OFFSET(struct move_console_output_request, h) == 26 ); -C_ASSERT( sizeof(struct move_console_output_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, signal) == 12 ); C_ASSERT( FIELD_OFFSET(struct send_console_signal_request, group_id) == 16 ); C_ASSERT( sizeof(struct send_console_signal_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 78bdf790dd..db5d0dd6ea 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2139,17 +2139,6 @@ static void dump_create_console_output_reply( const struct create_console_output fprintf( stderr, " handle_out=%04x", req->handle_out ); } -static void dump_move_console_output_request( const struct move_console_output_request *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); - fprintf( stderr, ", x_src=%d", req->x_src ); - fprintf( stderr, ", y_src=%d", req->y_src ); - fprintf( stderr, ", x_dst=%d", req->x_dst ); - fprintf( stderr, ", y_dst=%d", req->y_dst ); - fprintf( stderr, ", w=%d", req->w ); - fprintf( stderr, ", h=%d", req->h ); -} - static void dump_send_console_signal_request( const struct send_console_signal_request *req ) { fprintf( stderr, " signal=%d", req->signal ); @@ -4539,7 +4528,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, (dump_func)dump_create_console_output_request, - (dump_func)dump_move_console_output_request, (dump_func)dump_send_console_signal_request, (dump_func)dump_read_directory_changes_request, (dump_func)dump_read_change_request, @@ -4829,7 +4817,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_console_output_reply, NULL, NULL, - NULL, (dump_func)dump_read_change_reply, (dump_func)dump_create_mapping_reply, (dump_func)dump_open_mapping_reply, @@ -5115,7 +5102,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "append_console_input_history", "get_console_input_history", "create_console_output", - "move_console_output", "send_console_signal", "read_directory_changes", "read_change",

1 0

Jacek Caban : server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events.
by Alexandre Julliard July 29, 2020

July 29, 2020

Module: wine Branch: master Commit: c37c9bf65a6f6dfd9708f6654227a953504dc158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c37c9bf65a6f6dfd9708f665… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:38:04 2020 +0200 server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 1 - programs/wineconsole/wineconsole.c | 18 ------------------ server/console.c | 4 ---- 3 files changed, 23 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index a6df63155c..d42128f810 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -206,7 +206,6 @@ enum condrv_renderer_event_type { CONSOLE_RENDERER_NONE_EVENT, CONSOLE_RENDERER_TITLE_EVENT, - CONSOLE_RENDERER_ACTIVE_SB_EVENT, CONSOLE_RENDERER_SB_RESIZE_EVENT, CONSOLE_RENDERER_UPDATE_EVENT, CONSOLE_RENDERER_CURSOR_POS_EVENT, diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 63fdb7e72f..a61aad5293 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -199,7 +199,6 @@ void WINECON_GrabChanges(struct inner_data* data) struct condrv_renderer_event *evts = data->events; int i, ev_found; DWORD num; - HANDLE h; if (data->in_grab_changes) return; @@ -267,23 +266,6 @@ void WINECON_GrabChanges(struct inner_data* data) WINE_TRACE("%u/%u: title()\n", i+1, num); data->fnSetTitle(data); break; - case CONSOLE_RENDERER_ACTIVE_SB_EVENT: - SERVER_START_REQ( open_console ) - { - req->from = wine_server_obj_handle( data->hConIn ); - req->access = GENERIC_READ | GENERIC_WRITE; - req->attributes = 0; - req->share = FILE_SHARE_READ | FILE_SHARE_WRITE; - h = wine_server_call_err( req ) ? 0 : wine_server_ptr_handle(reply->handle); - } - SERVER_END_REQ; - WINE_TRACE("%u/%u: active(%p)\n", i+1, num, h); - if (h) - { - CloseHandle(data->hConOut); - data->hConOut = h; - } - break; case CONSOLE_RENDERER_SB_RESIZE_EVENT: if (data->curcfg.sb_width != evts[i].u.resize.width || data->curcfg.sb_height != evts[i].u.resize.height) diff --git a/server/console.c b/server/console.c index add8b1278d..46d43e7832 100644 --- a/server/console.c +++ b/server/console.c @@ -496,10 +496,6 @@ static void generate_sb_initial_events( struct console_input *console_input ) struct screen_buffer *screen_buffer = console_input->active; struct condrv_renderer_event evt; - evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT; - memset(&evt.u, 0, sizeof(evt.u)); - 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;

1 0

Jacek Caban : server: Remove no longer used read_console_output request.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: f6fb372a045256d84d6e18d4757b9f59e209cf0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6fb372a045256d84d6e18d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 17:11:09 2020 +0200 server: Remove no longer used read_console_output request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 24 +------------- server/console.c | 73 ------------------------------------------ server/protocol.def | 14 -------- server/request.h | 11 ------- server/trace.c | 19 ----------- 5 files changed, 1 insertion(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f6fb372a045256d84d6e…

1 0

Myah Caron : include: Add IShellLinkDual interface.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 6d66efa3fee7f529bba6c478e71d54e0d66995f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d66efa3fee7f529bba6c478… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Mon Jul 27 07:30:25 2020 +0000 include: Add IShellLinkDual interface. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shldisp.idl | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/include/shldisp.idl b/include/shldisp.idl index 19f2d73ed0..9032b94ea0 100644 --- a/include/shldisp.idl +++ b/include/shldisp.idl @@ -738,6 +738,82 @@ coclass ShellFolderView [default, source] dispinterface DShellFolderViewEvents; } +/***************************************************************************** + * IShellLinkDual interface + */ +[ + uuid (88a05c00-f000-11ce-8350-444553540000), + oleautomation, + dual, + hidden + ] +interface IShellLinkDual : IDispatch { + [propget] + HRESULT Path ([out, retval] BSTR *pbs); + + [propput] + HRESULT Path ([in] BSTR bs); + + [propget] + HRESULT Description ([out, retval] BSTR *pbs); + + [propput] + HRESULT Description ([in] BSTR bs); + + [propget] + HRESULT WorkingDirectory ([out, retval] BSTR *pbs); + + [propput] + HRESULT WorkingDirectory ([in] BSTR bs); + + [propget] + HRESULT Arguments ([out, retval] BSTR *pbs); + + [propput] + HRESULT Arguments ([in] BSTR bs); + + [propget] + HRESULT Hotkey ([out, retval] int *piHK); + + [propput] + HRESULT Hotkey ([in] int iHK); + + [propget] + HRESULT ShowCommand ([out, retval] int *piShowCommand); + + [propput] + HRESULT ShowCommand ([in] int iShowCommand); + + HRESULT Resolve ([in] int fFlags); + + HRESULT GetIconLocation ([out] BSTR *pbs, + [out, retval] int *piIcon); + + HRESULT SetIconLocation ([in] BSTR bs, + [in] int iIcon); + + HRESULT Save ([in, optional] VARIANT vWhere); +} + +[ + uuid (317ee249-f12e-11d2-b1e4-00c04f8eeb3e), + oleautomation, + dual, + hidden +] +interface IShellLinkDual2 : IShellLinkDual { + [propget] + HRESULT Target ([out, retval] FolderItem **ppfi); +} + +[ + uuid (11219420-1768-11d1-95be-00609797ea4f), + noncreatable +] +coclass ShellLinkObject { + [default] interface IShellLinkDual2; +} + } /* library Shell32 */ /*****************************************************************************

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputW.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: f8fa6fd68608b53def2c34a489b5af2416f47cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8fa6fd68608b53def2c34a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 17:10:56 2020 +0200 kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 59 ++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a4b9b8c491..b97cf140d6 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -894,37 +894,48 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputA( HANDLE handle, CHAR_INFO *buff BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputW( HANDLE handle, CHAR_INFO *buffer, COORD size, COORD coord, SMALL_RECT *region ) { - int width, height, y; - BOOL ret = TRUE; + struct condrv_output_params params; + unsigned int width, height, y; + SMALL_RECT *result; + DWORD count; + BOOL ret; + if (region->Left > region->Right || region->Top > region->Bottom) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + if (size.X <= coord.X || size.Y <= coord.Y) + { + region->Right = region->Left - 1; + region->Bottom = region->Top - 1; + SetLastError( ERROR_INVALID_FUNCTION ); + return FALSE; + } width = min( region->Right - region->Left + 1, size.X - coord.X ); height = min( region->Bottom - region->Top + 1, size.Y - coord.Y ); - if (width > 0 && height > 0) + count = sizeof(*result) + width * height * sizeof(*buffer); + if (!(result = HeapAlloc( GetProcessHeap(), 0, count ))) { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + params.mode = CHAR_INFO_MODE_TEXTATTR; + params.x = region->Left; + params.y = region->Top; + params.width = width; + if ((ret = console_ioctl( handle, IOCTL_CONDRV_READ_OUTPUT, &params, sizeof(params), result, count, &count )) && count) + { + CHAR_INFO *char_info = (CHAR_INFO *)(result + 1); + *region = *result; + width = region->Right - region->Left + 1; + height = region->Bottom - region->Top + 1; for (y = 0; y < height; y++) - { - SERVER_START_REQ( read_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = region->Left; - req->y = region->Top + y; - req->mode = CHAR_INFO_MODE_TEXTATTR; - req->wrap = FALSE; - wine_server_set_reply( req, &buffer[(y+coord.Y) * size.X + coord.X], - width * sizeof(CHAR_INFO) ); - if ((ret = !wine_server_call_err( req ))) - { - width = min( width, reply->width - region->Left ); - height = min( height, reply->height - region->Top ); - } - } - SERVER_END_REQ; - if (!ret) break; - } + memcpy( &buffer[(y + coord.Y) * size.X + coord.X], &char_info[y * width], width * sizeof(*buffer) ); } - region->Bottom = region->Top + height - 1; - region->Right = region->Left + width - 1; + HeapFree( GetProcessHeap(), 0, result ); return ret; }

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputAttribute.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 5f6bb63800c14a46a4124c5a5e42094cae3a38fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f6bb63800c14a46a4124c5a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 17:10:40 2020 +0200 kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputAttribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 63e9b20292..a4b9b8c491 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -786,6 +786,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekConsoleInputW( HANDLE handle, INPUT_RECORD *bu BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputAttribute( HANDLE handle, WORD *attr, DWORD length, COORD coord, DWORD *count ) { + struct condrv_output_params params; BOOL ret; TRACE( "(%p,%p,%d,%dx%d,%p)\n", handle, attr, length, coord.X, coord.Y, count ); @@ -796,18 +797,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH ReadConsoleOutputAttribute( HANDLE handle, WORD *a return FALSE; } - *count = 0; - SERVER_START_REQ( read_console_output ) - { - req->handle = console_handle_unmap( handle ); - req->x = coord.X; - req->y = coord.Y; - req->mode = CHAR_INFO_MODE_ATTR; - req->wrap = TRUE; - wine_server_set_reply( req, attr, length * sizeof(WORD) ); - if ((ret = !wine_server_call_err( req ))) *count = wine_server_reply_size(reply) / sizeof(WORD); - } - SERVER_END_REQ; + params.mode = CHAR_INFO_MODE_ATTR; + params.x = coord.X; + params.y = coord.Y; + params.width = 0; + ret = console_ioctl( handle, IOCTL_CONDRV_READ_OUTPUT, &params, sizeof(params), + attr, length * sizeof(*attr), count ); + *count /= sizeof(*attr); return ret; }

1 0

Jacek Caban : kernel32/tests: Add more console output reading tests.
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 1e5cd8fadcb80b68391de6589304d9f2654dbdd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e5cd8fadcb80b68391de658… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 28 17:11:19 2020 +0200 kernel32/tests: Add more console output reading tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 176 +++++++++++++++++++++++++++++++++++++++++- dlls/kernelbase/console.c | 2 + 2 files changed, 175 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e5cd8fadcb80b68391d…

1 0

Alexandre Julliard : ntdll: Use a syscall thunk for NtGetContextThread().
by Alexandre Julliard July 28, 2020

July 28, 2020

Module: wine Branch: master Commit: 57f419993eb8088ef210e8a56b07acf63509b159 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57f419993eb8088ef210e8a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 28 13:26:48 2020 +0200 ntdll: Use a syscall thunk for NtGetContextThread(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 +- dlls/ntdll/signal_i386.c | 49 ------------------ dlls/ntdll/thread.c | 12 ----- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/signal_arm.c | 74 +++++++++++---------------- dlls/ntdll/unix/signal_arm64.c | 65 ++++++++---------------- dlls/ntdll/unix/signal_i386.c | 10 +++- dlls/ntdll/unix/signal_x86_64.c | 108 ++++++++++++++++------------------------ dlls/ntdll/unixlib.h | 1 - 9 files changed, 104 insertions(+), 220 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=57f419993eb8088ef210…

1 0