Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 23:43:35 2006 New Revision: 23360 URL: http://svn.reactos.org/svn/reactos?rev=23360&view=rev Log: Created folder remotely Added: branches/alex-cm-branch/reactos/ntoskrnl/

18 years, 1 month

[ion] 23359: Created folder remotely

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 23:42:29 2006 New Revision: 23359 URL: http://svn.reactos.org/svn/reactos?rev=23359&view=rev Log: Created folder remotely Added: branches/alex-cm-branch/reactos/

18 years, 1 month

[ion] 23358: ph33r

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 23:41:21 2006 New Revision: 23358 URL: http://svn.reactos.org/svn/reactos?rev=23358&view=rev Log: ph33r Added: branches/alex-cm-branch/

18 years, 1 month

[ion] 23357: we're not auditing bottom-up

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 23:36:37 2006 New Revision: 23357 URL: http://svn.reactos.org/svn/reactos?rev=23357&view=rev Log: we're not auditing bottom-up Removed: branches/ntoskrnl-audit/

18 years, 1 month

[ion] 23356: "middle east peace attempt"

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 23:35:11 2006 New Revision: 23356 URL: http://svn.reactos.org/svn/reactos?rev=23356&view=rev Log: "middle east peace attempt" Removed: branches/win32k rewrite attempt/

18 years, 1 month

[ion] 23355: buhbye

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 23:34:42 2006 New Revision: 23355 URL: http://svn.reactos.org/svn/reactos?rev=23355&view=rev Log: buhbye Removed: branches/new_headers/

18 years, 1 month

[ion] 23354: - Added profiling for possible Nt I/O function optimizations. Booting and running Firefox gave an amazing "0 missed optimizations", so defintely, this has been moved down on the priority list. Also merged all tracing TODOs in one entry and added device.c tracing TODO. - Fix IRP Cancellation and enable all calls to IopQueueIrpToThread and IopUnqueueIrpFromThread. This seems to work properly now and the kernel fun entry for it has been removed. All remaining Io TODOs are now low prior

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 23:26:13 2006 New Revision: 23354 URL: http://svn.reactos.org/svn/reactos?rev=23354&view=rev Log: - Added profiling for possible Nt I/O function optimizations. Booting and running Firefox gave an amazing "0 missed optimizations", so defintely, this has been moved down on the priority list. Also merged all tracing TODOs in one entry and added device.c tracing TODO. - Fix IRP Cancellation and enable all calls to IopQueueIrpToThread and IopUnqueueIrpFromThread. This seems to work properly now and the kernel fun entry for it has been removed. All remaining Io TODOs are now low priority. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Jul 29 23:26:13 2006 @@ -9,14 +9,12 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Io: -// - See why queueing IRPs and cancelling them causes crashes. +// - Add tracing to iofunc.c, file.c and device.c // - Add Access Checks in IopParseDevice. // - Add validation checks in IoCreateFile. // - Add probe/alignment checks for Query/Set routines. -// - Add tracing to iofunc.c -// - Add tracing to file.c +// - Verify ShareAccess APIs, XP added some new semantics. // - Add support for some fast-paths when querying/setting data. -// - Verify ShareAccess APIs, XP added some new semantics. // - Add support for Fast Dispatch I/O. // // Ob: Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sat Jul 29 23:26:13 2006 @@ -16,6 +16,8 @@ // These define the Debug Masks Supported // #define IO_IRP_DEBUG 0x01 +#define IO_FO_DEBUG 0x02 +#define IO_DEVICE_DEBUG 0x04 // // Debug/Tracing support Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 29 23:26:13 2006 @@ -373,7 +373,7 @@ OpenPacket->FileObject = FileObject; /* Queue the IRP and call the driver */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { @@ -404,7 +404,7 @@ FileObject->Event.Header.SignalState = 1; /* Now that we've signaled the events, de-associate the IRP */ - //IopUnQueueIrpFromThread(Irp); + IopUnQueueIrpFromThread(Irp); /* Check if the IRP had an input buffer */ if ((Irp->Flags & IRP_BUFFERED_IO) && @@ -611,6 +611,7 @@ NTSTATUS Status; KEVENT Event; PDEVICE_OBJECT DeviceObject; + KIRQL OldIrql; /* Check if the file has a device object */ if (FileObject->DeviceObject) @@ -656,7 +657,7 @@ StackPtr->FileObject = FileObject; /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); /* Call the FS Driver */ Status = IoCallDriver(DeviceObject, Irp); @@ -665,6 +666,11 @@ /* Wait for completion */ KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); } + + /* Raise to APC level and de-queue the IRP */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopUnQueueIrpFromThread(Irp); + KeLowerIrql(OldIrql); /* Free the IRP */ IoFreeIrp(Irp); @@ -830,7 +836,7 @@ } /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); /* Update operation counts */ IopUpdateOperationCount(IopOtherTransfer); @@ -1024,6 +1030,7 @@ PIO_STACK_LOCATION StackPtr; NTSTATUS Status; PDEVICE_OBJECT DeviceObject; + KIRQL OldIrql; /* Check if the file is locked and has more then one handle opened */ if ((FileObject->LockOperation) && (SystemHandleCount != 1)) @@ -1075,7 +1082,7 @@ StackPtr->FileObject = FileObject; /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); /* Update operation counts */ IopUpdateOperationCount(IopOtherTransfer); @@ -1087,6 +1094,11 @@ /* Wait for completion */ KeWaitForSingleObject(&Event, UserRequest, KernelMode, FALSE, NULL); } + + /* Raise to APC level and de-queue the IRP */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + IopUnQueueIrpFromThread(Irp); + KeLowerIrql(OldIrql); /* Free the IRP */ IoFreeIrp(Irp); 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 Sat Jul 29 23:26:13 2006 @@ -13,6 +13,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +ULONG IopMissedOptimizations; #if 0 IOTRACE(IO_IRP_DEBUG, @@ -127,7 +129,7 @@ PAGED_CODE(); /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); /* Update operation counts */ IopUpdateOperationCount(TransferType); @@ -449,7 +451,7 @@ } /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); @@ -696,7 +698,17 @@ StackPtr->Parameters.SetFile.Length = Length; /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); + + /* FIXME BUGBUG TEMPORARY CODE */ + if ((FileInformationClass == FileModeInformation) || + (FileInformationClass == FileRenameInformation ) || + (FileInformationClass == FileLinkInformation ) || + (FileInformationClass == FileMoveClusterInformation)) + { + DPRINT1("Missed optimization: %lx\n", FileInformationClass); + IopMissedOptimizations++; + } /* Call the Driver */ Status = IoCallDriver(FileObject->DeviceObject, Irp); @@ -1635,10 +1647,20 @@ StackPtr->Parameters.QueryFile.Length = Length; /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); /* Update operation counts */ IopUpdateOperationCount(IopOtherTransfer); + + /* FIXME BUGBUG TEMPORARY CODE */ + if ((FileInformationClass == FileAccessInformation) || + (FileInformationClass == FileModeInformation) || + (FileInformationClass == FileAlignmentInformation) || + (FileInformationClass == FileAllInformation)) + { + DPRINT1("Missed optimization: %lx\n", FileInformationClass); + IopMissedOptimizations++; + } /* Call the Driver */ Status = IoCallDriver(DeviceObject, Irp); @@ -2181,12 +2203,22 @@ StackPtr->Parameters.SetFile.Length = Length; /* Queue the IRP */ - //IopQueueIrpToThread(Irp); + IopQueueIrpToThread(Irp); /* Update operation counts */ IopUpdateOperationCount(IopOtherTransfer); - /* FIXME: Later, we can implement a lot of stuff here and avoid a driver call */ + /* FIXME BUGBUG TEMPORARY CODE */ + if ((FileInformationClass == FileModeInformation) || + (FileInformationClass == FileRenameInformation ) || + (FileInformationClass == FileLinkInformation ) || + (FileInformationClass == FileMoveClusterInformation ) || + (FileInformationClass == FileDispositionInformation )) + { + DPRINT1("Missed optimization: %lx\n", FileInformationClass); + IopMissedOptimizations++; + } + /* Handle IO Completion Port quickly */ if (FileInformationClass == FileCompletionInformation) {

18 years, 1 month

[hpoussin] 23353: Remove no longer needed hack

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Jul 29 21:59:04 2006 New Revision: 23353 URL: http://svn.reactos.org/svn/reactos?rev=23353&view=rev Log: Remove no longer needed hack Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c Sat Jul 29 21:59:04 2006 @@ -1000,14 +1000,6 @@ ObDereferenceObject(FileObject); - /* hpoussin, July 2006. Dereferencing the FileObject once - * is not enough to trigger the sending of IRP_MJ_CLEANUP. - * So, do it once more... According to Alex, it's because - * FileObjects should start with a ref count of 1 instead - * of 2 at the moment... - */ - ObDereferenceObject(FileObject); - return STATUS_SUCCESS; }

18 years, 1 month

[ion] 23352: - Add another paramter to IopCleanupFailedIrp to free an optional buffer being specified to it. This way we don't leak some allocated buffers when IRP allocation fails. - Create inlined IopUnQueueIrpFromThread to match IopQueueIrpToThread.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 20:56:26 2006 New Revision: 23352 URL: http://svn.reactos.org/svn/reactos?rev=23352&view=rev Log: - Add another paramter to IopCleanupFailedIrp to free an optional buffer being specified to it. This way we don't leak some allocated buffers when IRP allocation fails. - Create inlined IopUnQueueIrpFromThread to match IopQueueIrpToThread. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/include/internal/io_x.h trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Jul 29 20:56:26 2006 @@ -10,7 +10,6 @@ // // Io: // - See why queueing IRPs and cancelling them causes crashes. -// - Add another parameter to IopCleanupFailedIrp. // - Add Access Checks in IopParseDevice. // - Add validation checks in IoCreateFile. // - Add probe/alignment checks for Query/Set routines. Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Sat Jul 29 20:56:26 2006 @@ -666,7 +666,8 @@ NTAPI IopCleanupFailedIrp( IN PFILE_OBJECT FileObject, - IN PKEVENT EventObject + IN PKEVENT EventObject, + IN PVOID Buffer OPTIONAL ); VOID Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h Sat Jul 29 20:56:26 2006 @@ -41,6 +41,15 @@ /* Lower irql */ KeLowerIrql(OldIrql); +} + +VOID +FORCEINLINE +IopUnQueueIrpFromThread(IN PIRP Irp) +{ + /* Remove it from the list and reset it */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); } VOID Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Sat Jul 29 20:56:26 2006 @@ -404,8 +404,7 @@ FileObject->Event.Header.SignalState = 1; /* Now that we've signaled the events, de-associate the IRP */ - //RemoveEntryList(&Irp->ThreadListEntry); - //InitializeListHead(&Irp->ThreadListEntry); + //IopUnQueueIrpFromThread(Irp); /* Check if the IRP had an input buffer */ if ((Irp->Flags & IRP_BUFFERED_IO) && @@ -795,7 +794,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, NULL); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; 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 Sat Jul 29 20:56:26 2006 @@ -346,7 +346,7 @@ FALSE, EventObject, IoStatusBlock); - if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + if (!Irp) return IopCleanupFailedIrp(FileObject, Event, NULL); /* Set some extra settings */ Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID) NULL; @@ -415,7 +415,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, NULL); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -673,7 +673,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, NULL); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -887,7 +887,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, Event); /* Set up the IRP */ Irp->Flags = (LocalEvent) ? IRP_SYNCHRONOUS_API : 0; @@ -1017,7 +1017,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + if (!Irp) return IopCleanupFailedIrp(FileObject, Event, NULL); /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -1165,7 +1165,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + if (!Irp) return IopCleanupFailedIrp(FileObject, Event, NULL); /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -1366,7 +1366,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) return IopCleanupFailedIrp(FileObject, EventHandle); + if (!Irp) return IopCleanupFailedIrp(FileObject, EventHandle, AuxBuffer); /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -1587,7 +1587,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, Event); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -1882,7 +1882,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, NULL); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -2129,7 +2129,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, Event); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -2463,7 +2463,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, Event); /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -2693,7 +2693,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, NULL); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, NULL); /* Set the IRP */ Irp->Tail.Overlay.OriginalFileObject = FileObject; @@ -2885,7 +2885,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, Event); /* Set up the IRP */ Irp->RequestorMode = PreviousMode; @@ -3035,7 +3035,7 @@ /* Allocate the IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); - if (!Irp) return IopCleanupFailedIrp(FileObject, Event); + if (!Irp) return IopCleanupFailedIrp(FileObject, NULL, Event); /* Set up the IRP */ Irp->RequestorMode = PreviousMode; Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c Sat Jul 29 20:56:26 2006 @@ -43,12 +43,16 @@ NTSTATUS NTAPI IopCleanupFailedIrp(IN PFILE_OBJECT FileObject, - IN PKEVENT EventObject) + IN PKEVENT EventObject OPTIONAL, + IN PVOID Buffer OPTIONAL) { PAGED_CODE(); /* Dereference the event */ if (EventObject) ObDereferenceObject(EventObject); + + /* Free a buffer, if any */ + if (Buffer) ExFreePool(Buffer); /* If this was a file opened for synch I/O, then unlock it */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) IopUnlockFileObject(FileObject); @@ -348,8 +352,7 @@ } /* Now that we've signaled the events, de-associate the IRP */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); + IopUnQueueIrpFromThread(Irp); /* Now check if a User APC Routine was requested */ if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) @@ -447,8 +450,7 @@ } /* Now that we've signaled the events, de-associate the IRP */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); + IopUnQueueIrpFromThread(Irp); /* Free the IRP as well */ IoFreeIrp(Irp);

18 years, 1 month

[ion] 23351: - Add SEH to all iofunc.c functions that required it. (note: Some SEH might seem "useless" to have been added. This is because we don't use Pool Quotas yet, which generate exceptions which will later need to be handled). - Implement IopExceptionCleanup as a generic cleanup handler for SEH exceptions.

by ion＠svn.reactos.org

Author: ion Date: Sat Jul 29 20:35:05 2006 New Revision: 23351 URL: http://svn.reactos.org/svn/reactos?rev=23351&view=rev Log: - Add SEH to all iofunc.c functions that required it. (note: Some SEH might seem "useless" to have been added. This is because we don't use Pool Quotas yet, which generate exceptions which will later need to be handled). - Implement IopExceptionCleanup as a generic cleanup handler for SEH exceptions. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Sat Jul 29 20:35:05 2006 @@ -10,8 +10,6 @@ // // Io: // - See why queueing IRPs and cancelling them causes crashes. -// - Add SEH to some places where it's missing (MDLs, etc) (iofunc). -// - Add a generic Cleanup/Exception Routine (iofunc). // - Add another parameter to IopCleanupFailedIrp. // - Add Access Checks in IopParseDevice. // - Add validation checks in IoCreateFile. 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 Sat Jul 29 20:35:05 2006 @@ -22,6 +22,45 @@ #endif /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +IopCleanupAfterException(IN PFILE_OBJECT FileObject, + IN PIRP Irp, + IN PKEVENT Event OPTIONAL, + IN PKEVENT LocalEvent OPTIONAL) +{ + PAGED_CODE(); + + /* Check if we had a buffer */ + if (Irp->AssociatedIrp.SystemBuffer) + { + /* Free it */ + ExFreePool(Irp->AssociatedIrp.SystemBuffer); + } + + /* Free the mdl */ + if (Irp->MdlAddress) IoFreeMdl(Irp->MdlAddress); + + /* Free the IRP */ + IoFreeIrp(Irp); + + /* Check if we had a file lock */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Release it */ + IopUnlockFileObject(FileObject); + } + + /* Check if we had an event */ + if (Event) ObDereferenceObject(Event); + + /* Check if we had a local event */ + if (LocalEvent) ExFreePool(LocalEvent); + + /* Derefenrce the FO */ + ObDereferenceObject(FileObject); +} NTSTATUS NTAPI @@ -1027,7 +1066,7 @@ IN BOOLEAN ExclusiveLock) { PFILE_OBJECT FileObject; - PLARGE_INTEGER LocalLength; + PLARGE_INTEGER LocalLength = NULL; PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; @@ -1143,25 +1182,32 @@ StackPtr->MinorFunction = IRP_MN_LOCK; StackPtr->FileObject = FileObject; - /* Allocate local buffer */ - LocalLength = ExAllocatePoolWithTag(NonPagedPool, - sizeof(LARGE_INTEGER), - TAG_LOCK); - if (!LocalLength) - { - /* Fail */ - IoFreeIrp(Irp); - if (Event) ObDereferenceObject(Event); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Set the length */ - *LocalLength = CapturedLength; + /* Enter SEH */ + _SEH_TRY + { + /* Allocate local buffer */ + LocalLength = ExAllocatePoolWithTag(NonPagedPool, + sizeof(LARGE_INTEGER), + TAG_LOCK); + + /* Set the length */ + *LocalLength = CapturedLength; + Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength; + StackPtr->Parameters.LockControl.Length = LocalLength; + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, Event, NULL); + if (LocalLength) ExFreePool(LocalLength); + + /* Get status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set Parameters */ - Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength; - StackPtr->Parameters.LockControl.Length = LocalLength; StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; StackPtr->Parameters.LockControl.Key = Key; @@ -1337,11 +1383,26 @@ /* Check if this is buffered I/O */ if (DeviceObject->Flags & DO_BUFFERED_IO) { - /* Allocate a buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, Event, NULL); + if (AuxBuffer) ExFreePool(AuxBuffer); + + /* Get status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set the buffer and flags */ Irp->UserBuffer = FileInformation; @@ -1545,11 +1606,23 @@ StackPtr->MajorFunction = IRP_MJ_QUERY_INFORMATION; StackPtr->FileObject = FileObject; - /* Allocate a buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, NULL, Event); + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set the flags */ Irp->Flags = (IRP_BUFFERED_IO | @@ -1575,7 +1648,7 @@ if (LocalEvent) { /* Then to a non-alertable wait */ - Status = KeWaitForSingleObject(&Event, + Status = KeWaitForSingleObject(Event, Executive, PreviousMode, FALSE, @@ -1839,11 +1912,23 @@ /* Check if we have a buffer length */ if (Length) { - /* Allocate a buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, NULL, Event); + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set the buffer and flags */ Irp->UserBuffer = Buffer; @@ -2063,14 +2148,28 @@ StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; StackPtr->FileObject = FileObject; - /* Allocate a buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - - /* Copy the data into it */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FileInformation, Length); + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + + /* Copy the data into it */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, + FileInformation, + Length); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, NULL, Event); + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set the flags */ Irp->Flags = (IRP_BUFFERED_IO | @@ -2266,7 +2365,7 @@ IN ULONG Key OPTIONAL) { PFILE_OBJECT FileObject; - PLARGE_INTEGER LocalLength; + PLARGE_INTEGER LocalLength = NULL; PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; @@ -2381,25 +2480,32 @@ StackPtr->MinorFunction = IRP_MN_UNLOCK_SINGLE; StackPtr->FileObject = FileObject; - /* Allocate local buffer */ - LocalLength = ExAllocatePoolWithTag(NonPagedPool, - sizeof(LARGE_INTEGER), + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + LocalLength = ExAllocatePoolWithTag(NonPagedPool, + sizeof(LARGE_INTEGER), TAG_LOCK); - if (!LocalLength) - { - /* Fail */ - IoFreeIrp(Irp); - if (Event) ObDereferenceObject(Event); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Set the length */ - *LocalLength = CapturedLength; + + /* Set the length */ + *LocalLength = CapturedLength; + Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength; + StackPtr->Parameters.LockControl.Length = LocalLength; + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, NULL, Event); + if (LocalLength) ExFreePool(LocalLength); + + /* Get exception status */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set Parameters */ - Irp->Tail.Overlay.AuxiliaryBuffer = (PVOID)LocalLength; - StackPtr->Parameters.LockControl.Length = LocalLength; StackPtr->Parameters.LockControl.ByteOffset = CapturedByteOffset; StackPtr->Parameters.LockControl.Key = Key; @@ -2619,14 +2725,27 @@ /* Check if we have a buffer length */ if (Length) { - /* Allocate a buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - - /* Copy the buffer and set flags */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, Buffer, Length); + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + + /* Copy the data into it */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, Buffer, Length); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, Event, NULL); + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Set the flags */ Irp->Flags = (IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER); } else @@ -2785,18 +2904,23 @@ StackPtr->MajorFunction = IRP_MJ_QUERY_VOLUME_INFORMATION; StackPtr->FileObject = FileObject; - /* Allocate system buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (!Irp->AssociatedIrp.SystemBuffer) - { - /* Fail */ - IoFreeIrp(Irp); - if (Event) ObDereferenceObject(Event); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, NULL, Event); + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set the flags for this buffered + deferred I/O */ Irp->Flags |= (IRP_BUFFERED_IO | @@ -2930,21 +3054,26 @@ StackPtr->MajorFunction = IRP_MJ_SET_VOLUME_INFORMATION; StackPtr->FileObject = FileObject; - /* Allocate system buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYSB); - if (!Irp->AssociatedIrp.SystemBuffer) - { - /* Fail */ - IoFreeIrp(Irp); - if (Event) ObDereferenceObject(Event); - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Copy the data into the buffer */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FsInformation, Length); + /* Enter SEH */ + _SEH_TRY + { + /* Allocate a buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + Length, + TAG_SYSB); + + /* Copy the data into it */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, FsInformation, Length); + } + _SEH_HANDLE + { + /* Allocating failed, clean up */ + IopCleanupAfterException(FileObject, Irp, NULL, Event); + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Set the flags for this buffered + deferred I/O */ Irp->Flags |= (IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER);

18 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2006