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

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

18 May '21

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: Export RtlWow64Get/SetThreadContext() on all 64-bit platforms.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: ee0b909f878ae56cd24025336ba9f6e7ef445697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee0b909f878ae56cd2402533… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 10:24:28 2021 +0200 ntdll: Export RtlWow64Get/SetThreadContext() on all 64-bit platforms. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/process.c | 18 ++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 18 ------------------ dlls/ntdll/unix/thread.c | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 06ca3d3957c..f05e9c39a88 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1073,9 +1073,9 @@ @ stdcall -arch=win64 RtlWow64GetCpuAreaInfo(ptr long ptr) @ stdcall RtlWow64GetCurrentMachine() @ stdcall RtlWow64GetProcessMachines(long ptr ptr) -@ stdcall -arch=x86_64 RtlWow64GetThreadContext(long ptr) +@ stdcall -arch=win64 RtlWow64GetThreadContext(long ptr) @ stdcall RtlWow64IsWowGuestMachineSupported(long ptr) -@ stdcall -arch=x86_64 RtlWow64SetThreadContext(long ptr) +@ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 82b1b69c4ea..3ed31e22100 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -142,6 +142,24 @@ NTSTATUS WINAPI RtlWow64GetCpuAreaInfo( WOW64_CPURESERVED *cpu, ULONG reserved, return STATUS_INVALID_PARAMETER; } + +/****************************************************************************** + * RtlWow64GetThreadContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context ) +{ + return NtQueryInformationThread( handle, ThreadWow64Context, context, sizeof(*context), NULL ); +} + + +/****************************************************************************** + * RtlWow64SetThreadContext (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context ) +{ + return NtSetInformationThread( handle, ThreadWow64Context, context, sizeof(*context) ); +} + #endif /********************************************************************** diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 0396433cb32..55975093174 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -343,24 +343,6 @@ __ASM_GLOBAL_FUNC( RtlCaptureContext, "fxsave 0x100(%rcx)\n\t" /* context->FltSave */ "ret" ); -/****************************************************************************** - * RtlWow64GetThreadContext (NTDLL.@) - */ -NTSTATUS WINAPI RtlWow64GetThreadContext( HANDLE handle, WOW64_CONTEXT *context ) -{ - return NtQueryInformationThread( handle, ThreadWow64Context, context, sizeof(*context), NULL ); -} - - -/****************************************************************************** - * RtlWow64SetThreadContext (NTDLL.@) - */ -NTSTATUS WINAPI RtlWow64SetThreadContext( HANDLE handle, const WOW64_CONTEXT *context ) -{ - return NtSetInformationThread( handle, ThreadWow64Context, context, sizeof(*context) ); -} - - static DWORD __cdecl nested_exception_handler( EXCEPTION_RECORD *rec, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **dispatcher ) { diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 639031059c6..d8fd0767da8 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1666,7 +1666,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadWow64Context: { -#ifdef __x86_64__ +#ifdef _WIN64 BOOL self; WOW64_CONTEXT *context = data; @@ -1861,7 +1861,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class, case ThreadWow64Context: { -#ifdef __x86_64__ +#ifdef _WIN64 BOOL self; const WOW64_CONTEXT *context = data;

1 0

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

18 May '21

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 : kernelbase: Fix PEB address for Wow64.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: ea767728c679f2d0e3ab5fc7e9f20cff2a7434a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea767728c679f2d0e3ab5fc7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 18 21:20:27 2021 +0200 kernelbase: Fix PEB address for Wow64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51151 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/debug.c | 2 +- dlls/psapi/tests/psapi_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 5d83e692222..207c04da50c 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -782,7 +782,7 @@ static BOOL init_module_iterator( struct module_iterator *iter, HANDLE process ) DWORD ldr_data32, first_module; PEB32 *peb32; - peb32 = (PEB32 *)(DWORD_PTR)pbi.PebBaseAddress; + peb32 = (PEB32 *)((char *)pbi.PebBaseAddress + 0x1000); if (!ReadProcessMemory( process, &peb32->LdrData, &ldr_data32, sizeof(ldr_data32), NULL )) return FALSE; ldr_data32_ptr = (PEB_LDR_DATA32 *)(DWORD_PTR) ldr_data32; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 8f94e0b5798..2b263d0acff 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -161,7 +161,6 @@ static void test_EnumProcessModules(void) ret = GetModuleFileNameExA(pi.hProcess, hMod, name, sizeof(name)); ok(ret, "got error %u\n", GetLastError()); -todo_wine ok(!strcmp(name, buffer), "got %s\n", name); ret = GetModuleInformation(pi.hProcess, hMod, &info, sizeof(info));

1 0

Hans Leidekker : webservices: Implement WsAbortChannel.
by Alexandre Julliard 18 May '21

18 May '21

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

Hans Leidekker : webservices: Always queue an async in WsReceiveMessage and WsRequestReply.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 96d2c61aa6630a20ba76dd7c624372c19aeb8fb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d2c61aa6630a20ba76dd7c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:42 2021 +0200 webservices: Always queue an async in WsReceiveMessage and WsRequestReply. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 58 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 69ceb2f051e..76b0c1a96e2 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -771,6 +771,34 @@ static HRESULT send_byte( SOCKET socket, BYTE byte ) return S_OK; } +struct async +{ + HRESULT hr; + HANDLE done; +}; + +static void CALLBACK async_callback( HRESULT hr, WS_CALLBACK_MODEL model, void *state ) +{ + struct async *async = state; + async->hr = hr; + SetEvent( async->done ); +} + +static void async_init( struct async *async, WS_ASYNC_CONTEXT *ctx ) +{ + async->done = CreateEventW( NULL, FALSE, FALSE, NULL ); + async->hr = E_FAIL; + ctx->callback = async_callback; + ctx->callbackState = async; +} + +static HRESULT async_wait( struct async *async ) +{ + DWORD err; + if ((err = WaitForSingleObject( async->done, INFINITE )) == WAIT_OBJECT_0) return async->hr; + return HRESULT_FROM_WIN32( err ); +} + static HRESULT shutdown_session( struct channel *channel ) { HRESULT hr; @@ -2154,6 +2182,8 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M void *value, ULONG size, ULONG *index, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %u %08x %08x %p %p %u %p %p %p\n", handle, msg, desc, count, option, read_option, heap, @@ -2170,10 +2200,14 @@ HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_M return E_INVALIDARG; } - if (ctx) - hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, ctx ); - else - hr = receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_receive_message( channel, msg, desc, count, option, read_option, heap, value, size, index, + ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr ); @@ -2266,6 +2300,8 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS WS_HEAP *heap, void *value, ULONG size, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %08x %p %u %p %p %08x %p %p %u %p %p\n", handle, request, request_desc, write_option, @@ -2287,12 +2323,14 @@ HRESULT WINAPI WsRequestReply( WS_CHANNEL *handle, WS_MESSAGE *request, const WS return WS_E_INVALID_OPERATION; } - if (ctx) - hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, - reply_desc, read_option, heap, value, size, ctx ); - else - hr = request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, - reply_desc, read_option, heap, value, size ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_request_reply( channel, request, request_desc, write_option, request_body, request_size, reply, + reply_desc, read_option, heap, value, size, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0

Hans Leidekker : webservices: Add async support in WsShutdownSessionChannel.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 6bc9748a6fc1b1a0278e1808cb18897f9230a6bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bc9748a6fc1b1a0278e1808… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:43 2021 +0200 webservices: Add async support in WsShutdownSessionChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 76b0c1a96e2..539a7813605 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -820,14 +820,45 @@ static HRESULT shutdown_session( struct channel *channel ) } } +struct shutdown_session +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void shutdown_session_proc( struct task *task ) +{ + struct shutdown_session *s = (struct shutdown_session *)task; + HRESULT hr; + + hr = shutdown_session( s->channel ); + + TRACE( "calling %p(%08x)\n", s->ctx.callback, hr ); + s->ctx.callback( hr, WS_LONG_CALLBACK, s->ctx.callbackState ); + TRACE( "%p returned\n", s->ctx.callback ); +} + +static HRESULT queue_shutdown_session( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct shutdown_session *s; + + if (!(s = heap_alloc( sizeof(*s) ))) return E_OUTOFMEMORY; + s->task.proc = shutdown_session_proc; + s->channel = channel; + s->ctx = *ctx; + return queue_task( &channel->send_q, &s->task ); +} + HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -844,7 +875,13 @@ HRESULT WINAPI WsShutdownSessionChannel( WS_CHANNEL *handle, const WS_ASYNC_CONT return WS_E_INVALID_OPERATION; } - hr = shutdown_session( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_shutdown_session( channel, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0

Hans Leidekker : webservices: Add async support in WsCloseChannel.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 81bedbf661d9000b246856195a21f1500ebffef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bedbf661d9000b24685619… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:44 2021 +0200 webservices: Add async support in WsCloseChannel. 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, 39 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 539a7813605..458815ea7cc 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -894,17 +894,47 @@ static void close_channel( struct channel *channel ) channel->state = WS_CHANNEL_STATE_CLOSED; } +struct close_channel +{ + struct task task; + struct channel *channel; + WS_ASYNC_CONTEXT ctx; +}; + +static void close_channel_proc( struct task *task ) +{ + struct close_channel *c = (struct close_channel *)task; + + close_channel( c->channel ); + + TRACE( "calling %p(S_OK)\n", c->ctx.callback ); + c->ctx.callback( S_OK, WS_LONG_CALLBACK, c->ctx.callbackState ); + TRACE( "%p returned\n", c->ctx.callback ); +} + +static HRESULT queue_close_channel( struct channel *channel, const WS_ASYNC_CONTEXT *ctx ) +{ + struct close_channel *c; + + if (!(c = heap_alloc( sizeof(*c) ))) return E_OUTOFMEMORY; + c->task.proc = close_channel_proc; + c->channel = channel; + c->ctx = *ctx; + return queue_task( &channel->send_q, &c->task ); +} + /************************************************************************** * WsCloseChannel [webservices.@] */ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; - HRESULT hr = S_OK; + WS_ASYNC_CONTEXT ctx_local; + struct async async; + HRESULT hr; TRACE( "%p %p %p\n", handle, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel) return E_INVALIDARG; @@ -916,7 +946,13 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, return E_INVALIDARG; } - close_channel( channel ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_close_channel( channel, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0

Hans Leidekker : webservices: Add async support in WsOpenChannel.
by Alexandre Julliard 18 May '21

18 May '21

Module: wine Branch: master Commit: 69fa6f21654544ad521da9484fc57970cb426d47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69fa6f21654544ad521da948… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 18 17:19:45 2021 +0200 webservices: Add async support in WsOpenChannel. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 48 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 458815ea7cc..bc65f0943bf 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1177,18 +1177,52 @@ static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS return hr; } +struct open_channel +{ + struct task task; + struct channel *channel; + const WS_ENDPOINT_ADDRESS *endpoint; + WS_ASYNC_CONTEXT ctx; +}; + +static void open_channel_proc( struct task *task ) +{ + struct open_channel *o = (struct open_channel *)task; + HRESULT hr; + + hr = open_channel( o->channel, o->endpoint ); + + TRACE( "calling %p(%08x)\n", o->ctx.callback, hr ); + o->ctx.callback( hr, WS_LONG_CALLBACK, o->ctx.callbackState ); + TRACE( "%p returned\n", o->ctx.callback ); +} + +static HRESULT queue_open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS *endpoint, + const WS_ASYNC_CONTEXT *ctx ) +{ + struct open_channel *o; + + if (!(o = heap_alloc( sizeof(*o) ))) return E_OUTOFMEMORY; + o->task.proc = open_channel_proc; + o->channel = channel; + o->endpoint = endpoint; + o->ctx = *ctx; + return queue_task( &channel->send_q, &o->task ); +} + /************************************************************************** * WsOpenChannel [webservices.@] */ -HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, - const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *endpoint, const WS_ASYNC_CONTEXT *ctx, + WS_ERROR *error ) { struct channel *channel = (struct channel *)handle; + WS_ASYNC_CONTEXT ctx_local; + struct async async; HRESULT hr; TRACE( "%p %p %p %p\n", handle, endpoint, ctx, error ); if (error) FIXME( "ignoring error parameter\n" ); - if (ctx) FIXME( "ignoring ctx parameter\n" ); if (!channel || !endpoint) return E_INVALIDARG; @@ -1205,7 +1239,13 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end return WS_E_INVALID_OPERATION; } - hr = open_channel( channel, endpoint ); + if (!ctx) async_init( &async, &ctx_local ); + hr = queue_open_channel( channel, endpoint, ctx ? ctx : &ctx_local ); + if (!ctx) + { + if (hr == WS_S_ASYNC) hr = async_wait( &async ); + CloseHandle( async.done ); + } LeaveCriticalSection( &channel->cs ); TRACE( "returning %08x\n", hr );

1 0

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

18 May '21

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