- Wait on the correct event

svn path=/trunk/; revision=40260

diff --git a/reactos/dll/win32/msafd/misc/sndrcv.c b/reactos/dll/win32/msafd/misc/sndrcv.c
index 1bf2d68..4fe8941 100644 (file)
--- a/reactos/dll/win32/msafd/misc/sndrcv.c
+++ b/reactos/dll/win32/msafd/misc/sndrcv.c
@@ -98,7 +98,7 @@ WSPRecv(SOCKET Handle,
     NTSTATUS                Status;
     PVOID                   APCContext;
     PVOID                   APCFunction;
-    HANDLE                  Event;
+    HANDLE                  Event = NULL;
     HANDLE                  SockEvent;
     PSOCKET_INFORMATION     Socket;
 
@@ -180,7 +180,7 @@ WSPRecv(SOCKET Handle,
 
     /* Send IOCTL */
     Status = NtDeviceIoControlFile((HANDLE)Handle,
-        SockEvent,
+        Event ? Event : SockEvent,
         APCFunction,
         APCContext,
         IOSB,
@@ -253,7 +253,7 @@ WSPRecvFrom(SOCKET Handle,
     NTSTATUS                    Status;
     PVOID                       APCContext;
     PVOID                       APCFunction;
-    HANDLE                      Event;
+    HANDLE                      Event = NULL;
     HANDLE                      SockEvent;
     PSOCKET_INFORMATION         Socket;
 
@@ -336,7 +336,7 @@ WSPRecvFrom(SOCKET Handle,
 
     /* Send IOCTL */
     Status = NtDeviceIoControlFile((HANDLE)Handle,
-                                    SockEvent,
+                                    Event ? Event : SockEvent,
                                     APCFunction,
                                     APCContext,
                                     IOSB,
@@ -395,7 +395,7 @@ WSPSend(SOCKET Handle,
     NTSTATUS                Status;
     PVOID                   APCContext;
     PVOID                   APCFunction;
-    HANDLE                  Event;
+    HANDLE                  Event = NULL;
     HANDLE                  SockEvent;
     PSOCKET_INFORMATION     Socket;
 
@@ -463,7 +463,7 @@ WSPSend(SOCKET Handle,
 
     /* Send IOCTL */
     Status = NtDeviceIoControlFile((HANDLE)Handle,
-                                    SockEvent,
+                                    Event ? Event : SockEvent,
                                     APCFunction,
                                     APCContext,
                                     IOSB,
@@ -516,7 +516,7 @@ WSPSendTo(SOCKET Handle,
     NTSTATUS                Status;
     PVOID                   APCContext;
     PVOID                   APCFunction;
-    HANDLE                  Event;
+    HANDLE                  Event = NULL;
     PTRANSPORT_ADDRESS      RemoteAddress;
     UCHAR                   TdiBuffer[0x16];
     PSOCKADDR               BindAddress;
@@ -593,7 +593,7 @@ WSPSendTo(SOCKET Handle,
 
     /* Send IOCTL */
     Status = NtDeviceIoControlFile((HANDLE)Handle,
-             SockEvent,
+             Event ? Event : SockEvent,
              APCFunction,
              APCContext,
              IOSB,