Same kind of fixes for NtFlushBuffersFile

svn path=/trunk/; revision=14942

reactos/ntoskrnl/io/file.c

@@ -1532,10 +1532,6 @@ NtFlushWriteBuffer(VOID)
   return STATUS_SUCCESS;
 }
 
-NTSTATUS
-STDCALL
-NtFlushBuffersFile (IN  HANDLE FileHandle,
-                    OUT PIO_STATUS_BLOCK IoStatusBlock)
 /*
  * FUNCTION: Flushes cached file data to disk
  * ARGUMENTS:
@@ -1546,54 +1542,98 @@ NtFlushBuffersFile (IN  HANDLE FileHandle,
  * RETURNS: Status 
  * REMARKS: This function maps to the win32 FlushFileBuffers
  */
+NTSTATUS
+STDCALL
+NtFlushBuffersFile(IN  HANDLE FileHandle,
+                   OUT PIO_STATUS_BLOCK IoStatusBlock)
 {
     PFILE_OBJECT FileObject = NULL;
     PIRP Irp;
     PIO_STACK_LOCATION StackPtr;
     NTSTATUS Status;
-   KPROCESSOR_MODE PreviousMode;
+    PDEVICE_OBJECT DeviceObject;
-
+    KEVENT Event;
-   PreviousMode = ExGetPreviousMode();
+    BOOLEAN LocalEvent = FALSE;
+    KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
 
+    /* Get the File Object */
     Status = ObReferenceObjectByHandle(FileHandle,
                                        FILE_WRITE_DATA,
                                        NULL,
                                        PreviousMode,
                                        (PVOID*)&FileObject,
                                        NULL);
-   if (Status != STATUS_SUCCESS)
+    if (Status != STATUS_SUCCESS) return(Status);
-     {
- return(Status);
-     }
-   KeResetEvent( &FileObject->Event );
-   Irp = IoBuildSynchronousFsdRequest(IRP_MJ_FLUSH_BUFFERS,
-          FileObject->DeviceObject,
-          NULL,
-          0,
-          NULL,
-          &FileObject->Event,
-          IoStatusBlock);
 
-   /* Trigger FileObject/Event dereferencing */
+    /* Check if this is a direct open or not */
+    if (FileObject->Flags & FO_DIRECT_DEVICE_OPEN)
+    {
+        DeviceObject = IoGetAttachedDevice(FileObject->DeviceObject);
+    }
+    else
+    {
+        DeviceObject = IoGetRelatedDeviceObject(FileObject);
+    }
+    
+    /* Check if we should use Sync IO or not */
+    if (FileObject->Flags & FO_SYNCHRONOUS_IO)
+    {
+        /* Use File Object event */
+        KeClearEvent(&FileObject->Event);
+    }
+    else
+    {
+        /* Use local event */
+        KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
+        LocalEvent = TRUE;
+    }
+
+    /* Allocate the IRP */
+    if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE)))
+    {
+        ObDereferenceObject(FileObject);
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
+    
+    /* Set up the IRP */
+    Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0;
+    Irp->RequestorMode = PreviousMode;
+    Irp->UserIosb = IoStatusBlock;
+    Irp->UserEvent = (LocalEvent) ? &Event : NULL;
+    Irp->Tail.Overlay.Thread = PsGetCurrentThread();
     Irp->Tail.Overlay.OriginalFileObject = FileObject;
 
-   Irp->RequestorMode = PreviousMode;
+    /* Set up Stack Data */
-
     StackPtr = IoGetNextIrpStackLocation(Irp);
+    StackPtr->MajorFunction = IRP_MJ_FLUSH_BUFFERS;
     StackPtr->FileObject = FileObject;
     
-   Status = IoCallDriver(FileObject->DeviceObject,Irp);
+    /* Call the Driver */
+    Status = IoCallDriver(DeviceObject, Irp);
     if (Status == STATUS_PENDING)
     {
- KeWaitForSingleObject(&FileObject->Event,
+        if (LocalEvent)
+        {
+            KeWaitForSingleObject(&Event, 
                                   Executive, 
                                   PreviousMode, 
                                   FileObject->Flags & FO_ALERTABLE_IO, 
                                   NULL);
             Status = IoStatusBlock->Status;
         }
+        else
+        {
+            KeWaitForSingleObject(&FileObject->Event,
+                                  Executive, 
+                                  PreviousMode, 
+                                  FileObject->Flags & FO_ALERTABLE_IO, 
+                                  NULL);
+            Status = FileObject->FinalStatus;
+        }
+    }
 
-   return(Status);
+    /* Return the Status */
+    return Status;
 }
 
 /*
@@ -1656,13 +1696,12 @@ NtNotifyChangeDirectoryFile(IN HANDLE FileHandle,
                                        PreviousMode,
                                        (PVOID *)&FileObject,
                                        NULL);
+    if (Status != STATUS_SUCCESS) return(Status);
+   
    
-   if (Status != STATUS_SUCCESS)
-     {
- return(Status);
-     }
    DeviceObject = FileObject->DeviceObject;
    
+   
    Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE);
    if (Irp==NULL)
      {