ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Remove the no longer used "mutex" argument to server_select(). 

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-11-30 16:18:46 -06:00 committed by Alexandre Julliard
parent db7cdf99b0
commit 518a175cba
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/ntdll/unix/server.c
View File

@ -585,8 +585,7 @@ static void invoke_system_apc( const apc_call_t *call, apc_result_t *result, BOO
* server_select * server_select
*/ */
unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags, unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags,
timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, timeout_t abs_timeout, context_t *context, user_apc_t *user_apc )
user_apc_t *user_apc )
{ {
unsigned int ret; unsigned int ret;
int cookie; int cookie;
@ -635,11 +634,6 @@ unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT
size = offsetof( select_op_t, signal_and_wait.signal ); size = offsetof( select_op_t, signal_and_wait.signal );
} }
pthread_sigmask( SIG_SETMASK, &old_set, NULL ); pthread_sigmask( SIG_SETMASK, &old_set, NULL );
if (mutex)
{
mutex_unlock( mutex );
mutex = NULL;
}
if (signaled) break; if (signaled) break;
ret = wait_select_reply( &cookie ); ret = wait_select_reply( &cookie );
@ -669,7 +663,7 @@ unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT f
abs_timeout -= now.QuadPart; abs_timeout -= now.QuadPart;
} }
ret = server_select( select_op, size, flags, abs_timeout, NULL, NULL, &apc ); ret = server_select( select_op, size, flags, abs_timeout, NULL, &apc );
if (ret == STATUS_USER_APC) return invoke_user_apc( NULL, &apc, ret ); if (ret == STATUS_USER_APC) return invoke_user_apc( NULL, &apc, ret );
/* A test on Windows 2000 shows that Windows always yields during /* A test on Windows 2000 shows that Windows always yields during
@ -690,7 +684,7 @@ NTSTATUS WINAPI NtContinue( CONTEXT *context, BOOLEAN alertable )
if (alertable) if (alertable)
{ {
status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, &apc );
if (status == STATUS_USER_APC) return invoke_user_apc( context, &apc, status ); if (status == STATUS_USER_APC) return invoke_user_apc( context, &apc, status );
} }
return signal_set_full_context( context ); return signal_set_full_context( context );
@ -705,7 +699,7 @@ NTSTATUS WINAPI NtTestAlert(void)
user_apc_t apc; user_apc_t apc;
NTSTATUS status; NTSTATUS status;
status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, NULL, &apc ); status = server_select( NULL, 0, SELECT_INTERRUPTIBLE | SELECT_ALERTABLE, 0, NULL, &apc );
if (status == STATUS_USER_APC) invoke_user_apc( NULL, &apc, STATUS_SUCCESS ); if (status == STATUS_USER_APC) invoke_user_apc( NULL, &apc, STATUS_SUCCESS );
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

4
dlls/ntdll/unix/thread.c
View File

@ -1440,7 +1440,7 @@ void wait_suspend( CONTEXT *context )
contexts_to_server( server_contexts, context ); contexts_to_server( server_contexts, context );
/* wait with 0 timeout, will only return once the thread is no longer suspended */ /* wait with 0 timeout, will only return once the thread is no longer suspended */
server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, server_contexts, NULL, NULL ); server_select( NULL, 0, SELECT_INTERRUPTIBLE, 0, server_contexts, NULL );
contexts_from_server( context, server_contexts ); contexts_from_server( context, server_contexts );
errno = saved_errno; errno = saved_errno;
} }
@ -1489,7 +1489,7 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL first_c
contexts_to_server( server_contexts, context ); contexts_to_server( server_contexts, context );
server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE,
TIMEOUT_INFINITE, server_contexts, NULL, NULL ); TIMEOUT_INFINITE, server_contexts, NULL );
SERVER_START_REQ( get_exception_status ) SERVER_START_REQ( get_exception_status )
{ {

3
dlls/ntdll/unix/unix_private.h
View File

@ -158,8 +158,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_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 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, extern unsigned int server_select( const select_op_t *select_op, data_size_t size, UINT flags,
timeout_t abs_timeout, context_t *context, pthread_mutex_t *mutex, timeout_t abs_timeout, context_t *context, user_apc_t *user_apc ) DECLSPEC_HIDDEN;
user_apc_t *user_apc ) DECLSPEC_HIDDEN;
extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags, extern unsigned int server_wait( const select_op_t *select_op, data_size_t size, UINT flags,
const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN; const LARGE_INTEGER *timeout ) DECLSPEC_HIDDEN;
extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call, extern unsigned int server_queue_process_apc( HANDLE process, const apc_call_t *call,