February 2023 - Wine-commits

Alexandre Julliard : ntdll: Use the standard unixlib macro for Unix calls.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 157be051439f2414bc241b0dcb2ef0d4e83b8a78 URL: https://gitlab.winehq.org/wine/wine/-/commit/157be051439f2414bc241b0dcb2ef0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 13:00:40 2023 +0100 ntdll: Use the standard unixlib macro for Unix calls. --- dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/signal_arm.c | 2 +- dlls/ntdll/signal_arm64.c | 2 +- dlls/ntdll/signal_x86_64.c | 2 +- dlls/ntdll/time.c | 2 +- dlls/ntdll/unixlib.h | 4 +--- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7661227e951..60ff36f4211 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -77,7 +77,7 @@ static DWORD (WINAPI *pCtrlRoutine)(void *); SYSTEM_DLL_INIT_BLOCK LdrSystemDllInitBlock = { 0xf0 }; -unixlib_handle_t ntdll_unix_handle = 0; +unixlib_handle_t __wine_unixlib_handle = 0; /* windows directory */ const WCHAR windows_dir[] = L"C:\\windows"; @@ -2627,7 +2627,7 @@ static NTSTATUS load_so_dll( LPCWSTR load_path, const UNICODE_STRING *nt_name, struct load_so_dll_params params = { *nt_name, &module }; TRACE( "trying %s as so lib\n", debugstr_us(nt_name) ); - if ((status = NTDLL_UNIX_CALL( load_so_dll, &params ))) + if ((status = WINE_UNIX_CALL( unix_load_so_dll, &params ))) { WARN( "failed to load .so lib %s\n", debugstr_us(nt_name) ); if (status == STATUS_INVALID_IMAGE_FORMAT) status = STATUS_INVALID_IMAGE_NOT_MZ; @@ -3153,7 +3153,7 @@ static NTSTATUS load_dll( const WCHAR *load_path, const WCHAR *libname, DWORD fl switch (nts) { case STATUS_INVALID_IMAGE_NOT_MZ: /* not in PE format, maybe it's a .so file */ - if (ntdll_unix_handle) nts = load_so_dll( load_path, &nt_name, flags, pwm ); + if (__wine_unixlib_handle) nts = load_so_dll( load_path, &nt_name, flags, pwm ); break; case STATUS_SUCCESS: /* valid PE file */ @@ -4121,7 +4121,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation, &meminfo, sizeof(meminfo), NULL ); NtQueryVirtualMemory( GetCurrentProcess(), meminfo.AllocationBase, MemoryWineUnixFuncs, - &ntdll_unix_handle, sizeof(ntdll_unix_handle), NULL ); + &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); peb->LdrData = &ldr; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index b426e03ff0e..47b535b69c5 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -165,7 +165,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { struct unwind_builtin_dll_params params = { type, dispatch, context }; - status = NTDLL_UNIX_CALL( unwind_builtin_dll, &params ); + status = WINE_UNIX_CALL( unix_unwind_builtin_dll, &params ); if (status != STATUS_SUCCESS) return status; if (dispatch->EstablisherFrame) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index bdf58dfba01..cadf774be67 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -199,7 +199,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { struct unwind_builtin_dll_params params = { type, dispatch, context }; - status = NTDLL_UNIX_CALL( unwind_builtin_dll, &params ); + status = WINE_UNIX_CALL( unix_unwind_builtin_dll, &params ); if (status != STATUS_SUCCESS) return status; if (dispatch->EstablisherFrame) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index ac543338893..81479f1fd91 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -282,7 +282,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX { struct unwind_builtin_dll_params params = { type, dispatch, context }; - status = NTDLL_UNIX_CALL( unwind_builtin_dll, &params ); + status = WINE_UNIX_CALL( unix_unwind_builtin_dll, &params ); if (!status && dispatch->LanguageHandler && !module) { FIXME( "calling personality routine in system library not supported yet\n" ); diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 0a4ff0f64d3..1c7f20c434e 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -374,7 +374,7 @@ LONGLONG WINAPI RtlGetSystemTimePrecise( void ) { LONGLONG ret; - NTDLL_UNIX_CALL( system_time_precise, &ret ); + WINE_UNIX_CALL( unix_system_time_precise, &ret ); return ret; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index 0b4c2a984bb..edbfb1f19b3 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -45,8 +45,6 @@ enum ntdll_unix_funcs unix_system_time_precise, }; -extern unixlib_handle_t ntdll_unix_handle; - -#define NTDLL_UNIX_CALL( func, params ) __wine_unix_call_dispatcher( ntdll_unix_handle, unix_ ## func, params ) +extern unixlib_handle_t __wine_unixlib_handle DECLSPEC_HIDDEN; #endif /* __NTDLL_UNIXLIB_H */

1 0

Alexandre Julliard : ntdll: Store the unixlib handle at ntdll load time.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 7406583e5ba62d08cc2a5a677b7f4e6341d5fcf6 URL: https://gitlab.winehq.org/wine/wine/-/commit/7406583e5ba62d08cc2a5a677b7f4e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 13:05:09 2023 +0100 ntdll: Store the unixlib handle at ntdll load time. --- dlls/ntdll/loader.c | 2 -- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/unix/loader.c | 18 ++++++++++++++---- dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unix/virtual.c | 22 +--------------------- 5 files changed, 16 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 60ff36f4211..e47beb461f9 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4120,8 +4120,6 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR NtQueryVirtualMemory( GetCurrentProcess(), LdrInitializeThunk, MemoryBasicInformation, &meminfo, sizeof(meminfo), NULL ); - NtQueryVirtualMemory( GetCurrentProcess(), meminfo.AllocationBase, MemoryWineUnixFuncs, - &__wine_unixlib_handle, sizeof(__wine_unixlib_handle), NULL ); peb->LdrData = &ldr; peb->FastPebLock = &peb_lock; diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b8c23c57283..537d244c216 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1698,6 +1698,7 @@ @ stdcall __wine_ctrl_routine(ptr) @ extern -private __wine_syscall_dispatcher @ extern -private __wine_unix_call_dispatcher +@ extern -private __wine_unixlib_handle @ extern -arch=arm64 __wine_current_teb # Debugging diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 65934acfc36..dd0c294ea92 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -117,7 +117,6 @@ void (WINAPI *p__wine_ctrl_routine)(void*); SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; static void *p__wine_syscall_dispatcher; -static void **p__wine_unix_call_dispatcher; static void * const syscalls[] = { @@ -398,7 +397,6 @@ const char **dll_paths = NULL; const char **system_dll_paths = NULL; const char *user_name = NULL; SECTION_IMAGE_INFORMATION main_image_info = { NULL }; -HMODULE ntdll_module = 0; static const IMAGE_EXPORT_DIRECTORY *ntdll_exports; /* adjust an array of pointers to make them into RVAs */ @@ -1037,6 +1035,9 @@ static const void *get_module_data_dir( HMODULE module, ULONG dir, ULONG *size ) static void load_ntdll_functions( HMODULE module ) { + void **p__wine_unix_call_dispatcher; + unixlib_handle_t *p__wine_unixlib_handle; + ntdll_exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); assert( ntdll_exports ); @@ -1055,6 +1056,9 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( __wine_ctrl_routine ); GET_FUNC( __wine_syscall_dispatcher ); GET_FUNC( __wine_unix_call_dispatcher ); + GET_FUNC( __wine_unixlib_handle ); + *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; + *p__wine_unixlib_handle = (UINT_PTR)__wine_unix_call_funcs; #ifdef __aarch64__ { void **p__wine_current_teb; @@ -1087,6 +1091,14 @@ static void load_ntdll_wow64_functions( HMODULE module ) p__wine_ctrl_routine = (void *)find_named_export( module, exports, "__wine_ctrl_routine" ); +#ifdef _WIN64 + { + unixlib_handle_t *p__wine_unixlib_handle = (void *)find_named_export( module, exports, + "__wine_unixlib_handle" ); + *p__wine_unixlib_handle = (UINT_PTR)__wine_unix_call_wow64_funcs; + } +#endif + /* also set the 32-bit LdrSystemDllInitBlock */ memcpy( (void *)(ULONG_PTR)pLdrSystemDllInitBlock->pLdrSystemDllInitBlock, pLdrSystemDllInitBlock, sizeof(*pLdrSystemDllInitBlock) ); @@ -1905,7 +1917,6 @@ static void load_ntdll(void) else if (status) fatal_error( "failed to load %s error %x\n", name, status ); free( name ); load_ntdll_functions( module ); - ntdll_module = module; } @@ -2099,7 +2110,6 @@ static void start_main_thread(void) if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); load_apiset_dll(); ntdll_init_syscalls( 0, &syscall_table, p__wine_syscall_dispatcher ); - *p__wine_unix_call_dispatcher = __wine_unix_call_dispatcher; server_init_process_done(); } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 8821cd78491..6c196436cc7 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -41,7 +41,6 @@ static const WORD current_machine = IMAGE_FILE_MACHINE_ARMNT; static const WORD current_machine = IMAGE_FILE_MACHINE_ARM64; #endif extern WORD native_machine DECLSPEC_HIDDEN; -extern HMODULE ntdll_module DECLSPEC_HIDDEN; extern const unixlib_entry_t __wine_unix_call_funcs[] DECLSPEC_HIDDEN; extern const unixlib_entry_t __wine_unix_call_wow64_funcs[] DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d4afb8cc2ad..b1267ff0db5 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -640,35 +640,15 @@ void *get_builtin_so_handle( void *module ) */ static NTSTATUS get_builtin_unix_funcs( void *module, BOOL wow, const void **funcs ) { - const char *p, *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; + const char *ptr_name = wow ? "__wine_unix_call_wow64_funcs" : "__wine_unix_call_funcs"; sigset_t sigset; NTSTATUS status = STATUS_DLL_NOT_FOUND; struct builtin_module *builtin; - if (module == ntdll_module) - { -#ifdef _WIN64 - *funcs = wow ? __wine_unix_call_wow64_funcs : __wine_unix_call_funcs; -#else - *funcs = __wine_unix_call_funcs; -#endif - return STATUS_SUCCESS; - } - server_enter_uninterrupted_section( &virtual_mutex, &sigset ); LIST_FOR_EACH_ENTRY( builtin, &builtin_modules, struct builtin_module, entry ) { if (builtin->module != module) continue; - if (builtin->unix_path && (p = strrchr( builtin->unix_path, '/' )) && !strcmp( p, "/ntdll.so" )) - { -#ifdef _WIN64 - *funcs = wow ? __wine_unix_call_wow64_funcs : __wine_unix_call_funcs; -#else - *funcs = __wine_unix_call_funcs; -#endif - status = STATUS_SUCCESS; - break; - } if (builtin->unix_path && !builtin->unix_handle) builtin->unix_handle = dlopen( builtin->unix_path, RTLD_NOW ); if (builtin->unix_handle)

1 0

Alexandre Julliard : ntdll: Replace the __wine_dbg_write() syscall by a Unix call.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 5c62fe0bfe167b907af0029aadf8e48144b7c547 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c62fe0bfe167b907af0029aadf8e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 13:06:14 2023 +0100 ntdll: Replace the __wine_dbg_write() syscall by a Unix call. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/thread.c | 10 ++++++++++ dlls/ntdll/unix/debug.c | 26 ++++++++++++++++++++++---- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/unix_private.h | 5 +++++ dlls/ntdll/unixlib.h | 7 +++++++ dlls/wow64/syscall.c | 12 ------------ dlls/wow64/syscall.h | 1 - 8 files changed, 47 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 537d244c216..c294a605f1e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1702,7 +1702,7 @@ @ extern -arch=arm64 __wine_current_teb # Debugging -@ stdcall -syscall -norelay __wine_dbg_write(ptr long) +@ stdcall -norelay __wine_dbg_write(ptr long) @ cdecl -norelay __wine_dbg_get_channel_flags(ptr) @ cdecl -norelay __wine_dbg_header(long long str) @ cdecl -norelay __wine_dbg_output(str) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 1bd8f900d22..b0b61419e37 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -157,6 +157,16 @@ int __cdecl __wine_dbg_header( enum __wine_debug_class cls, struct __wine_debug_ return info->out_pos; } +/*********************************************************************** + * __wine_dbg_write (NTDLL.@) + */ +int WINAPI __wine_dbg_write( const char *str, unsigned int len ) +{ + struct wine_dbg_write_params params = { str, len }; + + return WINE_UNIX_CALL( unix_wine_dbg_write, &params ); +} + /*********************************************************************** * __wine_dbg_output (NTDLL.@) */ diff --git a/dlls/ntdll/unix/debug.c b/dlls/ntdll/unix/debug.c index aa2d87c304f..bc0e3c1c694 100644 --- a/dlls/ntdll/unix/debug.c +++ b/dlls/ntdll/unix/debug.c @@ -253,12 +253,30 @@ const char * __cdecl __wine_dbg_strdup( const char *str ) } /*********************************************************************** - * __wine_dbg_write (NTDLL.@) + * unixcall_wine_dbg_write */ -int WINAPI __wine_dbg_write( const char *str, unsigned int len ) +NTSTATUS unixcall_wine_dbg_write( void *args ) { - return write( 2, str, len ); + struct wine_dbg_write_params *params = args; + + return write( 2, params->str, params->len ); +} + +#ifdef _WIN64 +/*********************************************************************** + * wow64_wine_dbg_write + */ +NTSTATUS wow64_wine_dbg_write( void *args ) +{ + struct + { + ULONG str; + unsigned int len; + } const *params32 = args; + + return write( 2, ULongToPtr(params32->str), params32->len ); } +#endif /*********************************************************************** * __wine_dbg_output (NTDLL.@) @@ -272,7 +290,7 @@ int __cdecl __wine_dbg_output( const char *str ) if (end) { ret += append_output( info, str, end + 1 - str ); - __wine_dbg_write( info->output, info->out_pos ); + write( 2, info->output, info->out_pos ); info->out_pos = 0; str = end + 1; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index dd0c294ea92..b0834c97795 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_dbg_write, __wine_unix_spawnvp, wine_nt_to_unix_file_name, wine_server_call, @@ -2061,6 +2060,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = { load_so_dll, unwind_builtin_dll, + unixcall_wine_dbg_write, system_time_precise, }; @@ -2077,6 +2077,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { wow64_load_so_dll, wow64_unwind_builtin_dll, + wow64_wine_dbg_write, system_time_precise, }; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 6c196436cc7..fcaf51d9652 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -283,6 +283,11 @@ extern void init_cpu_info(void) DECLSPEC_HIDDEN; extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN; 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; +#ifdef _WIN64 +extern NTSTATUS wow64_wine_dbg_write( void *args ) DECLSPEC_HIDDEN; +#endif + extern void dbg_init(void) DECLSPEC_HIDDEN; extern NTSTATUS call_user_apc_dispatcher( CONTEXT *context_ptr, ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index edbfb1f19b3..9fd23627ee9 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -25,6 +25,12 @@ struct _DISPATCHER_CONTEXT; +struct wine_dbg_write_params +{ + const char *str; + unsigned int len; +}; + struct load_so_dll_params { UNICODE_STRING nt_name; @@ -42,6 +48,7 @@ enum ntdll_unix_funcs { unix_load_so_dll, unix_unwind_builtin_dll, + unix_wine_dbg_write, unix_system_time_precise, }; diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index e9b8df76e7c..41215e58bb0 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -541,18 +541,6 @@ NTSTATUS WINAPI wow64_NtSetDefaultUILanguage( UINT *args ) } -/********************************************************************** - * wow64___wine_dbg_write - */ -NTSTATUS WINAPI wow64___wine_dbg_write( UINT *args ) -{ - const char *str = get_ptr( &args ); - ULONG len = get_ulong( &args ); - - return __wine_dbg_write( str, len ); -} - - /********************************************************************** * wow64___wine_unix_spawnvp */ diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 466821146e6..801bc6054da 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_dbg_write ) \ SYSCALL_ENTRY( __wine_unix_spawnvp ) \ SYSCALL_ENTRY( wine_nt_to_unix_file_name ) \ SYSCALL_ENTRY( wine_server_call ) \

1 0

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

14 Feb '23

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 14 Feb '23

14 Feb '23

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 14 Feb '23

14 Feb '23

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

Alexandre Julliard : ntdll: Replace the wine_server_handle_to_fd() syscall by a Unix call.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 46d0da53b61254d52aa86c6cb524609110cb1213 URL: https://gitlab.winehq.org/wine/wine/-/commit/46d0da53b61254d52aa86c6cb52460… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 14 13:53:15 2023 +0100 ntdll: Replace the wine_server_handle_to_fd() syscall by a Unix call. --- dlls/ntdll/loader.c | 11 +++++++++++ dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/unix/loader.c | 3 ++- dlls/ntdll/unix/server.c | 28 ++++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 2 ++ dlls/ntdll/unixlib.h | 9 +++++++++ dlls/wow64/file.c | 14 -------------- dlls/wow64/struct32.h | 2 -- dlls/wow64/syscall.h | 1 - 9 files changed, 53 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 0484be2f381..0689dd0f575 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3231,6 +3231,17 @@ NTSTATUS CDECL wine_server_fd_to_handle( int fd, unsigned int access, unsigned i } +/*********************************************************************** + * wine_server_handle_to_fd (NTDLL.@) + */ +NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int *unix_fd, + unsigned int *options ) +{ + struct wine_server_handle_to_fd_params params = { handle, access, unix_fd, options }; + + return WINE_UNIX_CALL( unix_wine_server_handle_to_fd, &params ); +} + /****************************************************************** * LdrLoadDll (NTDLL.@) */ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 48c546566e8..87f4629ee2c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1690,7 +1690,7 @@ # Server interface @ cdecl -norelay wine_server_call(ptr) @ cdecl wine_server_fd_to_handle(long long long ptr) -@ cdecl -syscall wine_server_handle_to_fd(long long ptr ptr) +@ cdecl wine_server_handle_to_fd(long long ptr ptr) # Unix interface @ stdcall __wine_unix_call(int64 long ptr) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 3095054ea08..5cbe57c020a 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_handle_to_fd, wine_unix_to_nt_file_name, }; @@ -2060,6 +2059,7 @@ const unixlib_entry_t __wine_unix_call_funcs[] = unixcall_wine_dbg_write, unixcall_wine_server_call, unixcall_wine_server_fd_to_handle, + unixcall_wine_server_handle_to_fd, unixcall_wine_spawnvp, system_time_precise, }; @@ -2080,6 +2080,7 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_wine_dbg_write, wow64_wine_server_call, wow64_wine_server_fd_to_handle, + wow64_wine_server_handle_to_fd, wow64_wine_spawnvp, system_time_precise, }; diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index fa618aa7182..1ce174d421e 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1132,6 +1132,17 @@ NTSTATUS CDECL wine_server_handle_to_fd( HANDLE handle, unsigned int access, int } +/*********************************************************************** + * unixcall_wine_server_handle_to_fd + */ +NTSTATUS unixcall_wine_server_handle_to_fd( void *args ) +{ + struct wine_server_handle_to_fd_params *params = args; + + return wine_server_handle_to_fd( params->handle, params->access, params->unix_fd, params->options ); +} + + /*********************************************************************** * server_pipe * @@ -1846,4 +1857,21 @@ NTSTATUS wow64_wine_server_fd_to_handle( void *args ) return ret; } +/********************************************************************** + * wow64_wine_server_handle_to_fd + */ +NTSTATUS wow64_wine_server_handle_to_fd( void *args ) +{ + struct + { + ULONG handle; + unsigned int access; + ULONG unix_fd; + ULONG options; + } const *params32 = args; + + return wine_server_handle_to_fd( ULongToHandle( params32->handle ), params32->access, + ULongToPtr( params32->unix_fd ), ULongToPtr( params32->options )); +} + #endif /* _WIN64 */ diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 55e34a30886..d7d1d0d2ac0 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -286,11 +286,13 @@ 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_server_handle_to_fd( 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_server_handle_to_fd( 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 f85223e1796..22e5663990d 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -39,6 +39,14 @@ struct wine_server_fd_to_handle_params HANDLE *handle; }; +struct wine_server_handle_to_fd_params +{ + HANDLE handle; + unsigned int access; + int *unix_fd; + unsigned int *options; +}; + struct wine_spawnvp_params { char **argv; @@ -65,6 +73,7 @@ enum ntdll_unix_funcs unix_wine_dbg_write, unix_wine_server_call, unix_wine_server_fd_to_handle, + unix_wine_server_handle_to_fd, unix_wine_spawnvp, unix_system_time_precise, }; diff --git a/dlls/wow64/file.c b/dlls/wow64/file.c index 74b27ddba93..3254d69d14a 100644 --- a/dlls/wow64/file.c +++ b/dlls/wow64/file.c @@ -944,20 +944,6 @@ NTSTATUS WINAPI wow64_wine_nt_to_unix_file_name( UINT *args ) } -/********************************************************************** - * wow64_wine_server_handle_to_fd - */ -NTSTATUS WINAPI wow64_wine_server_handle_to_fd( UINT *args ) -{ - HANDLE handle = get_handle( &args ); - ACCESS_MASK access = get_ulong( &args ); - int *unix_fd = get_ptr( &args ); - unsigned int *options = get_ptr( &args ); - - return wine_server_handle_to_fd( handle, access, unix_fd, options ); -} - - /********************************************************************** * wow64_wine_unix_to_nt_file_name */ diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index 5780fb574a6..76308a7f659 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -21,8 +21,6 @@ #ifndef __WOW64_STRUCT32_H #define __WOW64_STRUCT32_H -#include "wine/server.h" - typedef struct { ULONG Length; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 41abf509569..e91be71ebac 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_handle_to_fd ) \ SYSCALL_ENTRY( wine_unix_to_nt_file_name ) #endif /* __WOW64_SYSCALL_H */

1 0

Francois Gouget : dpnet/tests: Fix the unexpected async handle traces.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: cde58336b5154f6ade5238f310779ae9687a48ec URL: https://gitlab.winehq.org/wine/wine/-/commit/cde58336b5154f6ade5238f310779a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 13:54:39 2023 +0100 dpnet/tests: Fix the unexpected async handle traces. --- dlls/dpnet/tests/client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 2f7d6335a97..069966e666c 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -307,7 +307,7 @@ static void test_enum_hosts(void) hr = IDirectPlay8Client_CancelAsyncOperation(client, async, 0); ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08lx\n", hr); todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); - todo_wine ok(lastAsyncHandle == async, "got 0x%08lx\n", async); + todo_wine ok(lastAsyncHandle == async, "got 0x%08lx\n", lastAsyncHandle); hr = IDirectPlay8Client_Initialize(client2, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "got %lx\n", hr); @@ -322,7 +322,7 @@ static void test_enum_hosts(void) ok(hr == S_OK, "IDirectPlay8Client_CancelAsyncOperation failed with 0x%08lx\n", hr); flaky todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); - todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", async2); + todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", lastAsyncHandle); IDirectPlay8Address_Release(local); IDirectPlay8Address_Release(host); @@ -745,7 +745,7 @@ static void test_enum_hosts_peer(void) hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08lx\n", hr); todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); - todo_wine ok(lastAsyncHandle == async, "got 0x%08lx\n", async); + todo_wine ok(lastAsyncHandle == async, "got 0x%08lx\n", lastAsyncHandle); lastAsyncCode = E_FAIL; lastAsyncHandle = 0xdeadbeef; @@ -754,7 +754,7 @@ static void test_enum_hosts_peer(void) flaky todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08lx\n", lastAsyncCode); flaky - todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", async2); + todo_wine ok(lastAsyncHandle == async2, "got 0x%08lx\n", lastAsyncHandle); IDirectPlay8Peer_Release(peer2); IDirectPlay8Address_Release(local);

1 0

Rémi Bernon : dinput: Split dinput_unacquire_window_devices helper.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 7f9fb63aec7f00e73b3c0756d48947059c2b1797 URL: https://gitlab.winehq.org/wine/wine/-/commit/7f9fb63aec7f00e73b3c0756d48947… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Feb 12 00:25:29 2023 +0100 dinput: Split dinput_unacquire_window_devices helper. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54431 --- dlls/dinput/dinput_main.c | 52 ++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 149dd402aa8..6ea6338fd99 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -163,40 +163,50 @@ static void dinput_unacquire_window_devices( HWND window ) LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry ) { - if (!window || window == impl->win) - { - TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - } + if (window != impl->win) continue; + TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry ) { - if (!window || window == impl->win) - { - TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - } + if (window != impl->win) continue; + TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_rawmouse_list, struct dinput_device, entry ) { - if (!window || window == impl->win) - { - TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - } + if (window != impl->win) continue; + TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry ) { - if (!window || window == impl->win) - { - TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); - dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); - } + if (window != impl->win) continue; + TRACE( "%p window is not foreground - unacquiring %p\n", impl->win, impl ); + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); } LeaveCriticalSection( &dinput_hook_crit ); } +static void dinput_unacquire_devices(void) +{ + struct dinput_device *impl, *next; + + EnterCriticalSection( &dinput_hook_crit ); + + LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_device_list, struct dinput_device, entry ) + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); + LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_mouse_list, struct dinput_device, entry ) + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); + LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_rawmouse_list, struct dinput_device, entry ) + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); + LIST_FOR_EACH_ENTRY_SAFE( impl, next, &acquired_keyboard_list, struct dinput_device, entry ) + dinput_device_internal_unacquire( &impl->IDirectInputDevice8W_iface, STATUS_UNACQUIRED ); + + LeaveCriticalSection( &dinput_hook_crit ); +} + static LRESULT CALLBACK callwndproc_proc( int code, WPARAM wparam, LPARAM lparam ) { CWPSTRUCT *msg = (CWPSTRUCT *)lparam; @@ -390,7 +400,7 @@ static DWORD WINAPI dinput_thread_proc( void *params ) if (state.running) { ERR( "Unexpected termination, ret %#lx\n", ret ); - dinput_unacquire_window_devices( 0 ); + dinput_unacquire_devices(); } while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] );

1 0

Rémi Bernon : dinput: Name input thread message and wparam values.
by Alexandre Julliard 14 Feb '23

14 Feb '23

Module: wine Branch: master Commit: 20a835a20beb9baa3d09e8123ca4f715f16265aa URL: https://gitlab.winehq.org/wine/wine/-/commit/20a835a20beb9baa3d09e8123ca4f7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 13 23:42:45 2023 +0100 dinput: Name input thread message and wparam values. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54431 --- dlls/dinput/dinput_main.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6ea6338fd99..0bff483f100 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -49,6 +49,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #define INPUT_THREAD_MAX_DEVICES 128 +#define INPUT_THREAD_NOTIFY (WM_USER + 0x10) +#define NOTIFY_THREAD_STOP 0 +#define NOTIFY_REFRESH_DEVICES 1 + struct input_thread_state { BOOL running; @@ -101,7 +105,7 @@ void dinput_hooks_acquire_device( IDirectInputDevice8W *iface ) list_add_tail( &acquired_device_list, &impl->entry ); LeaveCriticalSection( &dinput_hook_crit ); - SendMessageW( di_em_win, WM_USER + 0x10, 1, 0 ); + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); } void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) @@ -112,7 +116,7 @@ void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) list_remove( &impl->entry ); LeaveCriticalSection( &dinput_hook_crit ); - SendMessageW( di_em_win, WM_USER + 0x10, 1, 0 ); + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); } static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface, DWORD status ) @@ -324,15 +328,19 @@ static LRESULT WINAPI di_em_win_wndproc(HWND hwnd, UINT msg, WPARAM wparam, LPAR } } - if (msg == WM_USER + 0x10) + if (msg == INPUT_THREAD_NOTIFY) { TRACE( "Processing hook change notification wparam %#Ix, lparam %#Ix.\n", wparam, lparam ); - if (!wparam) state->running = FALSE; - else + switch (wparam) { + case NOTIFY_THREAD_STOP: + state->running = FALSE; + break; + case NOTIFY_REFRESH_DEVICES: while (state->devices_count--) dinput_device_internal_release( state->devices[state->devices_count] ); input_thread_update_device_list( state ); + break; } return 0; @@ -440,7 +448,7 @@ void input_thread_remove_user(void) { TRACE( "Stopping input thread.\n" ); - SendMessageW( di_em_win, WM_USER + 0x10, 0, 0 ); + SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_THREAD_STOP, 0 ); WaitForSingleObject( dinput_thread, INFINITE ); CloseHandle( dinput_thread ); }

1 0