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

server: Don't bother queuing APC_NONE apcs. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-04-30 12:02:19 +02:00
parent 0b2cb328e7
commit f3d41cc789
3 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/kernel32/tests/sync.c
View File

@ -2738,6 +2738,8 @@ static void test_QueueUserAPC(void)
ret = pNtQueueApcThread(thread, call_user_apc, (ULONG_PTR)user_apc, 0, 0);
ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret);
ret = pNtQueueApcThread(thread, NULL, 0, 0, 0);
ok(ret == STATUS_UNSUCCESSFUL, "got %#x\n", ret);
SetLastError(0xdeadbeef);
ret = QueueUserAPC(user_apc, thread, 0);
@ -2745,6 +2747,16 @@ static void test_QueueUserAPC(void)
ok(GetLastError() == ERROR_GEN_FAILURE, "got %u\n", GetLastError());
CloseHandle(thread);
ret = QueueUserAPC(user_apc, GetCurrentThread(), 0);
ok(ret, "QueueUserAPC failed err %u\n", GetLastError());
ret = SleepEx( 100, TRUE );
ok( ret == WAIT_IO_COMPLETION, "SleepEx returned %u\n", ret);
ret = pNtQueueApcThread( GetCurrentThread(), NULL, 0, 0, 0 );
ok( !ret, "got %#x\n", ret);
ret = SleepEx( 100, TRUE );
ok( ret == WAIT_OBJECT_0, "SleepEx returned %u\n", ret);
}
START_TEST(sync)

14
server/thread.c
View File

@ -1061,6 +1061,7 @@ static inline struct list *get_apc_queue( struct thread *thread, enum apc_type t
switch(type)
{
case APC_NONE:
return NULL;
case APC_USER:
case APC_TIMER:
return &thread->user_apc;
@ -1111,12 +1112,12 @@ static int queue_apc( struct process *process, struct thread *thread, struct thr
}
}
if (!thread) return 0; /* nothing found */
queue = get_apc_queue( thread, apc->call.type );
if (!(queue = get_apc_queue( thread, apc->call.type ))) return 1;
}
else
{
if (thread->state == TERMINATED) return 0;
queue = get_apc_queue( thread, apc->call.type );
if (!(queue = get_apc_queue( thread, apc->call.type ))) return 1;
/* send signal for system APCs if needed */
if (queue == &thread->system_apc && list_empty( queue ) && !is_in_apc_wait( thread ))
{
@ -1640,13 +1641,8 @@ DECL_HANDLER(select)
while (get_error() == STATUS_USER_APC)
{
if (!(apc = thread_dequeue_apc( current, 0 )))
break;
/* Optimization: ignore APC_NONE calls, they are only used to
* wake up a thread, but since we got here the thread woke up already.
*/
if (apc->call.type != APC_NONE &&
(reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 )))
apc = thread_dequeue_apc( current, 0 );
if ((reply->apc_handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 )))
{
reply->call = apc->call;
release_object( apc );

13
server/timer.c
View File

@ -126,15 +126,12 @@ static void timer_callback( void *private )
{
apc_call_t data;
assert (timer->callback);
memset( &data, 0, sizeof(data) );
if (timer->callback)
{
data.type = APC_TIMER;
data.user.timer.func = timer->callback;
data.user.timer.time = timer->when;
data.user.timer.arg = timer->arg;
}
else data.type = APC_NONE; /* wake up only */
data.type = APC_TIMER;
data.user.timer.func = timer->callback;
data.user.timer.time = timer->when;
data.user.timer.arg = timer->arg;
if (!thread_queue_apc( NULL, timer->thread, &timer->obj, &data ))
{