February 2021 - Wine-Commits

Erich E. Hoover : ntoskrnl.exe: Implement volume information queries for device files.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: a656ca5e32be7d5d606ba71da288de97b9a8dd80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a656ca5e32be7d5d606ba71d… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Wed Oct 28 13:39:50 2020 -0600 ntoskrnl.exe: Implement volume information queries for device files. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 50 ++++++++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.c | 42 ++++++++++++++++++++++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 11 +++++++++ include/wine/server_protocol.h | 11 ++++++++- server/device.c | 18 +++++++++++++- server/protocol.def | 9 +++++++ server/trace.c | 6 +++++ 7 files changed, 145 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a656ca5e32be7d5d606b…

1 0

Erich E. Hoover : server: Allow volume information queries to be asynchronous.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 61d7629ba498f5375e2c7b6dfbdd89ff295d1bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61d7629ba498f5375e2c7b6d… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sat May 23 21:39:41 2020 -0600 server: Allow volume information queries to be asynchronous. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 7 +++++-- server/console.c | 5 +++-- server/fd.c | 13 +++++++++---- server/file.h | 4 ++-- server/named_pipe.c | 5 +++-- server/protocol.def | 2 ++ server/request.h | 8 +++++--- server/trace.c | 4 +++- 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index d2a361df26d..a7f1cdef053 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1688,13 +1688,16 @@ struct get_volume_info_request { struct request_header __header; obj_handle_t handle; + async_data_t async; unsigned int info_class; - char __pad_20[4]; + char __pad_60[4]; }; struct get_volume_info_reply { struct reply_header __header; + obj_handle_t wait; /* VARARG(data,bytes); */ + char __pad_12[4]; }; @@ -6266,7 +6269,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 675 +#define SERVER_PROTOCOL_VERSION 676 /* ### protocol_version end ### */ diff --git a/server/console.c b/server/console.c index cd6076f0033..92bda51846c 100644 --- a/server/console.c +++ b/server/console.c @@ -99,7 +99,7 @@ static const struct object_ops console_ops = static enum server_fd_type console_get_fd_type( struct fd *fd ); static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); -static void console_get_volume_info( struct fd *fd, unsigned int info_class ); +static int console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static int console_read( struct fd *fd, struct async *async, file_pos_t pos ); static int console_flush( struct fd *fd, struct async *async ); static int console_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); @@ -480,7 +480,7 @@ static void console_get_file_info( struct fd *fd, obj_handle_t handle, unsigned set_error( STATUS_INVALID_DEVICE_REQUEST ); } -static void console_get_volume_info( struct fd *fd, unsigned int info_class ) +static int console_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) { switch (info_class) { @@ -500,6 +500,7 @@ static void console_get_volume_info( struct fd *fd, unsigned int info_class ) default: set_error( STATUS_NOT_IMPLEMENTED ); } + return 0; } static struct object *create_console(void) diff --git a/server/fd.c b/server/fd.c index 2dcdd04a892..65a6f876e5c 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2369,9 +2369,10 @@ void default_fd_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int } /* default get_volume_info() routine */ -void no_fd_get_volume_info( struct fd *fd, unsigned int info_class ) +int no_fd_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) { set_error( STATUS_OBJECT_TYPE_MISMATCH ); + return 0; } /* default ioctl() routine */ @@ -2666,12 +2667,16 @@ DECL_HANDLER(get_file_info) DECL_HANDLER(get_volume_info) { struct fd *fd = get_handle_fd_obj( current->process, req->handle, 0 ); + struct async *async; - if (fd) + if (!fd) return; + + if ((async = create_request_async( fd, fd->comp_flags, &req->async ))) { - fd->fd_ops->get_volume_info( fd, req->info_class ); - release_object( fd ); + reply->wait = async_handoff( async, fd->fd_ops->get_volume_info( fd, async, req->info_class ), NULL, 1 ); + release_object( async ); } + release_object( fd ); } /* open a file object */ diff --git a/server/file.h b/server/file.h index 3b70799a3ec..fbfd1e4eec9 100644 --- a/server/file.h +++ b/server/file.h @@ -65,7 +65,7 @@ struct fd_ops /* query file info */ void (*get_file_info)( struct fd *, obj_handle_t, unsigned int ); /* query volume info */ - void (*get_volume_info)( struct fd *, unsigned int ); + int (*get_volume_info)( struct fd *, struct async *, unsigned int ); /* perform an ioctl on the file */ int (*ioctl)(struct fd *fd, ioctl_code_t code, struct async *async ); /* queue an async operation */ @@ -114,7 +114,7 @@ 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_get_volume_info( struct fd *fd, struct async *async, 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 ); extern void no_fd_queue_async( struct fd *fd, struct async *async, int type, int count ); diff --git a/server/named_pipe.c b/server/named_pipe.c index 2e80ef3b1aa..a3ce9d463f1 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -146,7 +146,7 @@ static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ); static int pipe_end_read( struct fd *fd, struct async *async, file_pos_t pos ); static int pipe_end_write( struct fd *fd, struct async *async_data, file_pos_t pos ); static int pipe_end_flush( struct fd *fd, struct async *async ); -static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ); +static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static void pipe_end_reselect_async( struct fd *fd, struct async_queue *queue ); static void pipe_end_get_file_info( struct fd *fd, obj_handle_t handle, unsigned int info_class ); @@ -742,7 +742,7 @@ static WCHAR *pipe_end_get_full_name( struct object *obj, data_size_t *len ) return pipe_end->pipe->obj.ops->get_full_name( &pipe_end->pipe->obj, len ); } -static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) +static int pipe_end_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ) { switch (info_class) { @@ -762,6 +762,7 @@ static void pipe_end_get_volume_info( struct fd *fd, unsigned int info_class ) default: set_error( STATUS_NOT_IMPLEMENTED ); } + return 0; } static void message_queue_read( struct pipe_end *pipe_end, struct iosb *iosb ) diff --git a/server/protocol.def b/server/protocol.def index f85826cc277..8ba8bc85b82 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1392,8 +1392,10 @@ enum server_fd_type /* Query volume information */ @REQ(get_volume_info) obj_handle_t handle; /* handle to the file */ + async_data_t async; /* async I/O parameters */ unsigned int info_class; /* queried information class */ @REPLY + obj_handle_t wait; /* handle to wait on for blocking read */ VARARG(data,bytes); /* volume info data */ @END diff --git a/server/request.h b/server/request.h index d1bfd746f39..e7ea5b0bdd6 100644 --- a/server/request.h +++ b/server/request.h @@ -1032,9 +1032,11 @@ C_ASSERT( FIELD_OFFSET(struct get_file_info_request, info_class) == 16 ); C_ASSERT( sizeof(struct get_file_info_request) == 24 ); C_ASSERT( sizeof(struct get_file_info_reply) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_volume_info_request, handle) == 12 ); -C_ASSERT( FIELD_OFFSET(struct get_volume_info_request, info_class) == 16 ); -C_ASSERT( sizeof(struct get_volume_info_request) == 24 ); -C_ASSERT( sizeof(struct get_volume_info_reply) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_volume_info_request, async) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_volume_info_request, info_class) == 56 ); +C_ASSERT( sizeof(struct get_volume_info_request) == 64 ); +C_ASSERT( FIELD_OFFSET(struct get_volume_info_reply, wait) == 8 ); +C_ASSERT( sizeof(struct get_volume_info_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct lock_file_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct lock_file_request, offset) == 16 ); C_ASSERT( FIELD_OFFSET(struct lock_file_request, count) == 24 ); diff --git a/server/trace.c b/server/trace.c index 5265cc69a15..842715e2836 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1993,12 +1993,14 @@ static void dump_get_file_info_reply( const struct get_file_info_reply *req ) static void dump_get_volume_info_request( const struct get_volume_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + dump_async_data( ", async=", &req->async ); fprintf( stderr, ", info_class=%08x", req->info_class ); } static void dump_get_volume_info_reply( const struct get_volume_info_reply *req ) { - dump_varargs_bytes( " data=", cur_size ); + fprintf( stderr, " wait=%04x", req->wait ); + dump_varargs_bytes( ", data=", cur_size ); } static void dump_lock_file_request( const struct lock_file_request *req )

1 0

Erich E. Hoover : ntdll: Use st_rdev for special devices in get_mountmgr_fs_info.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 09c67c4809822e177d70d2a06d12f7f57ce01487 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09c67c4809822e177d70d2a0… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Feb 11 15:27:51 2021 -0700 ntdll: Use st_rdev for special devices in get_mountmgr_fs_info. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 6337433ed80..e147fb47391 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1968,7 +1968,7 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni struct stat st; fstat( fd, &st ); - drive->unix_dev = st.st_dev; + drive->unix_dev = st.st_rdev ? st.st_rdev : st.st_dev; drive->letter = 0; } else

1 0

Alexandre Julliard : ntdll: Set the initial environment and command line in the process parameters on the Unix side.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 528f9d3217c2eed9ba8a8c643668660a9a047d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=528f9d3217c2eed9ba8a8c64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:43:56 2021 +0100 ntdll: Set the initial environment and command line in the process parameters on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 224 +++++++++-------------------------------- dlls/ntdll/unix/env.c | 174 ++++++++++++++++++++++++++++---- dlls/ntdll/unix/loader.c | 3 - dlls/ntdll/unix/unix_private.h | 3 - dlls/ntdll/unixlib.h | 5 +- 5 files changed, 198 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=528f9d3217c2eed9ba8a…

1 0

Bernhard Reiter : imagehlp: Partially implement BindImageEx().
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: d129a89d228190baeb8983ecfc18e093255148b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d129a89d228190baeb8983ec… Author: Bernhard Reiter <ockham(a)raz.or.at> Date: Sat Feb 13 11:30:11 2021 -0600 imagehlp: Partially implement BindImageEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=3591 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/modify.c | 91 +++++++++++++++++++++++++++++++++++++++++---- dlls/imagehlp/tests/image.c | 10 ++--- 2 files changed, 88 insertions(+), 13 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 434a666ae94..d740d221bfc 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -44,15 +44,90 @@ BOOL WINAPI BindImage( /*********************************************************************** * BindImageEx (IMAGEHLP.@) */ -BOOL WINAPI BindImageEx( - DWORD Flags, PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath, - PIMAGEHLP_STATUS_ROUTINE StatusRoutine) +BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, + const char *symbol_path, PIMAGEHLP_STATUS_ROUTINE cb) { - FIXME("(%d, %s, %s, %s, %p): stub\n", - Flags, debugstr_a(ImageName), debugstr_a(DllPath), - debugstr_a(SymbolPath), StatusRoutine - ); - return TRUE; + const IMAGE_IMPORT_DESCRIPTOR *import; + LOADED_IMAGE image; + ULONG size; + + TRACE("flags %#x, module %s, dll_path %s, symbol_path %s, cb %p.\n", + flags, debugstr_a(module), debugstr_a(dll_path), debugstr_a(symbol_path), cb); + + if (!(flags & BIND_NO_UPDATE)) + FIXME("Image modification is not implemented.\n"); + if (flags & ~BIND_NO_UPDATE) + FIXME("Ignoring flags %#x.\n", flags); + + if (!MapAndLoad(module, dll_path, &image, TRUE, TRUE)) + return FALSE; + + if (!(import = ImageDirectoryEntryToData(image.MappedAddress, FALSE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size))) + { + UnMapAndLoad(&image); + return TRUE; /* no imports */ + } + + if (image.FileHeader->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) + { + FIXME("Unhandled architecture %#x.\n", image.FileHeader->OptionalHeader.Magic); + UnMapAndLoad(&image); + return TRUE; + } + + for (; import->Name && import->FirstThunk; ++import) + { + char full_path[MAX_PATH]; + IMAGE_THUNK_DATA *thunk; + const char *dll_name; + DWORD thunk_rva; + + if (!(dll_name = ImageRvaToVa(image.FileHeader, image.MappedAddress, import->Name, 0))) + { + ERR("Failed to get VA for import name RVA %#x.\n", import->Name); + continue; + } + + if (cb) cb(BindImportModule, module, dll_name, 0, 0); + + if (!SearchPathA(dll_path, dll_name, 0, sizeof(full_path), full_path, 0)) + { + ERR("Import %s was not found.\n", debugstr_a(dll_path)); + continue; + } + + thunk_rva = import->OriginalFirstThunk ? import->OriginalFirstThunk : import->FirstThunk; + if (!(thunk = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk_rva, 0))) + { + ERR("Failed to get VA for import thunk RVA %#x.\n", thunk_rva); + continue; + } + + for (; thunk->u1.Ordinal; ++thunk) + { + if (IMAGE_SNAP_BY_ORDINAL(thunk->u1.Ordinal)) + { + /* FIXME: We apparently need to subtract the actual module's + * ordinal base. */ + FIXME("Ordinal imports are not implemented.\n"); + } + else + { + IMAGE_IMPORT_BY_NAME *name; + + if (!(name = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk->u1.AddressOfData, 0))) + { + ERR("Failed to get VA for name RVA %#x.\n", thunk->u1.AddressOfData); + continue; + } + + if (cb) cb(BindImportProcedure, module, full_path, 0, (ULONG_PTR)name->Name); + } + } + } + + UnMapAndLoad(&image); + return TRUE; } diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 888744ac203..e2aa9485510 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -372,7 +372,7 @@ static BOOL WINAPI bind_image_cb(IMAGEHLP_STATUS_REASON reason, const char *file char full_path[MAX_PATH]; BOOL ret; - ok(!!va, "expected nonzero VA\n"); + todo_wine ok(!!va, "expected nonzero VA\n"); ret = SearchPathA(NULL, last_module, ".dll", sizeof(full_path), full_path, NULL); ok(ret, "got error %u\n", GetLastError()); ok(!strcmp(module, full_path), "expected %s, got %s\n", debugstr_a(full_path), debugstr_a(module)); @@ -408,15 +408,15 @@ static void test_bind_image_ex(void) SetLastError(0xdeadbeef); ret = BindImageEx(BIND_ALL_IMAGES | BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE, "nonexistent.dll", 0, 0, bind_image_cb); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); ret = BindImageEx(BIND_ALL_IMAGES | BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE, filename, NULL, NULL, bind_image_cb); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(got_SysAllocString == 1, "got %u imports of SysAllocString\n", got_SysAllocString); - todo_wine ok(got_GetOpenFileNameA == 1, "got %u imports of GetOpenFileNameA\n", got_GetOpenFileNameA); + ok(got_SysAllocString == 1, "got %u imports of SysAllocString\n", got_SysAllocString); + ok(got_GetOpenFileNameA == 1, "got %u imports of GetOpenFileNameA\n", got_GetOpenFileNameA); todo_wine ok(got_SHRegGetIntW == 1, "got %u imports of SHRegGetIntW\n", got_SHRegGetIntW); ret = DeleteFileA(filename);

1 0

Alexandre Julliard : server: Store a filename for memory views of .so dlls.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 9ce326eea026f99ecc7c1e45084e8fd53105e8a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ce326eea026f99ecc7c1e45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:24:15 2021 +0100 server: Store a filename for memory views of .so dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 9 +++++---- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 5 +++-- include/wine/server_protocol.h | 3 ++- server/mapping.c | 25 +++++++++++++++++++------ server/protocol.def | 1 + server/trace.c | 3 ++- 7 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e8853415205..b82bc10485b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -981,7 +981,8 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) /*********************************************************************** * dlopen_dll */ -static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_info_t *image_info ) +static NTSTATUS dlopen_dll( const char *so_name, UNICODE_STRING *nt_name, + void **ret_module, pe_image_info_t *image_info ) { struct builtin_module *builtin; void *module, *handle; @@ -1028,7 +1029,7 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_inf dlclose( handle ); return STATUS_NO_MEMORY; } - virtual_create_builtin_view( module, image_info ); + virtual_create_builtin_view( module, nt_name, image_info ); *ret_module = module; return STATUS_SUCCESS; @@ -1107,7 +1108,7 @@ static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) len = nt_name->Length / sizeof(WCHAR); if (len > 3 && !wcsicmp( nt_name->Buffer + len - 3, soW )) nt_name->Length -= 3 * sizeof(WCHAR); - status = dlopen_dll( unix_name, module, &info ); + status = dlopen_dll( unix_name, nt_name, module, &info ); free( unix_name ); return status; } @@ -1261,7 +1262,7 @@ static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, HANDLE * { pe_image_info_t info; - if (!dlopen_dll( name, module, &info )) + if (!dlopen_dll( name, attr->ObjectName, module, &info )) { virtual_fill_image_information( &info, image_info ); status = STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 292a38043dd..af8a14a8c65 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -179,7 +179,8 @@ extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_name, + pe_image_info_t *info ) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index e0346a28ea3..c35f9c2fc07 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2483,7 +2483,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_create_builtin_view */ -NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) +NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_name, pe_image_info_t *info ) { NTSTATUS status; sigset_t sigset; @@ -2500,7 +2500,7 @@ NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); if (!status) { - TRACE( "created %p-%p\n", base, (char *)base + size ); + TRACE( "created %p-%p for %s\n", base, (char *)base + size, debugstr_us(nt_name) ); /* The PE header is always read-only, no write, no execute. */ set_page_vprot( base, page_size, VPROT_COMMITTED | VPROT_READ ); @@ -2521,6 +2521,7 @@ NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) req->base = wine_server_client_ptr( view->base ); req->size = size; wine_server_add_data( req, info, sizeof(*info) ); + wine_server_add_data( req, nt_name->Buffer, nt_name->Length ); status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9b9626c1c84..d2a361df26d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1923,6 +1923,7 @@ struct map_view_request mem_size_t size; file_pos_t start; /* VARARG(image,pe_image_info); */ + /* VARARG(name,unicode_str); */ }; struct map_view_reply { @@ -6265,7 +6266,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 674 +#define SERVER_PROTOCOL_VERSION 675 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 0e97391f74b..17c7ca26b3a 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -134,6 +134,8 @@ struct memory_view client_ptr_t base; /* view base address (in process addr space) */ mem_size_t size; /* view size */ file_pos_t start; /* start offset in mapping */ + data_size_t namelen; + WCHAR name[1]; /* filename for .so dll image views */ }; @@ -1000,6 +1002,12 @@ const pe_image_info_t *get_view_image_info( const struct memory_view *view, clie /* get the file name for a mapped view */ int get_view_nt_name( const struct memory_view *view, struct unicode_str *name ) { + if (view->namelen) /* .so builtin */ + { + name->str = view->name; + name->len = view->namelen; + return 1; + } if (!view->fd) return 0; get_nt_name( view->fd, name ); return 1; @@ -1157,6 +1165,7 @@ DECL_HANDLER(map_view) { struct mapping *mapping = NULL; struct memory_view *view; + data_size_t namelen = 0; if (!req->size || (req->base & page_mask) || req->base + req->size < req->base) /* overflow */ { @@ -1175,13 +1184,16 @@ DECL_HANDLER(map_view) if (!req->mapping) /* image mapping for a .so dll */ { - if (!(view = mem_alloc( sizeof(*view) ))) return; + if (get_req_data_size() > sizeof(view->image)) namelen = get_req_data_size() - sizeof(view->image); + if (!(view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) return; memset( view, 0, sizeof(*view) ); - view->base = req->base; - view->size = req->size; - view->start = req->start; - view->flags = SEC_IMAGE; + view->base = req->base; + view->size = req->size; + view->start = req->start; + view->flags = SEC_IMAGE; + view->namelen = namelen; memcpy( &view->image, get_req_data(), min( sizeof(view->image), get_req_data_size() )); + memcpy( view->name, (pe_image_info_t *)get_req_data() + 1, namelen ); add_process_view( current, view ); return; } @@ -1204,12 +1216,13 @@ DECL_HANDLER(map_view) goto done; } - if ((view = mem_alloc( sizeof(*view) ))) + if ((view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) { view->base = req->base; view->size = req->size; view->start = req->start; view->flags = mapping->flags; + view->namelen = namelen; view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; diff --git a/server/protocol.def b/server/protocol.def index caed5c37352..f85826cc277 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1540,6 +1540,7 @@ enum server_fd_type mem_size_t size; /* view size */ file_pos_t start; /* start offset in mapping */ VARARG(image,pe_image_info);/* image info for .so builtins */ + VARARG(name,unicode_str); /* image filename for .so builtins */ @END diff --git a/server/trace.c b/server/trace.c index 8984b75590d..5265cc69a15 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1308,7 +1308,7 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) info.header_size, info.file_size, info.checksum ); dump_client_cpu( ",cpu=", &info.cpu ); fputc( '}', stderr ); - remove_data( size ); + remove_data( min( size, sizeof(info) )); } static void dump_varargs_rawinput_devices(const char *prefix, data_size_t size ) @@ -2158,6 +2158,7 @@ static void dump_map_view_request( const struct map_view_request *req ) dump_uint64( ", size=", &req->size ); dump_uint64( ", start=", &req->start ); dump_varargs_pe_image_info( ", image=", cur_size ); + dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_unmap_view_request( const struct unmap_view_request *req )

1 0

Nikolay Sivov : mfplat: Fix use-after-free when releasing sample allocator.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 3cef5238bdaa5b08b6d0115211d1f45d459258d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cef5238bdaa5b08b6d01152… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 15 14:33:28 2021 +0300 mfplat: Fix use-after-free when releasing sample allocator. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/sample.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 4ecce4fbe84..10d2b7bc2a8 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -1174,8 +1174,6 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface) IDirect3DDeviceManager9_Release(allocator->d3d9_device_manager); if (allocator->dxgi_device_manager) IMFDXGIDeviceManager_Release(allocator->dxgi_device_manager); - if (allocator->attributes) - IMFAttributes_Release(allocator->attributes); sample_allocator_set_media_type(allocator, NULL); sample_allocator_set_attributes(allocator, NULL); sample_allocator_release_samples(allocator);

1 0

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.170.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 7e85f53d28e1c821638a79c40d2a0db39b30458f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e85f53d28e1c821638a79c4… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Feb 15 02:18:48 2021 -0800 winevulkan: Update to VK spec version 1.2.170. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vulkan-1/vulkan-1.spec | 2 +- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 309 +++- dlls/winevulkan/vulkan_thunks.h | 106 +- dlls/winevulkan/winevulkan.json | 2 +- dlls/winevulkan/winevulkan.spec | 2 +- include/wine/vulkan.h | 3074 +++++++++++++++++++++------------------ include/wine/vulkan_driver.h | 2 +- 8 files changed, 2074 insertions(+), 1425 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7e85f53d28e1c821638a…

1 0

Erich E. Hoover : ntdll: Allow NtQueryVolumeInformationFile to make async volume information queries.
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: 1b48335762e902738dc55eeaeddc89737798d5a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b48335762e902738dc55eea… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jun 12 14:53:43 2020 -0600 ntdll: Allow NtQueryVolumeInformationFile to make async volume information queries. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index e147fb47391..00ca2005f92 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6257,16 +6257,33 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, IO_STATUS_BLOCK *io io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ); if (io->u.Status == STATUS_BAD_DEVICE_TYPE) { + struct async_irp *async; + HANDLE wait_handle; + NTSTATUS status; + + if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) + return STATUS_NO_MEMORY; + async->buffer = buffer; + async->size = length; + SERVER_START_REQ( get_volume_info ) { + req->async = server_async( handle, &async->io, NULL, NULL, NULL, io ); req->handle = wine_server_obj_handle( handle ); req->info_class = info_class; wine_server_set_reply( req, buffer, length ); - io->u.Status = wine_server_call( req ); - if (!io->u.Status) io->Information = wine_server_reply_size( reply ); + status = wine_server_call( req ); + if (status != STATUS_PENDING) + { + io->u.Status = status; + io->Information = wine_server_reply_size( reply ); + } + wait_handle = wine_server_ptr_handle( reply->wait ); } SERVER_END_REQ; - return io->u.Status; + if (status != STATUS_PENDING) free( async ); + if (wait_handle) status = wait_async( wait_handle, FALSE, io ); + return status; } else if (io->u.Status) return io->u.Status;

1 0

Paul Gofman : vcomp110: Add test for C2VectParallel().
by Alexandre Julliard Feb. 15, 2021

Feb. 15, 2021

Module: wine Branch: master Commit: dbcbc8c7658eceadd97aa01bf2ae3332618c5a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbcbc8c7658eceadd97aa01b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 12 20:29:15 2021 +0300 vcomp110: Add test for C2VectParallel(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/vcomp110/tests/Makefile.in | 4 + dlls/vcomp110/tests/vcomp110.c | 292 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 298 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbcbc8c7658eceadd97a…

1 0