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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 3f04fdd87699c653409d8e87cf25f30db18f8cbc
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=3f04fdd87699c653409d8e87c...

Author: Zebediah Figura <zfigura(a)codeweavers.com>
Date:   Mon Jul  5 11:19:59 2021 -0500

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

This semantically reverts 481517178ff7dd542966d7f11f3d61b3fc8a0776.

That commit was used to implement NtFlushBuffersFile, which at the time didn't
use a callback function. 9050b58f0769fca75c4cebed7be3cce51989814e changed it to
use irp_completion(), since the result of a blocking flush needed to be taken
from the IOSB.

As of 97afac469fbe012e22acc1f1045c88b1004a241f 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: Zebediah Figura <zfigura(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 server/async.c | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/server/async.c b/server/async.c
index 4dedb27f3d8..0425e4eddf7 100644
--- a/server/async.c
+++ b/server/async.c
@@ -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 );