October 2018 - Wine-Commits

Jacek Caban : server: Use default_fd_get_file_info for FileAccessInformation implementation.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 8b8eba7e6cf168541c88b9d8ef1d48af011a5dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b8eba7e6cf168541c88b9d8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:21 2018 +0200 server: Use default_fd_get_file_info for FileAccessInformation implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 24 ++++-------------------- server/fd.c | 18 +++++++++++++++++- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index c784ee6..b571284 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2236,7 +2236,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, sizeof(FILE_STANDARD_INFORMATION), /* FileStandardInformation */ sizeof(FILE_INTERNAL_INFORMATION), /* FileInternalInformation */ sizeof(FILE_EA_INFORMATION), /* FileEaInformation */ - sizeof(FILE_ACCESS_INFORMATION), /* FileAccessInformation */ + 0, /* FileAccessInformation */ sizeof(FILE_NAME_INFORMATION), /* FileNameInformation */ sizeof(FILE_RENAME_INFORMATION)-sizeof(WCHAR), /* FileRenameInformation */ 0, /* FileLinkInformation */ @@ -2309,13 +2309,10 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; - if (class != FileAccessInformation) + if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) { - if ((io->u.Status = server_get_unix_fd( hFile, 0, &fd, &needs_close, NULL, NULL ))) - { - if (io->u.Status != STATUS_BAD_DEVICE_TYPE) return io->u.Status; - return server_get_file_info( hFile, io, ptr, len, class ); - } + if (io->u.Status != STATUS_BAD_DEVICE_TYPE) return io->u.Status; + return server_get_file_info( hFile, io, ptr, len, class ); } switch (class) @@ -2358,19 +2355,6 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, info->EaSize = 0; } break; - case FileAccessInformation: - { - FILE_ACCESS_INFORMATION *info = ptr; - SERVER_START_REQ( get_object_info ) - { - req->handle = wine_server_obj_handle( hFile ); - io->u.Status = wine_server_call( req ); - if (io->u.Status == STATUS_SUCCESS) - info->AccessFlags = reply->access; - } - SERVER_END_REQ; - } - break; case FileEndOfFileInformation: if (fd_get_file_info( fd, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else fill_file_info( &st, attr, ptr, class ); diff --git a/server/fd.c b/server/fd.c index 85d15d9..65dc8a2 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2178,7 +2178,23 @@ void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_ /* default get_file_info() routine */ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) { - set_error( STATUS_NOT_IMPLEMENTED ); + switch (info_class) + { + case FileAccessInformation: + { + FILE_ACCESS_INFORMATION info; + if (get_reply_max_size() < sizeof(info)) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + info.AccessFlags = get_handle_access( current->process, handle ); + set_reply_data( &info, sizeof(info) ); + break; + } + default: + set_error( STATUS_NOT_IMPLEMENTED ); + } } /* default get_volume_info() routine */

1 0

Alexandre Julliard : kernel32: Avoid setting an empty current directory in the process params.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 7a8ff7fab34e765956fbaf29b63226e561cc0045 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a8ff7fab34e765956fbaf29… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:21:06 2018 +0200 kernel32: Avoid setting an empty current directory in the process params. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ea483b9..1490f6d 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1887,8 +1887,9 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( LPCWSTR filename, LPC RtlInitUnicodeString( &desktopW, startup->lpDesktop ); runtimeW.Buffer = (WCHAR *)startup->lpReserved2; runtimeW.Length = runtimeW.MaximumLength = startup->cbReserved2; - if (RtlCreateProcessParametersEx( &params, &imageW, NULL, &curdirW, &cmdlineW, envW, &titleW, - &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) + if (RtlCreateProcessParametersEx( &params, &imageW, NULL, cur_dir ? &curdirW : NULL, + &cmdlineW, envW, &titleW, &desktopW, + NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) { if (envW != env) HeapFree( GetProcessHeap(), 0, envW ); return NULL;

1 0

Dmitry Timoshkov : shell32: Add bitmap resources for ids 133 and 134.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: ed24889dad5a6aeea4867be1056ca76ab6953c42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed24889dad5a6aeea4867be1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Oct 24 15:28:10 2018 +0300 shell32: Add bitmap resources for ids 133 and 134. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/idb_sort_decr.bmp | Bin 0 -> 838 bytes dlls/shell32/resources/idb_sort_incr.bmp | Bin 0 -> 838 bytes dlls/shell32/shell32.rc | 6 ++++++ dlls/shell32/shresdef.h | 3 +++ 4 files changed, 9 insertions(+) diff --git a/dlls/shell32/resources/idb_sort_decr.bmp b/dlls/shell32/resources/idb_sort_decr.bmp new file mode 100644 index 0000000..6956552 Binary files /dev/null and b/dlls/shell32/resources/idb_sort_decr.bmp differ diff --git a/dlls/shell32/resources/idb_sort_incr.bmp b/dlls/shell32/resources/idb_sort_incr.bmp new file mode 100644 index 0000000..0d9b6a2 Binary files /dev/null and b/dlls/shell32/resources/idb_sort_incr.bmp differ diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5c11590..46f0b6f 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -1064,6 +1064,12 @@ IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico /* @makedep: resources/internet.ico */ IDI_SHELL_WEB_BROWSER ICON resources/internet.ico +/* @makedep: resources/idb_sort_incr.bmp */ +IDB_SORT_INCR BITMAP resources/idb_sort_incr.bmp + +/* @makedep: resources/idb_sort_decr.bmp */ +IDB_SORT_DECR BITMAP resources/idb_sort_decr.bmp + /* @makedep: resources/idb_tb_large.bmp */ IDB_TB_LARGE_LIGHT BITMAP resources/idb_tb_large.bmp diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 16c9293..92185d6 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -424,6 +424,9 @@ FIXME: Need to add them, but for now just let them use the same: searching.avi #define IDC_FPROP_ARCHIVE 13021 /* bitmaps */ +#define IDB_SORT_INCR 133 +#define IDB_SORT_DECR 134 + /* explorer toolbar icons * FIXME: images are hacky and should be re-drawn; also dark and light bitmaps are same for now */

1 0

Alexandre Julliard : ntdll: Implement RtlCreateUserProcess().
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 5cc8bcf0b05f6cfd4f60fe371e00ec8a575bec83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc8bcf0b05f6cfd4f60fe37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 12:27:23 2018 +0200 ntdll: Implement RtlCreateUserProcess(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 583 ++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/rtl.c | 13 -- 2 files changed, 578 insertions(+), 18 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc8bcf0b05f6cfd4f60…

1 0

Alexandre Julliard : kernel32: Get std handles from the process parameters.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 33c3cee81771c6437cd73564ed84ab530e7f0185 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33c3cee81771c6437cd73564… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 24 11:32:16 2018 +0200 kernel32: Get std handles from the process parameters. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 799519e..59b6961 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1663,7 +1663,7 @@ static char **build_envp( const WCHAR *envW ) * * Fork and exec a new Unix binary, checking for errors. */ -static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char *newdir, DWORD flags ) +static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char *newdir ) { int fd[2], stdin_fd = -1, stdout_fd = -1, stderr_fd = -1; int pid, err; @@ -1698,7 +1698,8 @@ static int fork_and_exec( const RTL_USER_PROCESS_PARAMETERS *params, const char { close( fd[0] ); - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + if (params->ConsoleFlags || params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC || + (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { int nullfd = open( "/dev/null", O_RDWR ); setsid(); @@ -2035,11 +2036,11 @@ static BOOL terminate_main_thread(void) /*********************************************************************** * spawn_loader */ -static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned int flags, int socketfd, - int stdin_fd, int stdout_fd, const char *unixdir, char *winedebug, - const pe_image_info_t *pe_info ) +static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, int socketfd, + const char *unixdir, char *winedebug, const pe_image_info_t *pe_info ) { pid_t pid; + int stdin_fd = -1, stdout_fd = -1; char *wineloader = NULL; const char *loader = NULL; char **argv; @@ -2049,6 +2050,9 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned i if (!is_win64 ^ !is_64bit_arch( pe_info->cpu )) loader = get_alternate_loader( &wineloader ); + wine_server_handle_to_fd( params->hStdInput, FILE_READ_DATA, &stdin_fd, NULL ); + wine_server_handle_to_fd( params->hStdOutput, FILE_WRITE_DATA, &stdout_fd, NULL ); + if (!(pid = fork())) /* child */ { if (!(pid = fork())) /* grandchild */ @@ -2057,7 +2061,8 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned i ULONGLONG res_start = pe_info->base; ULONGLONG res_end = pe_info->base + pe_info->map_size; - if (flags & (CREATE_NEW_PROCESS_GROUP | CREATE_NEW_CONSOLE | DETACHED_PROCESS)) + if (params->ConsoleFlags || params->ConsoleHandle == KERNEL32_CONSOLE_ALLOC || + (params->hStdInput == INVALID_HANDLE_VALUE && params->hStdOutput == INVALID_HANDLE_VALUE)) { int fd = open( "/dev/null", O_RDWR ); setsid(); @@ -2107,6 +2112,8 @@ static pid_t spawn_loader( const RTL_USER_PROCESS_PARAMETERS *params, unsigned i } while (wret < 0 && errno == EINTR); } + if (stdin_fd != -1) close( stdin_fd ); + if (stdout_fd != -1) close( stdout_fd ); HeapFree( GetProcessHeap(), 0, wineloader ); HeapFree( GetProcessHeap(), 0, argv ); return pid; @@ -2292,7 +2299,7 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ char *winedebug = NULL; startup_info_t *startup_info; DWORD startup_info_size; - int socketfd[2], stdin_fd = -1, stdout_fd = -1; + int socketfd[2]; pid_t pid; int err; @@ -2401,23 +2408,12 @@ static BOOL create_process( HANDLE hFile, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ return FALSE; } - if (!(flags & (CREATE_NEW_CONSOLE | DETACHED_PROCESS))) - { - if (startup_info->hstdin) - wine_server_handle_to_fd( wine_server_ptr_handle(startup_info->hstdin), - FILE_READ_DATA, &stdin_fd, NULL ); - if (startup_info->hstdout) - wine_server_handle_to_fd( wine_server_ptr_handle(startup_info->hstdout), - FILE_WRITE_DATA, &stdout_fd, NULL ); - } HeapFree( GetProcessHeap(), 0, startup_info ); /* create the child process */ - pid = spawn_loader( params, flags, socketfd[0], stdin_fd, stdout_fd, unixdir, winedebug, pe_info ); + pid = spawn_loader( params, socketfd[0], unixdir, winedebug, pe_info ); - if (stdin_fd != -1) close( stdin_fd ); - if (stdout_fd != -1) close( stdout_fd ); close( socketfd[0] ); HeapFree( GetProcessHeap(), 0, winedebug ); if (pid == -1) @@ -2782,7 +2778,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A case BINARY_UNIX_EXE: /* unknown file, try as unix executable */ TRACE( "starting %s as Unix binary\n", debugstr_w(name) ); - retv = (fork_and_exec( params, unixdir, flags ) != -1); + retv = (fork_and_exec( params, unixdir ) != -1); break; } if (hFile) CloseHandle( hFile );

1 0

Jacek Caban : server: Add NtQueryInformationFile( FileIoCompletionNotificationInformation) implementation.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 66e20ce576fd815cffd016f3d36f84c619ea7bc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66e20ce576fd815cffd016f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:42 2018 +0200 server: Add NtQueryInformationFile(FileIoCompletionNotificationInformation) implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 10 ++++++++++ server/fd.c | 12 ++++++++++++ 2 files changed, 22 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c340839..5240854 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1284,6 +1284,11 @@ static void _test_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), + FileIoCompletionNotificationInformation); + ok_(__FILE__,line)(status == STATUS_SUCCESS || broken(status == STATUS_INVALID_INFO_CLASS), + "FileIoCompletionNotificationInformation returned %x\n", status); } #define test_no_file_info(a) _test_no_file_info(__LINE__,a) @@ -1300,6 +1305,11 @@ static void _test_no_file_info(unsigned line, HANDLE handle) status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH, "FileAccessInformation returned %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), + FileIoCompletionNotificationInformation); + ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH || broken(status == STATUS_INVALID_INFO_CLASS), + "FileIoCompletionNotificationInformation returned %x\n", status); } static void test_query_object(void) diff --git a/server/fd.c b/server/fd.c index 65dc8a2..3e73fae 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2192,6 +2192,18 @@ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int set_reply_data( &info, sizeof(info) ); break; } + case FileIoCompletionNotificationInformation: + { + FILE_IO_COMPLETION_NOTIFICATION_INFORMATION info; + if (get_reply_max_size() < sizeof(info)) + { + set_error( STATUS_INFO_LENGTH_MISMATCH ); + return; + } + info.Flags = 0; /* FIXME */ + set_reply_data( &info, sizeof(info) ); + break; + } default: set_error( STATUS_NOT_IMPLEMENTED ); }

1 0

Jacek Caban : server: Use server_get_file_info for all info classes not implemented on client side.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 04094a66694703789768cb230f40ceed2671c0ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=04094a66694703789768cb23… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:06 2018 +0200 server: Use server_get_file_info for all info classes not implemented on client side. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 7 ++----- server/change.c | 2 +- server/device.c | 2 +- server/fd.c | 6 ++++++ server/file.c | 2 +- server/file.h | 1 + server/mailslot.c | 6 +++--- server/named_pipe.c | 26 ++++++++++++++++---------- server/serial.c | 2 +- server/sock.c | 2 +- 10 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 77d2d32..c784ee6 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2200,7 +2200,7 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ; - if (io->u.Status == STATUS_OBJECT_TYPE_MISMATCH) + if (io->u.Status == STATUS_NOT_IMPLEMENTED) FIXME( "Unsupported info class %x\n", info_class ); return io->u.Status; @@ -2305,10 +2305,7 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (class <= 0 || class >= FileMaximumInformation) return io->u.Status = STATUS_INVALID_INFO_CLASS; if (!info_sizes[class]) - { - FIXME("Unsupported class (%d)\n", class); - return io->u.Status = STATUS_NOT_IMPLEMENTED; - } + return server_get_file_info( hFile, io, ptr, len, class ); if (len < info_sizes[class]) return io->u.Status = STATUS_INFO_LENGTH_MISMATCH; diff --git a/server/change.c b/server/change.c index 1f2f7c5..d00a885 100644 --- a/server/change.c +++ b/server/change.c @@ -187,7 +187,7 @@ static const struct fd_ops dir_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/device.c b/server/device.c index dcc2946..081fd2d 100644 --- a/server/device.c +++ b/server/device.c @@ -209,7 +209,7 @@ static const struct fd_ops device_file_fd_ops = device_file_read, /* read */ device_file_write, /* write */ device_file_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ device_file_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/fd.c b/server/fd.c index 4d07797..85d15d9 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2175,6 +2175,12 @@ void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_ set_error( STATUS_OBJECT_TYPE_MISMATCH ); } +/* default get_file_info() routine */ +void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ) +{ + set_error( STATUS_NOT_IMPLEMENTED ); +} + /* default get_volume_info() routine */ void no_fd_get_volume_info( struct fd *fd, unsigned int info_class ) { diff --git a/server/file.c b/server/file.c index 446621a..37f7afe 100644 --- a/server/file.c +++ b/server/file.c @@ -107,7 +107,7 @@ static const struct fd_ops file_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ file_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/file.h b/server/file.h index 8a47333..c30bc96 100644 --- a/server/file.h +++ b/server/file.h @@ -112,6 +112,7 @@ extern int no_fd_read( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_write( struct fd *fd, struct async *async, file_pos_t pos ); extern int no_fd_flush( struct fd *fd, struct async *async ); extern void no_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); +extern void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); extern void no_fd_get_volume_info( struct fd *fd, unsigned int info_class ); extern int no_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); extern int default_fd_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); diff --git a/server/mailslot.c b/server/mailslot.c index f4c7007..95308c4 100644 --- a/server/mailslot.c +++ b/server/mailslot.c @@ -104,7 +104,7 @@ static const struct fd_ops mailslot_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ mailslot_queue_async, /* queue_async */ @@ -159,7 +159,7 @@ static const struct fd_ops mail_writer_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -214,7 +214,7 @@ static const struct fd_ops mailslot_device_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ default_fd_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ diff --git a/server/named_pipe.c b/server/named_pipe.c index ebd8c4f..f643140 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -271,7 +271,7 @@ static const struct fd_ops named_pipe_device_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ named_pipe_device_ioctl, /* ioctl */ default_fd_queue_async, /* queue_async */ @@ -520,12 +520,6 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned struct pipe_end *pipe_end = get_fd_user( fd ); struct named_pipe *pipe = pipe_end->pipe; - if (!pipe) - { - set_error( STATUS_PIPE_DISCONNECTED ); - return; - } - switch (info_class) { case FileNameInformation: @@ -540,13 +534,13 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned return; } - name = get_object_name( &pipe->obj, &name_len ); /* FIXME: We should be able to return on unlinked pipe */ - if (!name) + if (!pipe || !(name = get_object_name( &pipe->obj, &name_len ))) { set_error( STATUS_PIPE_DISCONNECTED ); return; } + reply_size = offsetof( FILE_NAME_INFORMATION, FileName[name_len/sizeof(WCHAR) + 1] ); if (reply_size > get_reply_max_size()) { @@ -577,6 +571,12 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned return; } + if (!pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } + if (!(pipe_info = set_reply_data_size( sizeof(*pipe_info) ))) return; pipe_info->ReadMode = (pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_READ) ? FILE_PIPE_MESSAGE_MODE : FILE_PIPE_BYTE_STREAM_MODE; @@ -600,6 +600,12 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned return; } + if (!pipe) + { + set_error( STATUS_PIPE_DISCONNECTED ); + return; + } + if (!(pipe_info = set_reply_data_size( sizeof(*pipe_info) ))) return; pipe_info->NamedPipeType = (pipe_end->flags & NAMED_PIPE_MESSAGE_STREAM_WRITE) != 0; switch (pipe->sharing) @@ -626,7 +632,7 @@ static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned break; } default: - no_fd_get_file_info( fd, handle, info_class ); + default_fd_get_file_info( fd, handle, info_class ); } } diff --git a/server/serial.c b/server/serial.c index bb976a1..f0adf92 100644 --- a/server/serial.c +++ b/server/serial.c @@ -114,7 +114,7 @@ static const struct fd_ops serial_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ serial_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ diff --git a/server/sock.c b/server/sock.c index 84f54f6..a8e6e28 100644 --- a/server/sock.c +++ b/server/sock.c @@ -167,7 +167,7 @@ static const struct fd_ops sock_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - no_fd_get_file_info, /* get_file_info */ + default_fd_get_file_info, /* get_file_info */ no_fd_get_volume_info, /* get_volume_info */ sock_ioctl, /* ioctl */ sock_queue_async, /* queue_async */

1 0

Jacek Caban : ntdll/tests: Add more NtQueryInformationFile tests.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 6c2ac81084f4e8d66ab3f4361710680f0fdcc74b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c2ac81084f4e8d66ab3f436… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 23 17:45:31 2018 +0200 ntdll/tests: Add more NtQueryInformationFile tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 7eef55c..c340839 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -69,6 +69,7 @@ static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, c static NTSTATUS (WINAPI *pNtReleaseKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); static NTSTATUS (WINAPI *pNtOpenIoCompletion)( PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES ); +static NTSTATUS (WINAPI *pNtQueryInformationFile)(HANDLE, PIO_STATUS_BLOCK, void *, ULONG, FILE_INFORMATION_CLASS); #define KEYEDEVENT_WAIT 0x0001 #define KEYEDEVENT_WAKE 0x0002 @@ -1270,6 +1271,37 @@ static void test_symboliclink(void) pNtClose(dir); } +#define test_file_info(a) _test_file_info(__LINE__,a) +static void _test_file_info(unsigned line, HANDLE handle) +{ + IO_STATUS_BLOCK io; + char buf[256]; + NTSTATUS status; + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); + ok_(__FILE__,line)(status == STATUS_SUCCESS, "FileAccessInformation returned %x\n", status); +} + +#define test_no_file_info(a) _test_no_file_info(__LINE__,a) +static void _test_no_file_info(unsigned line, HANDLE handle) +{ + IO_STATUS_BLOCK io; + char buf[256]; + NTSTATUS status; + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), 0xdeadbeef); + ok_(__FILE__,line)(status == STATUS_INVALID_INFO_CLASS || status == STATUS_NOT_IMPLEMENTED, + "expected STATUS_NOT_IMPLEMENTED, got %x\n", status); + + status = pNtQueryInformationFile(handle, &io, buf, sizeof(buf), FileAccessInformation); + ok_(__FILE__,line)(status == STATUS_OBJECT_TYPE_MISMATCH, + "FileAccessInformation returned %x\n", status); +} + static void test_query_object(void) { static const WCHAR name[] = {'\\','B','a','s','e','N','a','m','e','d','O','b','j','e','c','t','s', @@ -1351,6 +1383,7 @@ static void test_query_object(void) ok( status == STATUS_INFO_LENGTH_MISMATCH, "NtQueryObject failed %x\n", status ); ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + sizeof(type_event) + sizeof(WCHAR), "unexpected len %u\n", len ); + test_no_file_info( handle ); pNtClose( handle ); handle = CreateEventA( NULL, FALSE, FALSE, NULL ); @@ -1361,6 +1394,7 @@ static void test_query_object(void) str = (UNICODE_STRING *)buffer; ok( str->Length == 0, "unexpected len %u\n", len ); ok( str->Buffer == NULL, "unexpected ptr %p\n", str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); GetWindowsDirectoryA( dir, MAX_PATH ); @@ -1401,6 +1435,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_file_info( handle ); pNtClose( handle ); @@ -1418,6 +1453,7 @@ static void test_query_object(void) ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); DeleteFileA( file1 ); + test_file_info( handle ); pNtClose( handle ); status = pNtCreateIoCompletion( &handle, IO_COMPLETION_ALL_ACCESS, NULL, 0 ); @@ -1432,6 +1468,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_iocompletion, sizeof(type_iocompletion) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); status = pNtCreateDirectoryObject( &handle, DIRECTORY_QUERY, NULL ); @@ -1446,6 +1483,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_directory, sizeof(type_directory) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); size.u.LowPart = 256; @@ -1462,6 +1500,7 @@ static void test_query_object(void) ok( len >= expected_len, "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_section, sizeof(type_section) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_no_file_info( handle ); pNtClose( handle ); handle = CreateMailslotA( "\\\\.\\mailslot\\test_mailslot", 100, 1000, NULL ); @@ -1478,6 +1517,7 @@ static void test_query_object(void) ok( len > sizeof(UNICODE_STRING) + sizeof("\\test_mailslot") * sizeof(WCHAR), "name too short %s\n", wine_dbgstr_w(str->Buffer) ); trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + test_file_info( handle ); pNtClose( handle ); handle = CreateNamedPipeA( "\\\\.\\pipe\\test_pipe", PIPE_ACCESS_DUPLEX, PIPE_READMODE_BYTE, @@ -1508,6 +1548,7 @@ static void test_query_object(void) ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_file_info( handle ); client = CreateFileA( "\\\\.\\pipe\\test_pipe", GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0 ); @@ -1522,6 +1563,7 @@ static void test_query_object(void) ok( len >= sizeof(OBJECT_TYPE_INFORMATION) + str->Length + sizeof(WCHAR), "unexpected len %u\n", len ); ok( str->Buffer && !memcmp( str->Buffer, type_file, sizeof(type_file) ), "wrong/bad type name %s (%p)\n", wine_dbgstr_w(str->Buffer), str->Buffer ); + test_file_info( client ); pNtClose( client ); pNtClose( handle ); @@ -2064,6 +2106,7 @@ START_TEST(om) pNtReleaseKeyedEvent = (void *)GetProcAddress(hntdll, "NtReleaseKeyedEvent"); pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion"); + pNtQueryInformationFile = (void *)GetProcAddress(hntdll, "NtQueryInformationFile"); test_case_sensitive(); test_namespace_pipe();

1 0

Nikolay Sivov : gdiplus: Implement GdipRotatePenTransform().
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 363326678cd2f473b6fcf3d141846fa79007837d URL: https://source.winehq.org/git/wine.git/?a=commit;h=363326678cd2f473b6fcf3d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 00:04:18 2018 +0300 gdiplus: Implement GdipRotatePenTransform(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/pen.c | 7 +------ dlls/gdiplus/tests/pen.c | 38 ++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/pen.c b/dlls/gdiplus/pen.c index ad45bcb..8bcb918 100644 --- a/dlls/gdiplus/pen.c +++ b/dlls/gdiplus/pen.c @@ -480,17 +480,12 @@ GpStatus WINGDIPAPI GdipScalePenTransform(GpPen *pen, REAL sx, REAL sy, GpMatrix GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen *pen, REAL angle, GpMatrixOrder order) { - static int calls; - TRACE("(%p,%0.2f,%u)\n", pen, angle, order); if(!pen) return InvalidParameter; - if(!(calls++)) - FIXME("not implemented\n"); - - return NotImplemented; + return GdipRotateMatrix(&pen->transform, angle, order); } GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *pen, GDIPCONST GpMatrix *matrix, diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 530967a..ceab92a 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -588,6 +588,44 @@ static void test_transform(void) expectf(-15.0, values[4]); expectf(-76.0, values[5]); + /* Rotate */ + status = GdipResetPenTransform(pen); + expect(Ok, status); + + status = GdipSetMatrixElements(matrix, 2.0, 1.0, 1.0, 4.0, 1.0, 2.0); + expect(Ok, status); + + status = GdipSetPenTransform(pen, matrix); + expect(Ok, status); + + status = GdipRotatePenTransform(NULL, 10.0, MatrixOrderPrepend); + expect(InvalidParameter, status); + + status = GdipRotatePenTransform(pen, 45.0, MatrixOrderPrepend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(2.12, values[0]); + expectf(3.54, values[1]); + expectf(-0.71, values[2]); + expectf(2.12, values[3]); + expectf(1.0, values[4]); + expectf(2.0, values[5]); + + status = GdipScalePenTransform(pen, 2.0, -10.0, MatrixOrderAppend); + expect(Ok, status); + + status = GdipRotatePenTransform(pen, 180.0, MatrixOrderAppend); + expect(Ok, status); + + get_pen_transform(pen, values); + expectf(-4.24, values[0]); + expectf(35.36, values[1]); + expectf(1.41, values[2]); + expectf(21.21, values[3]); + expectf(-2.0, values[4]); + expectf(20.0, values[5]); + GdipDeletePen(pen); GdipDeleteMatrix(matrix); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 5593ac5..ad944d6 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -631,6 +631,7 @@ GpStatus WINGDIPAPI GdipGetPenMode(GpPen*,GpPenAlignment*); GpStatus WINGDIPAPI GdipGetPenTransform(GpPen *, GpMatrix *); GpStatus WINGDIPAPI GdipMultiplyPenTransform(GpPen *,GDIPCONST GpMatrix *,GpMatrixOrder); GpStatus WINGDIPAPI GdipResetPenTransform(GpPen*); +GpStatus WINGDIPAPI GdipRotatePenTransform(GpPen*,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipScalePenTransform(GpPen*,REAL,REAL,GpMatrixOrder); GpStatus WINGDIPAPI GdipSetPenBrushFill(GpPen*,GpBrush*); GpStatus WINGDIPAPI GdipSetPenColor(GpPen*,ARGB);

1 0

Nikolay Sivov : start: Try cycling through extensions if original path failed to execute.
by Alexandre Julliard Oct. 24, 2018

Oct. 24, 2018

Module: wine Branch: master Commit: 1c9365488553ff5fe21b710b25d2808583bf1a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9365488553ff5fe21b710b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 24 14:32:14 2018 +0300 start: Try cycling through extensions if original path failed to execute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/start/start.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/programs/start/start.c b/programs/start/start.c index 32372ec..ccec9bc 100644 --- a/programs/start/start.c +++ b/programs/start/start.c @@ -403,7 +403,55 @@ int wmain (int argc, WCHAR *argv[]) } if (!ShellExecuteExW(&sei)) - fatal_string_error(STRING_EXECFAIL, GetLastError(), sei.lpFile); + { + static const WCHAR pathextW[] = {'P','A','T','H','E','X','T',0}; + const WCHAR *filename = sei.lpFile; + DWORD size, filename_len; + WCHAR *name, *env; + + size = GetEnvironmentVariableW(pathextW, NULL, 0); + if (size) + { + WCHAR *start, *ptr; + + env = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + if (!env) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + GetEnvironmentVariableW(pathextW, env, size); + + filename_len = strlenW(filename); + name = HeapAlloc(GetProcessHeap(), 0, (filename_len + size) * sizeof(WCHAR)); + if (!name) + fatal_string_error(STRING_EXECFAIL, ERROR_OUTOFMEMORY, sei.lpFile); + + sei.lpFile = name; + start = env; + while ((ptr = strchrW(start, ';'))) + { + if (start == ptr) + { + start = ptr + 1; + continue; + } + + strcpyW(name, filename); + memcpy(&name[filename_len], start, (ptr - start) * sizeof(WCHAR)); + name[filename_len + (ptr - start)] = 0; + + if (ShellExecuteExW(&sei)) + { + HeapFree(GetProcessHeap(), 0, name); + HeapFree(GetProcessHeap(), 0, env); + goto done; + } + + start = ptr + 1; + } + + } + + fatal_string_error(STRING_EXECFAIL, GetLastError(), filename); + } done: HeapFree( GetProcessHeap(), 0, args );

1 0