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

Jacek Caban : wineconsole: Rename hSynchro to console.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: ad1f09d57424b26bcf463dd45b5b0acb5bd97029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad1f09d57424b26bcf463dd4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:28 2020 +0200 wineconsole: Rename hSynchro to console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/winecon_private.h | 2 +- programs/wineconsole/wineconsole.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index cdf05e9332..d78502a260 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -62,7 +62,7 @@ struct inner_data { HANDLE hConIn; /* console input handle */ HANDLE hConOut; /* screen buffer handle: has to be changed when active sb changes */ - HANDLE hSynchro; /* waitable handle signalled by server when something in server has been modified */ + HANDLE console; /* console renderer handle */ HANDLE hProcess; /* handle to the child process or NULL */ HWND hWnd; /* handle of 'user' window or NULL for 'curses' */ INT nCmdShow; /* argument of WinMain */ diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 75bb878bfd..7e39ed5e51 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -203,7 +203,7 @@ void WINECON_GrabChanges(struct inner_data* data) if (data->in_grab_changes) return; - if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE)) + if (!GetOverlappedResult(data->console, &data->overlapped, &num, FALSE)) { if (GetLastError() == ERROR_IO_INCOMPLETE) return; ERR( "failed to get renderer events: %u\n", GetLastError() ); @@ -355,7 +355,7 @@ void WINECON_GrabChanges(struct inner_data* data) } data->in_grab_changes = FALSE; - if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events, + if (!DeviceIoControl(data->console, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, data->events, sizeof(data->events), NULL, &data->overlapped) && GetLastError() != ERROR_IO_PENDING) { ERR("failed to get renderer events: %u\n", GetLastError()); @@ -550,7 +550,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->fnDeleteBackend) data->fnDeleteBackend(data); if (data->hConIn) CloseHandle(data->hConIn); if (data->hConOut) CloseHandle(data->hConOut); - if (data->hSynchro) CloseHandle(data->hSynchro); + if (data->console) CloseHandle(data->console); if (data->hProcess) CloseHandle(data->hProcess); if (data->overlapped.hEvent) CloseHandle(data->overlapped.hEvent); HeapFree(GetProcessHeap(), 0, data->curcfg.registry); @@ -664,17 +664,17 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna } SERVER_END_REQ; if (!ret) goto error; - WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->hSynchro); + WINE_TRACE("using hConIn %p, hSynchro event %p\n", data->hConIn, data->console); RtlInitUnicodeString(&string, renderer_pathW); attr.ObjectName = &string; - status = NtCreateFile(&data->hSynchro, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES + status = NtCreateFile(&data->console, FILE_READ_DATA | FILE_WRITE_DATA | FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, &io, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0); if (status) goto error; h = condrv_handle(data->hConIn); - if (!DeviceIoControl(data->hSynchro, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL)) + if (!DeviceIoControl(data->console, IOCTL_CONDRV_ATTACH_RENDERER, &h, sizeof(h), NULL, 0, NULL, NULL)) goto error; SERVER_START_REQ(create_console_output)

1 0

Jacek Caban : wineconsole: Use renderer handle instead of hConOut where possible.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 1f5a45e63ecff2f83eb927e253007bd75fb36c05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f5a45e63ecff2f83eb927e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:37:47 2020 +0200 wineconsole: Use renderer handle instead of hConOut where possible. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 2 +- programs/wineconsole/user.c | 2 +- programs/wineconsole/wineconsole.c | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index ff38bafe2c..3f56bdb0ca 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -324,7 +324,7 @@ static void WCCURSES_ComputePositions(struct inner_data* data) data->curcfg.win_width, data->curcfg.win_height, x, y); pos.Left = pos.Top = 0; pos.Right = x - 1; pos.Bottom = y - 1; - SetConsoleWindowInfo(data->hConOut, FALSE, &pos); + SetConsoleWindowInfo(data->console, FALSE, &pos); return; /* we'll get called again upon event for new window size */ } if (PRIVATE(data)->pad) WCCURSES_PosCursor(data); diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 67531c0045..4476845154 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -687,7 +687,7 @@ static void WCUSER_CopySelectionToClipboard(const struct inner_data* data) LPWSTR end; DWORD count; - ReadConsoleOutputCharacterW(data->hConOut, p, w - 1, c, &count); + ReadConsoleOutputCharacterW(data->console, p, w - 1, c, &count); /* strip spaces from the end of the line */ end = p + w - 1; diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 7e39ed5e51..63fdb7e72f 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -70,7 +70,7 @@ static void WINECON_FetchCells(struct inner_data* data, int upd_tp, int upd_bm) COORD size = { data->curcfg.sb_width, data->curcfg.sb_height }; COORD coord = { 0, upd_tp }; - if (ReadConsoleOutputW(data->hConOut, data->cells, size, coord, &region)) + if (ReadConsoleOutputW(data->console, data->cells, size, coord, &region)) data->fnRefresh(data, upd_tp, upd_bm); } @@ -186,7 +186,7 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* params.info.popup_attr = cfg->popup_attr; memcpy(params.info.color_map, cfg->color_map, sizeof(cfg->color_map)); - DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); + DeviceIoControl(data->console, IOCTL_CONDRV_SET_OUTPUT_INFO, &params, sizeof(params), NULL, 0, NULL, NULL); } /****************************************************************** @@ -383,11 +383,11 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf * (no notification is sent when invariant operation is requested) */ cinfo.bVisible = !cfg->cursor_visible; - SetConsoleCursorInfo(data->hConOut, &cinfo); + SetConsoleCursorInfo(data->console, &cinfo); /* </FIXME> */ cinfo.bVisible = cfg->cursor_visible; /* this shall update (through notif) curcfg */ - SetConsoleCursorInfo(data->hConOut, &cinfo); + SetConsoleCursorInfo(data->console, &cinfo); } if (data->curcfg.history_size != cfg->history_size) { @@ -425,7 +425,7 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf params->info.font_weight = cfg->font_weight; params->info.font_pitch_family = cfg->font_pitch_family; memcpy(params + 1, cfg->face_name, len * sizeof(WCHAR)); - DeviceIoControl(data->hConOut, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), + DeviceIoControl(data->console, IOCTL_CONDRV_SET_OUTPUT_INFO, params, sizeof(*params) + len * sizeof(WCHAR), NULL, 0, NULL, NULL); } } @@ -436,8 +436,8 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf data->curcfg.def_attr = cfg->def_attr; screen_size = cfg->win_width * (cfg->win_height + 1); - FillConsoleOutputAttribute(data->hConOut, cfg->def_attr, screen_size, top_left, &written); - SetConsoleTextAttribute(data->hConOut, cfg->def_attr); + FillConsoleOutputAttribute(data->console, cfg->def_attr, screen_size, top_left, &written); + SetConsoleTextAttribute(data->console, cfg->def_attr); } WINECON_SetColors(data, cfg); /* now let's look at the window / sb size changes... @@ -454,13 +454,13 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf #define ChgSBfWidth() do {c.X = cfg->sb_width; \ c.Y = data->curcfg.sb_height;\ - SetConsoleScreenBufferSize(data->hConOut, c);\ + SetConsoleScreenBufferSize(data->console, c);\ } while (0) #define ChgWinHPos() do {pos.Left = cfg->win_pos.X - data->curcfg.win_pos.X; \ pos.Top = 0; \ pos.Right = pos.Left + cfg->win_width - data->curcfg.win_width; \ pos.Bottom = 0; \ - SetConsoleWindowInfo(data->hConOut, FALSE, &pos);\ + SetConsoleWindowInfo(data->console, FALSE, &pos);\ } while (0) #define TstSBfHeight() (data->curcfg.sb_height != cfg->sb_height) #define TstWinVPos() (data->curcfg.win_height != cfg->win_height || data->curcfg.win_pos.Y != cfg->win_pos.Y) @@ -468,13 +468,13 @@ void WINECON_SetConfig(struct inner_data* data, const struct config_data* cf /* since we're going to apply height after width is done, we use width as defined * in cfg, and not in data->curcfg because if won't be updated yet */ #define ChgSBfHeight() do {c.X = cfg->sb_width; c.Y = cfg->sb_height; \ - SetConsoleScreenBufferSize(data->hConOut, c); \ + SetConsoleScreenBufferSize(data->console, c); \ } while (0) #define ChgWinVPos() do {pos.Left = 0; \ pos.Top = cfg->win_pos.Y - data->curcfg.win_pos.Y; \ pos.Right = 0; \ pos.Bottom = pos.Top + cfg->win_height - data->curcfg.win_height; \ - SetConsoleWindowInfo(data->hConOut, FALSE, &pos);\ + SetConsoleWindowInfo(data->console, FALSE, &pos);\ } while (0) do @@ -582,7 +582,7 @@ static BOOL WINECON_GetServerConfig(struct inner_data* data) data->curcfg.insert_mode = (mode & (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS)) == (ENABLE_INSERT_MODE|ENABLE_EXTENDED_FLAGS); - if (!DeviceIoControl(data->hConOut, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, + if (!DeviceIoControl(data->console, IOCTL_CONDRV_GET_OUTPUT_INFO, NULL, 0, &output_info, sizeof(output_info), NULL, NULL)) return FALSE; data->curcfg.cursor_size = output_info.cursor_size;

1 0

Jacek Caban : server: Remove no longer needed CONSOLE_RENDERER_ACTIVE_SB_EVENT events.
by Alexandre Julliard 29 Jul '20

29 Jul '20

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 needed open_console request.
by Alexandre Julliard 29 Jul '20

29 Jul '20

Module: wine Branch: master Commit: 305da71c7d8098bf2d2a07584a25be2e5fcc2b91 URL: https://source.winehq.org/git/wine.git/?a=commit;h=305da71c7d8098bf2d2a0758… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 29 12:38:28 2020 +0200 server: Remove no longer needed open_console request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 23 +---------------------- server/console.c | 22 ---------------------- server/protocol.def | 11 ----------- server/request.h | 9 --------- server/trace.c | 16 ---------------- 5 files changed, 1 insertion(+), 80 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d4bb5c9ab3..7753d24877 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1850,24 +1850,6 @@ struct free_console_reply -struct open_console_request -{ - struct request_header __header; - obj_handle_t from; - unsigned int access; - unsigned int attributes; - int share; - char __pad_28[4]; -}; -struct open_console_reply -{ - struct reply_header __header; - obj_handle_t handle; - char __pad_12[4]; -}; - - - struct attach_console_request { struct request_header __header; @@ -5572,7 +5554,6 @@ enum request REQ_set_socket_deferred, REQ_alloc_console, REQ_free_console, - REQ_open_console, REQ_attach_console, REQ_get_console_wait_event, REQ_set_console_input_info, @@ -5863,7 +5844,6 @@ union generic_request struct set_socket_deferred_request set_socket_deferred_request; struct alloc_console_request alloc_console_request; struct free_console_request free_console_request; - struct open_console_request open_console_request; struct attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; struct set_console_input_info_request set_console_input_info_request; @@ -6152,7 +6132,6 @@ union generic_reply struct set_socket_deferred_reply set_socket_deferred_reply; struct alloc_console_reply alloc_console_reply; struct free_console_reply free_console_reply; - struct open_console_reply open_console_reply; struct attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; struct set_console_input_info_reply set_console_input_info_reply; @@ -6376,7 +6355,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 632 +#define SERVER_PROTOCOL_VERSION 633 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 46d43e7832..0060f7cb65 100644 --- a/server/console.c +++ b/server/console.c @@ -2091,28 +2091,6 @@ DECL_HANDLER(free_console) free_console( current->process ); } -/* open a handle to the process console */ -DECL_HANDLER(open_console) -{ - struct object *obj = NULL; - - if ((obj = get_handle_obj( current->process, req->from, - FILE_READ_PROPERTIES|FILE_WRITE_PROPERTIES, &console_input_ops ))) - { - struct console_input *console = (struct console_input *)obj; - obj = (console->active) ? grab_object( console->active ) : NULL; - release_object( console ); - } - - /* FIXME: req->share is not used (as in screen buffer creation) */ - if (obj) - { - reply->handle = alloc_handle( current->process, obj, req->access, req->attributes ); - release_object( obj ); - } - else if (!get_error()) set_error( STATUS_ACCESS_DENIED ); -} - /* attach to a other process's console */ DECL_HANDLER(attach_console) { diff --git a/server/protocol.def b/server/protocol.def index b48cf70e48..c2773307a4 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1472,17 +1472,6 @@ enum server_fd_type @END -/* Open a handle to the process console */ -(a)REQ(open_console) - obj_handle_t from; /* console_in handle to get active screen buffer */ - unsigned int access; /* wanted access rights */ - unsigned int attributes; /* object attributes */ - int share; /* share mask (only for output handles) */ -(a)REPLY - obj_handle_t handle; /* handle to the console */ -(a)END - - /* Attach to a other process's console */ @REQ(attach_console) process_id_t pid; /* pid of attached console process */ diff --git a/server/request.h b/server/request.h index fd5141d6cb..190581332b 100644 --- a/server/request.h +++ b/server/request.h @@ -183,7 +183,6 @@ DECL_HANDLER(enable_socket_event); DECL_HANDLER(set_socket_deferred); DECL_HANDLER(alloc_console); DECL_HANDLER(free_console); -DECL_HANDLER(open_console); DECL_HANDLER(attach_console); DECL_HANDLER(get_console_wait_event); DECL_HANDLER(set_console_input_info); @@ -473,7 +472,6 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_socket_deferred, (req_handler)req_alloc_console, (req_handler)req_free_console, - (req_handler)req_open_console, (req_handler)req_attach_console, (req_handler)req_get_console_wait_event, (req_handler)req_set_console_input_info, @@ -1112,13 +1110,6 @@ C_ASSERT( sizeof(struct alloc_console_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct alloc_console_reply, handle_in) == 8 ); C_ASSERT( sizeof(struct alloc_console_reply) == 16 ); C_ASSERT( sizeof(struct free_console_request) == 16 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, from) == 12 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, access) == 16 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, attributes) == 20 ); -C_ASSERT( FIELD_OFFSET(struct open_console_request, share) == 24 ); -C_ASSERT( sizeof(struct open_console_request) == 32 ); -C_ASSERT( FIELD_OFFSET(struct open_console_reply, handle) == 8 ); -C_ASSERT( sizeof(struct open_console_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct attach_console_request, pid) == 12 ); C_ASSERT( sizeof(struct attach_console_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct attach_console_reply, std_in) == 8 ); diff --git a/server/trace.c b/server/trace.c index db5d0dd6ea..15a769fb59 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2041,19 +2041,6 @@ static void dump_free_console_request( const struct free_console_request *req ) { } -static void dump_open_console_request( const struct open_console_request *req ) -{ - fprintf( stderr, " from=%04x", req->from ); - fprintf( stderr, ", access=%08x", req->access ); - fprintf( stderr, ", attributes=%08x", req->attributes ); - fprintf( stderr, ", share=%d", req->share ); -} - -static void dump_open_console_reply( const struct open_console_reply *req ) -{ - fprintf( stderr, " handle=%04x", req->handle ); -} - static void dump_attach_console_request( const struct attach_console_request *req ) { fprintf( stderr, " pid=%04x", req->pid ); @@ -4520,7 +4507,6 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_socket_deferred_request, (dump_func)dump_alloc_console_request, (dump_func)dump_free_console_request, - (dump_func)dump_open_console_request, (dump_func)dump_attach_console_request, (dump_func)dump_get_console_wait_event_request, (dump_func)dump_set_console_input_info_request, @@ -4807,7 +4793,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_alloc_console_reply, NULL, - (dump_func)dump_open_console_reply, (dump_func)dump_attach_console_reply, (dump_func)dump_get_console_wait_event_reply, NULL, @@ -5094,7 +5079,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_socket_deferred", "alloc_console", "free_console", - "open_console", "attach_console", "get_console_wait_event", "set_console_input_info",

1 0

Jacek Caban : kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputAttribute.
by Alexandre Julliard 28 Jul '20

28 Jul '20

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 : kernelbase: Use IOCTL_CONDRV_READ_OUTPUT in ReadConsoleOutputW.
by Alexandre Julliard 28 Jul '20

28 Jul '20

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 : server: Remove no longer used read_console_output request.
by Alexandre Julliard 28 Jul '20

28 Jul '20

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

Jacek Caban : kernel32/tests: Add more console output reading tests.
by Alexandre Julliard 28 Jul '20

28 Jul '20

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

Myah Caron : include: Add IShellLinkDual interface.
by Alexandre Julliard 28 Jul '20

28 Jul '20

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

Gijs Vermeulen : wbemprox: Support retrieving more than one object in IEnumWbemClassObject::Next().
by Alexandre Julliard 28 Jul '20

28 Jul '20

Module: wine Branch: master Commit: 84d85adeea578cac37bded97984409f44c7985ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=84d85adeea578cac37bded97… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Jul 28 11:35:08 2020 +0200 wbemprox: Support retrieving more than one object in IEnumWbemClassObject::Next(). Patch by GitHub user pnevmoslon with some modifications. Fixes gamepad support in Mortal Kombat 11. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 23 ++++++++++++++--------- dlls/wbemprox/tests/query.c | 12 ++++++------ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index ba7720b098..db6017e0c9 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -116,24 +116,29 @@ static HRESULT WINAPI enum_class_object_Next( struct table *table; static int once = 0; HRESULT hr; + ULONG i, j; TRACE("%p, %d, %u, %p, %p\n", iface, lTimeout, uCount, apObjects, puReturned); - if (!uCount) return WBEM_S_FALSE; if (!apObjects || !puReturned) return WBEM_E_INVALID_PARAMETER; if (lTimeout != WBEM_INFINITE && !once++) FIXME("timeout not supported\n"); *puReturned = 0; - if (ec->index >= view->result_count) return WBEM_S_FALSE; - table = get_view_table( view, ec->index ); - hr = create_class_object( table->name, iface, ec->index, NULL, apObjects ); - if (hr != S_OK) return hr; + for (i = 0; i < uCount; i++) + { + if (ec->index >= view->result_count) return WBEM_S_FALSE; + table = get_view_table( view, ec->index ); + hr = create_class_object( table->name, iface, ec->index, NULL, &apObjects[i] ); + if (hr != S_OK) + { + for (j = 0; j < i; j++) IWbemClassObject_Release( apObjects[j] ); + return hr; + } + ec->index++; + (*puReturned)++; + } - ec->index++; - *puReturned = 1; - if (ec->index == view->result_count && uCount > 1) return WBEM_S_FALSE; - if (uCount > 1) return WBEM_S_TIMEDOUT; return WBEM_S_NO_ERROR; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e99e221c30..e48722f3bc 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -181,8 +181,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 2; hr = IEnumWbemClassObject_Next( result, 10000, 0, &obj1, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == 0, "expected 0, got %u\n", count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == 0, "expected 0, got %u\n", count ); for (;;) { @@ -199,8 +199,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects, obj, &count ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] ); @@ -210,8 +210,8 @@ static void test_IEnumWbemClassObject_Next( IWbemServices *services ) count = 0; hr = IEnumWbemClassObject_Next( result, 10000, num_objects + 1, obj, &count ); - todo_wine ok( hr == S_FALSE, "got %08x\n", hr ); - todo_wine ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( count == num_objects, "expected %u, got %u\n", num_objects, count ); for (i = 0; i < count; i++) IWbemClassObject_Release( obj[i] );

1 0