Skip to content

W
wine-winehq
Commit 3f04fdd8 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

server: Don't check the user data for NULL in async_terminate().

This semantically reverts 48151717. That commit was used to implement NtFlushBuffersFile, which at the time didn't use a callback function. 9050b58f changed it to use irp_completion(), since the result of a blocking flush needed to be taken from the IOSB. As of 97afac46 that's not true anymore, but on the other hand it is theoretically possible for a device driver to touch the Information member of the IOSB, and we don't seem to lose anything by making all asyncs take a common path. Since all asyncs pass user data and there's no clear reason for them not to, let's get rid of a bit of extra code complexity that's no longer used. Signed-off-by: 's avatarZebediah Figura <zfigura@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d888cbcb
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 12 deletions
server/async.c
View file @ 3f04fdd8
......@@ -161,18 +161,14 @@ void async_terminate( struct async *async, unsigned int status )
if (!async->direct_result)
{
if (async->data.user)
{
apc_call_t data;
memset( &data, 0, sizeof(data) );
data.type = APC_ASYNC_IO;
data.async_io.user = async->data.user;
data.async_io.sb = async->data.iosb;
data.async_io.status = status;
thread_queue_apc( async->thread->process, async->thread, &async->obj, &data );
}
else async_set_result( &async->obj, STATUS_SUCCESS, 0 );
apc_call_t data;
memset( &data, 0, sizeof(data) );
data.type = APC_ASYNC_IO;
data.async_io.user = async->data.user;
data.async_io.sb = async->data.iosb;
data.async_io.status = status;
thread_queue_apc( async->thread->process, async->thread, &async->obj, &data );
}
async_reselect( async );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment