September 2020 - Wine-Commits

Jacek Caban : server: Introduce IOCTL_CONDRV_BIND_PID ioctl.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 3e115d244ed2e2018bfe4a7fa5a9ea7a37b2c8ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e115d244ed2e2018bfe4a7f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:39:26 2020 +0200 server: Introduce IOCTL_CONDRV_BIND_PID ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 3 ++ server/console.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++-- server/trace.c | 1 + 3 files changed, 83 insertions(+), 2 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 1b3b918504..e5ba9c7444 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -49,6 +49,9 @@ #define IOCTL_CONDRV_FILL_OUTPUT CTL_CODE(FILE_DEVICE_CONSOLE, 36, METHOD_BUFFERED, FILE_WRITE_ACCESS) #define IOCTL_CONDRV_SCROLL CTL_CODE(FILE_DEVICE_CONSOLE, 37, METHOD_BUFFERED, FILE_WRITE_ACCESS) +/* console connection ioctls */ +#define IOCTL_CONDRV_BIND_PID CTL_CODE(FILE_DEVICE_CONSOLE, 51, METHOD_BUFFERED, FILE_READ_PROPERTIES) + /* console renderer ioctls */ #define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_ATTACH_RENDERER CTL_CODE(FILE_DEVICE_CONSOLE, 71, METHOD_BUFFERED, FILE_READ_ACCESS) diff --git a/server/console.c b/server/console.c index 95c087ae15..b9fb0fb448 100644 --- a/server/console.c +++ b/server/console.c @@ -362,12 +362,15 @@ static const struct object_ops console_device_ops = struct console_connection { struct object obj; /* object header */ + struct fd *fd; /* pseudo-fd for ioctls */ }; static void console_connection_dump( struct object *obj, int verbose ); +static struct fd *console_connection_get_fd( struct object *obj ); static struct object *console_connection_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); +static void console_connection_destroy( struct object *obj ); static const struct object_ops console_connection_ops = { @@ -379,7 +382,7 @@ static const struct object_ops console_connection_ops = NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ - no_get_fd, /* get_fd */ + console_connection_get_fd, /* get_fd */ no_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ @@ -389,7 +392,24 @@ static const struct object_ops console_connection_ops = console_connection_open_file, /* open_file */ no_kernel_obj_list, /* get_kernel_obj_list */ console_connection_close_handle, /* close_handle */ - no_destroy /* destroy */ + console_connection_destroy /* destroy */ +}; + +static int console_connection_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + +static const struct fd_ops console_connection_fd_ops = +{ + default_fd_get_poll_events, /* get_poll_events */ + default_poll_event, /* poll_event */ + console_get_fd_type, /* get_fd_type */ + no_fd_read, /* read */ + no_fd_write, /* write */ + no_fd_flush, /* flush */ + no_fd_get_file_info, /* get_file_info */ + no_fd_get_volume_info, /* get_volume_info */ + console_connection_ioctl, /* ioctl */ + default_fd_queue_async, /* queue_async */ + default_fd_reselect_async /* reselect_async */ }; static struct list screen_buffer_list = LIST_INIT(screen_buffer_list); @@ -1329,6 +1349,11 @@ static struct object *create_console_connection( struct console_input *console ) } if (!(connection = alloc_object( &console_connection_ops ))) return NULL; + if (!(connection->fd = alloc_pseudo_fd( &console_connection_fd_ops, &connection->obj, 0 ))) + { + release_object( connection ); + return NULL; + } if (console) { @@ -2248,6 +2273,46 @@ static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct } } +static int console_connection_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console_connection *console_connection = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_BIND_PID: + { + struct process *process; + unsigned int pid; + if (get_req_data_size() != sizeof(unsigned int)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + if (current->process->console) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } + + pid = *(unsigned int *)get_req_data(); + if (pid == ATTACH_PARENT_PROCESS) pid = current->process->parent_id; + if (!(process = get_process_from_id( pid ))) return 0; + + if (process->console) + { + current->process->console = (struct console_input *)grab_object( process->console ); + process->console->num_proc++; + } + else set_error( STATUS_ACCESS_DENIED ); + release_object( process ); + return !get_error(); + } + + default: + return default_fd_ioctl( console_connection->fd, code, async ); + } +} + static int console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct console_server *server = get_fd_user( fd ); @@ -2282,6 +2347,12 @@ static void console_connection_dump( struct object *obj, int verbose ) fputs( "console connection\n", stderr ); } +static struct fd *console_connection_get_fd( struct object *obj ) +{ + struct console_connection *connection = (struct console_connection *)obj; + return (struct fd *)grab_object( connection->fd ); +} + static struct object *console_connection_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) { @@ -2294,6 +2365,12 @@ static int console_connection_close_handle( struct object *obj, struct process * return 1; } +static void console_connection_destroy( struct object *obj ) +{ + struct console_connection *connection = (struct console_connection *)obj; + if (connection->fd) release_object( connection->fd ); +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'}; diff --git a/server/trace.c b/server/trace.c index c93e4fe3b4..990515d635 100644 --- a/server/trace.c +++ b/server/trace.c @@ -116,6 +116,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) #define CASE(c) case c: fprintf( stderr, "%s%s", prefix, #c ); break CASE(IOCTL_CONDRV_ACTIVATE); CASE(IOCTL_CONDRV_ATTACH_RENDERER); + CASE(IOCTL_CONDRV_BIND_PID); CASE(IOCTL_CONDRV_CTRL_EVENT); CASE(IOCTL_CONDRV_FILL_OUTPUT); CASE(IOCTL_CONDRV_GET_INPUT_INFO);

1 0

Jacek Caban : server: Remove no longer used attach_console request.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 3d31e52fe7bbfbfe28af6dd224bb7594bbcd9521 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d31e52fe7bbfbfe28af6dd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:39:54 2020 +0200 server: Remove no longer used attach_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 | 17 +---------------- server/console.c | 29 ----------------------------- server/protocol.def | 6 ------ server/request.h | 4 ---- server/trace.c | 8 -------- 5 files changed, 1 insertion(+), 63 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5259b5a60c..2d4e016478 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1850,18 +1850,6 @@ struct free_console_reply -struct attach_console_request -{ - struct request_header __header; - process_id_t pid; -}; -struct attach_console_reply -{ - struct reply_header __header; -}; - - - struct get_console_wait_event_request { struct request_header __header; @@ -5522,7 +5510,6 @@ enum request REQ_set_socket_deferred, REQ_alloc_console, REQ_free_console, - REQ_attach_console, REQ_get_console_wait_event, REQ_append_console_input_history, REQ_get_console_input_history, @@ -5811,7 +5798,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 attach_console_request attach_console_request; struct get_console_wait_event_request get_console_wait_event_request; struct append_console_input_history_request append_console_input_history_request; struct get_console_input_history_request get_console_input_history_request; @@ -6098,7 +6084,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 attach_console_reply attach_console_reply; struct get_console_wait_event_reply get_console_wait_event_reply; struct append_console_input_history_reply append_console_input_history_reply; struct get_console_input_history_reply get_console_input_history_reply; @@ -6320,7 +6305,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 641 +#define SERVER_PROTOCOL_VERSION 642 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index 5346c7cb8f..a946abacbb 100644 --- a/server/console.c +++ b/server/console.c @@ -2565,35 +2565,6 @@ DECL_HANDLER(free_console) free_console( current->process ); } -/* attach to a other process's console */ -DECL_HANDLER(attach_console) -{ - struct process *process; - - if (current->process->console) - { - set_error( STATUS_ACCESS_DENIED ); - return; - } - - process = get_process_from_id( req->pid == ATTACH_PARENT_PROCESS - ? current->process->parent_id : req->pid ); - if (!process) return; - - if (process->console && process->console->active) - { - current->process->console = (struct console_input *)grab_object( process->console ); - current->process->console->num_proc++; - } - else - { - set_error( STATUS_INVALID_HANDLE ); - } - - release_object( process ); - return; -} - /* appends a string to console's history */ DECL_HANDLER(append_console_input_history) { diff --git a/server/protocol.def b/server/protocol.def index 92290af701..fd9b721d69 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1472,12 +1472,6 @@ enum server_fd_type @END -/* Attach to a other process's console */ -(a)REQ(attach_console) - process_id_t pid; /* pid of attached console process */ -(a)END - - /* Get the input queue wait event */ @REQ(get_console_wait_event) obj_handle_t handle; /* handle to the console */ diff --git a/server/request.h b/server/request.h index db7215bd43..39f3ce7b2e 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(attach_console); DECL_HANDLER(get_console_wait_event); DECL_HANDLER(append_console_input_history); DECL_HANDLER(get_console_input_history); @@ -471,7 +470,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_attach_console, (req_handler)req_get_console_wait_event, (req_handler)req_append_console_input_history, (req_handler)req_get_console_input_history, @@ -1108,8 +1106,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 attach_console_request, pid) == 12 ); -C_ASSERT( sizeof(struct attach_console_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_request, handle) == 12 ); C_ASSERT( sizeof(struct get_console_wait_event_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_console_wait_event_reply, event) == 8 ); diff --git a/server/trace.c b/server/trace.c index 990515d635..91e3208c49 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2044,11 +2044,6 @@ static void dump_free_console_request( const struct free_console_request *req ) { } -static void dump_attach_console_request( const struct attach_console_request *req ) -{ - fprintf( stderr, " pid=%04x", req->pid ); -} - static void dump_get_console_wait_event_request( const struct get_console_wait_event_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); @@ -4493,7 +4488,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_attach_console_request, (dump_func)dump_get_console_wait_event_request, (dump_func)dump_append_console_input_history_request, (dump_func)dump_get_console_input_history_request, @@ -4778,7 +4772,6 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, (dump_func)dump_alloc_console_reply, NULL, - NULL, (dump_func)dump_get_console_wait_event_reply, NULL, (dump_func)dump_get_console_input_history_reply, @@ -5063,7 +5056,6 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_socket_deferred", "alloc_console", "free_console", - "attach_console", "get_console_wait_event", "append_console_input_history", "get_console_input_history",

1 0

Jacek Caban : server: Support creating console reference from console connection object.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: d6565b083251427e0b64efa279c314316aa20dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6565b083251427e0b64efa2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:39:35 2020 +0200 server: Support creating console reference from console connection object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/server/console.c b/server/console.c index b9fb0fb448..5346c7cb8f 100644 --- a/server/console.c +++ b/server/console.c @@ -367,6 +367,7 @@ struct console_connection static void console_connection_dump( struct object *obj, int verbose ); static struct fd *console_connection_get_fd( struct object *obj ); +static struct object *console_connection_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ); static struct object *console_connection_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ); static int console_connection_close_handle( struct object *obj, struct process *process, obj_handle_t handle ); @@ -386,7 +387,7 @@ static const struct object_ops console_connection_ops = no_map_access, /* map_access */ default_get_sd, /* get_sd */ default_set_sd, /* set_sd */ - no_lookup_name, /* lookup_name */ + console_connection_lookup_name, /* lookup_name */ directory_link_name, /* link_name */ default_unlink_name, /* unlink_name */ console_connection_open_file, /* open_file */ @@ -2353,6 +2354,24 @@ static struct fd *console_connection_get_fd( struct object *obj ) return (struct fd *)grab_object( connection->fd ); } +static struct object *console_connection_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) +{ + static const WCHAR referenceW[] = {'R','e','f','e','r','e','n','c','e'}; + + if (name->len == sizeof(referenceW) && !memcmp( name->str, referenceW, name->len )) + { + if (!current->process->console) + { + set_error( STATUS_INVALID_HANDLE ); + return NULL; + } + name->len = 0; + return grab_object( current->process->console ); + } + + return NULL; +} + static struct object *console_connection_open_file( struct object *obj, unsigned int access, unsigned int sharing, unsigned int options ) {

1 0

Jacek Caban : server: Allow creating unbound console connection objects.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 3217abd7a57e2b6bc3d7eb6c3de3d570cd5b86f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3217abd7a57e2b6bc3d7eb6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:39:10 2020 +0200 server: Allow creating unbound console connection objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/console.c b/server/console.c index 50698a727f..95c087ae15 100644 --- a/server/console.c +++ b/server/console.c @@ -1330,8 +1330,11 @@ static struct object *create_console_connection( struct console_input *console ) if (!(connection = alloc_object( &console_connection_ops ))) return NULL; - current->process->console = (struct console_input *)grab_object( console ); - console->num_proc++; + if (console) + { + current->process->console = (struct console_input *)grab_object( console ); + console->num_proc++; + } return &connection->obj; } @@ -2305,6 +2308,7 @@ static void console_device_dump( struct object *obj, int verbose ) static struct object *console_device_lookup_name( struct object *obj, struct unicode_str *name, unsigned int attr ) { + static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n'}; static const WCHAR consoleW[] = {'C','o','n','s','o','l','e'}; static const WCHAR current_inW[] = {'C','u','r','r','e','n','t','I','n'}; static const WCHAR current_outW[] = {'C','u','r','r','e','n','t','O','u','t'}; @@ -2363,6 +2367,12 @@ static struct object *console_device_lookup_name( struct object *obj, struct uni return create_console_server(); } + if (name->len == sizeof(connectionW) && !memcmp( name->str, connectionW, name->len )) + { + name->len = 0; + return create_console_connection( NULL ); + } + return NULL; }

1 0

Jacek Caban : kernelbase: Use console connection object in AttachConsole.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: ca95afd37f6416b1972ef33a811939b37b405320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca95afd37f6416b1972ef33a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:39:45 2020 +0200 kernelbase: Use console connection object in AttachConsole. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index eff63a29a1..8c39cde30a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -293,24 +293,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH AttachConsole( DWORD pid ) RtlEnterCriticalSection( &console_section ); - SERVER_START_REQ( attach_console ) + if (RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle) { - req->pid = pid; - ret = !wine_server_call_err( req ); + RtlLeaveCriticalSection( &console_section ); + WARN( "console already attached\n" ); + SetLastError( ERROR_ACCESS_DENIED ); + return FALSE; } - SERVER_END_REQ; + ret = create_console_connection( NULL ) && + console_ioctl( console_connection, IOCTL_CONDRV_BIND_PID, &pid, sizeof(pid), NULL, 0, NULL ); if (ret) { - if ((ret = init_console_std_handles())) - { - HANDLE console = CreateFileW( L"CONIN$", GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, 0, NULL, OPEN_EXISTING, 0, 0 ); - if (console != INVALID_HANDLE_VALUE) RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = console; - else ret = FALSE; - } - if (!ret) FreeConsole(); + RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = create_console_reference( console_connection ); + ret = RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle && init_console_std_handles(); } + if (!ret) FreeConsole(); RtlLeaveCriticalSection( &console_section ); return ret; }

1 0

Akihiro Sagawa : vbscript: Support non-Latin 1 characters in Asc.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 35376075ac7b11af3ab6bfb8bdd7b09a61d648b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35376075ac7b11af3ab6bfb8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed Sep 16 21:34:13 2020 +0900 vbscript: Support non-Latin 1 characters in Asc. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49309 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 23 ++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 5 +++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 80323fe136..92288fcd88 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1749,10 +1749,27 @@ static HRESULT Global_Asc(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA str = conv_str; } - if(!SysStringLen(str) || *str >= 0x100) + if(!SysStringLen(str)) hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); - else if(res) - hres = return_short(res, *str); + else { + unsigned char buf[2]; + short val = 0; + int n = WideCharToMultiByte(CP_ACP, 0, str, 1, (char*)buf, sizeof(buf), NULL, NULL); + switch(n) { + case 1: + val = buf[0]; + break; + case 2: + val = (buf[0] << 8) | buf[1]; + break; + default: + WARN("Failed to convert %x\n", *str); + hres = MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); + } + if(SUCCEEDED(hres)) + hres = return_short(res, val); + } + SysFreeString(conv_str); return hres; } diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index be95aae4b9..48b263334c 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1842,6 +1842,11 @@ call testAsc(" ", 32) call testAsc(Chr(255), 255) call testAsc(Chr(0), 0) if isEnglishLang then testAsc true, 84 +if Asc(Chr(&h81)) = &h8145 then + ' Japanese (CP 932) + call testAsc(Chr(&h8e8e), -29042) + call testAsc(Chr(220), 220) +end if call testAscError() sub testErrNumber(n)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: d8a3a04f58710d35de12d876db38e57877aeb995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8a3a04f58710d35de12d876… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Sep 16 23:11:32 2020 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/po/lt.po b/po/lt.po index e7347c9e9f..2ca29dd94b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-09-15 21:49+0300\n" +"PO-Revision-Date: 2020-09-16 23:11+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10946,33 +10946,27 @@ msgstr "Yra mažiausiai viena nenustatyta saugumo problema su šiuo liudijimu." #: dlls/wininet/wininet.rc:35 msgid "Effective Date" -msgstr "" +msgstr "Įsigaliojimo data" #: dlls/wininet/wininet.rc:37 -#, fuzzy -#| msgid "Security" msgid "Security Protocol" -msgstr "Saugumas" +msgstr "Saugumo protokolas" #: dlls/wininet/wininet.rc:38 -#, fuzzy -#| msgid "Signature" msgid "Signature Type" -msgstr "Parašas" +msgstr "Parašo tipas" #: dlls/wininet/wininet.rc:39 -#, fuzzy -#| msgid "Encrypting File System" msgid "Encryption Type" -msgstr "Failų šifravimo sistema" +msgstr "Šifravimo tipas" #: dlls/wininet/wininet.rc:40 msgid "Privacy Strength" -msgstr "" +msgstr "Privatumo stiprumas" #: dlls/wininet/wininet.rc:43 msgid "bits" -msgstr "" +msgstr "bitai" #: dlls/wininet/winineterror.mc:26 msgid "The request has timed out.\n"

1 0

Jacek Caban : kernelbase: Create console connection in init_console.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 74192f7a56c319c1a9cadb67a3dd3305c965292d URL: https://source.winehq.org/git/wine.git/?a=commit;h=74192f7a56c319c1a9cadb67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 16 20:39:01 2020 +0200 kernelbase: Create console connection in init_console. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/console.c | 20 ++++++++++++++++++++ server/console.c | 6 ++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index f4dd06ae2d..eff63a29a1 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -54,6 +54,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION console_section = { &critsect_debug, -1, 0, 0, 0, 0 }; +static HANDLE console_connection; static HANDLE console_wait_event; static unsigned int console_flags; @@ -208,6 +209,21 @@ static HANDLE create_console_reference( HANDLE root ) return set_ntstatus( status ) ? handle : NULL; } +static BOOL create_console_connection( HANDLE root ) +{ + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING string; + IO_STATUS_BLOCK iosb; + NTSTATUS status; + + RtlInitUnicodeString( &string, root ? L"Connection" : L"\\Device\\ConDrv\\Connection" ); + attr.RootDirectory = root; + attr.ObjectName = &string; + status = NtCreateFile( &console_connection, FILE_WRITE_PROPERTIES | FILE_READ_PROPERTIES | SYNCHRONIZE, &attr, + &iosb, NULL, FILE_ATTRIBUTE_NORMAL, 0, FILE_OPEN, FILE_NON_DIRECTORY_FILE, NULL, 0 ); + return set_ntstatus( status ); +} + static BOOL init_console_std_handles(void) { HANDLE std_out = NULL, std_err = NULL, handle; @@ -568,6 +584,9 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeConsole(void) RtlEnterCriticalSection( &console_section ); + NtClose( console_connection ); + console_connection = NULL; + NtClose( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle ); RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle = NULL; @@ -1734,6 +1753,7 @@ void init_console( void ) if (RtlImageNtHeader( mod )->OptionalHeader.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) AllocConsole(); } + else if (params->ConsoleHandle) create_console_connection( params->ConsoleHandle ); RtlAddVectoredExceptionHandler( FALSE, handle_ctrl_c ); } diff --git a/server/console.c b/server/console.c index 108371080e..50698a727f 100644 --- a/server/console.c +++ b/server/console.c @@ -799,14 +799,12 @@ obj_handle_t inherit_console( struct thread *parent_thread, obj_handle_t handle, { struct console_input *console = NULL; - if (handle && !(console = (struct console_input *)get_handle_obj( current->process, handle, 0, - &console_input_ops ))) - return 0; + if (handle) return duplicate_handle( current->process, handle, process, 0, 0, DUP_HANDLE_SAME_ACCESS ); /* if parent is a renderer, then attach current process to its console * a bit hacky.... */ - if (!console && hconin && parent_thread) + if (hconin && parent_thread) { /* FIXME: should we check some access rights ? */ if (!(console = (struct console_input *)get_handle_obj( parent_thread->process, hconin,

1 0

Myah Caron : sapi: Improve stub for ISpObjectToken::SetId.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 5d49d3348368bcde6b55df157b2e79f62fa6ad98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d49d3348368bcde6b55df15… Author: Myah Caron <qsniyg(a)protonmail.com> Date: Wed Sep 16 06:23:40 2020 +0000 sapi: Improve stub for ISpObjectToken::SetId. Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/token.c | 16 ++++++++-------- dlls/sapi/token.c | 29 +++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/sapi/tests/token.c b/dlls/sapi/tests/token.c index 887539778a..1ca49398ad 100644 --- a/dlls/sapi/tests/token.c +++ b/dlls/sapi/tests/token.c @@ -202,23 +202,23 @@ static void test_object_token(void) ok( cat == (LPVOID)0xdeadbeef, "got %p\n", cat ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, L"bogus", NULL, FALSE ); - todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); + ok( hr == E_POINTER, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE\\winetest bogus", FALSE ); - todo_wine ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); + ok( hr == SPERR_NOT_FOUND, "got %08x\n", hr ); /* SetId succeeds even if the key is invalid, but exists */ hr = ISpObjectToken_SetId( token, NULL, L"HKEY_LOCAL_MACHINE\\SOFTWARE", FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, NULL, FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_SetId( token, NULL, L"bogus", FALSE ); - todo_wine ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); + ok( hr == SPERR_ALREADY_INITIALIZED, "got %08x\n", hr ); hr = ISpObjectToken_GetId( token, NULL ); todo_wine ok( hr == E_POINTER, "got %08x\n", hr ); @@ -265,7 +265,7 @@ static void test_object_token(void) /* NULL appears to auto-detect the category */ hr = ISpObjectToken_SetId( token, NULL, token_id, FALSE ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); tempW = NULL; hr = ISpObjectToken_GetId( token, &tempW ); diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index f7a00d73f0..b4a318b4ad 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -781,6 +781,8 @@ struct object_token { ISpObjectToken ISpObjectToken_iface; LONG ref; + + HKEY token_key; }; static struct object_token *impl_from_ISpObjectToken( ISpObjectToken *iface ) @@ -827,6 +829,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) if (!ref) { + if (This->token_key) RegCloseKey( This->token_key ); heap_free( This ); } @@ -923,8 +926,28 @@ static HRESULT WINAPI token_SetId( ISpObjectToken *iface, LPCWSTR category_id, LPCWSTR token_id, BOOL create ) { - FIXME( "stub\n" ); - return E_NOTIMPL; + struct object_token *This = impl_from_ISpObjectToken( iface ); + BOOL res; + HRESULT hr; + HKEY root, key; + const WCHAR *subkey; + + FIXME( "(%p)->(%s %s %d): semi-stub\n", This, debugstr_w( category_id ), + debugstr_w(token_id), create ); + + if (This->token_key) return SPERR_ALREADY_INITIALIZED; + + if (!token_id) return E_POINTER; + + hr = parse_cat_id( token_id, &root, &subkey ); + if (hr != S_OK) return SPERR_NOT_FOUND; + + res = RegOpenKeyExW( root, subkey, 0, KEY_ALL_ACCESS, &key ); + if (res) return SPERR_NOT_FOUND; + + This->token_key = key; + + return S_OK; } static HRESULT WINAPI token_GetId( ISpObjectToken *iface, @@ -1047,6 +1070,8 @@ HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) This->ISpObjectToken_iface.lpVtbl = &token_vtbl; This->ref = 1; + This->token_key = NULL; + hr = ISpObjectToken_QueryInterface( &This->ISpObjectToken_iface, iid, obj ); ISpObjectToken_Release( &This->ISpObjectToken_iface );

1 0

Gijs Vermeulen : msvcrt: Fix _snprintf_l function signature.
by Alexandre Julliard Sept. 16, 2020

Sept. 16, 2020

Module: wine Branch: master Commit: 6a81e9a436facc8e074f30992a0217680422865f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a81e9a436facc8e074f3099… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Wed Sep 16 18:42:00 2020 +0200 msvcrt: Fix _snprintf_l function signature. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 8d558e4ab8..e6051762d1 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1165,12 +1165,12 @@ int WINAPIV MSVCRT__snprintf(char *str, MSVCRT_size_t len, const char *format, . /********************************************************************* * _snprintf_l (MSVCRT.@) */ -int WINAPIV MSVCRT__snprintf_l(char *str, MSVCRT_size_t count, MSVCRT__locale_t locale, - const char *format, ...) +int WINAPIV MSVCRT__snprintf_l(char *str, MSVCRT_size_t count, const char *format, + MSVCRT__locale_t locale, ...) { int retval; __ms_va_list valist; - __ms_va_start(valist, format); + __ms_va_start(valist, locale); retval = MSVCRT_vsnprintf_l(str, count, format, locale, valist); __ms_va_end(valist); return retval;

1 0