- Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Replace the __wine_unix_spawnvp() syscall by a Unix call.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: a14b4c7d0dbb9a200239070253d6590850654544 URL: https://gitlab.winehq.org/wine/wine/-/commit/a14b4c7d0dbb9a200239070253d659… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 13:48:43 2023 +0100 ntdll: Replace the __wine_unix_spawnvp() syscall by a Unix call. --- dlls/ntdll/loader.c | 11 +++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/process.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unixlib.h | 7 +++++++ dlls/wow64/syscall.c | 19 ------------------- dlls/wow64/syscall.h | 1 - 8 files changed, 61 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e47beb461f9..b483d75ec45 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3199,6 +3199,17 @@ NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, vo } +/*********************************************************************** + * __wine_unix_spawnvp + */ +NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ) +{ + struct wine_spawnvp_params params = { (char **)argv, wait }; + + return WINE_UNIX_CALL( unix_wine_spawnvp, &params ); +} + + /****************************************************************** * LdrLoadDll (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c294a605f1e..a138c4c0299 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1694,7 +1694,7 @@ # Unix interface @ stdcall __wine_unix_call(int64 long ptr) -@ stdcall -syscall __wine_unix_spawnvp(long ptr) +@ stdcall __wine_unix_spawnvp(long ptr) @ stdcall __wine_ctrl_routine(ptr) @ extern -private __wine_syscall_dispatcher @ extern -private __wine_unix_call_dispatcher diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index b0834c97795..d040a90dab3 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -357,7 +357,6 @@ static void * const syscalls[] = NtWriteFileGather, NtWriteVirtualMemory, NtYieldExecution, - __wine_unix_spawnvp, wine_nt_to_unix_file_name, wine_server_call, wine_server_fd_to_handle, @@ -2061,6 +2060,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = load_so_dll, unwind_builtin_dll, unixcall_wine_dbg_write, + unixcall_wine_spawnvp, system_time_precise, }; @@ -2078,6 +2078,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_load_so_dll, wow64_unwind_builtin_dll, wow64_wine_dbg_write, + wow64_wine_spawnvp, system_time_precise, }; diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 9f2c5ffb29c..79e5d4bab87 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -538,6 +538,44 @@ NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ) } +/*********************************************************************** + * unixcall_wine_spawnvp + */ +NTSTATUS unixcall_wine_spawnvp( void *args ) +{ + struct wine_spawnvp_params *params = args; + + return __wine_unix_spawnvp( params->argv, params->wait ); +} + + +#ifdef _WIN64 +/*********************************************************************** + * wow64_wine_spawnvp + */ +NTSTATUS wow64_wine_spawnvp( void *args ) +{ + struct + { + ULONG argv; + int wait; + } const *params32 = args; + + ULONG *argv32 = ULongToPtr( params32->argv ); + unsigned int i, count = 0; + char **argv; + NTSTATUS ret; + + while (argv32[count]) count++; + argv = malloc( (count + 1) * sizeof(*argv) ); + for (i = 0; i < count; i++) argv[i] = ULongToPtr( argv32[i] ); + argv[count] = NULL; + ret = __wine_unix_spawnvp( argv, params32->wait ); + free( argv ); + return ret; +} +#endif + /*********************************************************************** * fork_and_exec * diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index fcaf51d9652..849dc1d28e9 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -284,8 +284,10 @@ extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULO extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) DECLSPEC_HIDDEN; extern NTSTATUS unixcall_wine_dbg_write( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS unixcall_wine_spawnvp( void *args ) DECLSPEC_HIDDEN; #ifdef _WIN64 extern NTSTATUS wow64_wine_dbg_write( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS wow64_wine_spawnvp( void *args ) DECLSPEC_HIDDEN; #endif extern void dbg_init(void) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 9fd23627ee9..3266a71c55e 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -31,6 +31,12 @@ struct wine_dbg_write_params unsigned int len; }; +struct wine_spawnvp_params +{ + char **argv; + int wait; +}; + struct load_so_dll_params { UNICODE_STRING nt_name; @@ -49,6 +55,7 @@ enum ntdll_unix_funcs unix_load_so_dll, unix_unwind_builtin_dll, unix_wine_dbg_write, + unix_wine_spawnvp, unix_system_time_precise, }; diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 41215e58bb0..8e923d83844 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -541,25 +541,6 @@ NTSTATUS WINAPI wow64_NtSetDefaultUILanguage( UINT *args ) } -/********************************************************************** - * wow64___wine_unix_spawnvp - */ -NTSTATUS WINAPI wow64___wine_unix_spawnvp( UINT *args ) -{ - ULONG *argv32 = get_ptr( &args ); - int wait = get_ulong( &args ); - - unsigned int i, count = 0; - char **argv; - - while (argv32[count]) count++; - argv = Wow64AllocateTemp( (count + 1) * sizeof(*argv) ); - for (i = 0; i < count; i++) argv[i] = ULongToPtr( argv32[i] ); - argv[count] = NULL; - return __wine_unix_spawnvp( argv, wait ); -} - - /********************************************************************** * wow64_wine_server_call */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 801bc6054da..8fbdc3909ef 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -257,7 +257,6 @@ SYSCALL_ENTRY( NtWriteFileGather ) \ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) \ - SYSCALL_ENTRY( __wine_unix_spawnvp ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_server_fd_to_handle ) \

1 0

Alexandre Julliard : ntdll: Replace the wine_server_call() syscall by a Unix call.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 8a3ba513ff860d5197c445df6707aef0620f837a URL: https://gitlab.winehq.org/wine/wine/-/commit/8a3ba513ff860d5197c445df6707ae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 13:50:52 2023 +0100 ntdll: Replace the wine_server_call() syscall by a Unix call. --- dlls/ntdll/loader.c | 9 ++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/server.c | 50 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unixlib.h | 1 + dlls/wow64/struct32.h | 18 --------------- dlls/wow64/syscall.c | 25 --------------------- dlls/wow64/syscall.h | 1 - 9 files changed, 65 insertions(+), 46 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index b483d75ec45..0a22ec9a36b 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3210,6 +3210,15 @@ NTSTATUS WINAPI __wine_unix_spawnvp( char * const argv[], int wait ) } +/*********************************************************************** + * wine_server_call + */ +unsigned int CDECL wine_server_call( void *req_ptr ) +{ + return WINE_UNIX_CALL( unix_wine_server_call, req_ptr ); +} + + /****************************************************************** * LdrLoadDll (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a138c4c0299..8fa8d01c7dd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1688,7 +1688,7 @@ # or 'wine_' (for user-visible functions) to avoid namespace conflicts. # Server interface -@ cdecl -syscall -norelay wine_server_call(ptr) +@ cdecl -norelay wine_server_call(ptr) @ cdecl -syscall wine_server_fd_to_handle(long long long ptr) @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index d040a90dab3..9ff1e5c52cd 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -358,7 +358,6 @@ static void * const syscalls[] = NtWriteVirtualMemory, NtYieldExecution, wine_nt_to_unix_file_name, - wine_server_call, wine_server_fd_to_handle, wine_server_handle_to_fd, wine_unix_to_nt_file_name, @@ -2060,6 +2059,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = load_so_dll, unwind_builtin_dll, unixcall_wine_dbg_write, + unixcall_wine_server_call, unixcall_wine_spawnvp, system_time_precise, }; @@ -2078,6 +2078,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_load_so_dll, wow64_unwind_builtin_dll, wow64_wine_dbg_write, + wow64_wine_server_call, wow64_wine_spawnvp, system_time_precise, }; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 75a766078cd..f9b403723fa 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -286,6 +286,17 @@ unsigned int CDECL wine_server_call( void *req_ptr ) } +/*********************************************************************** + * unixcall_wine_server_call + * + * Perform a server call. + */ +NTSTATUS unixcall_wine_server_call( void *args ) +{ + return wine_server_call( args ); +} + + /*********************************************************************** * server_enter_uninterrupted_section */ @@ -1764,3 +1775,42 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) } return ret; } + +#ifdef _WIN64 + +struct __server_request_info32 +{ + union + { + union generic_request req; + union generic_reply reply; + } u; + unsigned int data_count; + ULONG reply_data; + struct { ULONG ptr; data_size_t size; } data[__SERVER_MAX_DATA]; +}; + +/********************************************************************** + * wow64_wine_server_call + */ +NTSTATUS wow64_wine_server_call( void *args ) +{ + struct __server_request_info32 *req32 = args; + unsigned int i; + NTSTATUS status; + struct __server_request_info req; + + req.u.req = req32->u.req; + req.data_count = req32->data_count; + for (i = 0; i < req.data_count; i++) + { + req.data[i].ptr = ULongToPtr( req32->data[i].ptr ); + req.data[i].size = req32->data[i].size; + } + req.reply_data = ULongToPtr( req32->reply_data ); + status = wine_server_call( &req ); + req32->u.reply = req.u.reply; + return status; +} + +#endif /* _WIN64 */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 849dc1d28e9..e581cde0486 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -284,9 +284,11 @@ extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULO extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) DECLSPEC_HIDDEN; extern NTSTATUS unixcall_wine_dbg_write( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS unixcall_wine_server_call( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS unixcall_wine_spawnvp( void *args ) DECLSPEC_HIDDEN; #ifdef _WIN64 extern NTSTATUS wow64_wine_dbg_write( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS wow64_wine_server_call( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_wine_spawnvp( void *args ) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 3266a71c55e..a205c86ac99 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -55,6 +55,7 @@ enum ntdll_unix_funcs unix_load_so_dll, unix_unwind_builtin_dll, unix_wine_dbg_write, + unix_wine_server_call, unix_wine_spawnvp, unix_system_time_precise, }; diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 9511f80523f..5780fb574a6 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -667,24 +667,6 @@ typedef struct ULONG NumberOfBytes; } MEMORY_RANGE_ENTRY32; -struct __server_iovec32 -{ - ULONG ptr; - data_size_t size; -}; - -struct __server_request_info32 -{ - union - { - union generic_request req; - union generic_reply reply; - } u; - unsigned int data_count; - ULONG reply_data; - struct __server_iovec32 data[__SERVER_MAX_DATA]; -}; - typedef struct { ULONG LowestStartingAddress; diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 8e923d83844..9323bae296e 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -541,31 +541,6 @@ NTSTATUS WINAPI wow64_NtSetDefaultUILanguage( UINT *args ) } -/********************************************************************** - * wow64_wine_server_call - */ -NTSTATUS WINAPI wow64_wine_server_call( UINT *args ) -{ - struct __server_request_info32 *req32 = get_ptr( &args ); - - unsigned int i; - NTSTATUS status; - struct __server_request_info req; - - req.u.req = req32->u.req; - req.data_count = req32->data_count; - for (i = 0; i < req.data_count; i++) - { - req.data[i].ptr = ULongToPtr( req32->data[i].ptr ); - req.data[i].size = req32->data[i].size; - } - req.reply_data = ULongToPtr( req32->reply_data ); - status = wine_server_call( &req ); - req32->u.reply = req.u.reply; - return status; -} - - /********************************************************************** * get_syscall_num */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 8fbdc3909ef..8b0416d22c2 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -258,7 +258,6 @@ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ - SYSCALL_ENTRY( wine_server_call ) \ SYSCALL_ENTRY( wine_server_fd_to_handle ) \ SYSCALL_ENTRY( wine_server_handle_to_fd ) \ SYSCALL_ENTRY( wine_unix_to_nt_file_name )

1 0

Alexandre Julliard : ntdll: Replace the wine_server_fd_to_handle() syscall by a Unix call.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 6d27bcbe2c97a14c8f9dfc3c3dfeaced0cfb70cb URL: https://gitlab.winehq.org/wine/wine/-/commit/6d27bcbe2c97a14c8f9dfc3c3dfeac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 13:51:57 2023 +0100 ntdll: Replace the wine_server_fd_to_handle() syscall by a Unix call. --- dlls/ntdll/loader.c | 12 ++++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/server.c | 33 +++++++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unixlib.h | 9 +++++++++ dlls/wow64/file.c | 20 -------------------- dlls/wow64/syscall.h | 1 - 8 files changed, 59 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0a22ec9a36b..0484be2f381 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3219,6 +3219,18 @@ unsigned int CDECL wine_server_call( void *req_ptr ) } +/*********************************************************************** + * wine_server_fd_to_handle + */ +NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned int attributes, + HANDLE *handle ) +{ + struct wine_server_fd_to_handle_params params = { fd, access, attributes, handle }; + + return WINE_UNIX_CALL( unix_wine_server_fd_to_handle, &params ); +} + + /****************************************************************** * LdrLoadDll (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 8fa8d01c7dd..48c546566e8 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1689,7 +1689,7 @@ # Server interface @ cdecl -norelay wine_server_call(ptr) -@ cdecl -syscall wine_server_fd_to_handle(long long long ptr) +@ cdecl wine_server_fd_to_handle(long long long ptr) @ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) # Unix interface diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 9ff1e5c52cd..3095054ea08 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -358,7 +358,6 @@ static void * const syscalls[] = NtWriteVirtualMemory, NtYieldExecution, wine_nt_to_unix_file_name, - wine_server_fd_to_handle, wine_server_handle_to_fd, wine_unix_to_nt_file_name, }; @@ -2060,6 +2059,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unwind_builtin_dll, unixcall_wine_dbg_write, unixcall_wine_server_call, + unixcall_wine_server_fd_to_handle, unixcall_wine_spawnvp, system_time_precise, }; @@ -2079,6 +2079,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_unwind_builtin_dll, wow64_wine_dbg_write, wow64_wine_server_call, + wow64_wine_server_fd_to_handle, wow64_wine_spawnvp, system_time_precise, }; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index f9b403723fa..fa618aa7182 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1102,6 +1102,17 @@ NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned i } +/*********************************************************************** + * unixcall_wine_server_fd_to_handle + */ +NTSTATUS unixcall_wine_server_fd_to_handle( void *args ) +{ + struct wine_server_fd_to_handle_params *params = args; + + return wine_server_fd_to_handle( params->fd, params->access, params->attributes, params->handle ); +} + + /*********************************************************************** * wine_server_handle_to_fd * @@ -1813,4 +1824,26 @@ NTSTATUS wow64_wine_server_call( void *args ) return status; } +/*********************************************************************** + * wow64_wine_server_fd_to_handle + */ +NTSTATUS wow64_wine_server_fd_to_handle( void *args ) +{ + struct + { + int fd; + unsigned int access; + unsigned int attributes; + ULONG handle; + } const *params32 = args; + + ULONG *handle32 = ULongToPtr( params32->handle ); + HANDLE handle; + NTSTATUS ret; + + ret = wine_server_fd_to_handle( params32->fd, params32->access, params32->attributes, &handle ); + *handle32 = HandleToULong( handle ); + return ret; +} + #endif /* _WIN64 */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index e581cde0486..55e34a30886 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -285,10 +285,12 @@ extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULON extern NTSTATUS unixcall_wine_dbg_write( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS unixcall_wine_server_call( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS unixcall_wine_server_fd_to_handle( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS unixcall_wine_spawnvp( void *args ) DECLSPEC_HIDDEN; #ifdef _WIN64 extern NTSTATUS wow64_wine_dbg_write( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_wine_server_call( void *args ) DECLSPEC_HIDDEN; +extern NTSTATUS wow64_wine_server_fd_to_handle( void *args ) DECLSPEC_HIDDEN; extern NTSTATUS wow64_wine_spawnvp( void *args ) DECLSPEC_HIDDEN; #endif diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index a205c86ac99..f85223e1796 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -31,6 +31,14 @@ struct wine_dbg_write_params unsigned int len; }; +struct wine_server_fd_to_handle_params +{ + int fd; + unsigned int access; + unsigned int attributes; + HANDLE *handle; +}; + struct wine_spawnvp_params { char **argv; @@ -56,6 +64,7 @@ enum ntdll_unix_funcs unix_unwind_builtin_dll, unix_wine_dbg_write, unix_wine_server_call, + unix_wine_server_fd_to_handle, unix_wine_spawnvp, unix_system_time_precise, }; diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index ebe0e9b3a77..74b27ddba93 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -944,26 +944,6 @@ NTSTATUS WINAPI wow64_wine_nt_to_unix_file_name( UINT *args ) } -/********************************************************************** - * wow64_wine_server_fd_to_handle - */ -NTSTATUS WINAPI wow64_wine_server_fd_to_handle( UINT *args ) -{ - int fd = get_ulong( &args ); - ACCESS_MASK access = get_ulong( &args ); - ULONG attributes = get_ulong( &args ); - ULONG *handle_ptr = get_ptr( &args ); - - HANDLE handle = 0; - NTSTATUS status; - - *handle_ptr = 0; - status = wine_server_fd_to_handle( fd, access, attributes, &handle ); - put_handle( handle_ptr, handle ); - return status; -} - - /********************************************************************** * wow64_wine_server_handle_to_fd */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 8b0416d22c2..41abf509569 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -258,7 +258,6 @@ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ - SYSCALL_ENTRY( wine_server_fd_to_handle ) \ SYSCALL_ENTRY( wine_server_handle_to_fd ) \ SYSCALL_ENTRY( wine_unix_to_nt_file_name )

1 0

Zebediah Figura : user32: Pass BSMINFO in BroadcastSystemMessageExA().
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 0ac2166cecf8066b63c1e4e0c920a4ea119a3c13 URL: https://gitlab.winehq.org/wine/wine/-/commit/0ac2166cecf8066b63c1e4e0c920a4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 5 21:44:26 2023 -0600 user32: Pass BSMINFO in BroadcastSystemMessageExA(). --- dlls/user32/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9ad4abd21b5..33e81c76e4b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1192,7 +1192,7 @@ LONG WINAPI BroadcastSystemMessageW( DWORD flags, LPDWORD recipients, UINT msg, LONG WINAPI BroadcastSystemMessageExA( DWORD flags, LPDWORD recipients, UINT msg, WPARAM wp, LPARAM lp, PBSMINFO pinfo ) { map_wparam_AtoW( msg, &wp, WMCHAR_MAP_NOMAPPING ); - return BroadcastSystemMessageExW( flags, recipients, msg, wp, lp, NULL ); + return BroadcastSystemMessageExW( flags, recipients, msg, wp, lp, pinfo ); }

1 0

Francois Gouget : dbghelp: Fix a typo in a comment.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: d9ccc8664c8aef3e50bac6bc2d1dfa404f9c6eb1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d9ccc8664c8aef3e50bac6bc2d1dfa… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:32:27 2023 +0100 dbghelp: Fix a typo in a comment. --- dlls/dbghelp/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index d4aef183677..56a47ab7dac 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2276,7 +2276,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt_compiland* compiland = NULL; struct location loc; - /* overwrite compiland name from outter context (if any) */ + /* overwrite compiland name from outer context (if any) */ if (objname) compiland = codeview_new_compiland(msc_dbg, objname); /*

1 0

Francois Gouget : kernel32/tests: Fix a typo in a comment.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 2f3d4d8fa1866b12a23664989b81e158237f74b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f3d4d8fa1866b12a23664989b81e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:32:50 2023 +0100 kernel32/tests: Fix a typo in a comment. --- dlls/kernel32/tests/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index eb0b5fec772..5d2d971232f 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -87,7 +87,7 @@ static void test_query_dos_deviceA(void) for (;;) { if (!*p) break; ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); - /* Win10+ exposes security device which requires extra priviledges to be queried. So skip it */ + /* Win10+ exposes the security device which requires extra privileges to be queried. So skip it */ ok(ret2 || broken( !strcmp( p, "MSSECFLTSYS" ) && GetLastError() == ERROR_ACCESS_DENIED ), "QueryDosDeviceA failed to return current mapping for %s, last error %lu\n", p, GetLastError()); p += strlen(p) + 1;

1 0

Francois Gouget : winex11.drv: Fix a typo in a comment.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 9338531ee40785f2237414205f8ba050e640acc1 URL: https://gitlab.winehq.org/wine/wine/-/commit/9338531ee40785f2237414205f8ba0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:34:44 2023 +0100 winex11.drv: Fix a typo in a comment. --- dlls/winex11.drv/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 98b0b23e103..17fc6d867f5 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -984,7 +984,7 @@ static void update_net_wm_fullscreen_monitors( struct x11drv_win_data *data ) if (!(data->net_wm_state & (1 << NET_WM_STATE_FULLSCREEN)) || is_virtual_desktop()) return; - /* If the current display device handler can not detect dynamic device changes, do not use + /* If the current display device handler cannot detect dynamic device changes, do not use * _NET_WM_FULLSCREEN_MONITORS because xinerama_get_fullscreen_monitors() may report wrong * indices because of stale xinerama monitor information */ if (!X11DRV_DisplayDevices_SupportEventHandlers())

1 0

Francois Gouget : winevulkan: Add a trailing linefeed to some FIXME() thunk messages.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: 348fafcdbb9f62e545ccf2ae80b0cac98c0a4d04 URL: https://gitlab.winehq.org/wine/wine/-/commit/348fafcdbb9f62e545ccf2ae80b0ca… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:37:37 2023 +0100 winevulkan: Add a trailing linefeed to some FIXME() thunk messages. --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 152 ++++++++++++++++++++-------------------- 2 files changed, 77 insertions(+), 77 deletions(-)

1 0

Francois Gouget : winegstreamer: Fix a typo in a comment.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: a72415ce5df8a9bdd877c50db423875dafa31c3e URL: https://gitlab.winehq.org/wine/wine/-/commit/a72415ce5df8a9bdd877c50db42387… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 13 18:33:48 2023 +0100 winegstreamer: Fix a typo in a comment. --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 32ac4a2830d..5bb824f4399 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1411,7 +1411,7 @@ static NTSTATUS wg_parser_connect(void *args) struct wg_parser_stream *stream = parser->streams[i]; gint64 duration; - /* If we receieved a buffer waiting for tags or caps does not make sense anymore. */ + /* If we received a buffer, waiting for tags or caps does not make sense anymore. */ while ((!stream->has_caps || !stream->has_tags) && !parser->error && !stream->has_buffer) pthread_cond_wait(&parser->init_cond, &parser->mutex);

1 0

Francois Gouget : spoolss/tests: Fix a typo in a comment.
by Alexandre Julliard Feb. 14, 2023

Feb. 14, 2023

Module: wine Branch: master Commit: ed03f20d60151c567dc2a0636e835a73d25e5f73 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed03f20d60151c567dc2a0636e835a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 17:12:07 2023 +0100 spoolss/tests: Fix a typo in a comment. --- dlls/spoolss/tests/spoolss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/spoolss/tests/spoolss.c b/dlls/spoolss/tests/spoolss.c index ce55cf50220..07af82e56ac 100644 --- a/dlls/spoolss/tests/spoolss.c +++ b/dlls/spoolss/tests/spoolss.c @@ -208,7 +208,7 @@ START_TEST(spoolss) { LPCSTR ptr; - /* The tests fail on Win7 (see comments in load_function() */ + /* The tests fail on Win7 (see comments in load_functions() */ ptr = load_functions(); if (ptr) { win_skip("%s not found\n", ptr);

1 0