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

Alexandre Julliard : winebuild: Fix retrieving syscall arg length on x86_64.
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 461fc592ad1462c022bcf1c2cebfaee2bb5cc1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=461fc592ad1462c022bcf1c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:47:33 2020 +0200 winebuild: Fix retrieving syscall arg length on x86_64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index b725e81163..edbe8d0c0f 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1498,7 +1498,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\tsubq $0xb,0x8(%%rbp)\n" ); output( "\tcmpq $%u,%%rax\n", count ); output( "\tjae 3f\n" ); - output( "\tmovzbq .Lsyscall_args(%%rip),%%rcx\n" ); + output( "\tleaq .Lsyscall_args(%%rip),%%rcx\n" ); + output( "\tmovzbl (%%rcx,%%rax),%%ecx\n" ); output( "\tsubq $0x20,%%rcx\n" ); output( "\tjbe 1f\n" ); output( "\tsubq %%rcx,%%rsp\n" );

1 0

Alexandre Julliard : ntdll: Return a char pointer instead of an ANSI_STRING in nt_to_unix_file_name().
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: d0a16b7dc99a4040e4e804c04d71a24b3a9d829e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a16b7dc99a4040e4e804c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 09:57:57 2020 +0200 ntdll: Return a char pointer instead of an ANSI_STRING in nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 124 ++++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 8 +-- dlls/ntdll/unix/process.c | 6 +- dlls/ntdll/unix/unix_private.h | 3 +- 4 files changed, 76 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0a16b7dc99a4040e4e8…

1 0

Alexandre Julliard : ntdll: Allocate the return buffer in the caller for wine_nt_to_unix_file_name().
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 368e3a93b8da3641c53f260bb4c96d03d00d1080 URL: https://source.winehq.org/git/wine.git/?a=commit;h=368e3a93b8da3641c53f260b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 09:59:08 2020 +0200 ntdll: Allocate the return buffer in the caller for wine_nt_to_unix_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 18 +++++++++++++++--- dlls/ntdll/directory.c | 4 ++-- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/file.c | 11 +++++++++-- dlls/ntdll/unixlib.h | 2 +- include/winternl.h | 2 +- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 33c39865b9..f958610dbd 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -276,18 +276,30 @@ DWORD /*BOOLEAN*/ WINAPI KERNEL32_Wow64EnableWow64FsRedirection( BOOLEAN enable char * CDECL wine_get_unix_file_name( LPCWSTR dosW ) { UNICODE_STRING nt_name; - ANSI_STRING unix_name; NTSTATUS status; + SIZE_T size = 256; + char *buffer; if (!RtlDosPathNameToNtPathName_U( dosW, &nt_name, NULL, NULL )) return NULL; - status = wine_nt_to_unix_file_name( &nt_name, &unix_name, FILE_OPEN_IF ); + for (;;) + { + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, size ))) + { + RtlFreeUnicodeString( &nt_name ); + return NULL; + } + status = wine_nt_to_unix_file_name( &nt_name, buffer, &size, FILE_OPEN_IF ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + HeapFree( GetProcessHeap(), 0, buffer ); + } RtlFreeUnicodeString( &nt_name ); if (status && status != STATUS_NO_SUCH_FILE) { + HeapFree( GetProcessHeap(), 0, buffer ); SetLastError( RtlNtStatusToDosError( status ) ); return NULL; } - return unix_name.Buffer; + return buffer; } diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 6c78203981..ad129acfb5 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -110,10 +110,10 @@ NTSTATUS WINAPI DECLSPEC_HOTPATCH NtQueryDirectoryFile( HANDLE handle, HANDLE ev * element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is * returned, but the unix name is still filled in properly. */ -NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, +NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, UINT disposition ) { - return unix_funcs->nt_to_unix_file_name( nameW, unix_name_ret, disposition ); + return unix_funcs->nt_to_unix_file_name( nameW, nameA, size, disposition ); } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 3f28e3d5ea..d80a80cf39 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1604,5 +1604,5 @@ @ cdecl __wine_get_unix_codepage() # Filesystem -@ cdecl wine_nt_to_unix_file_name(ptr ptr long) +@ cdecl wine_nt_to_unix_file_name(ptr ptr ptr long) @ cdecl wine_unix_to_nt_file_name(ptr ptr) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 0862b94921..9b6158f2cc 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3427,12 +3427,19 @@ NTSTATUS nt_to_unix_file_name( const UNICODE_STRING *nameW, char **unix_name_ret * element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is * returned, but the unix name is still filled in properly. */ -NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, +NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, UINT disposition ) { char *buffer = NULL; NTSTATUS status = nt_to_unix_file_name( nameW, &buffer, disposition ); - if (buffer) RtlInitAnsiString( unix_name_ret, buffer ); + + if (buffer) + { + if (*size > strlen(buffer)) strcpy( nameA, buffer ); + else status = STATUS_BUFFER_TOO_SMALL; + *size = strlen(buffer) + 1; + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + } return status; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 0c0d2e3250..ca708e45c2 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -332,7 +332,7 @@ struct unix_funcs void (CDECL *server_init_process_done)( void *relay ); /* file functions */ - NTSTATUS (CDECL *nt_to_unix_file_name)( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, + NTSTATUS (CDECL *nt_to_unix_file_name)( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, UINT disposition ); NTSTATUS (CDECL *unix_to_nt_file_name)( const ANSI_STRING *name, UNICODE_STRING *nt ); void (CDECL *set_show_dot_files)( BOOL enable ); diff --git a/include/winternl.h b/include/winternl.h index 4ee32d3c9e..ea2a23f3b6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3371,7 +3371,7 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); /* Wine internal functions */ -NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRING *unix_name_ret, +NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, UINT disposition ); NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt );

1 0

Alexandre Julliard : ntdll: Use char pointers instead of ANSI/UNICODE_STRING in unix_to_nt_file_name().
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 5ebdeaaa372186b4c3a9098676c76423a1781154 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebdeaaa372186b4c3a90986… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 10:01:19 2020 +0200 ntdll: Use char pointers instead of ANSI/UNICODE_STRING in unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 29 ++++++------- dlls/ntdll/unix/file.c | 97 +++++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 25 ++++++----- dlls/ntdll/unix/unix_private.h | 2 +- 4 files changed, 79 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ebdeaaa372186b4c3a9…

1 0

Alexandre Julliard : ntdll: Allocate the buffer in the caller for wine_unix_to_nt_file_name().
by Alexandre Julliard 09 Jul '20

09 Jul '20

Module: wine Branch: master Commit: 6f862a1ad803b1a7037797cedb3624445538afc1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f862a1ad803b1a7037797ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 10:03:15 2020 +0200 ntdll: Allocate the buffer in the caller for wine_unix_to_nt_file_name(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 28 +++++++++++++++------------- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/path.c | 35 +++++++++++++++++++---------------- dlls/ntdll/unix/file.c | 16 +++++++++++++--- dlls/ntdll/unixlib.h | 4 ++-- include/winternl.h | 2 +- 6 files changed, 51 insertions(+), 36 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index f958610dbd..5377c2302b 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -312,36 +312,38 @@ char * CDECL wine_get_unix_file_name( LPCWSTR dosW ) WCHAR * CDECL wine_get_dos_file_name( LPCSTR str ) { UNICODE_STRING nt_name; - ANSI_STRING unix_name; NTSTATUS status; WCHAR *buffer; - DWORD len; + SIZE_T len = strlen(str) + 1; if (str[0] != '/') /* relative path name */ { - len = strlen( str ) + 1; if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; MultiByteToWideChar( CP_UNIXCP, 0, str, len, buffer, len ); status = RtlDosPathNameToNtPathName_U_WithStatus( buffer, &nt_name, NULL, NULL ); RtlFreeHeap( GetProcessHeap(), 0, buffer ); + if (!set_ntstatus( status )) return NULL; + buffer = nt_name.Buffer; + len = nt_name.Length / sizeof(WCHAR) + 1; } else { - RtlInitAnsiString( &unix_name, str ); - status = wine_unix_to_nt_file_name( &unix_name, &nt_name ); + len += 8; /* \??\unix prefix */ + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ))) return NULL; + if (!set_ntstatus( wine_unix_to_nt_file_name( str, buffer, &len ))) + { + HeapFree( GetProcessHeap(), 0, buffer ); + return NULL; + } } - if (!set_ntstatus( status )) return NULL; - if (nt_name.Buffer[5] == ':') + if (buffer[5] == ':') { /* get rid of the \??\ prefix */ /* FIXME: should implement RtlNtPathNameToDosPathName and use that instead */ - len = nt_name.Length - 4 * sizeof(WCHAR); - memmove( nt_name.Buffer, nt_name.Buffer + 4, len ); - nt_name.Buffer[len / sizeof(WCHAR)] = 0; + memmove( buffer, buffer + 4, (len - 4) * sizeof(WCHAR) ); } - else - nt_name.Buffer[1] = '\\'; - return nt_name.Buffer; + else buffer[1] = '\\'; + return buffer; } /************************************************************************* diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d80a80cf39..bd41da37af 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1605,4 +1605,4 @@ # Filesystem @ cdecl wine_nt_to_unix_file_name(ptr ptr ptr long) -@ cdecl wine_unix_to_nt_file_name(ptr ptr) +@ cdecl wine_unix_to_nt_file_name(str ptr ptr) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index fb85942eca..5f2d379071 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -545,26 +545,34 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) if (name[0] == '/') /* may be a Unix path */ { char *unix_name; - ANSI_STRING unix_str; - UNICODE_STRING nt_str; + WCHAR *nt_str; + SIZE_T buflen; + NTSTATUS status; unix_name = RtlAllocateHeap( GetProcessHeap(), 0, 3 * wcslen(name) + 1 ); ntdll_wcstoumbs( name, wcslen(name) + 1, unix_name, 3 * wcslen(name) + 1, FALSE ); - RtlInitAnsiString( &unix_str, unix_name ); - unix_funcs->unix_to_nt_file_name( &unix_str, &nt_str ); - RtlFreeAnsiString( &unix_str ); - if (nt_str.Length > 5 * sizeof(WCHAR) && nt_str.Buffer[5] == ':') + buflen = strlen(unix_name) + 10; + for (;;) { - reqsize = nt_str.Length - 3 * sizeof(WCHAR); + if (!(nt_str = RtlAllocateHeap( GetProcessHeap(), 0, buflen * sizeof(WCHAR) ))) break; + status = unix_funcs->unix_to_nt_file_name( unix_name, nt_str, &buflen ); + if (status != STATUS_BUFFER_TOO_SMALL) break; + RtlFreeHeap( GetProcessHeap(), 0, nt_str ); + } + RtlFreeHeap( GetProcessHeap(), 0, unix_name ); + if (!status && buflen > 6 && nt_str[5] == ':') + { + reqsize = (buflen - 4) * sizeof(WCHAR); if (reqsize <= size) { - memcpy( buffer, nt_str.Buffer + 4, reqsize ); + memcpy( buffer, nt_str + 4, reqsize ); collapse_path( buffer, 3 ); reqsize -= sizeof(WCHAR); } - RtlFreeUnicodeString( &nt_str ); + RtlFreeHeap( GetProcessHeap(), 0, nt_str ); goto done; } + RtlFreeHeap( GetProcessHeap(), 0, nt_str ); } if (cd->Buffer[1] == ':') { @@ -889,12 +897,7 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) /****************************************************************** * wine_unix_to_nt_file_name (NTDLL.@) Not a Windows API */ -NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ) +NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) { - unsigned int lenA = name->Length; - const char *path = name->Buffer; - - if (!lenA) return STATUS_INVALID_PARAMETER; - if (path[0] != '/') return STATUS_INVALID_PARAMETER; /* relative path not supported */ - return unix_funcs->unix_to_nt_file_name( name, nt ); + return unix_funcs->unix_to_nt_file_name( name, buffer, size ); } diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 760fb4c249..9356fb03f4 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3482,11 +3482,21 @@ NTSTATUS unix_to_nt_file_name( const char *name, WCHAR **nt ) /****************************************************************** * wine_unix_to_nt_file_name */ -NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ) +NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ) { WCHAR *nt_name = NULL; - NTSTATUS status = unix_to_nt_file_name( name->Buffer, &nt_name ); - if (nt_name) RtlInitUnicodeString( nt, nt_name ); + NTSTATUS status; + + if (name[0] != '/') return STATUS_INVALID_PARAMETER; /* relative paths are not supported */ + + status = unix_to_nt_file_name( name, &nt_name ); + if (nt_name) + { + if (*size > wcslen(nt_name)) wcscpy( buffer, nt_name ); + else status = STATUS_BUFFER_TOO_SMALL; + *size = wcslen(nt_name) + 1; + RtlFreeHeap( GetProcessHeap(), 0, nt_name ); + } return status; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index ca708e45c2..f39dd2d6d8 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,7 +28,7 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 73 +#define NTDLL_UNIXLIB_VERSION 74 struct unix_funcs { @@ -334,7 +334,7 @@ struct unix_funcs /* file functions */ NTSTATUS (CDECL *nt_to_unix_file_name)( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, UINT disposition ); - NTSTATUS (CDECL *unix_to_nt_file_name)( const ANSI_STRING *name, UNICODE_STRING *nt ); + NTSTATUS (CDECL *unix_to_nt_file_name)( const char *name, WCHAR *buffer, SIZE_T *size ); void (CDECL *set_show_dot_files)( BOOL enable ); /* loader functions */ diff --git a/include/winternl.h b/include/winternl.h index ea2a23f3b6..10d109fede 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3373,7 +3373,7 @@ NTSYSAPI void WINAPI TpWaitForWork(TP_WORK *,BOOL); NTSYSAPI NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, char *nameA, SIZE_T *size, UINT disposition ); -NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const ANSI_STRING *name, UNICODE_STRING *nt ); +NTSYSAPI NTSTATUS CDECL wine_unix_to_nt_file_name( const char *name, WCHAR *buffer, SIZE_T *size ); /***********************************************************************

1 0

Jacek Caban : server: Introduce IOCTL_CONDRV_GET_RENDERER_EVENTS ioctl.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 845156cc3dc8c8c6b1b62fcb57bcdfc25c94e100 URL: https://source.winehq.org/git/wine.git/?a=commit;h=845156cc3dc8c8c6b1b62fcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:29:36 2020 +0200 server: Introduce IOCTL_CONDRV_GET_RENDERER_EVENTS 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 | 62 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/include/wine/condrv.h b/include/wine/condrv.h index f0f6d2ea58..c713ce7314 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -29,6 +29,9 @@ #define IOCTL_CONDRV_PEEK CTL_CODE(FILE_DEVICE_CONSOLE, 12, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_CONDRV_GET_INPUT_INFO CTL_CODE(FILE_DEVICE_CONSOLE, 13, METHOD_BUFFERED, FILE_READ_PROPERTIES) +/* console renderer ioctls */ +#define IOCTL_CONDRV_GET_RENDERER_EVENTS CTL_CODE(FILE_DEVICE_CONSOLE, 70, METHOD_BUFFERED, FILE_READ_PROPERTIES) + /* IOCTL_CONDRV_GET_INPUT_INFO result */ struct condrv_input_info { diff --git a/server/console.c b/server/console.c index ad15578374..a5925adf94 100644 --- a/server/console.c +++ b/server/console.c @@ -116,6 +116,7 @@ struct console_input_events int num_alloc; /* number of allocated events */ int num_used; /* number of actually used events */ struct console_renderer_event *events; + struct async_queue read_q; /* read queue */ }; static const struct object_ops console_input_events_ops = @@ -141,6 +142,8 @@ static const struct object_ops console_input_events_ops = console_input_events_destroy /* destroy */ }; +static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); + static const struct fd_ops console_input_events_fd_ops = { default_fd_get_poll_events, /* get_poll_events */ @@ -151,7 +154,7 @@ static const struct fd_ops console_input_events_fd_ops = no_fd_flush, /* flush */ no_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ - default_fd_ioctl, /* ioctl */ + console_input_events_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -300,6 +303,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 ); + free_async_queue( &evts->read_q ); if (evts->fd) release_object( evts->fd ); free( evts->events ); } @@ -319,12 +323,42 @@ static struct fd *console_input_events_get_fd( struct object* obj ) return (struct fd*)grab_object( evts->fd ); } +/* retrieves events from the console's renderer events list */ +static int get_renderer_events( struct console_input_events* evts, struct async *async ) +{ + struct iosb *iosb = async_get_iosb( async ); + data_size_t num; + + num = min( iosb->out_size / sizeof(evts->events[0]), evts->num_used ); + if (num && !(iosb->out_data = malloc( num * sizeof(evts->events[0] )))) + { + async_terminate( async, STATUS_NO_MEMORY ); + release_object( iosb ); + return 0; + } + + iosb->status = STATUS_SUCCESS; + iosb->out_size = iosb->result = num * sizeof(evts->events[0]); + if (num) memcpy( iosb->out_data, evts->events, iosb->result ); + release_object( iosb ); + async_terminate( async, STATUS_ALERTED ); + + if (num && num < evts->num_used) + { + memmove( &evts->events[0], &evts->events[num], + (evts->num_used - num) * sizeof(evts->events[0]) ); + } + evts->num_used -= num; + return 1; +} + /* add an event to the console's renderer events list */ static void console_input_events_append( struct console_input* console, struct console_renderer_event* evt) { struct console_input_events* evts; int collapsed = FALSE; + struct async *async; if (!(evts = console->evt)) return; /* to be done even when evt has been generated by the renderer ? */ @@ -357,7 +391,12 @@ static void console_input_events_append( struct console_input* console, } evts->events[evts->num_used++] = *evt; } - wake_up( &evts->obj, 0 ); + while (evts->num_used && (async = find_pending_async( &evts->read_q ))) + { + get_renderer_events( evts, async ); + release_object( async ); + } + if (evts->num_used) wake_up( &evts->obj, 0 ); } /* retrieves events from the console's renderer events list */ @@ -382,6 +421,7 @@ static struct console_input_events *create_console_input_events(void) if (!(evt = alloc_object( &console_input_events_ops ))) return NULL; evt->num_alloc = evt->num_used = 0; evt->events = NULL; + init_async_queue( &evt->read_q ); if (!(evt->fd = alloc_pseudo_fd( &console_input_events_fd_ops, &evt->obj, 0 ))) { release_object( evt ); @@ -1600,6 +1640,24 @@ static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async } } +static int console_input_events_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct console_input_events *evts = get_fd_user( fd ); + + switch (code) + { + case IOCTL_CONDRV_GET_RENDERER_EVENTS: + set_error( STATUS_PENDING ); + if (evts->num_used) return get_renderer_events( evts, async ); + queue_async( &evts->read_q, async ); + return 1; + + default: + set_error( STATUS_INVALID_HANDLE ); + return 0; + } +} + static struct object_type *console_device_get_type( struct object *obj ) { static const WCHAR name[] = {'D','e','v','i','c','e'};

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_GET_RENDERER_EVENTS to fetch events.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: a0d325333fb0cba6028a15b924dd115cbbdc0586 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0d325333fb0cba6028a15b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:29:49 2020 +0200 wineconsole: Use IOCTL_CONDRV_GET_RENDERER_EVENTS to fetch events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index e94af41d2b..2820657a70 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -243,20 +243,20 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* void WINECON_GrabChanges(struct inner_data* data) { struct console_renderer_event evts[256]; - int i, num, ev_found; + int i, ev_found; + DWORD num; HANDLE h; if (data->in_grab_changes) return; - SERVER_START_REQ( get_console_renderer_events ) + if (!DeviceIoControl( data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, evts, + sizeof(evts), &num, NULL ) || !num) { - wine_server_set_reply( req, evts, sizeof(evts) ); - req->handle = wine_server_obj_handle( data->hSynchro ); - if (!wine_server_call_err( req )) num = wine_server_reply_size(reply) / sizeof(evts[0]); - else num = 0; + ERR( "failed to get renderer events: %u\n", GetLastError() ); + data->dying = TRUE; + return; } - SERVER_END_REQ; - if (!num) {WINE_WARN("hmm renderer signaled but no events available\n"); return;} + num /= sizeof(*evts); WINE_TRACE( "got %u events\n", num ); /* FIXME: should do some event compression here (cursor pos, update) */

1 0

Jacek Caban : server: Remove no longer needed get_console_renderer_events request.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 378ce9e6bea05fed194d44666eabd7a0d25caffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=378ce9e6bea05fed194d4466… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:31:40 2020 +0200 server: Remove no longer needed get_console_renderer_events request. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/condrv.h | 49 ++++++++++++++++++++++++++++++ include/wine/server_protocol.h | 62 +------------------------------------- programs/wineconsole/wineconsole.c | 2 +- server/console.c | 47 ++++++----------------------- server/protocol.def | 52 -------------------------------- server/request.h | 5 --- server/trace.c | 13 -------- 7 files changed, 61 insertions(+), 169 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=378ce9e6bea05fed194d…

1 0

Jacek Caban : wineconsole: Use OVERLAPPED to wait for console events.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: 340a661723eab4afe2204837716e2b53cc14f5f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=340a661723eab4afe2204837… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:31:55 2020 +0200 wineconsole: Use OVERLAPPED to wait for console events. 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/winecon_private.h | 4 ++++ programs/wineconsole/wineconsole.c | 18 +++++++++++++----- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 6fa669d150..ff38bafe2c 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -1020,7 +1020,7 @@ static int WCCURSES_MainLoop(struct inner_data* data) if (pipe( PRIVATE(data)->sync_pipe ) == -1) return 1; PRIVATE(data)->input_thread = CreateThread( NULL, 0, input_thread, data, 0, &id ); - while (!data->dying && WaitForSingleObject(data->hSynchro, INFINITE) == WAIT_OBJECT_0) + while (!data->dying && WaitForSingleObject(data->overlapped.hEvent, INFINITE) == WAIT_OBJECT_0) { EnterCriticalSection(&PRIVATE(data)->lock); WINECON_GrabChanges(data); diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index de3f4ae98c..67531c0045 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1365,7 +1365,7 @@ static int WCUSER_MainLoop(struct inner_data* data) ShowWindow(data->hWnd, data->nCmdShow); while (!data->dying || !data->curcfg.exit_on_die) { - switch (MsgWaitForMultipleObjects(1, &data->hSynchro, FALSE, INFINITE, QS_ALLINPUT)) + switch (MsgWaitForMultipleObjects(1, &data->overlapped.hEvent, FALSE, INFINITE, QS_ALLINPUT)) { case WAIT_OBJECT_0: WINECON_GrabChanges(data); diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index 54d8782a2a..cdf05e9332 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -22,6 +22,7 @@ #include <windef.h> #include <winbase.h> #include <wincon.h> +#include <wine/condrv.h> #include "wineconsole_res.h" @@ -69,6 +70,9 @@ struct inner_data { BOOL in_grab_changes;/* to handle re-entrant calls to WINECON_GrabChanges */ BOOL dying; /* to TRUE when we've been notified by server that child has died */ + OVERLAPPED overlapped; + struct condrv_renderer_event events[256]; + int (*fnMainLoop)(struct inner_data* data); void (*fnPosCursor)(const struct inner_data* data); void (*fnShapeCursor)(struct inner_data* data, int size, int vis, BOOL force); diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index bc2aef847e..6ccba13c8a 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -27,7 +27,6 @@ #include "winecon_private.h" #include "winnls.h" #include "winuser.h" -#include "wine/condrv.h" #include "wine/unicode.h" #include "wine/debug.h" @@ -242,21 +241,20 @@ static void WINECON_SetColors(struct inner_data *data, const struct config_data* */ void WINECON_GrabChanges(struct inner_data* data) { - struct condrv_renderer_event evts[256]; + struct condrv_renderer_event *evts = data->events; int i, ev_found; DWORD num; HANDLE h; if (data->in_grab_changes) return; - if (!DeviceIoControl( data->hSynchro, IOCTL_CONDRV_GET_RENDERER_EVENTS, NULL, 0, evts, - sizeof(evts), &num, NULL ) || !num) + if (!GetOverlappedResult(data->hSynchro, &data->overlapped, &num, FALSE)) { ERR( "failed to get renderer events: %u\n", GetLastError() ); data->dying = TRUE; return; } - num /= sizeof(*evts); + num /= sizeof(data->events[0]); WINE_TRACE( "got %u events\n", num ); /* FIXME: should do some event compression here (cursor pos, update) */ @@ -400,6 +398,13 @@ 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, + sizeof(data->events), NULL, &data->overlapped) && GetLastError() != ERROR_IO_PENDING) + { + ERR("failed to get renderer events: %u\n", GetLastError()); + data->dying = TRUE; + } } /****************************************************************** @@ -590,6 +595,7 @@ static void WINECON_Delete(struct inner_data* data) if (data->hConOut) CloseHandle(data->hConOut); if (data->hSynchro) CloseHandle(data->hSynchro); if (data->hProcess) CloseHandle(data->hProcess); + if (data->overlapped.hEvent) CloseHandle(data->overlapped.hEvent); HeapFree(GetProcessHeap(), 0, data->curcfg.registry); HeapFree(GetProcessHeap(), 0, data->cells); HeapFree(GetProcessHeap(), 0, data); @@ -676,6 +682,8 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna /* should always be defined */ } + if (!(data->overlapped.hEvent = CreateEventW(NULL, TRUE, TRUE, NULL))) goto error; + /* the handles here are created without the whistles and bells required by console * (mainly because wineconsole doesn't need it) * - they are not inheritable

1 0

Jacek Caban : server: Remove no longer needed supoort for signaling console_input_events object.
by Alexandre Julliard 08 Jul '20

08 Jul '20

Module: wine Branch: master Commit: ca0db956a65f9010983c6723643e50df115ef34a URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca0db956a65f9010983c6723… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 8 16:32:04 2020 +0200 server: Remove no longer needed supoort for signaling console_input_events object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/console.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/server/console.c b/server/console.c index 9494ea84b8..a18892b156 100644 --- a/server/console.c +++ b/server/console.c @@ -106,7 +106,6 @@ static const struct object_ops console_input_ops = static void console_input_events_dump( struct object *obj, int verbose ); static void console_input_events_destroy( struct object *obj ); -static int console_input_events_signaled( struct object *obj, struct wait_queue_entry *entry ); static struct fd *console_input_events_get_fd( struct object *obj ); struct console_input_events @@ -126,7 +125,7 @@ static const struct object_ops console_input_events_ops = no_get_type, /* get_type */ add_queue, /* add_queue */ remove_queue, /* remove_queue */ - console_input_events_signaled, /* signaled */ + NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ console_input_events_get_fd, /* get_fd */ @@ -308,14 +307,6 @@ static void console_input_events_destroy( struct object *obj ) free( evts->events ); } -/* the renderer events list is signaled when it's not empty */ -static int console_input_events_signaled( struct object *obj, struct wait_queue_entry *entry ) -{ - struct console_input_events *evts = (struct console_input_events *)obj; - assert( obj->ops == &console_input_events_ops ); - return (evts->num_used != 0); -} - static struct fd *console_input_events_get_fd( struct object* obj ) { struct console_input_events *evts = (struct console_input_events*)obj; @@ -396,7 +387,6 @@ static void console_input_events_append( struct console_input* console, get_renderer_events( evts, async ); release_object( async ); } - if (evts->num_used) wake_up( &evts->obj, 0 ); } static struct console_input_events *create_console_input_events(void)

1 0