[PATCH v4 2/7] ntdll: The async handle passed to set_async_direct_result() cannot be NULL.

[Zebediah Figura]

From: Zebediah Figura

---
 dlls/ntdll/unix/sync.c         | 9 +++++----
 dlls/ntdll/unix/unix_private.h | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c
index 1194ee514b5..821a1f08311 100644
--- a/dlls/ntdll/unix/sync.c
+++ b/dlls/ntdll/unix/sync.c
@@ -2533,21 +2533,22 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG
 /* Notify direct completion of async and close the wait handle if it is no longer needed.
  * This function is a no-op (returns status as-is) if the supplied handle is NULL.
  */
-void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending )
+void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending )
 {
     NTSTATUS ret;

-    if (!*optional_handle) return;
+    /* if we got STATUS_ALERTED, we must have a valid async handle */
+    assert( *async_handle );

SERVER_START_REQ( set_async_direct_result )
     {
-        req->handle       = wine_server_obj_handle( *optional_handle );
+        req->handle       = wine_server_obj_handle( *async_handle );
         req->status       = status;
         req->information  = information;
         req->mark_pending = mark_pending;
         ret = wine_server_call( req );
         if (ret == STATUS_SUCCESS)
-            *optional_handle = wine_server_ptr_handle( reply->handle );
+            *async_handle = wine_server_ptr_handle( reply->handle );
     }
     SERVER_END_REQ;

diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h
index 47f0f9c56a9..73b9ed76de0 100644
--- a/dlls/ntdll/unix/unix_private.h
+++ b/dlls/ntdll/unix/unix_private.h
@@ -278,7 +278,7 @@ extern NTSTATUS get_device_info( int fd, struct _FILE_FS_DEVICE_INFORMATION *inf
 extern void init_files(void) DECLSPEC_HIDDEN;
 extern void init_cpu_info(void) DECLSPEC_HIDDEN;
 extern void add_completion( HANDLE handle, ULONG_PTR value, NTSTATUS status, ULONG info, BOOL async ) DECLSPEC_HIDDEN;
-extern void set_async_direct_result( HANDLE *optional_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending );
+extern void set_async_direct_result( HANDLE *async_handle, NTSTATUS status, ULONG_PTR information, BOOL mark_pending ) DECLSPEC_HIDDEN;

extern void dbg_init(void) DECLSPEC_HIDDEN;