diff --git a/reactos/drivers/net/afd/afd/opnclose.c b/reactos/drivers/net/afd/afd/opnclose.c
index 81593e8a7aa..45a11e511ed 100644
--- a/reactos/drivers/net/afd/afd/opnclose.c
+++ b/reactos/drivers/net/afd/afd/opnclose.c
@@ -242,13 +242,16 @@ AfdClose(
     case IRP_MJ_CLEANUP:
         FCB->OpenHandleCount--;
         Status = STATUS_SUCCESS;
+
+        ExFreePool(CCB);
+
         break;
 
 	default:
         Status = STATUS_INVALID_DEVICE_REQUEST;
     }
 
-    ExFreePool(CCB);
+//    ExFreePool(CCB);
 
     Irp->IoStatus.Status = Status;
     Irp->IoStatus.Information = 0;
diff --git a/reactos/include/ddk/kefuncs.h b/reactos/include/ddk/kefuncs.h
index 6322bf21f39..bb479335592 100644
--- a/reactos/include/ddk/kefuncs.h
+++ b/reactos/include/ddk/kefuncs.h
@@ -169,7 +169,7 @@ LONG STDCALL
 KeInsertQueue(IN PKQUEUE Queue,
 	      IN PLIST_ENTRY Entry);
 
-VOID STDCALL KeInsertQueueApc (PKAPC	Apc,
+BOOLEAN STDCALL KeInsertQueueApc (PKAPC	Apc,
 			       PVOID	SystemArgument1,
 			       PVOID	SystemArgument2,
 			       UCHAR	Mode);
diff --git a/reactos/ntoskrnl/include/internal/io.h b/reactos/ntoskrnl/include/internal/io.h
index e6b04e766f0..56c740c571c 100644
--- a/reactos/ntoskrnl/include/internal/io.h
+++ b/reactos/ntoskrnl/include/internal/io.h
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: io.h,v 1.30 2003/05/13 21:28:26 chorns Exp $
+/* $Id: io.h,v 1.31 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -271,7 +271,13 @@ IoMountVolume(IN PDEVICE_OBJECT DeviceObject,
 POBJECT IoOpenSymlink(POBJECT SymbolicLink);
 POBJECT IoOpenFileOnDevice(POBJECT SymbolicLink, PWCHAR Name);
 
-VOID IoSecondStageCompletion(PIRP Irp, CCHAR PriorityBoost);
+VOID STDCALL
+IoSecondStageCompletion(
+   PKAPC Apc,
+   PKNORMAL_ROUTINE* NormalRoutine,
+   PVOID* NormalContext,
+   PVOID* SystemArgument1,
+   PVOID* SystemArgument2);
 
 NTSTATUS STDCALL
 IopCreateFile(PVOID ObjectBody,
diff --git a/reactos/ntoskrnl/io/cleanup.c b/reactos/ntoskrnl/io/cleanup.c
index 6aabc894055..860fa5f32bd 100644
--- a/reactos/ntoskrnl/io/cleanup.c
+++ b/reactos/ntoskrnl/io/cleanup.c
@@ -20,52 +20,6 @@
 #include <internal/debug.h>
 
 /* FUNCTIONS ***************************************************************/
-
-VOID STDCALL
-IopCompleteRequest1(struct _KAPC* Apc,
-		    PKNORMAL_ROUTINE* NormalRoutine,
-		    PVOID* NormalContext,
-		    PVOID* SystemArgument1,
-		    PVOID* SystemArgument2)
-{
-   PIRP Irp;
-   CCHAR PriorityBoost;
-   PIO_STACK_LOCATION IoStack;
-   PFILE_OBJECT FileObject;
-   
-   DPRINT("IopCompleteRequest1()\n");
-   
-   Irp = (PIRP)(*SystemArgument1);
-   PriorityBoost = (CCHAR)(LONG)(*SystemArgument2);
-   
-   IoStack = &Irp->Stack[(ULONG)Irp->CurrentLocation];
-   FileObject = IoStack->FileObject;
-   
-   (*SystemArgument1) = (PVOID)Irp->UserIosb;
-   (*SystemArgument2) = (PVOID)Irp->IoStatus.Information;
-   
-   if (Irp->UserIosb!=NULL)
-     {
-	*Irp->UserIosb=Irp->IoStatus;
-     }
-
-   if (Irp->UserEvent)
-   {
-      KeSetEvent(Irp->UserEvent,PriorityBoost,FALSE);
-   }
-
-   if (!(Irp->Flags & IRP_PAGING_IO) && FileObject)
-   {
-      if (IoStack->MajorFunction != IRP_MJ_CLOSE)
-      {
-	 ObDereferenceObject(FileObject);
-      }
-   }
-   
-   IoFreeIrp(Irp);
-
-}
-
 VOID IoDeviceControlCompletion(PDEVICE_OBJECT DeviceObject,
 			       PIRP Irp,
 			       PIO_STACK_LOCATION IoStack)
@@ -171,99 +125,155 @@ VOID IoVolumeInformationCompletion(PDEVICE_OBJECT DeviceObject,
 {
 }
 
-VOID IoSecondStageCompletion(PIRP Irp, CCHAR PriorityBoost)
+
+VOID STDCALL
+IoSecondStageCompletion_KernelApcRoutine(
+    IN PKAPC Apc,
+    IN OUT PKNORMAL_ROUTINE *NormalRoutine,
+    IN OUT PVOID *NormalContext,
+    IN OUT PVOID *SystemArgument1,
+    IN OUT PVOID *SystemArgument2
+    )
+{
+   IoFreeIrp((PIRP)(*SystemArgument1));
+}
+
+
+VOID STDCALL
+IoSecondStageCompletion_RundownApcRoutine(
+   IN PKAPC Apc
+   )
+{
+   PIRP Irp;
+
+   Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc);
+   IoFreeIrp(Irp);
+}
+
+
 /*
  * FUNCTION: Performs the second stage of irp completion for read/write irps
- * ARGUMENTS:
- *          Irp = Irp to completion
- *          FromDevice = True if the operation transfered data from the device
+ * 
+ * Called as a special kernel APC or directly from IofCompleteRequest()
  */
+VOID STDCALL
+IoSecondStageCompletion(
+   PKAPC Apc,
+   PKNORMAL_ROUTINE* NormalRoutine,
+   PVOID* NormalContext,
+   PVOID* SystemArgument1,
+   PVOID* SystemArgument2)
+
 {
-   PIO_STACK_LOCATION IoStack;
-   PDEVICE_OBJECT DeviceObject;
-   PFILE_OBJECT FileObject;
-   
-   DPRINT("IoSecondStageCompletion(Irp %x, PriorityBoost %d)\n",
-	  Irp, PriorityBoost);
+   PIO_STACK_LOCATION   IoStack;
+   PDEVICE_OBJECT       DeviceObject;
+   PFILE_OBJECT         OriginalFileObject;
+   PIRP                 Irp;
+   CCHAR                PriorityBoost;
+
+   OriginalFileObject = (PFILE_OBJECT)(*NormalContext);
+   Irp = (PIRP)(*SystemArgument1);
+   PriorityBoost = (CCHAR)(LONG)(*SystemArgument2);
    
    IoStack = &Irp->Stack[(ULONG)Irp->CurrentLocation];
-   FileObject = IoStack->FileObject;
-   
    DeviceObject = IoStack->DeviceObject;
-   
+
+   DPRINT("IoSecondStageCompletion(Irp %x, PriorityBoost %d)\n", Irp, PriorityBoost);
+
    switch (IoStack->MajorFunction)
      {
       case IRP_MJ_CREATE:
       case IRP_MJ_FLUSH_BUFFERS:
-	  /* NOP */
-	break;
-	
+     /* NOP */
+   break;
+   
       case IRP_MJ_READ:
       case IRP_MJ_WRITE:
-	IoReadWriteCompletion(DeviceObject,Irp,IoStack);
-	break;
-	
+   IoReadWriteCompletion(DeviceObject,Irp,IoStack);
+   break;
+   
       case IRP_MJ_DEVICE_CONTROL:
       case IRP_MJ_INTERNAL_DEVICE_CONTROL:
-	IoDeviceControlCompletion(DeviceObject, Irp, IoStack);
-	break;
-	
+   IoDeviceControlCompletion(DeviceObject, Irp, IoStack);
+   break;
+   
       case IRP_MJ_QUERY_VOLUME_INFORMATION:
       case IRP_MJ_SET_VOLUME_INFORMATION:
-	IoVolumeInformationCompletion(DeviceObject, Irp, IoStack);
-	break;
-	
+   IoVolumeInformationCompletion(DeviceObject, Irp, IoStack);
+   break;
+   
       default:
-	break;
+   break;
      }
    
-   if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL)
-     {
-	PKTHREAD Thread;
-	PKNORMAL_ROUTINE UserApcRoutine;
-	PVOID UserApcContext;
-	
-   	DPRINT("Dispatching APC\n");
-	Thread = &Irp->Tail.Overlay.Thread->Tcb;
-	UserApcRoutine = (PKNORMAL_ROUTINE)
-	  Irp->Overlay.AsynchronousParameters.UserApcRoutine;
-	UserApcContext = (PVOID)
-	  Irp->Overlay.AsynchronousParameters.UserApcContext;
-	KeInitializeApc(&Irp->Tail.Apc,
-			Thread,
-			0,
-			IopCompleteRequest1,
-			NULL,
-			UserApcRoutine,
-			UserMode,
-			UserApcContext);
-	KeInsertQueueApc(&Irp->Tail.Apc,
-			 Irp,
-			 (PVOID)(LONG)PriorityBoost,
-			 KernelMode);
-	return;
-     }
-   
-   DPRINT("Irp->UserIosb %x &Irp->UserIosb %x\n", 
-	   Irp->UserIosb,
-	   &Irp->UserIosb);
    if (Irp->UserIosb!=NULL)
-     {
-	*Irp->UserIosb=Irp->IoStatus;
-     }
+   {
+      *Irp->UserIosb=Irp->IoStatus;
+   }
 
    if (Irp->UserEvent)
    {
       KeSetEvent(Irp->UserEvent,PriorityBoost,FALSE);
    }
 
-   if (!(Irp->Flags & IRP_PAGING_IO) && FileObject)
+   //Windows NT File System Internals, page 169
+   if (OriginalFileObject)
    {
-      if (IoStack->MajorFunction != IRP_MJ_CLOSE)
+      if (Irp->UserEvent == NULL)
       {
-	 ObDereferenceObject(FileObject);
+         KeSetEvent(&OriginalFileObject->Event,PriorityBoost,FALSE);         
+      }
+      else if (OriginalFileObject->Flags & FO_SYNCHRONOUS_IO && Irp->UserEvent != &OriginalFileObject->Event)
+      {
+         KeSetEvent(&OriginalFileObject->Event,PriorityBoost,FALSE);         
       }
    }
 
+   //Windows NT File System Internals, page 154
+   if (!(Irp->Flags & IRP_PAGING_IO) && OriginalFileObject)
+   {
+      // if the event is not the one in the file object, it needs dereferenced   
+      if (Irp->UserEvent && Irp->UserEvent != &OriginalFileObject->Event)   
+      {
+         ObDereferenceObject(Irp->UserEvent);
+      }
+  
+      if (IoStack->MajorFunction != IRP_MJ_CLOSE)
+      {
+         ObDereferenceObject(OriginalFileObject);
+      }
+   }
+
+   if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL)
+   {
+      PKNORMAL_ROUTINE UserApcRoutine;
+      PVOID UserApcContext;
+   
+      DPRINT("Dispatching user APC\n");
+
+      UserApcRoutine = (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine;
+      UserApcContext = (PVOID)Irp->Overlay.AsynchronousParameters.UserApcContext;
+
+      KeInitializeApc(  &Irp->Tail.Apc,
+                        KeGetCurrentThread(),
+                        0,
+                        IoSecondStageCompletion_KernelApcRoutine,
+                        IoSecondStageCompletion_RundownApcRoutine,
+                        UserApcRoutine,
+                        UserMode,
+                        UserApcContext);
+
+      KeInsertQueueApc( &Irp->Tail.Apc,
+                        Irp,
+                        NULL,
+                        KernelMode);
+
+      //NOTE: kernel (or rundown) routine frees the IRP
+
+      return;
+
+   }
+
    IoFreeIrp(Irp);
+   
 }
diff --git a/reactos/ntoskrnl/io/create.c b/reactos/ntoskrnl/io/create.c
index 3e5c54fc564..0282dc89e28 100644
--- a/reactos/ntoskrnl/io/create.c
+++ b/reactos/ntoskrnl/io/create.c
@@ -1,4 +1,4 @@
-/* $Id: create.c,v 1.63 2003/05/12 10:00:46 ekohl Exp $
+/* $Id: create.c,v 1.64 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -378,7 +378,7 @@ IoCreateFile(OUT	PHANDLE			FileHandle,
    SecurityContext.DesiredAccess = DesiredAccess;
    SecurityContext.FullCreateOptions = 0; /* ?? */
    
-   KeInitializeEvent(&FileObject->Lock, NotificationEvent, TRUE);
+   KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE);
    KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE);
    
    DPRINT("FileObject %x\n", FileObject);
@@ -394,6 +394,9 @@ IoCreateFile(OUT	PHANDLE			FileHandle,
 	ZwClose(*FileHandle);
 	return (STATUS_UNSUCCESSFUL);
      }
+
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
      
    Irp->UserIosb = &IoSB;   //return iostatus
    Irp->AssociatedIrp.SystemBuffer = EaBuffer;
diff --git a/reactos/ntoskrnl/io/dir.c b/reactos/ntoskrnl/io/dir.c
index b28b6dface2..1f1acc67c72 100644
--- a/reactos/ntoskrnl/io/dir.c
+++ b/reactos/ntoskrnl/io/dir.c
@@ -1,4 +1,4 @@
-/* $Id: dir.c,v 1.15 2002/09/08 10:23:24 chorns Exp $
+/* $Id: dir.c,v 1.16 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -111,6 +111,8 @@ NtQueryDirectoryFile(
 	return STATUS_UNSUCCESSFUL;
      }
    
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
    
    Irp->UserIosb = &IoSB;
    Irp->UserEvent = &FileObject->Event;
diff --git a/reactos/ntoskrnl/io/file.c b/reactos/ntoskrnl/io/file.c
index b8a826a17b3..0d5a704d4ae 100644
--- a/reactos/ntoskrnl/io/file.c
+++ b/reactos/ntoskrnl/io/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.23 2003/03/23 14:46:09 ekohl Exp $
+/* $Id: file.c,v 1.24 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -80,6 +80,9 @@ NtQueryInformationFile(HANDLE FileHandle,
 	return(STATUS_INSUFFICIENT_RESOURCES);
      }
    
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
    Irp->AssociatedIrp.SystemBuffer = SystemBuffer;
    Irp->UserIosb = &IoSB;
    Irp->UserEvent = &FileObject->Event;
@@ -161,6 +164,9 @@ IoQueryFileInformation(IN PFILE_OBJECT FileObject,
 	ObDereferenceObject(FileObject);
 	return STATUS_INSUFFICIENT_RESOURCES;
      }
+
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
    
    Irp->AssociatedIrp.SystemBuffer = FileInformation;
    Irp->UserIosb = &IoStatusBlock;
@@ -293,6 +299,9 @@ NtSetInformationFile(HANDLE FileHandle,
 		      FileInformation,
 		      Length);
    
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
    Irp->AssociatedIrp.SystemBuffer = SystemBuffer;
    Irp->UserIosb = &IoSB;
    Irp->UserEvent = &FileObject->Event;
diff --git a/reactos/ntoskrnl/io/flush.c b/reactos/ntoskrnl/io/flush.c
index 078f5ea767e..831a67c3502 100644
--- a/reactos/ntoskrnl/io/flush.c
+++ b/reactos/ntoskrnl/io/flush.c
@@ -69,6 +69,9 @@ NtFlushBuffersFile (
 				      &FileObject->Event,
 				      &IoSB);
 
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
    StackPtr = IoGetNextIrpStackLocation(Irp);
    StackPtr->FileObject = FileObject;
 
diff --git a/reactos/ntoskrnl/io/fs.c b/reactos/ntoskrnl/io/fs.c
index 3b9b8dce769..89bf215eeb8 100644
--- a/reactos/ntoskrnl/io/fs.c
+++ b/reactos/ntoskrnl/io/fs.c
@@ -1,4 +1,4 @@
-/* $Id: fs.c,v 1.32 2003/05/13 21:28:26 chorns Exp $
+/* $Id: fs.c,v 1.33 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -129,6 +129,9 @@ NtFsControlFile (
 				       ptrEvent,
 				       &IoSB);
    
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+   
    Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine;
    Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext;
 
diff --git a/reactos/ntoskrnl/io/ioctrl.c b/reactos/ntoskrnl/io/ioctrl.c
index 8b65a153290..885f2208b41 100644
--- a/reactos/ntoskrnl/io/ioctrl.c
+++ b/reactos/ntoskrnl/io/ioctrl.c
@@ -1,4 +1,4 @@
-/* $Id: ioctrl.c,v 1.16 2002/09/08 10:23:25 chorns Exp $
+/* $Id: ioctrl.c,v 1.17 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -92,6 +92,9 @@ NTSTATUS STDCALL NtDeviceIoControlFile (IN HANDLE DeviceHandle,
 				       ptrEvent,
 				       Event ? IoStatusBlock : &IoSB);
 
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
    Irp->Overlay.AsynchronousParameters.UserApcRoutine = UserApcRoutine;
    Irp->Overlay.AsynchronousParameters.UserApcContext = UserApcContext;
 
diff --git a/reactos/ntoskrnl/io/iomgr.c b/reactos/ntoskrnl/io/iomgr.c
index 6f36c29cbd8..c0e7fffb0d2 100644
--- a/reactos/ntoskrnl/io/iomgr.c
+++ b/reactos/ntoskrnl/io/iomgr.c
@@ -1,4 +1,4 @@
-/* $Id: iomgr.c,v 1.32 2003/05/13 21:28:26 chorns Exp $
+/* $Id: iomgr.c,v 1.33 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -58,11 +58,15 @@ IopCloseFile(PVOID ObjectBody,
      {
 	return;
      }
-   
+
+#if 0
+//NOTE: Allmost certain that the latest changes to I/O Mgr makes this redundant (OriginalFileObject case)
    ObReferenceObjectByPointer(FileObject,
 			      STANDARD_RIGHTS_REQUIRED,
 			      IoFileObjectType,
 			      UserMode);
+#endif
+
    KeResetEvent( &FileObject->Event );
   
    Irp = IoBuildSynchronousFsdRequest(IRP_MJ_CLEANUP,
@@ -94,11 +98,14 @@ IopDeleteFile(PVOID ObjectBody)
 
    if (FileObject->DeviceObject)
    {
+#if 0
+//NOTE: Allmost certain that the latest changes to I/O Mgr makes this redundant (OriginalFileObject case)
+     
      ObReferenceObjectByPointer(ObjectBody,
 			        STANDARD_RIGHTS_REQUIRED,
 			        IoFileObjectType,
 			        UserMode);
-   
+#endif   
      KeResetEvent( &FileObject->Event );
      Irp = IoBuildSynchronousFsdRequest(IRP_MJ_CLOSE,
 				        FileObject->DeviceObject,
diff --git a/reactos/ntoskrnl/io/irp.c b/reactos/ntoskrnl/io/irp.c
index ef822ed1b97..ba5daa0f7da 100644
--- a/reactos/ntoskrnl/io/irp.c
+++ b/reactos/ntoskrnl/io/irp.c
@@ -1,4 +1,4 @@
-/* $Id: irp.c,v 1.49 2003/05/17 00:25:39 chorns Exp $
+/* $Id: irp.c,v 1.50 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -191,25 +191,9 @@ IoAllocateIrp(CCHAR StackSize,
 }
 
 
-VOID STDCALL
-IopCompleteRequest(struct _KAPC* Apc,
-		   PKNORMAL_ROUTINE* NormalRoutine,
-		   PVOID* NormalContext,
-		   PVOID* SystemArgument1,
-		   PVOID* SystemArgument2)
-{
-  DPRINT("IopCompleteRequest(Apc %x, SystemArgument1 %x, (*SystemArgument1) %x\n",
-	 Apc,
-	 SystemArgument1,
-	 *SystemArgument1);
-  IoSecondStageCompletion((PIRP)(*SystemArgument1),
-			  (KPRIORITY)(*SystemArgument2));
-}
-
-
 VOID FASTCALL
 IofCompleteRequest(PIRP Irp,
-		   CCHAR PriorityBoost)
+         CCHAR PriorityBoost)
 /*
  * FUNCTION: Indicates the caller has finished all processing for a given
  * I/O request and is returning the given IRP to the I/O manager
@@ -222,6 +206,7 @@ IofCompleteRequest(PIRP Irp,
    ULONG             i;
    NTSTATUS          Status;
    PDEVICE_OBJECT    DeviceObject;
+   PFILE_OBJECT      OriginalFileObject;
 
    DPRINT("IoCompleteRequest(Irp %x, PriorityBoost %d) Event %x THread %x\n",
       Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread());
@@ -275,30 +260,42 @@ IofCompleteRequest(PIRP Irp,
       }
    }
 
+   //Windows NT File System Internals, page 154
+   OriginalFileObject = Irp->Tail.Overlay.OriginalFileObject;
+
    if (Irp->PendingReturned)
-     {
-	DPRINT("Dispatching APC\n");
-	KeInitializeApc(&Irp->Tail.Apc,
-			&Irp->Tail.Overlay.Thread->Tcb,
-			0,
-			IopCompleteRequest,
-			NULL,
-			(PKNORMAL_ROUTINE)
-			NULL,
-			KernelMode,
-			NULL);
-	KeInsertQueueApc(&Irp->Tail.Apc,
-			 (PVOID)Irp,
-			 (PVOID)(ULONG)PriorityBoost,
-			 KernelMode);
-	DPRINT("Finished dispatching APC\n");
-     }
+   {
+      BOOLEAN bStatus;
+
+      DPRINT("Dispatching APC\n");
+      KeInitializeApc(  &Irp->Tail.Apc,
+                        &Irp->Tail.Overlay.Thread->Tcb,
+                        0,
+                        IoSecondStageCompletion,
+                        NULL,
+                        (PKNORMAL_ROUTINE) NULL,
+                        KernelMode,
+                        OriginalFileObject);
+      
+      bStatus = KeInsertQueueApc(&Irp->Tail.Apc,
+                                 (PVOID)Irp,
+                                 (PVOID)(ULONG)PriorityBoost,
+                                 KernelMode);
+
+      if (bStatus == FALSE)
+      {
+         DPRINT1("Error queueing APC for thread. Thread has probably exited.\n");
+      }
+
+      DPRINT("Finished dispatching APC\n");
+   }
    else
-     {
-	DPRINT("Calling completion routine directly\n");
-	IoSecondStageCompletion(Irp,PriorityBoost);
-	DPRINT("Finished completition routine\n");
-     }
+   {
+      DPRINT("Calling IoSecondStageCompletion routine directly\n");
+      IoSecondStageCompletion(NULL,NULL,(PVOID)&OriginalFileObject,(PVOID) &Irp,(PVOID) &PriorityBoost);
+      DPRINT("Finished completition routine\n");
+   }
+
 }
 
 
@@ -328,31 +325,28 @@ IoCompleteRequest(PIRP Irp,
 BOOLEAN STDCALL
 IoIsOperationSynchronous(IN PIRP Irp)
 {
-  PFILE_OBJECT FileObject = NULL;
-  ULONG Flags = 0;
+   PFILE_OBJECT FileObject = NULL;
 
-  /* Check the FILE_OBJECT's flags first. */
-  FileObject = IoGetCurrentIrpStackLocation(Irp)->FileObject;
-  if (!(FO_SYNCHRONOUS_IO & FileObject->Flags))
-    {
-      /* Check IRP's flags. */
-      Flags = Irp->Flags;
-      if (!((IRP_SYNCHRONOUS_API | IRP_SYNCHRONOUS_PAGING_IO) & Flags))
-	{
-	  return(FALSE);
-	}
-    }
+   FileObject = IoGetCurrentIrpStackLocation(Irp)->FileObject;
+  
+   if (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO)
+   {
+      return TRUE;
+   }
 
-  /* Check more IRP's flags. */
-  Flags = Irp->Flags;
-  if (!(IRP_PAGING_IO & Flags)
-      || (IRP_SYNCHRONOUS_PAGING_IO & Flags))
-    {
-      return(TRUE);
-    }
+   if (Irp->Flags & IRP_PAGING_IO)
+   {
+      return FALSE;
+   }
 
-  /* Otherwise, it is an asynchronous operation. */
-  return(FALSE);
+   //NOTE: Windows 2000 crash if IoStack->FileObject == NULL, so I guess we should too;-)
+   if (Irp->Flags & IRP_SYNCHRONOUS_API || FileObject->Flags & FO_SYNCHRONOUS_IO)
+   {
+      return TRUE;
+   }
+
+   /* Otherwise, it is an asynchronous operation. */
+   return FALSE;
 }
 
 
diff --git a/reactos/ntoskrnl/io/lock.c b/reactos/ntoskrnl/io/lock.c
index 3b1469316d7..2304f88c255 100644
--- a/reactos/ntoskrnl/io/lock.c
+++ b/reactos/ntoskrnl/io/lock.c
@@ -114,6 +114,9 @@ NtLockFile (
 	else
 		IoStatusBlock = UserIoStatusBlock;
 
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
 	Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine;
 	Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext;
 
@@ -250,6 +253,9 @@ NtUnlockFile (
 		goto fail;
 	}
 
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
 	Irp->UserIosb = &LocalIoStatusBlock;
 	Irp->Tail.Overlay.Thread = PsGetCurrentThread();
 
diff --git a/reactos/ntoskrnl/io/rw.c b/reactos/ntoskrnl/io/rw.c
index 2e1e75609a2..84b7207d9f7 100644
--- a/reactos/ntoskrnl/io/rw.c
+++ b/reactos/ntoskrnl/io/rw.c
@@ -1,4 +1,4 @@
-/* $Id: rw.c,v 1.42 2003/05/16 12:03:11 chorns Exp $
+/* $Id: rw.c,v 1.43 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -21,23 +21,6 @@
 /* FUNCTIONS ***************************************************************/
 
 
-NTSTATUS STDCALL
-IopReadWriteIoComplete(PDEVICE_OBJECT DeviceObject,
-  PIRP Irp,
-  PVOID Context)
-{
-  PIO_STACK_LOCATION IrpStack;
-
-  DPRINT("IopReadWriteIoComplete(DeviceObject %p  Irp %p  Context %p) called\n",
-	  DeviceObject, Irp, Context);
-
-  IrpStack = IoGetCurrentIrpStackLocation(Irp);
-
-  ObDereferenceObject(Irp->UserEvent);
-
-  return STATUS_SUCCESS;
-}
-
 /**********************************************************************
  * NAME							EXPORTED
  *	NtReadFile
@@ -68,7 +51,6 @@ NTSTATUS STDCALL NtReadFile(HANDLE			FileHandle,
   PKEVENT Event = NULL;
   IO_STATUS_BLOCK Iosb;
   PIO_STATUS_BLOCK IoStatusBlock;
-  BOOLEAN SetIoCompletionRoutine;
   
   DPRINT("NtReadFile(FileHandle %x Buffer %x Length %x ByteOffset %x, "
 	 "IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset,
@@ -103,13 +85,12 @@ NTSTATUS STDCALL NtReadFile(HANDLE			FileHandle,
 	  ObDereferenceObject(FileObject);
 	  return(Status);
 	}
-      SetIoCompletionRoutine = TRUE;
+
     }
   else 
     {
       Event = &FileObject->Event;
       KeResetEvent(Event);
-      SetIoCompletionRoutine = FALSE;
     }
   
   if (FileObject->Flags & FO_SYNCHRONOUS_IO)
@@ -128,6 +109,9 @@ NTSTATUS STDCALL NtReadFile(HANDLE			FileHandle,
 				     ByteOffset,
 				     Event,
 				     IoStatusBlock);
+
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
   
   Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine;
   Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext;
@@ -143,16 +127,6 @@ NTSTATUS STDCALL NtReadFile(HANDLE			FileHandle,
       StackPtr->Parameters.Read.Key = 0;
     }
   
-  if (SetIoCompletionRoutine)
-    {
-      /* Set completion routine */
-      IoSetCompletionRoutine(Irp,
-        IopReadWriteIoComplete,
-        NULL,
-        TRUE,
-        TRUE,
-        TRUE);
-    }
 
   Status = IoCallDriver(FileObject->DeviceObject, Irp);
   if (Status == STATUS_PENDING && FileObject->Flags & FO_SYNCHRONOUS_IO)
@@ -221,7 +195,6 @@ NTSTATUS STDCALL NtWriteFile(HANDLE			FileHandle,
   PKEVENT Event = NULL;
   IO_STATUS_BLOCK Iosb;
   PIO_STATUS_BLOCK IoStatusBlock;
-  BOOLEAN SetIoCompletionRoutine;
 
   DPRINT("NtWriteFile(FileHandle %x Buffer %x Length %x ByteOffset %x, "
 	 "IoStatusBlock %x)\n", FileHandle, Buffer, Length, ByteOffset,
@@ -256,13 +229,12 @@ NTSTATUS STDCALL NtWriteFile(HANDLE			FileHandle,
 	  ObDereferenceObject(FileObject);
 	  return(Status);
 	}
-      SetIoCompletionRoutine = TRUE;
+
     }
   else 
     {
       Event = &FileObject->Event;
       KeResetEvent(Event);
-      SetIoCompletionRoutine = FALSE;
     }
   
   if (FileObject->Flags & FO_SYNCHRONOUS_IO)
@@ -282,6 +254,9 @@ NTSTATUS STDCALL NtWriteFile(HANDLE			FileHandle,
 				     Event,
 				     IoStatusBlock);
   
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
   Irp->Overlay.AsynchronousParameters.UserApcRoutine = ApcRoutine;
   Irp->Overlay.AsynchronousParameters.UserApcContext = ApcContext;
   
@@ -296,17 +271,6 @@ NTSTATUS STDCALL NtWriteFile(HANDLE			FileHandle,
       StackPtr->Parameters.Write.Key = 0;
     }
 
-  if (SetIoCompletionRoutine)
-    {
-      /* Set completion routine */
-      IoSetCompletionRoutine(Irp,
-        IopReadWriteIoComplete,
-        NULL,
-        TRUE,
-        TRUE,
-        TRUE);
-    }
-
   Status = IoCallDriver(FileObject->DeviceObject, Irp);
   if (Status == STATUS_PENDING && FileObject->Flags & FO_SYNCHRONOUS_IO)
      {
diff --git a/reactos/ntoskrnl/io/vpb.c b/reactos/ntoskrnl/io/vpb.c
index d5390277662..b572776a1ed 100644
--- a/reactos/ntoskrnl/io/vpb.c
+++ b/reactos/ntoskrnl/io/vpb.c
@@ -1,4 +1,4 @@
-/* $Id: vpb.c,v 1.19 2002/09/08 10:23:26 chorns Exp $
+/* $Id: vpb.c,v 1.20 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -139,6 +139,9 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle,
 	return(STATUS_INSUFFICIENT_RESOURCES);
      }
    
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
    Irp->AssociatedIrp.SystemBuffer = SystemBuffer;
    KeResetEvent( &FileObject->Event );
    Irp->UserEvent = &FileObject->Event;
@@ -221,6 +224,9 @@ IoQueryVolumeInformation(IN PFILE_OBJECT FileObject,
 	ObDereferenceObject(FileObject);
 	return(STATUS_INSUFFICIENT_RESOURCES);
      }
+
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
    
    Irp->AssociatedIrp.SystemBuffer = FsInformation;
    KeResetEvent( &FileObject->Event );
@@ -310,6 +316,9 @@ NtSetVolumeInformationFile(IN HANDLE FileHandle,
 		      FsInformation,
 		      Length);
    
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
    Irp->AssociatedIrp.SystemBuffer = SystemBuffer;
    KeResetEvent( &FileObject->Event );
    Irp->UserEvent = &FileObject->Event;
diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c
index 8a8a6336bc0..b8e30c0f270 100644
--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@@ -287,7 +287,7 @@ KiDeliverApc(ULONG Unknown1,
    KeReleaseSpinLock(&PiApcLock, oldlvl);
 }
 
-VOID STDCALL
+BOOLEAN STDCALL
 KeInsertQueueApc (PKAPC	Apc,
 		  PVOID	SystemArgument1,
 		  PVOID	SystemArgument2,
@@ -300,6 +300,7 @@ KeInsertQueueApc (PKAPC	Apc,
  *         Mode = TBD
  */
 {
+   //FIXME: return FALSE if APC can't be queued to target thread (thread has ended)
    KIRQL oldlvl;
    PKTHREAD TargetThread;
    
@@ -343,7 +344,7 @@ KeInsertQueueApc (PKAPC	Apc,
        Apc->NormalRoutine == NULL)
      {
        KeReleaseSpinLock(&PiApcLock, oldlvl);
-       return;
+       return TRUE;
      }
 
    /*
@@ -397,6 +398,7 @@ KeInsertQueueApc (PKAPC	Apc,
 			       STATUS_USER_APC);
      }
    KeReleaseSpinLock(&PiApcLock, oldlvl);
+   return TRUE;
 }
 
 BOOLEAN STDCALL
diff --git a/reactos/subsys/win32k/ntuser/input.c b/reactos/subsys/win32k/ntuser/input.c
index bb68dedcc12..57bf5d848f5 100644
--- a/reactos/subsys/win32k/ntuser/input.c
+++ b/reactos/subsys/win32k/ntuser/input.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: input.c,v 1.6 2003/05/18 17:16:17 ea Exp $
+/* $Id: input.c,v 1.7 2003/05/22 00:47:04 gdalsnes Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -226,6 +226,10 @@ InitInputImpl(VOID)
 				       TRUE,
 				       &FileObject->Event,
 				       &Iosb);
+
+   //trigger FileObject/Event dereferencing
+   Irp->Tail.Overlay.OriginalFileObject = FileObject;
+
    StackPtr = IoGetNextIrpStackLocation(Irp);
    StackPtr->FileObject = FileObject;
    StackPtr->DeviceObject = FileObject->DeviceObject;