May 2021 - Wine-Commits - list.winehq.org

Alexandre Julliard : ntdll: Add platform-specific helpers for getting/setting the Wow64 context.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: e8a1341f5c1cc1c0116f1aaef3b49baeb33a83f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8a1341f5c1cc1c0116f1aae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 11:58:40 2021 +0200 ntdll: Add platform-specific helpers for getting/setting the Wow64 context. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 18 ++++++++++++++++++ dlls/ntdll/unix/signal_arm64.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ntdll/unix/signal_i386.c | 18 ++++++++++++++++++ dlls/ntdll/unix/signal_x86_64.c | 25 +++++++++++++++++++++++++ dlls/ntdll/unix/thread.c | 26 ++------------------------ dlls/ntdll/unix/unix_private.h | 2 ++ 6 files changed, 101 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index f8c118c116d..c0cf53d503f 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -411,6 +411,24 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } +/*********************************************************************** + * set_thread_wow64_context + */ +NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) +{ + return STATUS_INVALID_INFO_CLASS; +} + + +/*********************************************************************** + * get_thread_wow64_context + */ +NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) +{ + return STATUS_INVALID_INFO_CLASS; +} + + /*********************************************************************** * setup_exception * diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 28d7c1df8b3..a685b072431 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -481,6 +481,42 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } +/*********************************************************************** + * set_thread_wow64_context + */ +NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) +{ + BOOL self; + USHORT machine; + + switch (size) + { + case sizeof(I386_CONTEXT): machine = IMAGE_FILE_MACHINE_I386; break; + case sizeof(ARM_CONTEXT): machine = IMAGE_FILE_MACHINE_ARMNT; break; + default: return STATUS_INFO_LENGTH_MISMATCH; + } + return set_thread_context( handle, ctx, &self, machine ); +} + + +/*********************************************************************** + * get_thread_wow64_context + */ +NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) +{ + BOOL self; + USHORT machine; + + switch (size) + { + case sizeof(I386_CONTEXT): machine = IMAGE_FILE_MACHINE_I386; break; + case sizeof(ARM_CONTEXT): machine = IMAGE_FILE_MACHINE_ARMNT; break; + default: return STATUS_INFO_LENGTH_MISMATCH; + } + return get_thread_context( handle, ctx, &self, machine ); +} + + /* Note, unwind_builtin_dll above has hardcoded assumptions on how this * function stores things on the stack; if modified, modify that one in * sync as well. */ diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 3c7b07e0707..da635c0f516 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1255,6 +1255,24 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } +/*********************************************************************** + * set_thread_wow64_context + */ +NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) +{ + return STATUS_INVALID_INFO_CLASS; +} + + +/*********************************************************************** + * get_thread_wow64_context + */ +NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) +{ + return STATUS_INVALID_INFO_CLASS; +} + + /*********************************************************************** * is_privileged_instr * diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index d79ddf7d250..b2cda5eef13 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1849,6 +1849,31 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) return STATUS_SUCCESS; } + +/*********************************************************************** + * set_thread_wow64_context + */ +NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) +{ + BOOL self; + + if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; + return set_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); +} + + +/*********************************************************************** + * get_thread_wow64_context + */ +NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) +{ + BOOL self; + + if (size != sizeof(I386_CONTEXT)) return STATUS_INFO_LENGTH_MISMATCH; + return get_thread_context( handle, ctx, &self, IMAGE_FILE_MACHINE_I386 ); +} + + extern void CDECL raise_func_trampoline( void *dispatcher ); __ASM_GLOBAL_FUNC( raise_func_trampoline, diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index d8fd0767da8..624dff0e5f1 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1665,19 +1665,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, } case ThreadWow64Context: - { -#ifdef _WIN64 - BOOL self; - WOW64_CONTEXT *context = data; - - if (length != sizeof(*context)) return STATUS_INFO_LENGTH_MISMATCH; - if ((status = get_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ))) return status; - if (ret_len && !status) *ret_len = sizeof(*context); - return status; -#else - return STATUS_INVALID_INFO_CLASS; -#endif - } + return get_thread_wow64_context( handle, data, length ); case ThreadHideFromDebugger: if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; @@ -1860,17 +1848,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, } case ThreadWow64Context: - { -#ifdef _WIN64 - BOOL self; - const WOW64_CONTEXT *context = data; - - if (length != sizeof(*context)) return STATUS_INFO_LENGTH_MISMATCH; - return set_thread_context( handle, context, &self, IMAGE_FILE_MACHINE_I386 ); -#else - return STATUS_INVALID_INFO_CLASS; -#endif - } + return set_thread_wow64_context( handle, data, length ); case ThreadEnableAlignmentFaultFixup: if (length != sizeof(BOOLEAN)) return STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 41df2d431a3..bd00d4e9d42 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -236,6 +236,8 @@ extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE ent extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int) ) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void signal_restore_full_cpu_context(void) DECLSPEC_HIDDEN; +extern NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) DECLSPEC_HIDDEN; +extern NTSTATUS set_thread_wow64_context( HANDLE handle, const void *ctx, ULONG size ) DECLSPEC_HIDDEN; extern void fill_vm_counters( VM_COUNTERS_EX *pvmi, int unix_pid ) DECLSPEC_HIDDEN; extern NTSTATUS open_hkcu_key( const char *path, HANDLE *key ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Pass a server context to server_select().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 8eda3fcc68f281c05518ec1b17522aaf6fcf7d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8eda3fcc68f281c05518ec1b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 16:20:08 2021 +0200 ntdll: Pass a server context to server_select(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 27 ++++----------------------- dlls/ntdll/unix/thread.c | 29 ++++++++++------------------- dlls/ntdll/unix/unix_private.h | 4 +--- 3 files changed, 15 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index d77a476f7a6..d153fdce0be 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -620,24 +620,18 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO * server_select */ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, pthread_mutex_t *mutex, + timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, user_apc_t *user_apc ) { unsigned int ret; int cookie; obj_handle_t apc_handle = 0; - context_t server_context; - BOOL suspend_context = FALSE; + BOOL suspend_context = !!context; apc_call_t call; apc_result_t result; sigset_t old_set; memset( &result, 0, sizeof(result) ); - if (context) - { - suspend_context = TRUE; - context_to_server( &server_context, context, current_machine ); - } do { @@ -655,26 +649,13 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT wine_server_add_data( req, select_op, size ); if (suspend_context) { - wine_server_add_data( req, &server_context, sizeof(server_context) ); + wine_server_add_data( req, context, sizeof(*context) ); suspend_context = FALSE; /* server owns the context now */ } - if (context) wine_server_set_reply( req, &server_context, sizeof(server_context) ); + if (context) wine_server_set_reply( req, context, sizeof(*context) ); ret = server_call_unlocked( req ); apc_handle = reply->apc_handle; call = reply->call; - if (wine_server_reply_size( reply )) - { - DWORD context_flags = context->ContextFlags; /* unchanged registers are still available */ - XSTATE *xs = xstate_from_context( context ); - ULONG64 mask; - - if (xs) - mask = xs->Mask; - context_from_server( context, &server_context, current_machine ); - context->ContextFlags |= context_flags; - if (xs) - xs->Mask |= mask; - } } SERVER_END_REQ; diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 4d2aa47270d..639031059c6 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -139,7 +139,7 @@ static unsigned int get_server_context_flags( const void *context, USHORT machin * * Convert a register context to the server format. */ -NTSTATUS context_to_server( context_t *to, const void *src, USHORT machine ) +static NTSTATUS context_to_server( context_t *to, const void *src, USHORT machine ) { DWORD i, flags; @@ -388,7 +388,7 @@ NTSTATUS context_to_server( context_t *to, const void *src, USHORT machine ) * * Convert a register context from the server format. */ -NTSTATUS context_from_server( void *dst, const context_t *from, USHORT machine ) +static NTSTATUS context_from_server( void *dst, const context_t *from, USHORT machine ) { DWORD i; @@ -1052,9 +1052,12 @@ void exit_process( int status ) void wait_suspend( CONTEXT *context ) { int saved_errno = errno; + context_t server_context; + context_to_server( &server_context, context, current_machine ); /* wait with 0 timeout, will only return once the thread is no longer suspended */ - server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, context, NULL, NULL ); + server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, &server_context, NULL, NULL ); + context_from_server( context, &server_context, current_machine ); errno = saved_errno; } @@ -1095,22 +1098,15 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c if (handle) { - struct xcontext exception_context; - DECLSPEC_ALIGN(64) XSTATE xs; - XSTATE *src_xs; + context_t server_context; select_op.wait.op = SELECT_WAIT; select_op.wait.handles[0] = handle; - exception_context.c = *context; - if ((src_xs = xstate_from_context( context ))) - { - context_init_xstate( &exception_context.c, &xs ); - memcpy( &xs, src_xs, sizeof(xs) ); - } + context_to_server( &server_context, context, current_machine ); server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, - TIMEOUT_INFINITE, &exception_context.c, NULL, NULL ); + TIMEOUT_INFINITE, &server_context, NULL, NULL ); SERVER_START_REQ( get_exception_status ) { @@ -1118,12 +1114,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c ret = wine_server_call( req ); } SERVER_END_REQ; - if (ret >= 0) - { - *context = exception_context.c; - if (src_xs) - memcpy( src_xs, &xs, sizeof(xs) ); - } + if (ret >= 0) context_from_server( context, &server_context, current_machine ); } pthread_sigmask( SIG_SETMASK, &old_set, NULL ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 3ec412959bc..41df2d431a3 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -159,7 +159,7 @@ extern unsigned int server_call_unlocked( void *req_ptr ) DECLSPEC_HIDDEN; extern void server_enter_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern void server_leave_uninterrupted_section( pthread_mutex_t *mutex, sigset_t *sigset ) DECLSPEC_HIDDEN; extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, - timeout_t abs_timeout, CONTEXT *context, pthread_mutex_t *mutex, + timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, user_apc_t *user_apc ) DECLSPEC_HIDDEN; extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; @@ -177,8 +177,6 @@ extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; extern void set_thread_id( TEB *teb, DWORD pid, DWORD tid ) DECLSPEC_HIDDEN; extern NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR zero_bits, SIZE_T reserve_size, SIZE_T commit_size, SIZE_T *pthread_size ) DECLSPEC_HIDDEN; -extern NTSTATUS context_to_server( context_t *to, const void *src, USHORT machine ) DECLSPEC_HIDDEN; -extern NTSTATUS context_from_server( void *dst, const context_t *from, USHORT machine ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_thread( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN abort_process( int status ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN exit_process( int status ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : ntdll: Make the server context conversion functions generic.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: f04c2bd4f1e16d0b51cfaf18a5f2f42bacc70a15 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f04c2bd4f1e16d0b51cfaf18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 10:18:19 2021 +0200 ntdll: Make the server context conversion functions generic. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/server.c | 4 +- dlls/ntdll/unix/signal_arm.c | 138 +------ dlls/ntdll/unix/signal_arm64.c | 130 +------ dlls/ntdll/unix/signal_i386.c | 175 +-------- dlls/ntdll/unix/signal_x86_64.c | 226 +---------- dlls/ntdll/unix/thread.c | 818 +++++++++++++++++++++++++++++++--------- dlls/ntdll/unix/unix_private.h | 44 +-- 7 files changed, 651 insertions(+), 884 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f04c2bd4f1e16d0b51cf…

1 0

Paul Gofman : wbemprox: Check for method existence in class_object_GetMethod().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 09b0154ac111e032d3d12a94479da1bd4a3d02cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=09b0154ac111e032d3d12a94… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 18 09:49:44 2021 +0200 wbemprox: Check for method existence in class_object_GetMethod(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/class.c | 17 +++++++++++++++++ dlls/wbemprox/tests/query.c | 11 +++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index f48c815ef8d..2f2d3ef2bfb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -875,10 +875,27 @@ static HRESULT WINAPI class_object_GetMethod( { struct class_object *co = impl_from_IWbemClassObject( iface ); IWbemClassObject *in, *out; + struct table *table; + unsigned int i; HRESULT hr; TRACE("%p, %s, %08x, %p, %p\n", iface, debugstr_w(wszName), lFlags, ppInSignature, ppOutSignature); + if (ppInSignature) *ppInSignature = NULL; + if (ppOutSignature) *ppOutSignature = NULL; + + table = get_view_table( impl_from_IEnumWbemClassObject( co->iter )->query->view, co->index ); + + for (i = 0; i < table->num_cols; ++i) + { + if (is_method( table, i ) && !lstrcmpiW( table->columns[i].name, wszName )) break; + } + if (i == table->num_cols) + { + FIXME("Method %s not found in class %s.\n", debugstr_w(wszName), debugstr_w(co->name)); + return WBEM_E_NOT_FOUND; + } + hr = create_signature( co->name, wszName, PARAM_IN, &in ); if (hr != S_OK) return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index a79bc759bea..85b242aba6f 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -460,7 +460,7 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) WBEM_FLAVOR_ORIGIN_PROPAGATED; WCHAR full_path[MAX_COMPUTERNAME_LENGTH + ARRAY_SIZE( L"\\\\%s\\ROOT\\CIMV2:" )]; BSTR class, method; - IWbemClassObject *process, *sig_in, *out; + IWbemClassObject *process, *sig_in, *sig_out, *out; IWbemQualifierSet *qualifiers; VARIANT retval, val; SAFEARRAY *names; @@ -504,8 +504,15 @@ static void test_Win32_Process( IWbemServices *services, BOOL use_full_path ) } SafeArrayDestroy( names ); + sig_in = (void *)0xdeadbeef; + sig_out = (void *)0xdeadbeef; + hr = IWbemClassObject_GetMethod( process, L"unknown", 0, &sig_in, &sig_out ); + ok( hr == WBEM_E_NOT_FOUND, "Got unexpected hr %#x\n", hr ); + ok( !sig_in, "Got unexpected sig_in %p.\n", sig_in ); + ok( !sig_out, "Got unexpected sig_out %p.\n", sig_out ); + sig_in = (void*)0xdeadbeef; - hr = IWbemClassObject_GetMethod( process, L"GetOwner", 0, &sig_in, NULL ); + hr = IWbemClassObject_GetMethod( process, L"getowner", 0, &sig_in, NULL ); ok( hr == S_OK, "failed to get GetOwner method %08x\n", hr ); ok( !sig_in, "sig_in != NULL\n"); IWbemClassObject_Release( process );

1 0

Zebediah Figura : advapi32: Quiet a couple of noisy FIXMEs.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 805a670ce5fd338acc8b1b10d80102c0a07ab106 URL: https://source.winehq.org/git/wine.git/?a=commit;h=805a670ce5fd338acc8b1b10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 23:42:08 2021 -0500 advapi32: Quiet a couple of noisy FIXMEs. The .NET installers call these many times. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/lsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index 7b118733b50..7e6bfc74620 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -190,7 +190,7 @@ NTSTATUS WINAPI LsaAddAccountRights( */ NTSTATUS WINAPI LsaClose(IN LSA_HANDLE ObjectHandle) { - FIXME("(%p) stub\n", ObjectHandle); + WARN("(%p) stub\n", ObjectHandle); return STATUS_SUCCESS; } @@ -734,7 +734,7 @@ NTSTATUS WINAPI LsaOpenPolicy( IN ACCESS_MASK DesiredAccess, IN OUT PLSA_HANDLE PolicyHandle) { - FIXME("(%s,%p,0x%08x,%p) stub\n", + WARN("(%s,%p,0x%08x,%p) stub\n", SystemName?debugstr_w(SystemName->Buffer):"(null)", ObjectAttributes, DesiredAccess, PolicyHandle);

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_CONNECT in connect().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: a891713f48fbcdae05f27f7e73b1cec78cf42644 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a891713f48fbcdae05f27f7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:30:01 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_CONNECT in connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 106 ++++++++++++++++++----------------------------- dlls/ws2_32/tests/sock.c | 21 +--------- 2 files changed, 43 insertions(+), 84 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3a39493bc3b..889f0327baf 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1145,13 +1145,6 @@ static void _get_sock_errors(SOCKET s, int *events) SERVER_END_REQ; } -static int get_sock_error(SOCKET s, unsigned int bit) -{ - int events[FD_MAX_EVENTS]; - _get_sock_errors(s, events); - return events[bit]; -} - static int _get_fd_type(int fd) { int sock_type = -1; @@ -2976,82 +2969,65 @@ int WINAPI WS_closesocket(SOCKET s) return res; } -static int do_connect(int fd, const struct WS_sockaddr* name, int namelen) + +/*********************************************************************** + * connect (ws2_32.4) + */ +int WINAPI WS_connect( SOCKET s, const struct WS_sockaddr *addr, int len ) { union generic_unix_sockaddr uaddr; - unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr); + unsigned int uaddrlen = ws_sockaddr_ws2u( addr, len, &uaddr ); + struct afd_connect_params *params; + IO_STATUS_BLOCK io; + HANDLE sync_event; + NTSTATUS status; + + TRACE( "socket %#lx, addr %s, len %d\n", s, debugstr_sockaddr(addr), len ); if (!uaddrlen) - return WSAEFAULT; + { + SetLastError( WSAEFAULT ); + return -1; + } - if (name->sa_family == WS_AF_INET) + if (addr->sa_family == WS_AF_INET) { - struct sockaddr_in *in4 = (struct sockaddr_in*) &uaddr; - if (memcmp(&in4->sin_addr, magic_loopback_addr, 4) == 0) + struct sockaddr_in *in4 = (struct sockaddr_in *)&uaddr; + if (!memcmp(&in4->sin_addr, magic_loopback_addr, sizeof(magic_loopback_addr))) { - /* Trying to connect to magic replace-loopback address, - * assuming we really want to connect to localhost */ - TRACE("Trying to connect to magic IP address, using " - "INADDR_LOOPBACK instead.\n"); + TRACE("Replacing magic address 127.12.34.56 with INADDR_LOOPBACK.\n"); in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); } } - if (connect(fd, &uaddr.addr, uaddrlen) == 0) - return 0; - - return wsaErrno(); -} - -/*********************************************************************** - * connect (WS2_32.4) - */ -int WINAPI WS_connect(SOCKET s, const struct WS_sockaddr* name, int namelen) -{ - int fd = get_sock_fd( s, FILE_READ_DATA, NULL ); + if (!(sync_event = get_sync_event())) return -1; - TRACE("socket %04lx, ptr %p %s, length %d\n", s, name, debugstr_sockaddr(name), namelen); - - if (fd != -1) + if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + uaddrlen ))) { - BOOL is_blocking; - int ret = do_connect(fd, name, namelen); - if (ret == 0) - goto connect_success; - - if (ret == WSAEWOULDBLOCK) - { - /* tell wineserver that a connection is in progress */ - _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, - FD_CONNECT, - FD_WINE_CONNECTED|FD_WINE_LISTENING); - ret = sock_is_blocking( s, &is_blocking ); - if (!ret) - { - if (is_blocking) - { - do_block(fd, POLLIN | POLLOUT, -1); - _sync_sock_state(s); /* let wineserver notice connection */ - /* retrieve any error codes from it */ - if (!(ret = get_sock_error(s, FD_CONNECT_BIT))) goto connect_success; - } - else ret = WSAEWOULDBLOCK; - } - } - release_sock_fd( s, fd ); - SetLastError(ret); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return -1; } - return SOCKET_ERROR; + params->addr_len = uaddrlen; + params->synchronous = TRUE; + memcpy(params + 1, &uaddr, uaddrlen); -connect_success: - release_sock_fd( s, fd ); - _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, - FD_WINE_CONNECTED|FD_READ|FD_WRITE, - FD_CONNECT|FD_WINE_LISTENING); - TRACE("\tconnected %04lx\n", s); + status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_CONNECT, + params, sizeof(*params) + uaddrlen, NULL, 0); + HeapFree( GetProcessHeap(), 0, params ); + if (status == STATUS_PENDING) + { + if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) return -1; + status = io.u.Status; + } + if (status) + { + SetLastError( NtStatusToWSAError( status ) ); + return -1; + } return 0; } + /*********************************************************************** * WSAConnect (WS2_32.30) */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 33cdd5d6d15..5028a4e749e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4159,7 +4159,7 @@ static void test_connect_events(struct event_test_ctx *ctx) if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); else - check_events_todo(ctx, FD_CONNECT, FD_WRITE, 200); + check_events(ctx, FD_CONNECT, FD_WRITE, 200); closesocket(client); closesocket(server); @@ -6117,25 +6117,8 @@ todo_wine /* try to connect a socket that's being accepted into */ iret = connect(acceptor, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); - todo_wine ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, + ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "connecting to acceptex acceptor succeeded? return %d + errno %d\n", iret, WSAGetLastError()); - if (!iret || (iret == SOCKET_ERROR && WSAGetLastError() == WSAEWOULDBLOCK)) { - /* We need to cancel this call, otherwise things fail */ - closesocket(acceptor); - acceptor = socket(AF_INET, SOCK_STREAM, 0); - ok(acceptor != INVALID_SOCKET, "failed to create socket, error %u\n", GetLastError()); - - bret = CancelIo((HANDLE) listener); - ok(bret, "Failed to cancel failed test. Bailing...\n"); - if (!bret) return; - - overlapped.Internal = 0xdeadbeef; - bret = pAcceptEx(listener, acceptor, buffer, 0, - sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, - &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); - ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); - } bret = pConnectEx(acceptor, (struct sockaddr *)&bindAddress, sizeof(bindAddress), NULL, 0, &bytesReturned, &overlapped2);

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_CONNECT in ConnectEx().
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: d3b6c772a5ac73f8c78427a37767ce77b1c52dff URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3b6c772a5ac73f8c78427a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:30:00 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_CONNECT in ConnectEx(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 138 ++++++++++++++++++--------------------------------- 1 file changed, 48 insertions(+), 90 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0c1ba594825..3a39493bc3b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3064,116 +3064,74 @@ int WINAPI WSAConnect( SOCKET s, const struct WS_sockaddr* name, int namelen, return WS_connect( s, name, namelen ); } -/*********************************************************************** - * ConnectEx - */ -static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int namelen, - PVOID sendBuf, DWORD sendBufLen, LPDWORD sent, LPOVERLAPPED ov) -{ - int fd, ret, status; - if (!ov) - { - SetLastError( ERROR_INVALID_PARAMETER ); - return FALSE; - } +static BOOL WINAPI WS2_ConnectEx( SOCKET s, const struct WS_sockaddr *name, int namelen, + void *send_buffer, DWORD send_len, DWORD *ret_len, OVERLAPPED *overlapped ) +{ + union generic_unix_sockaddr uaddr; + unsigned int uaddrlen = ws_sockaddr_ws2u(name, namelen, &uaddr); + struct afd_connect_params *params; + void *cvalue = NULL; + NTSTATUS status; + int fd, ret; - fd = get_sock_fd( s, FILE_READ_DATA, NULL ); - if (fd == -1) return FALSE; + TRACE( "socket %#lx, ptr %p %s, length %d, send_buffer %p, send_len %u, overlapped %p\n", + s, name, debugstr_sockaddr(name), namelen, send_buffer, send_len, overlapped ); - TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", - s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); + if ((fd = get_sock_fd( s, FILE_READ_DATA, NULL )) == -1) + return FALSE; - ret = is_fd_bound(fd, NULL, NULL); - if (ret <= 0) + if ((ret = is_fd_bound( fd, NULL, NULL )) <= 0) { - SetLastError(ret == -1 ? wsaErrno() : WSAEINVAL); + SetLastError( ret ? wsaErrno() : WSAEINVAL ); release_sock_fd( s, fd ); return FALSE; } + release_sock_fd( s, fd ); - ret = do_connect(fd, name, namelen); - if (ret == 0) + if (!overlapped) { - WSABUF wsabuf; - - _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, - FD_WINE_CONNECTED|FD_READ|FD_WRITE, - FD_CONNECT|FD_WINE_LISTENING); - - wsabuf.len = sendBufLen; - wsabuf.buf = (char*) sendBuf; - - /* WSASend takes care of completion if need be */ - if (WSASend(s, &wsabuf, sendBuf ? 1 : 0, sent, 0, ov, NULL) != SOCKET_ERROR) - goto connection_success; + SetLastError( WSA_INVALID_PARAMETER ); + return FALSE; } - else if (ret == WSAEWOULDBLOCK) - { - struct ws2_async *wsa; - DWORD size; - - ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0; - _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, - FD_CONNECT, - FD_WINE_CONNECTED|FD_WINE_LISTENING); + if (!((ULONG_PTR)overlapped->hEvent & 1)) cvalue = overlapped; + overlapped->Internal = STATUS_PENDING; + overlapped->InternalHigh = 0; - size = offsetof( struct ws2_async, iovec[1] ) + sendBufLen; + if (!uaddrlen) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } - /* Indirectly call WSASend */ - if (!(wsa = (struct ws2_async *)alloc_async_io( size, WS2_async_send ))) - { - SetLastError(WSAEFAULT); - } - else + if (name->sa_family == WS_AF_INET) + { + struct sockaddr_in *in4 = (struct sockaddr_in *)&uaddr; + if (!memcmp( &in4->sin_addr, magic_loopback_addr, sizeof(magic_loopback_addr) )) { - IO_STATUS_BLOCK *iosb = (IO_STATUS_BLOCK *)ov; - iosb->u.Status = STATUS_PENDING; - iosb->Information = 0; - - wsa->hSocket = SOCKET2HANDLE(s); - wsa->addr = NULL; - wsa->addrlen.val = 0; - wsa->flags = 0; - wsa->lpFlags = &wsa->flags; - wsa->control = NULL; - wsa->n_iovecs = sendBuf ? 1 : 0; - wsa->first_iovec = 0; - wsa->completion_func = NULL; - wsa->iovec[0].iov_base = &wsa->iovec[1]; - wsa->iovec[0].iov_len = sendBufLen; - - if (sendBufLen) - memcpy( wsa->iovec[0].iov_base, sendBuf, sendBufLen ); - - status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, &wsa->io, ov->hEvent, - NULL, (void *)cvalue, iosb ); - if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); - - /* If the connect already failed */ - if (status == STATUS_PIPE_DISCONNECTED) - { - ov->Internal = sock_error_to_ntstatus( get_sock_error( s, FD_CONNECT_BIT )); - ov->InternalHigh = 0; - if (cvalue) WS_AddCompletion( s, cvalue, ov->Internal, ov->InternalHigh, TRUE ); - if (ov->hEvent) NtSetEvent( ov->hEvent, NULL ); - status = STATUS_PENDING; - } - SetLastError( NtStatusToWSAError(status) ); + TRACE("Replacing magic address 127.12.34.56 with INADDR_LOOPBACK.\n"); + in4->sin_addr.s_addr = htonl(INADDR_LOOPBACK); } } - else + + if (!(params = HeapAlloc( GetProcessHeap(), 0, sizeof(*params) + uaddrlen + send_len ))) { - SetLastError(ret); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return SOCKET_ERROR; } + params->addr_len = uaddrlen; + params->synchronous = FALSE; + memcpy( params + 1, &uaddr, uaddrlen ); + memcpy( (char *)(params + 1) + uaddrlen, send_buffer, send_len ); - release_sock_fd( s, fd ); - return FALSE; - -connection_success: - release_sock_fd( s, fd ); - return TRUE; + status = NtDeviceIoControlFile( SOCKET2HANDLE(s), overlapped->hEvent, NULL, cvalue, + (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_WINE_CONNECT, + params, sizeof(*params) + uaddrlen + send_len, NULL, 0 ); + HeapFree( GetProcessHeap(), 0, params ); + if (ret_len) *ret_len = overlapped->InternalHigh; + SetLastError( NtStatusToWSAError( status ) ); + return !status; } /***********************************************************************

1 0

Zebediah Figura : ws2_32: Remove a leftover cast.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 8fbf62ec47638ade6b4374541176fe90a6fb2c8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fbf62ec47638ade6b437454… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:29:57 2021 -0500 ws2_32: Remove a leftover cast. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 94f3f139c9c..0c1ba594825 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2352,8 +2352,8 @@ SOCKET WINAPI WS_accept( SOCKET s, struct WS_sockaddr *addr, int *len ) TRACE("%#lx\n", s); if (!(sync_event = get_sync_event())) return INVALID_SOCKET; - status = NtDeviceIoControlFile( SOCKET2HANDLE(s), (HANDLE)((ULONG_PTR)sync_event | 0), NULL, NULL, &io, - IOCTL_AFD_WINE_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); + status = NtDeviceIoControlFile( (HANDLE)s, sync_event, NULL, NULL, &io, IOCTL_AFD_WINE_ACCEPT, + NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED)

1 0

Hans Leidekker : webservices: Implement WsAbortChannel.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 180edff83adad627c29930c8e1f4ede20ff9dbdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=180edff83adad627c29930c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:41 2021 +0200 webservices: Implement WsAbortChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index fb9f5b3162c..69ceb2f051e 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -290,10 +290,37 @@ static void clear_queue( struct queue *queue ) queue->ready = NULL; } -static void reset_channel( struct channel *channel ) +static void abort_channel( struct channel *channel ) { clear_queue( &channel->send_q ); clear_queue( &channel->recv_q ); +} + +/************************************************************************** + * WsAbortChannel [webservices.@] + */ +HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + + TRACE( "%p %p\n", handle, error ); + + EnterCriticalSection( &channel->cs ); + + if (channel->magic != CHANNEL_MAGIC) + { + LeaveCriticalSection( &channel->cs ); + return E_INVALIDARG; + } + + abort_channel( channel ); + + LeaveCriticalSection( &channel->cs ); + return S_OK; +} + +static void reset_channel( struct channel *channel ) +{ channel->state = WS_CHANNEL_STATE_CREATED; channel->session_state = SESSION_STATE_UNINITIALIZED; clear_addr( &channel->addr ); @@ -352,6 +379,7 @@ static void free_props( struct channel *channel ) static void free_channel( struct channel *channel ) { + abort_channel( channel ); reset_channel( channel ); WsFreeWriter( channel->writer ); @@ -631,7 +659,10 @@ HRESULT WINAPI WsResetChannel( WS_CHANNEL *handle, WS_ERROR *error ) if (channel->state != WS_CHANNEL_STATE_CREATED && channel->state != WS_CHANNEL_STATE_CLOSED) hr = WS_E_INVALID_OPERATION; else + { + abort_channel( channel ); reset_channel( channel ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); @@ -2521,12 +2552,3 @@ HRESULT channel_accept_udp( SOCKET socket, HANDLE wait, HANDLE cancel, WS_CHANNE LeaveCriticalSection( &channel->cs ); return hr; } - -/************************************************************************** - * WsAbortChannel [webservices.@] - */ -HRESULT WINAPI WsAbortChannel( WS_CHANNEL *handle, WS_ERROR *error ) -{ - FIXME( "%p %p: stub!\n", handle, error ); - return E_NOTIMPL; -}

1 0

Zebediah Figura : ws2_32: Cache the synchronous I/O event in the per-thread data.
by Alexandre Julliard May 18, 2021

May 18, 2021

Module: wine Branch: master Commit: 520a84870f300de0422aa815198b3fd5ea6fdab1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=520a84870f300de0422aa815… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 17 21:29:56 2021 -0500 ws2_32: Cache the synchronous I/O event in the per-thread data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 +++++++++++++----- dlls/ws2_32/ws2_32_private.h | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2ba1982b1d9..94f3f139c9c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1280,6 +1280,8 @@ static void free_per_thread_data(void) if (!ptb) return; + CloseHandle( ptb->sync_event ); + /* delete scratch buffers */ HeapFree( GetProcessHeap(), 0, ptb->he_buffer ); HeapFree( GetProcessHeap(), 0, ptb->se_buffer ); @@ -1290,6 +1292,16 @@ static void free_per_thread_data(void) NtCurrentTeb()->WinSockData = NULL; } +static HANDLE get_sync_event(void) +{ + struct per_thread_data *data; + + if (!(data = get_per_thread_data())) return NULL; + if (!data->sync_event) + data->sync_event = CreateEventW( NULL, TRUE, FALSE, NULL ); + return data->sync_event; +} + /*********************************************************************** * DllMain (WS2_32.init) */ @@ -2339,19 +2351,15 @@ SOCKET WINAPI WS_accept( SOCKET s, struct WS_sockaddr *addr, int *len ) TRACE("%#lx\n", s); - if (!(sync_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return INVALID_SOCKET; + if (!(sync_event = get_sync_event())) return INVALID_SOCKET; status = NtDeviceIoControlFile( SOCKET2HANDLE(s), (HANDLE)((ULONG_PTR)sync_event | 0), NULL, NULL, &io, IOCTL_AFD_WINE_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) - { - CloseHandle( sync_event ); return SOCKET_ERROR; - } status = io.u.Status; } - CloseHandle( sync_event ); if (status) { WARN("failed; status %#x\n", status); diff --git a/dlls/ws2_32/ws2_32_private.h b/dlls/ws2_32/ws2_32_private.h index e86a3569510..527dbe903b4 100644 --- a/dlls/ws2_32/ws2_32_private.h +++ b/dlls/ws2_32/ws2_32_private.h @@ -181,6 +181,7 @@ UINT sock_get_error( int err ) DECLSPEC_HIDDEN; struct per_thread_data { + HANDLE sync_event; /* event to wait on for synchronous ioctls */ int opentype; struct WS_hostent *he_buffer; struct WS_servent *se_buffer;

1 0