[ros-diffs] [ion] 25037: - Fix IopSecurityFile to send the IRP to the right device. - Fix IoSetInformation to send the IRP to the right device. - After the major fix in 24996, the functions that had been written to work with the I/O bug stopped working (by sending the IRP to the wrong device object, which, due to the bug was the ""right"" object), this is now fixed and the bootcd works again.

Author: ion
Date: Sun Dec  3 21:04:32 2006
New Revision: 25037

URL: http://svn.reactos.org/svn/reactos?rev=25037&view=rev
Log:
- Fix IopSecurityFile to send the IRP to the right device.
- Fix IoSetInformation to send the IRP to the right device.
- After the major fix in 24996, the functions that had been written to work with the I/O bug stopped working (by sending the IRP to the wrong device object, which, due to the bug was the ""right"" object), this is now fixed and the bootcd works again.

Modified:
    trunk/reactos/ntoskrnl/io/iomgr/file.c
    trunk/reactos/ntoskrnl/io/iomgr/iofunc.c

Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?re...
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/file.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sun Dec  3 21:04:32 2006
@@ -655,7 +655,6 @@
         /* Set up Stack Pointer Data */
         StackPtr = IoGetNextIrpStackLocation(Irp);
         StackPtr->MajorFunction = IRP_MJ_CLOSE;
-        StackPtr->DeviceObject = DeviceObject;
         StackPtr->FileObject = FileObject;

/* Queue the IRP */
@@ -686,6 +685,8 @@
             ObDereferenceObject(FileObject->CompletionContext->Port);
             ExFreePool(FileObject->CompletionContext);
         }
+
+        /* FIXME: Dereference device object */
     }
 }

@@ -839,7 +840,7 @@
     IopUpdateOperationCount(IopOtherTransfer);

/* Call the Driver */
-    Status = IoCallDriver(FileObject->DeviceObject, Irp);
+    Status = IoCallDriver(DeviceObject, Irp);

/* Check if this was async I/O */
     if (LocalEvent)
@@ -1536,6 +1537,8 @@
                             (PVOID*)&CreatedFileObject,
                             &FileHandle);
     CreatedFileObject->Flags |= FO_HANDLE_CREATED;
+
+    /* FIXME: Reference VPB */

/* Close the extra handle and return file */
     NtClose(FileHandle);

Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c?...
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Sun Dec  3 21:04:32 2006
@@ -697,7 +697,7 @@
     //IopQueueIrpToThread(Irp);

/* Call the Driver */
-    Status = IoCallDriver(FileObject->DeviceObject, Irp);
+    Status = IoCallDriver(DeviceObject, Irp);

/* Check if this was synch I/O */
     if (!LocalEvent)