February 2021 - Wine-commits

Paul Gofman : vcomp: Change _vcomp_fork_call_wrapper() args parameter type to void **.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 5366f67ef017f41d0936bc5bf2722e27acbe1b2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5366f67ef017f41d0936bc5b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 12 20:29:13 2021 +0300 vcomp: Change _vcomp_fork_call_wrapper() args parameter type to void **. That is assumed in the asm implementation. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 7b97dfc72c8..11dfb78030b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -117,9 +117,14 @@ struct vcomp_task_data unsigned int dynamic_chunksize; }; +static void **ptr_from_va_list(__ms_va_list valist) +{ + return *(void ***)&valist; +} + #if defined(__i386__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushl %ebp\n\t" __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") @@ -154,7 +159,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__x86_64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "pushq %rbp\n\t" __ASM_SEH(".seh_pushreg %rbp\n\t") @@ -198,7 +203,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__arm__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "push {r4, r5, LR}\n\t" "mov r4, r0\n\t" @@ -234,7 +239,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #elif defined(__aarch64__) -extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args); +extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, "stp x29, x30, [SP,#-16]!\n\t" "mov x29, SP\n\t" @@ -263,7 +268,7 @@ __ASM_GLOBAL_FUNC( _vcomp_fork_call_wrapper, #else -static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, __ms_va_list args) +static void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args) { ERR("Not implemented for this architecture\n"); } @@ -1406,7 +1411,7 @@ static DWORD WINAPI _vcomp_fork_worker(void *param) if (team != NULL) { LeaveCriticalSection(&vcomp_section); - _vcomp_fork_call_wrapper(team->wrapper, team->nargs, team->valist); + _vcomp_fork_call_wrapper(team->wrapper, team->nargs, ptr_from_va_list(team->valist)); EnterCriticalSection(&vcomp_section); thread_data->team = NULL; @@ -1540,7 +1545,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) } vcomp_set_thread_data(&thread_data); - _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, team_data.valist); + _vcomp_fork_call_wrapper(team_data.wrapper, team_data.nargs, ptr_from_va_list(team_data.valist)); vcomp_set_thread_data(prev_thread_data); prev_thread_data->fork_threads = 0;

1 0

Paul Gofman : vcomp: Implement C2VectParallel().
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: ab89486e96819f741f220677023f464e1459bcab URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab89486e96819f741f220677… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Feb 12 20:29:14 2021 +0300 vcomp: Implement C2VectParallel(). Used by Ancient Cities. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 158 ++++++++++++++++++++++++++++++++++++++++++++ dlls/vcomp110/vcomp110.spec | 2 +- dlls/vcomp120/vcomp120.spec | 2 +- dlls/vcomp140/vcomp140.spec | 2 +- 4 files changed, 161 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 11dfb78030b..fa0b84300f1 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +#define MAX_VECT_PARALLEL_CALLBACK_ARGS 128 + typedef CRITICAL_SECTION *omp_lock_t; typedef CRITICAL_SECTION *omp_nest_lock_t; @@ -122,6 +124,14 @@ static void **ptr_from_va_list(__ms_va_list valist) return *(void ***)&valist; } +static void copy_va_list_data(void **args, __ms_va_list valist, int args_count) +{ + unsigned int i; + + for (i = 0; i < args_count; ++i) + args[i] = va_arg(valist, void *); +} + #if defined(__i386__) extern void CDECL _vcomp_fork_call_wrapper(void *wrapper, int nargs, void **args); @@ -1665,6 +1675,154 @@ void CDECL _vcomp_leave_critsect(CRITICAL_SECTION *critsect) LeaveCriticalSection(critsect); } +static unsigned int get_step_count(int start, int end, int range_offset, int step) +{ + int range = end - start + step - range_offset; + + if (step < 0) + return (unsigned)-range / -step; + else + return (unsigned)range / step; +} + +static void CDECL c2vectparallel_wrapper(int start, int end, int step, int end_included, BOOL dynamic_distribution, + int volatile *dynamic_start, void *function, int nargs, __ms_va_list valist) +{ + void *wrapper_args[MAX_VECT_PARALLEL_CALLBACK_ARGS]; + unsigned int step_count, steps_per_call, remainder; + int thread_count = omp_get_num_threads(); + int curr_start, curr_end, range_offset; + int thread = _vcomp_get_thread_num(); + int step_sign; + + copy_va_list_data(&wrapper_args[2], valist, nargs - 2); + + step_sign = step > 0 ? 1 : -1; + range_offset = step_sign * !end_included; + + if (dynamic_distribution) + { + int next_start, new_start, end_value; + + start = *dynamic_start; + end_value = end + !!end_included * step; + while (start != end_value) + { + step_count = get_step_count(start, end, range_offset, step); + + curr_end = start + (step_count + thread_count - 1) / thread_count * step + + range_offset; + + if ((curr_end - end) * step_sign > 0) + { + next_start = end_value; + curr_end = end; + } + else + { + next_start = curr_end - range_offset; + curr_end -= step; + } + + if ((new_start = InterlockedCompareExchange(dynamic_start, next_start, start)) != start) + { + start = new_start; + continue; + } + + wrapper_args[0] = (void *)(ULONG_PTR)start; + wrapper_args[1] = (void *)(ULONG_PTR)curr_end; + _vcomp_fork_call_wrapper(function, nargs, wrapper_args); + start = *dynamic_start; + } + return; + } + + step_count = get_step_count(start, end, range_offset, step); + + /* According to the tests native vcomp still makes extra calls + * with empty range from excessive threads under certain conditions + * for unclear reason. */ + if (thread >= step_count && (end_included || (step != 1 && step != -1))) + return; + + steps_per_call = step_count / thread_count; + remainder = step_count % thread_count; + + if (thread < remainder) + { + curr_start = thread * (steps_per_call + 1); + curr_end = curr_start + steps_per_call + 1; + } + else if (thread < step_count) + { + curr_start = remainder + steps_per_call * thread; + curr_end = curr_start + steps_per_call; + } + else + { + curr_start = curr_end = 0; + } + + curr_start = start + curr_start * step; + curr_end = start + (curr_end - 1) * step + range_offset; + + wrapper_args[0] = (void *)(ULONG_PTR)curr_start; + wrapper_args[1] = (void *)(ULONG_PTR)curr_end; + _vcomp_fork_call_wrapper(function, nargs, wrapper_args); +} + +void CDECL C2VectParallel(int start, int end, int step, BOOL end_included, int thread_count, + BOOL dynamic_distribution, void *function, int nargs, ...) +{ + struct vcomp_thread_data *thread_data; + int volatile dynamic_start; + int prev_thread_count; + __ms_va_list valist; + + TRACE("start %d, end %d, step %d, end_included %d, thread_count %d, dynamic_distribution %#x," + " function %p, nargs %d.\n", start, end, step, end_included, thread_count, + dynamic_distribution, function, nargs); + + if (nargs > MAX_VECT_PARALLEL_CALLBACK_ARGS) + { + FIXME("Number of arguments %u exceeds supported maximum %u" + " (not calling the loop code, expect problems).\n", + nargs, MAX_VECT_PARALLEL_CALLBACK_ARGS); + return; + } + + __ms_va_start(valist, nargs); + + /* This expression can result in integer overflow. According to the tests, + * native vcomp runs the function as a single thread both for empty range + * and (end - start) not fitting the integer range. */ + if ((step > 0 && end < start) || (step < 0 && end > start) + || (end - start) / step < 2 || thread_count < 0) + { + void *wrapper_args[MAX_VECT_PARALLEL_CALLBACK_ARGS]; + + wrapper_args[0] = (void *)(ULONG_PTR)start; + wrapper_args[1] = (void *)(ULONG_PTR)end; + copy_va_list_data(&wrapper_args[2], valist, nargs - 2); + _vcomp_fork_call_wrapper(function, nargs, wrapper_args); + __ms_va_end(valist); + return; + } + + thread_data = vcomp_init_thread_data(); + prev_thread_count = thread_data->fork_threads; + thread_data->fork_threads = thread_count; + + dynamic_start = start; + + _vcomp_fork(TRUE, 9, c2vectparallel_wrapper, start, end, step, end_included, dynamic_distribution, + &dynamic_start, function, nargs, valist); + + thread_data->fork_threads = prev_thread_count; + __ms_va_end(valist); +} + BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { TRACE("(%p, %d, %p)\n", instance, reason, reserved); diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 22a94823c5f..fb4d626c07c 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -1,4 +1,4 @@ -@ stub C2VectParallel +@ varargs C2VectParallel(long long long long long long ptr long) @ cdecl _vcomp_atomic_add_i1(ptr long) @ cdecl _vcomp_atomic_add_i2(ptr long) @ cdecl _vcomp_atomic_add_i4(ptr long) diff --git a/dlls/vcomp120/vcomp120.spec b/dlls/vcomp120/vcomp120.spec index 22a94823c5f..fb4d626c07c 100644 --- a/dlls/vcomp120/vcomp120.spec +++ b/dlls/vcomp120/vcomp120.spec @@ -1,4 +1,4 @@ -@ stub C2VectParallel +@ varargs C2VectParallel(long long long long long long ptr long) @ cdecl _vcomp_atomic_add_i1(ptr long) @ cdecl _vcomp_atomic_add_i2(ptr long) @ cdecl _vcomp_atomic_add_i4(ptr long) diff --git a/dlls/vcomp140/vcomp140.spec b/dlls/vcomp140/vcomp140.spec index 22a94823c5f..fb4d626c07c 100644 --- a/dlls/vcomp140/vcomp140.spec +++ b/dlls/vcomp140/vcomp140.spec @@ -1,4 +1,4 @@ -@ stub C2VectParallel +@ varargs C2VectParallel(long long long long long long ptr long) @ cdecl _vcomp_atomic_add_i1(ptr long) @ cdecl _vcomp_atomic_add_i2(ptr long) @ cdecl _vcomp_atomic_add_i4(ptr long)

1 0

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

15 Feb '21

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

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

15 Feb '21

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

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

15 Feb '21

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: Allow NtQueryVolumeInformationFile to make async volume information queries.
by Alexandre Julliard 15 Feb '21

15 Feb '21

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

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

15 Feb '21

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 : mountmgr.sys: Add support for volume information queries.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: d896c2201f5c03fae738d74e6ad617aa772f86e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d896c2201f5c03fae738d74e… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Fri Jun 12 14:48:25 2020 -0600 mountmgr.sys: Add support for 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/mountmgr.sys/device.c | 123 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index c9cee002bc0..dd2c7d70759 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -91,6 +91,7 @@ struct disk_device char *unix_device; /* unix device path */ char *unix_mount; /* unix mount point path */ char *serial; /* disk serial number */ + struct volume *volume; /* associated volume */ }; struct volume @@ -746,7 +747,7 @@ static DWORD VOLUME_GetAudioCDSerial( const CDROM_TOC *toc ) /* create the disk device for a given volume */ -static NTSTATUS create_disk_device( enum device_type type, struct disk_device **device_ret ) +static NTSTATUS create_disk_device( enum device_type type, struct disk_device **device_ret, struct volume *volume ) { static const WCHAR harddiskvolW[] = {'\\','D','e','v','i','c','e', '\\','H','a','r','d','d','i','s','k','V','o','l','u','m','e','%','u',0}; @@ -808,6 +809,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** device->unix_device = NULL; device->unix_mount = NULL; device->symlink.Buffer = NULL; + device->volume = volume; if (link_format) { @@ -930,7 +932,7 @@ static NTSTATUS create_volume( const char *udi, enum device_type type, struct vo if (!(volume = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*volume) ))) return STATUS_NO_MEMORY; - if (!(status = create_disk_device( type, &volume->device ))) + if (!(status = create_disk_device( type, &volume->device, volume ))) { if (udi) set_volume_udi( volume, udi ); list_add_tail( &volumes_list, &volume->entry ); @@ -1125,7 +1127,7 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, if (type != disk_device->type) { - if ((status = create_disk_device( type, &disk_device ))) return status; + if ((status = create_disk_device( type, &disk_device, volume ))) return status; if (volume->mount) { delete_mount_point( volume->mount ); @@ -1826,6 +1828,118 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp ) return status; } +static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) +{ + IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + int info_class = irpsp->Parameters.QueryVolume.FsInformationClass; + ULONG length = irpsp->Parameters.QueryVolume.Length; + struct disk_device *dev = device->DeviceExtension; + PIO_STATUS_BLOCK io = &irp->IoStatus; + struct volume *volume; + NTSTATUS status; + + TRACE( "volume query %x length %u\n", info_class, length ); + + EnterCriticalSection( &device_section ); + volume = dev->volume; + if (!volume) + { + status = STATUS_BAD_DEVICE_TYPE; + goto done; + } + + switch(info_class) + { + case FileFsVolumeInformation: + { + + FILE_FS_VOLUME_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + + if (length < sizeof(FILE_FS_VOLUME_INFORMATION)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + info->VolumeCreationTime.QuadPart = 0; /* FIXME */ + info->VolumeSerialNumber = volume->serial; + info->VolumeLabelLength = min( strlenW(volume->label) * sizeof(WCHAR), + length - offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) ); + info->SupportsObjects = (get_mountmgr_fs_type(volume->fs_type) == MOUNTMGR_FS_TYPE_NTFS); + memcpy( info->VolumeLabel, volume->label, info->VolumeLabelLength ); + + io->Information = offsetof( FILE_FS_VOLUME_INFORMATION, VolumeLabel ) + info->VolumeLabelLength; + status = STATUS_SUCCESS; + break; + } + case FileFsAttributeInformation: + { + static const WCHAR fatW[] = {'F','A','T'}; + static const WCHAR fat32W[] = {'F','A','T','3','2'}; + static const WCHAR ntfsW[] = {'N','T','F','S'}; + static const WCHAR cdfsW[] = {'C','D','F','S'}; + static const WCHAR udfW[] = {'U','D','F'}; + + FILE_FS_ATTRIBUTE_INFORMATION *info = irp->AssociatedIrp.SystemBuffer; + enum mountmgr_fs_type fs_type = get_mountmgr_fs_type(volume->fs_type); + + if (length < sizeof(FILE_FS_ATTRIBUTE_INFORMATION)) + { + status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + switch (fs_type) + { + case MOUNTMGR_FS_TYPE_ISO9660: + info->FileSystemAttributes = FILE_READ_ONLY_VOLUME; + info->MaximumComponentNameLength = 221; + info->FileSystemNameLength = min( sizeof(cdfsW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, cdfsW, info->FileSystemNameLength); + break; + case MOUNTMGR_FS_TYPE_UDF: + info->FileSystemAttributes = FILE_READ_ONLY_VOLUME | FILE_UNICODE_ON_DISK | FILE_CASE_SENSITIVE_SEARCH; + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(udfW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, udfW, info->FileSystemNameLength); + break; + case MOUNTMGR_FS_TYPE_FAT: + info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; /* FIXME */ + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(fatW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, fatW, info->FileSystemNameLength); + break; + case MOUNTMGR_FS_TYPE_FAT32: + info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES; /* FIXME */ + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(fat32W), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, fat32W, info->FileSystemNameLength); + break; + default: + info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES | FILE_PERSISTENT_ACLS; + info->MaximumComponentNameLength = 255; + info->FileSystemNameLength = min( sizeof(ntfsW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) ); + memcpy(info->FileSystemName, ntfsW, info->FileSystemNameLength); + break; + } + + io->Information = offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) + info->FileSystemNameLength; + status = STATUS_SUCCESS; + break; + } + default: + FIXME("Unsupported volume query %x\n", irpsp->Parameters.QueryVolume.FsInformationClass); + status = STATUS_NOT_SUPPORTED; + break; + } + +done: + io->u.Status = status; + LeaveCriticalSection( &device_section ); + IoCompleteRequest( irp, IO_NO_INCREMENT ); + return status; +} + /* handler for ioctls on the harddisk device */ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) { @@ -1925,9 +2039,10 @@ NTSTATUS WINAPI harddisk_driver_entry( DRIVER_OBJECT *driver, UNICODE_STRING *pa harddisk_driver = driver; driver->MajorFunction[IRP_MJ_DEVICE_CONTROL] = harddisk_ioctl; + driver->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = harddisk_query_volume; /* create a harddisk0 device that isn't assigned to any drive */ - create_disk_device( DEVICE_HARDDISK, &device ); + create_disk_device( DEVICE_HARDDISK, &device, NULL ); create_drive_devices();

1 0

Liam Middlebrook : winevulkan: Handle bitmask types backed by VkFlags64.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 746b27f97d0776a90b049ed38dfc2e42f92f0ae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=746b27f97d0776a90b049ed3… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Feb 15 02:18:47 2021 -0800 winevulkan: Handle bitmask types backed by VkFlags64. Previously bitmask types were always treated as 32-bit values, now the basetype of each bitmask must be checked. 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/winevulkan/make_vulkan | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 76eba97180b..f341c3c5ad0 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1375,7 +1375,14 @@ class VkParam(object): if self.is_static_array() or self.is_pointer(): self.format_str = "%p" else: - if self.type_info["category"] in ["bitmask", "enum"]: + if self.type_info["category"] in ["bitmask"]: + # Since 1.2.170 bitmasks can be 32 or 64-bit, check the basetype. + if self.type_info["data"].type == "VkFlags64": + self.format_str = "0x%s" + self.format_conv = "wine_dbgstr_longlong({0})" + else: + self.format_str = "%#x" + elif self.type_info["category"] in ["enum"]: self.format_str = "%#x" elif self.is_handle(): # We use uint64_t for non-dispatchable handles as opposed to pointers @@ -1577,7 +1584,13 @@ class VkParam(object): return "str" if self.is_dispatchable() or self.is_pointer() or self.is_static_array(): return "ptr" - if self.type_info["category"] in ["bitmask", "enum"]: + if self.type_info["category"] in ["bitmask"]: + # Since 1.2.170 bitmasks can be 32 or 64-bit, check the basetype. + if self.type_info["data"].type == "VkFlags64": + return "int64" + else: + return "long" + if self.type_info["category"] in ["enum"]: return "long" if self.is_handle() and not self.is_dispatchable(): return "int64"

1 0

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

15 Feb '21

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