From 58f655bf69ca83898b3bb62e99cfa0b2f82d1ac3 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Sat, 8 Nov 2003 16:43:02 +0000
Subject: [PATCH] Signal external event object if one was supplied.

svn path=/trunk/; revision=6582
---
 reactos/ntoskrnl/io/ioctrl.c | 4 ++--
 reactos/ntoskrnl/io/rw.c     | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/ntoskrnl/io/ioctrl.c b/reactos/ntoskrnl/io/ioctrl.c
index 3ce0262a7e9..e0f4818be42 100644
--- a/reactos/ntoskrnl/io/ioctrl.c
+++ b/reactos/ntoskrnl/io/ioctrl.c
@@ -1,4 +1,4 @@
-/* $Id: ioctrl.c,v 1.19 2003/11/06 18:05:54 ekohl Exp $
+/* $Id: ioctrl.c,v 1.20 2003/11/08 16:43:02 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -111,7 +111,7 @@ NtDeviceIoControlFile (IN HANDLE DeviceHandle,
   StackPtr->Parameters.DeviceIoControl.OutputBufferLength = OutputBufferLength;
 
   Status = IoCallDriver(DeviceObject,Irp);
-  if (Status == STATUS_PENDING && FileObject->Flags & FO_SYNCHRONOUS_IO)
+  if (Event == NULL && Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO))
     {
       BOOLEAN Alertable;
 
diff --git a/reactos/ntoskrnl/io/rw.c b/reactos/ntoskrnl/io/rw.c
index 0367d203960..7893f2fdb7a 100644
--- a/reactos/ntoskrnl/io/rw.c
+++ b/reactos/ntoskrnl/io/rw.c
@@ -1,4 +1,4 @@
-/* $Id: rw.c,v 1.46 2003/11/06 18:05:54 ekohl Exp $
+/* $Id: rw.c,v 1.47 2003/11/08 16:43:02 ekohl Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -88,7 +88,6 @@ NtReadFile (IN HANDLE FileHandle,
 	  ObDereferenceObject(FileObject);
 	  return(Status);
 	}
-
     }
   else
     {
@@ -122,7 +121,7 @@ NtReadFile (IN HANDLE FileHandle,
     }
 
   Status = IoCallDriver(FileObject->DeviceObject, Irp);
-  if (Status == STATUS_PENDING && FileObject->Flags & FO_SYNCHRONOUS_IO)
+  if (Event == NULL && Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO))
     {
       BOOLEAN Alertable;
 
@@ -245,7 +244,7 @@ NtWriteFile (IN HANDLE FileHandle,
     }
 
   Status = IoCallDriver(FileObject->DeviceObject, Irp);
-  if (Status == STATUS_PENDING && FileObject->Flags & FO_SYNCHRONOUS_IO)
+  if (Event == NULL && Status == STATUS_PENDING && (FileObject->Flags & FO_SYNCHRONOUS_IO))
     {
       BOOLEAN Alertable;