Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 22708: - Create iofunc.c and put all functions that ultimately create a system IRP to send to a device in it, thus clearing up irp.c and file.c and making the code base more modular. - File.c now includes only functions dealing with the FILE_OBJECT itself.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 09:45:02 2006 New Revision: 22708 URL: http://svn.reactos.org/svn/reactos?rev=22708&view=rev Log: - Create iofunc.c and put all functions that ultimately create a system IRP to send to a device in it, thus clearing up irp.c and file.c and making the code base more modular. - File.c now includes only functions dealing with the FILE_OBJECT itself. Added: trunk/reactos/ntoskrnl/io/iofunc.c Modified: trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/irp.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=227… Added: trunk/reactos/ntoskrnl/io/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iofunc.c?rev=2… Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=22… Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r…

1 0

[ion] 22707: - More name-decoration, tracing, comments, etc. - Handle cases where we ran out of memory while trying to allocate the IRP - Make sure the IRP can be re-used in IoReuseIrp.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 08:46:53 2006 New Revision: 22707 URL: http://svn.reactos.org/svn/reactos?rev=22707&view=rev Log: - More name-decoration, tracing, comments, etc. - Handle cases where we ran out of memory while trying to allocate the IRP - Make sure the IRP can be re-used in IoReuseIrp. Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 08:46:53 2006 @@ -1350,8 +1350,8 @@ IoGetRequestorSessionId(IN PIRP Irp, OUT PULONG pSessionId) { + /* Return the session */ *pSessionId = IoGetRequestorProcess(Irp)->Session; - return STATUS_SUCCESS; } @@ -1370,13 +1370,15 @@ */ VOID NTAPI -IoInitializeIrp(PIRP Irp, - USHORT PacketSize, - CCHAR StackSize) -{ - ASSERT(Irp != NULL); - +IoInitializeIrp(IN PIRP Irp, + IN USHORT PacketSize, + IN CCHAR StackSize) +{ /* Clear it */ + IOTRACE(IO_IRP_DEBUG, + "%s - Initializing IRP %p\n", + __FUNCTION__, + Irp); RtlZeroMemory(Irp, PacketSize); /* Set the Header and other data */ @@ -1399,10 +1401,12 @@ IoIsOperationSynchronous(IN PIRP Irp) { /* Check the flags */ - if ((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) || + if (((Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) && + (!(Irp->Flags & IRP_PAGING_IO) && + !(Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO))) || (Irp->Flags & IRP_SYNCHRONOUS_API) || (IoGetCurrentIrpStackLocation(Irp)->FileObject->Flags & - FO_SYNCHRONOUS_IO)) + FO_SYNCHRONOUS_IO)) { /* Synch API or Paging I/O is OK, as is Sync File I/O */ return TRUE; @@ -1429,10 +1433,14 @@ */ PIRP NTAPI -IoMakeAssociatedIrp(PIRP Irp, - CCHAR StackSize) -{ - PIRP AssocIrp; +IoMakeAssociatedIrp(IN PIRP Irp, + IN CCHAR StackSize) +{ + PIRP AssocIrp; + IOTRACE(IO_IRP_DEBUG, + "%s - Associating IRP %p\n", + __FUNCTION__, + Irp); /* Allocate the IRP */ AssocIrp = IoAllocateIrp(StackSize, FALSE); @@ -1446,7 +1454,6 @@ /* Associate them */ AssocIrp->AssociatedIrp.MasterIrp = Irp; - return AssocIrp; } @@ -1455,11 +1462,11 @@ */ NTSTATUS NTAPI -IoPageRead(PFILE_OBJECT FileObject, - PMDL Mdl, - PLARGE_INTEGER Offset, - PKEVENT Event, - PIO_STATUS_BLOCK StatusBlock) +IoPageRead(IN PFILE_OBJECT FileObject, + IN PMDL Mdl, + IN PLARGE_INTEGER Offset, + IN PKEVENT Event, + IN PIO_STATUS_BLOCK StatusBlock) { PIRP Irp; PIO_STACK_LOCATION StackPtr; @@ -1470,6 +1477,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -1505,6 +1513,10 @@ IoQueueThreadIrp(IN PIRP Irp) { KIRQL OldIrql; + IOTRACE(IO_IRP_DEBUG, + "%s - Queueing IRP %p\n", + __FUNCTION__, + Irp); /* Raise to APC */ OldIrql = KfRaiseIrql(APC_LEVEL); @@ -1530,6 +1542,14 @@ IN NTSTATUS Status) { UCHAR AllocationFlags; + IOTRACE(IO_IRP_DEBUG, + "%s - Reusing IRP %p\n", + __FUNCTION__, + Irp); + + /* Make sure it's OK to reuse it */ + ASSERT(!Irp->CancelRoutine); + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); /* Get the old flags */ AllocationFlags = Irp->AllocationFlags; @@ -1549,6 +1569,7 @@ NTAPI IoSetTopLevelIrp(IN PIRP Irp) { + /* Set the IRP */ PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; } @@ -1572,6 +1593,7 @@ /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return STATUS_INSUFFICIENT_RESOURCES; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp);

1 0

[ion] 22706: - Add more tracing/name decoration/comments. - Bugcheck if cancelling and IRP that's already been completed. - Bugcheck if attempting to call a driver with an IRP that's already past its maximum stack size. - Make sure that when we free an IRP, it's not associated to a thread anymore, nor having any drivers that think it's valid.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 08:29:32 2006 New Revision: 22706 URL: http://svn.reactos.org/svn/reactos?rev=22706&view=rev Log: - Add more tracing/name decoration/comments. - Bugcheck if cancelling and IRP that's already been completed. - Bugcheck if attempting to call a driver with an IRP that's already past its maximum stack size. - Make sure that when we free an IRP, it's not associated to a thread anymore, nor having any drivers that think it's valid. Modified: trunk/reactos/ntoskrnl/io/irp.c Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 08:29:32 2006 @@ -13,6 +13,10 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +/* Undefine some macros we implement here */ +#undef IoCallDriver +#undef IoCompleteRequest ULONG IopTraceLevel = IO_IRP_DEBUG; @@ -843,40 +847,61 @@ */ BOOLEAN NTAPI -IoCancelIrp(PIRP Irp) -{ - KIRQL oldlvl; - PDRIVER_CANCEL CancelRoutine; - - DPRINT("IoCancelIrp(Irp 0x%p)\n",Irp); - - IoAcquireCancelSpinLock(&oldlvl); - - Irp->Cancel = TRUE; - - CancelRoutine = IoSetCancelRoutine(Irp, NULL); - if (CancelRoutine == NULL) - { - IoReleaseCancelSpinLock(oldlvl); - return(FALSE); - } - - Irp->CancelIrql = oldlvl; - CancelRoutine(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); - return(TRUE); -} - -/* - * @name IoCancelThreadIo +IoCancelIrp(IN PIRP Irp) +{ + KIRQL OldIrql; + PDRIVER_CANCEL CancelRoutine; + + /* Acquire the cancel lock and cancel the IRP */ + IOTRACE(IO_IRP_DEBUG, + "%s - Canceling IRP %p\n", + __FUNCTION__, + Irp); + + IoAcquireCancelSpinLock(&OldIrql); + Irp->Cancel = TRUE; + + /* Clear the cancel routine and get the old one */ + CancelRoutine = IoSetCancelRoutine(Irp, NULL); + if (CancelRoutine) + { + /* We had a routine, make sure the IRP isn't completed */ + if (Irp->CurrentLocation > (Irp->StackCount + 1)) + { + /* It is, bugcheck */ + KeBugCheckEx(CANCEL_STATE_IN_COMPLETED_IRP, + (ULONG_PTR)Irp, + 0, + 0, + 0); + } + + /* Set the cancel IRQL And call the routine */ + Irp->CancelIrql = OldIrql; + CancelRoutine(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); + return TRUE; + } + + /* Otherwise, release the cancel lock and fail */ + IoReleaseCancelSpinLock(OldIrql); + return FALSE; +} + +/* + * @implemented */ VOID NTAPI -IoCancelThreadIo(PETHREAD Thread) +IoCancelThreadIo(IN PETHREAD Thread) { PIRP Irp; KIRQL OldIrql; ULONG Retries = 3000; LARGE_INTEGER Interval; + IOTRACE(IO_IRP_DEBUG, + "%s - Canceling IRPs for Thread %p\n", + __FUNCTION__, + Thread); /* Raise to APC to protect the IrpList */ OldIrql = KfRaiseIrql(APC_LEVEL); @@ -904,19 +929,16 @@ * Don't stay here forever if some broken driver doesn't complete * the IRP. */ - if (Retries-- == 0) IopRemoveThreadIrp(); + if (!(Retries--)) IopRemoveThreadIrp(); /* Raise the IRQL Again */ OldIrql = KfRaiseIrql(APC_LEVEL); } - + /* We're done, lower the IRQL */ KfLowerIrql(OldIrql); } -#ifdef IoCallDriver -#undef IoCallDriver -#endif /* * @implemented */ @@ -932,7 +954,6 @@ /* * @implemented */ -#undef IoCompleteRequest VOID NTAPI IoCompleteRequest(PIRP Irp, @@ -949,6 +970,7 @@ NTAPI IoEnqueueIrp(IN PIRP Irp) { + /* This is the same as calling IoQueueThreadIrp */ IoQueueThreadIrp(Irp); } @@ -966,11 +988,17 @@ /* Get the Driver Object */ DriverObject = DeviceObject->DriverObject; - /* Set the Stack Location */ - IoSetNextIrpStackLocation(Irp); - - /* Get the current one */ - Param = IoGetCurrentIrpStackLocation(Irp); + /* Decrease the current location and check if */ + Irp->CurrentLocation--; + if (Irp->CurrentLocation <= 0) + { + /* This IRP ran out of stack, bugcheck */ + KeBugCheckEx(NO_MORE_IRP_STACK_LOCATIONS, (ULONG_PTR)Irp, 0, 0, 0); + } + + /* Now update the stack location */ + Param = IoGetNextIrpStackLocation(Irp); + Irp->Tail.Overlay.CurrentStackLocation = Param; /* Get the Device Object */ Param->DeviceObject = DeviceObject; @@ -980,9 +1008,6 @@ Irp); } -#ifdef IoCompleteRequest -#undef IoCompleteRequest -#endif /* * @implemented */ @@ -1242,7 +1267,15 @@ PNPAGED_LOOKASIDE_LIST List; PP_NPAGED_LOOKASIDE_NUMBER ListType = LookasideSmallIrpList; PKPRCB Prcb; - + IOTRACE(IO_IRP_DEBUG, + "%s - Freeing IRPs %p\n", + __FUNCTION__, + Irp); + + /* Make sure the Thread IRP list is empty and that it OK to free it */ + ASSERT(IsListEmpty(&Irp->ThreadListEntry)); + ASSERT(Irp->CurrentLocation >= Irp->StackCount); + /* If this was a pool alloc, free it with the pool */ if (!(Irp->AllocationFlags & IRP_ALLOCATED_FIXED_SIZE)) { @@ -1252,10 +1285,7 @@ else { /* Check if this was a Big IRP */ - if (Irp->StackCount != 1) - { - ListType = LookasideLargeIrpList; - } + if (Irp->StackCount != 1) ListType = LookasideLargeIrpList; /* Get the PRCB */ Prcb = KeGetCurrentPrcb(); @@ -1284,7 +1314,7 @@ } } - /* The free was within dhe Depth */ + /* The free was within the Depth */ if (Irp) { InterlockedPushEntrySList(&List->L.ListHead,

1 0

[ion] 22705: - Add more name/prototype decoration and API tracing. - Don't handle IRP_MJ_POWER in IoBuildAsyncronousFsdRequest. - Use IoAllocateMdl instead of being a cowboy and using MmCreateMdl. - Handle failure/out-of-memory cases in IoBuildAsyncronousFsdRequest - Free the input buffer on failure in IoBuildDeviceIoControlRequest - Handle failure in IoBuildSyncronousFsdREquest.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 07:48:03 2006 New Revision: 22705 URL: http://svn.reactos.org/svn/reactos?rev=22705&view=rev Log: - Add more name/prototype decoration and API tracing. - Don't handle IRP_MJ_POWER in IoBuildAsyncronousFsdRequest. - Use IoAllocateMdl instead of being a cowboy and using MmCreateMdl. - Handle failure/out-of-memory cases in IoBuildAsyncronousFsdRequest - Free the input buffer on failure in IoBuildDeviceIoControlRequest - Handle failure in IoBuildSyncronousFsdREquest. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/irp.c 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 Fri Jun 30 07:48:03 2006 @@ -33,9 +33,9 @@ #endif // -// FIXME: What is this? -// -#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) +// Returns the type of METHOD_ used in this IOCTL +// +#define IO_METHOD_FROM_CTL_CODE(c) (c & 0x00000003) // // Packet Types when piggybacking on the IRP Overlay Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 07:48:03 2006 @@ -394,8 +394,8 @@ */ PIRP NTAPI -IoAllocateIrp(CCHAR StackSize, - BOOLEAN ChargeQuota) +IoAllocateIrp(IN CCHAR StackSize, + IN BOOLEAN ChargeQuota) { PIRP Irp = NULL; USHORT Size = IoSizeOfIrp(StackSize); @@ -478,6 +478,11 @@ Irp->AllocationFlags = Flags; /* Return it */ + IOTRACE(IO_IRP_DEBUG, + "%s - Allocated IRP %p with allocation flags %lx\n", + __FUNCTION__, + Irp, + Flags); return Irp; } @@ -486,19 +491,19 @@ */ PIRP NTAPI -IoBuildAsynchronousFsdRequest(ULONG MajorFunction, - PDEVICE_OBJECT DeviceObject, - PVOID Buffer, - ULONG Length, - PLARGE_INTEGER StartingOffset, - PIO_STATUS_BLOCK IoStatusBlock) +IoBuildAsynchronousFsdRequest(IN ULONG MajorFunction, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Buffer, + IN ULONG Length, + IN PLARGE_INTEGER StartingOffset, + IN PIO_STATUS_BLOCK IoStatusBlock) { PIRP Irp; PIO_STACK_LOCATION StackPtr; - LOCK_OPERATION AccessType; /* Allocate IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) return Irp; + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return Irp; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -507,9 +512,10 @@ StackPtr->MajorFunction = (UCHAR)MajorFunction; /* Do not handle the following here */ - if (MajorFunction != IRP_MJ_FLUSH_BUFFERS && - MajorFunction != IRP_MJ_SHUTDOWN && - MajorFunction != IRP_MJ_PNP) + if ((MajorFunction != IRP_MJ_FLUSH_BUFFERS) && + (MajorFunction != IRP_MJ_SHUTDOWN) && + (MajorFunction != IRP_MJ_PNP) && + (MajorFunction != IRP_MJ_POWER)) { /* Check if this is Buffered IO */ if (DeviceObject->Flags & DO_BUFFERED_IO) @@ -517,6 +523,12 @@ /* Allocate the System Buffer */ Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYS_BUF); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } /* Set flags */ Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; @@ -537,35 +549,38 @@ else if (DeviceObject->Flags & DO_DIRECT_IO) { /* Use an MDL for Direct I/O */ - Irp->MdlAddress = MmCreateMdl(NULL, Buffer, Length); - - if (MajorFunction == IRP_MJ_READ) - { - AccessType = IoWriteAccess; - } - else - { - AccessType = IoReadAccess; + Irp->MdlAddress = IoAllocateMdl(Buffer, + Length, + FALSE, + FALSE, + NULL); + if (!Irp->MdlAddress) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; } /* Probe and Lock */ _SEH_TRY { /* Do the probe */ - MmProbeAndLockPages(Irp->MdlAddress, KernelMode, AccessType); + MmProbeAndLockPages(Irp->MdlAddress, + KernelMode, + MajorFunction == IRP_MJ_READ ? + IoWriteAccess : IoReadAccess); } _SEH_HANDLE { /* Free the IRP and its MDL */ IoFreeMdl(Irp->MdlAddress); IoFreeIrp(Irp); - /* FIXME - pass the exception to the caller? */ Irp = NULL; } _SEH_END; - if (!Irp) - return NULL; + /* This is how we know if we failed during the probe */ + if (!Irp) return NULL; } else { @@ -573,13 +588,16 @@ Irp->UserBuffer = Buffer; } + /* Check if this is a read */ if (MajorFunction == IRP_MJ_READ) { + /* Set the parameters for a read */ StackPtr->Parameters.Read.Length = Length; StackPtr->Parameters.Read.ByteOffset = *StartingOffset; } else if (MajorFunction == IRP_MJ_WRITE) { + /* Otherwise, set write parameters */ StackPtr->Parameters.Write.Length = Length; StackPtr->Parameters.Write.ByteOffset = *StartingOffset; } @@ -590,6 +608,13 @@ Irp->Tail.Overlay.Thread = PsGetCurrentThread(); /* Set the Status Block after all is done */ + IOTRACE(IO_IRP_DEBUG, + "%s - Built IRP %p with Major, Buffer, DO %lx %p %p\n", + __FUNCTION__, + Irp, + MajorFunction, + Buffer, + DeviceObject); return Irp; } @@ -598,23 +623,23 @@ */ PIRP NTAPI -IoBuildDeviceIoControlRequest (ULONG IoControlCode, - PDEVICE_OBJECT DeviceObject, - PVOID InputBuffer, - ULONG InputBufferLength, - PVOID OutputBuffer, - ULONG OutputBufferLength, - BOOLEAN InternalDeviceIoControl, - PKEVENT Event, - PIO_STATUS_BLOCK IoStatusBlock) +IoBuildDeviceIoControlRequest(IN ULONG IoControlCode, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID InputBuffer, + IN ULONG InputBufferLength, + IN PVOID OutputBuffer, + IN ULONG OutputBufferLength, + IN BOOLEAN InternalDeviceIoControl, + IN PKEVENT Event, + IN PIO_STATUS_BLOCK IoStatusBlock) { PIRP Irp; PIO_STACK_LOCATION StackPtr; ULONG BufferLength; - LOCK_OPERATION AccessType; /* Allocate IRP */ - if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) return Irp; + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) return Irp; /* Get the Stack */ StackPtr = IoGetNextIrpStackLocation(Irp); @@ -633,136 +658,132 @@ /* Handle the Methods */ switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) { + /* Buffered I/O */ case METHOD_BUFFERED: - /* Select the right Buffer Length */ - BufferLength = InputBufferLength > OutputBufferLength ? - InputBufferLength : OutputBufferLength; - - /* Make sure there is one */ - if (BufferLength) - { - /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, BufferLength, TAG_SYS_BUF); - - /* Fail if we couldn't */ - if (Irp->AssociatedIrp.SystemBuffer == NULL) - { - IoFreeIrp(Irp); - return(NULL); - } - - /* Check if we got a buffer */ + /* Select the right Buffer Length */ + BufferLength = InputBufferLength > OutputBufferLength ? + InputBufferLength : OutputBufferLength; + + /* Make sure there is one */ + if (BufferLength) + { + /* Allocate the System Buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + BufferLength, + TAG_SYS_BUF); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } + + /* Check if we got a buffer */ + if (InputBuffer) + { + /* Copy into the System Buffer */ + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, + InputBuffer, + InputBufferLength); + } + + /* Write the flags */ + Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; + if (OutputBuffer) Irp->Flags |= IRP_INPUT_OPERATION; + + /* Save the Buffer */ + Irp->UserBuffer = OutputBuffer; + } + else + { + /* Clear the Flags and Buffer */ + Irp->Flags = 0; + Irp->UserBuffer = NULL; + } + break; + + /* Direct I/O */ + case METHOD_IN_DIRECT: + case METHOD_OUT_DIRECT: + + /* Check if we got an input buffer */ if (InputBuffer) { + /* Allocate the System Buffer */ + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + InputBufferLength, + TAG_SYS_BUF); + if (!Irp->AssociatedIrp.SystemBuffer) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } + /* Copy into the System Buffer */ RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, InputBuffer, InputBufferLength); - } - - /* Write the flags */ - Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; - if (OutputBuffer) Irp->Flags |= IRP_INPUT_OPERATION; - - /* Save the Buffer */ + + /* Write the flags */ + Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; + } + else + { + Irp->Flags = 0; + } + + /* Check if we got an output buffer */ + if (OutputBuffer) + { + /* Allocate the System Buffer */ + Irp->MdlAddress = IoAllocateMdl(OutputBuffer, + OutputBufferLength, + FALSE, + FALSE, + Irp); + if (!Irp->MdlAddress) + { + /* Free the IRP and fail */ + IoFreeIrp(Irp); + return NULL; + } + + /* Probe and Lock */ + _SEH_TRY + { + /* Do the probe */ + MmProbeAndLockPages(Irp->MdlAddress, + KernelMode, + IO_METHOD_FROM_CTL_CODE(IoControlCode) == + METHOD_IN_DIRECT ? + IoReadAccess : IoWriteAccess); + } + _SEH_HANDLE + { + /* Free the MDL */ + IoFreeMdl(Irp->MdlAddress); + + /* Free the input buffer and IRP */ + if (InputBuffer) ExFreePool(Irp->AssociatedIrp.SystemBuffer); + IoFreeIrp(Irp); + Irp = NULL; + } + _SEH_END; + + /* This is how we know if probing failed */ + if (!Irp) return NULL; + } + break; + + case METHOD_NEITHER: + + /* Just save the Buffer */ Irp->UserBuffer = OutputBuffer; - } - else - { - /* Clear the Flags and Buffer */ - Irp->Flags = 0; - Irp->UserBuffer = NULL; - } - break; - - case METHOD_IN_DIRECT: - case METHOD_OUT_DIRECT: - - /* Check if we got an input buffer */ - if (InputBuffer) - { - /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = - ExAllocatePoolWithTag(NonPagedPool, - InputBufferLength, - TAG_SYS_BUF); - - /* Fail if we couldn't */ - if (Irp->AssociatedIrp.SystemBuffer == NULL) - { - IoFreeIrp(Irp); - return(NULL); - } - - /* Copy into the System Buffer */ - RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, - InputBuffer, - InputBufferLength); - - /* Write the flags */ - Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; - } - else - { - Irp->Flags = 0; - } - - /* Check if we got an output buffer */ - if (OutputBuffer) - { - /* Allocate the System Buffer */ - Irp->MdlAddress = IoAllocateMdl(OutputBuffer, - OutputBufferLength, - FALSE, - FALSE, - Irp); - - /* Fail if we couldn't */ - if (Irp->MdlAddress == NULL) - { - IoFreeIrp(Irp); - return NULL; - } - - /* Probe and Lock */ - _SEH_TRY - { - /* Use the right Access Type */ - if (IO_METHOD_FROM_CTL_CODE(IoControlCode) == METHOD_IN_DIRECT) - { - AccessType = IoReadAccess; - } - else - { - AccessType = IoWriteAccess; - } - - /* Do the probe */ - MmProbeAndLockPages(Irp->MdlAddress, KernelMode, AccessType); - } - _SEH_HANDLE - { - /* Free the MDL and IRP */ - IoFreeMdl(Irp->MdlAddress); - IoFreeIrp(Irp); - /* FIXME - pass the exception to the caller? */ - Irp = NULL; - } - _SEH_END; - - if (!Irp) - return NULL; - } - break; - - case METHOD_NEITHER: - - /* Just save the Buffer */ - Irp->UserBuffer = OutputBuffer; - StackPtr->Parameters.DeviceIoControl.Type3InputBuffer = InputBuffer; - break; + StackPtr->Parameters.DeviceIoControl.Type3InputBuffer = InputBuffer; } /* Now write the Event and IoSB */ @@ -774,6 +795,14 @@ IoQueueThreadIrp(Irp); /* Return the IRP */ + IOTRACE(IO_IRP_DEBUG, + "%s - Built IRP %p with IOCTL, Buffers, DO %lx %p %p %p\n", + __FUNCTION__, + Irp, + IoControlCode, + InputBuffer, + OutputBuffer, + DeviceObject); return Irp; } @@ -782,13 +811,13 @@ */ PIRP NTAPI -IoBuildSynchronousFsdRequest(ULONG MajorFunction, - PDEVICE_OBJECT DeviceObject, - PVOID Buffer, - ULONG Length, - PLARGE_INTEGER StartingOffset, - PKEVENT Event, - PIO_STATUS_BLOCK IoStatusBlock) +IoBuildSynchronousFsdRequest(IN ULONG MajorFunction, + IN PDEVICE_OBJECT DeviceObject, + IN PVOID Buffer, + IN ULONG Length, + IN PLARGE_INTEGER StartingOffset, + IN PKEVENT Event, + IN PIO_STATUS_BLOCK IoStatusBlock) { PIRP Irp; @@ -799,6 +828,7 @@ Length, StartingOffset, IoStatusBlock ); + if (!Irp) return NULL; /* Set the Event which makes it Syncronous */ Irp->UserEvent = Event;

1 0

[ion] 22704: - Fix I/O Completion (IopCompleteRequest/IofCompleteRequest) for the first time after the 40-thread long flame war last year: - Don't read pointers from the file object or IRP before they are actually used, because in some parts of the code, these pointers could change before we actually use them. - Get rid of the #if 1/#if 0 nonsense hbirr had added. - Properly check for success/warning/failure cases (thanks to Filip for checking this out with me last year) - Handle scenarios when
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 07:15:56 2006 New Revision: 22704 URL: http://svn.reactos.org/svn/reactos?rev=22704&view=rev Log: - Fix I/O Completion (IopCompleteRequest/IofCompleteRequest) for the first time after the 40-thread long flame war last year: - Don't read pointers from the file object or IRP before they are actually used, because in some parts of the code, these pointers could change before we actually use them. - Get rid of the #if 1/#if 0 nonsense hbirr had added. - Properly check for success/warning/failure cases (thanks to Filip for checking this out with me last year) - Handle scenarios when the IRP is marked IRP_CREATE_OPERATION - Bugcheck if IofCompleteRequest is called twice on the same IRP - Copy the master IRP's thread to the associated IRP - Free the Auxiliary Buffer if there is one. - Some formatting fixes, and majorly recomment the code to make it a lot clearer and more verbose on some of the more intricate details. - Remove some hacks which I don't think are needed anymore. If you notice regressions due to this patch let me know ASAP. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/irp.c 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 Fri Jun 30 07:15:56 2006 @@ -62,6 +62,15 @@ Count]) \ : \ FIELD_OFFSET(CM_RESOURCE_LIST, List) + +// +// Determines if the IRP is Synchronous +// +#define IsIrpSynchronous(Irp, FileObject) \ + ((Irp->Flags & IRP_SYNCHRONOUS_API) || \ + (!(FileObject) ? \ + FALSE : \ + FileObject->Flags & FO_SYNCHRONOUS_IO)) \ /* * VOID Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 07:15:56 2006 @@ -13,6 +13,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> + +ULONG IopTraceLevel = IO_IRP_DEBUG; /* PRIVATE FUNCTIONS ********************************************************/ @@ -162,21 +164,17 @@ PFILE_OBJECT FileObject; PIRP Irp; PMDL Mdl; - PKEVENT UserEvent; - BOOLEAN SyncIrp; - - if (Apc) DPRINT("IoSecondStageCompletition with APC: 0x%p\n", Apc); + PVOID Port = NULL, Key = NULL; + BOOLEAN SignaledCreateRequest = FALSE; /* Get data from the APC */ - FileObject = (PFILE_OBJECT)(*SystemArgument1); + FileObject = (PFILE_OBJECT)*SystemArgument1; Irp = CONTAINING_RECORD(Apc, IRP, Tail.Apc); - DPRINT("IoSecondStageCompletition, 0x%p\n", Irp); - - /* Save the User Event */ - UserEvent = Irp->UserEvent; - - /* Remember if the IRP is Sync or not */ - SyncIrp = Irp->Flags & IRP_SYNCHRONOUS_API ? TRUE : FALSE; + IOTRACE(IO_IRP_DEBUG, + "%s - Completing IRP %p for %p\n", + __FUNCTION__, + Irp, + FileObject); /* Handle Buffered case first */ if (Irp->Flags & IRP_BUFFERED_IO) @@ -195,6 +193,7 @@ /* Also check if we should de-allocate it */ if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { + /* Deallocate it */ ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); } } @@ -210,17 +209,25 @@ IoFreeMdl(Mdl); } - /* Remove the IRP from the list of Thread Pending IRPs */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); - -#if 1 - /* Check for Success but allow failure for Async IRPs */ - if (!(NT_ERROR(Irp->IoStatus.Status)) || - ((NT_ERROR(Irp->IoStatus.Status)) && - (Irp->PendingReturned) && !(SyncIrp) && - ((FileObject == NULL) || (FileObject->Flags & FO_SYNCHRONOUS_IO)))) - { + /* + * Check if either the request was completed without any errors + * (but warnings are OK!), or if it was completed with an error, but + * did return from a pending I/O Operation and is not synchronous. + */ + if ((!NT_ERROR(Irp->IoStatus.Status)) || + (NT_ERROR(Irp->IoStatus.Status) && + (Irp->PendingReturned) && + !(IsIrpSynchronous(Irp, FileObject)))) + { + /* Get any information we need from the FO before we kill it */ + if ((FileObject) && (FileObject->CompletionContext)) + { + /* Save Completion Data */ + Port = FileObject->CompletionContext->Port; + Key = FileObject->CompletionContext->Key; + } + + /* Use SEH to make sure we don't write somewhere invalid */ _SEH_TRY { /* Save the IOSB Information */ @@ -232,47 +239,54 @@ } _SEH_END; - /* Check if there's an event */ - if (UserEvent) - { - /* Check if we should signal the File Object Event as well */ + /* Check if we have an event or a file object */ + if (Irp->UserEvent) + { + /* At the very least, this is a PKEVENT, so signal it always */ + KeSetEvent(Irp->UserEvent, 0, FALSE); + + /* Check if we also have a File Object */ if (FileObject) { /* - * If the File Object is SYNC, then we need to - * signal its event too + * Now, if this is a Synch I/O File Object, then this event is + * NOT an actual Executive Event, so we won't dereference it, + * and instead, we will signal the File Object */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { - /* Set the Status */ + /* Signal the file object and set the status */ + KeSetEvent(&FileObject->Event, 0, FALSE); FileObject->FinalStatus = Irp->IoStatus.Status; - - /* Signal Event */ - KeSetEvent(&FileObject->Event, 0, FALSE); } - } - - /* Signal the Event */ - KeSetEvent(UserEvent, 0, FALSE); - - /* Dereference the Event if this is an ASYNC IRP */ - if (FileObject && !SyncIrp && UserEvent != &FileObject->Event) - { - ObDereferenceObject(UserEvent); + + /* + * This could also be a create operation, in which case we want + * to make sure there's no APC fired. + */ + if (Irp->Flags & IRP_CREATE_OPERATION) + { + /* Clear the APC Routine and remmeber this */ + Irp->Overlay.AsynchronousParameters.UserApcRoutine = NULL; + SignaledCreateRequest = TRUE; + } } } else if (FileObject) { - /* Set the Status */ + /* Signal the file object and set the status */ + KeSetEvent(&FileObject->Event, 0, FALSE); FileObject->FinalStatus = Irp->IoStatus.Status; - - /* Signal the File Object Instead */ - KeSetEvent(&FileObject->Event, 0, FALSE); - } - - /* Now call the User APC if one was requested */ + } + + /* Now that we've signaled the events, de-associate the IRP */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + /* Now check if a User APC Routine was requested */ if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) { + /* Initialize it */ KeInitializeApc(&Irp->Tail.Apc, KeGetCurrentThread(), CurrentApcEnvironment, @@ -284,179 +298,93 @@ Irp-> Overlay.AsynchronousParameters.UserApcContext); - KeInsertQueueApc(&Irp->Tail.Apc, - Irp->UserIosb, - NULL, - 2); - Irp = NULL; - } - else if (FileObject && FileObject->CompletionContext) - { - /* Call the IO Completion Port if we have one, instead */ - Irp->Tail.CompletionKey = FileObject->CompletionContext->Key; + /* Queue it */ + KeInsertQueueApc(&Irp->Tail.Apc, Irp->UserIosb, NULL, 2); + } + else if ((Port) && + (Irp->Overlay.AsynchronousParameters.UserApcContext)) + { + /* We have an I/O Completion setup... create the special Overlay */ + Irp->Tail.CompletionKey = Key; Irp->Tail.Overlay.PacketType = IrpCompletionPacket; - KeInsertQueue(FileObject->CompletionContext->Port, - &Irp->Tail.Overlay.ListEntry); - Irp = NULL; + KeInsertQueue(Port, &Irp->Tail.Overlay.ListEntry); + } + else + { + /* Free the IRP since we don't need it anymore */ + IoFreeIrp(Irp); + } + + /* Check if we have a file object that wasn't part of a create */ + if ((FileObject) && !(SignaledCreateRequest)) + { + /* Dereference it, since it's not needed anymore either */ + ObDereferenceObject(FileObject); } } else { /* - * Signal the Events only if PendingReturned and we have a File Object + * Either we didn't return from the request, or we did return but this + * request was synchronous. */ - if (FileObject && Irp->PendingReturned) - { - /* Check for SYNC IRP */ - if (SyncIrp) - { - /* Set the status in this case only */ - _SEH_TRY + if ((Irp->PendingReturned) && (FileObject)) + { + /* So we did return with a synch operation, was it the IRP? */ + if (Irp->Flags & IRP_SYNCHRONOUS_API) + { + /* Yes, this IRP was synchronous, so retrn the I/O Status */ + *Irp->UserIosb = Irp->IoStatus; + + /* Now check if the user gave an event */ + if (Irp->UserEvent) { - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; - - /* Signal our event if we have one */ - if (UserEvent) - { - KeSetEvent(UserEvent, 0, FALSE); + /* Signal it */ + KeSetEvent(Irp->UserEvent, 0, FALSE); } else { - /* Signal the File's Event instead */ + /* No event was given, so signal the FO instead */ KeSetEvent(&FileObject->Event, 0, FALSE); } } else { -#if 1 - /* FIXME: This is necessary to fix bug #609 */ - _SEH_TRY - { - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; -#endif - /* We'll report the Status to the File Object, not the IRP */ + /* + * It's not the IRP that was synchronous, it was the FO + * that was opened this way. Signal its event. + */ FileObject->FinalStatus = Irp->IoStatus.Status; - - /* Signal the File Object ONLY if this was Async */ KeSetEvent(&FileObject->Event, 0, FALSE); } } - /* Dereference the Event if it's an ASYNC IRP on a File Object */ - if (UserEvent && !SyncIrp && FileObject) - { - if (UserEvent != &FileObject->Event) - { - ObDereferenceObject(UserEvent); - } - } - } - - /* Dereference the File Object */ - if (FileObject) ObDereferenceObject(FileObject); - - /* Free the IRP */ - if (Irp) IoFreeIrp(Irp); - -#else - - if (NT_SUCCESS(Irp->IoStatus.Status) || Irp->PendingReturned) - { - _SEH_TRY - { - /* Save the IOSB Information */ - *Irp->UserIosb = Irp->IoStatus; - } - _SEH_HANDLE - { - /* Ignore any error */ - } - _SEH_END; - - if (FileObject) - { - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Set the Status */ - FileObject->FinalStatus = Irp->IoStatus.Status; - - /* FIXME: Remove this check when I/O code is fixed */ - if (UserEvent != &FileObject->Event) - { - /* Signal Event */ - KeSetEvent(&FileObject->Event, 0, FALSE); - } - } - } - - /* Signal the user event, if one exist */ - if (UserEvent) - { - KeSetEvent(UserEvent, 0, FALSE); - } - - /* Now call the User APC if one was requested */ - if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) - { - KeInitializeApc(&Irp->Tail.Apc, - KeGetCurrentThread(), - CurrentApcEnvironment, - IopFreeIrpKernelApc, - IopAbortIrpKernelApc, - (PKNORMAL_ROUTINE)Irp-> - Overlay.AsynchronousParameters.UserApcRoutine, - Irp->RequestorMode, - Irp-> - Overlay.AsynchronousParameters.UserApcContext); - - KeInsertQueueApc(&Irp->Tail.Apc, - Irp->UserIosb, - NULL, - 2); - Irp = NULL; - } - else if (FileObject && FileObject->CompletionContext) - { - /* Call the IO Completion Port if we have one, instead */ - IoSetIoCompletion(FileObject->CompletionContext->Port, - FileObject->CompletionContext->Key, - Irp-> - Overlay.AsynchronousParameters.UserApcContext, - Irp->IoStatus.Status, - Irp->IoStatus.Information, - FALSE); - Irp = NULL; - } - } - - /* Free the Irp if it hasn't already */ - if (Irp) IoFreeIrp(Irp); - - if (FileObject) - { - /* Dereference the user event, if it is an event object */ - /* FIXME: Remove last check when I/O code is fixed */ - if (UserEvent && !SyncIrp && UserEvent != &FileObject->Event) - { - ObDereferenceObject(UserEvent); - } - - /* Dereference the File Object */ - ObDereferenceObject(FileObject); - } -#endif + /* Now that we got here, we do this for incomplete I/Os as well */ + if ((FileObject) && !(Irp->Flags & IRP_CREATE_OPERATION)) + { + /* Dereference the File Object unless this was a create */ + ObDereferenceObject(FileObject); + } + + /* + * Check if this was an Executive Event (remember that we know this + * by checking if the IRP is synchronous) + */ + if ((Irp->UserEvent) && + (FileObject) && + !(Irp->Flags & IRP_SYNCHRONOUS_API)) + { + /* This isn't a PKEVENT, so dereference it */ + ObDereferenceObject(Irp->UserEvent); + } + + /* Now that we've signaled the events, de-associate the IRP */ + RemoveEntryList(&Irp->ThreadListEntry); + InitializeListHead(&Irp->ThreadListEntry); + + /* Free the IRP as well */ + IoFreeIrp(Irp); + } } /* FUNCTIONS *****************************************************************/ @@ -1030,46 +958,43 @@ */ VOID FASTCALL -IofCompleteRequest(PIRP Irp, - CCHAR PriorityBoost) +IofCompleteRequest(IN PIRP Irp, + IN CCHAR PriorityBoost) { PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - PFILE_OBJECT FileObject = Irp->Tail.Overlay.OriginalFileObject; - PETHREAD Thread = Irp->Tail.Overlay.Thread; + PFILE_OBJECT FileObject; + PETHREAD Thread; NTSTATUS Status; PMDL Mdl; - + ULONG MasterIrpCount; + PIRP MasterIrp; + IOTRACE(IO_IRP_DEBUG, + "%s - Completing IRP %p\n", + __FUNCTION__, + Irp); + + /* Make sure this IRP isn't getting completed more then once */ + if ((Irp->CurrentLocation) > (Irp->StackCount + 1)) + { + /* Bugcheck */ + KeBugCheckEx(MULTIPLE_IRP_COMPLETE_REQUESTS, (ULONG_PTR)Irp, 0, 0, 0); + } + + /* Some sanity checks */ ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(!Irp->CancelRoutine); ASSERT(Irp->IoStatus.Status != STATUS_PENDING); - /* Get the Current Stack */ + /* Get the Current Stack and skip it */ StackPtr = IoGetCurrentIrpStackLocation(Irp); IoSkipCurrentIrpStackLocation(Irp); /* Loop the Stacks and complete the IRPs */ - for (;Irp->CurrentLocation <= (Irp->StackCount + 1); StackPtr++) + do { /* Set Pending Returned */ Irp->PendingReturned = StackPtr->Control & SL_PENDING_RETURNED; - - /* - * Completion routines expect the current irp stack location to be the same as when - * IoSetCompletionRoutine was called to set them. A side effect is that completion - * routines set by highest level drivers without their own stack location will receive - * an invalid current stack location (at least it should be considered as invalid). - * Since the DeviceObject argument passed is taken from the current stack, this value - * is also invalid (NULL). - */ - if (Irp->CurrentLocation == (Irp->StackCount + 1)) - { - DeviceObject = NULL; - } - else - { - DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject; - } /* Check if there is a Completion Routine to Call */ if ((NT_SUCCESS(Irp->IoStatus.Status) && @@ -1078,44 +1003,65 @@ (StackPtr->Control & SL_INVOKE_ON_ERROR)) || (Irp->Cancel && (StackPtr->Control & SL_INVOKE_ON_CANCEL))) { - /* Call it */ + /* Check for highest-level device completion routines */ + if (Irp->CurrentLocation == (Irp->StackCount + 1)) + { + /* Clear the DO, since the current stack location is invalid */ + DeviceObject = NULL; + } + else + { + /* Otherwise, return the real one */ + DeviceObject = IoGetCurrentIrpStackLocation(Irp)->DeviceObject; + } + + /* Call the completion routine */ Status = StackPtr->CompletionRoutine(DeviceObject, Irp, StackPtr->Context); - /* Don't touch the Packet if this was returned. It might be gone! */ + /* Don't touch the Packet in this case, since it might be gone! */ if (Status == STATUS_MORE_PROCESSING_REQUIRED) return; } else { - if ((Irp->CurrentLocation <= Irp->StackCount) && (Irp->PendingReturned)) - { + /* Otherwise, check if this is a completed IRP */ + if ((Irp->CurrentLocation <= Irp->StackCount) && + (Irp->PendingReturned)) + { + /* Mark it as pending */ IoMarkIrpPending(Irp); } } - /* Move to next stack */ + /* Move to next stack location and pointer */ IoSkipCurrentIrpStackLocation(Irp); - } - - /* Windows NT File System Internals, page 165 */ + StackPtr++; + } while (Irp->CurrentLocation <= (Irp->StackCount + 1)); + + /* Check if the IRP is an associated IRP */ if (Irp->Flags & IRP_ASSOCIATED_IRP) { - ULONG MasterIrpCount; - PIRP MasterIrp = Irp->AssociatedIrp.MasterIrp; - /* This should never happen! */ ASSERT(IsListEmpty(&Irp->ThreadListEntry)); - /* Decrement and get the old count */ - MasterIrpCount = InterlockedDecrement(&MasterIrp->AssociatedIrp.IrpCount); - - /* Free MDLs and IRP */ + /* Get the master IRP and count */ + MasterIrp = Irp->AssociatedIrp.MasterIrp; + MasterIrpCount = InterlockedDecrement(&MasterIrp-> + AssociatedIrp.IrpCount); + + /* Set the thread of this IRP as the master's */ + Irp->Tail.Overlay.Thread = MasterIrp->Tail.Overlay.Thread; + + /* Free the MDLs */ while ((Mdl = Irp->MdlAddress)) { + /* Go to the next one */ Irp->MdlAddress = Mdl->Next; IoFreeMdl(Mdl); } + + /* Free the IRP itself */ IoFreeIrp(Irp); /* Complete the Master IRP */ @@ -1123,8 +1069,16 @@ return; } - /* Windows NT File System Internals, page 165 */ - if (Irp->Flags & (IRP_PAGING_IO|IRP_CLOSE_OPERATION)) + /* Check if we have an auxiliary buffer */ + if (Irp->Tail.Overlay.AuxiliaryBuffer) + { + /* Free it */ + ExFreePool(Irp->Tail.Overlay.AuxiliaryBuffer); + Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + } + + /* Check if this is a Paging I/O or Close Operation */ + if (Irp->Flags & (IRP_PAGING_IO | IRP_CLOSE_OPERATION)) { /* This should never happen! */ ASSERT(IsListEmpty(&Irp->ThreadListEntry)); @@ -1137,10 +1091,7 @@ KeSetEvent(Irp->UserEvent, PriorityBoost, FALSE); /* Free the IRP for a Paging I/O Only, Close is handled by us */ - if (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) - { - IoFreeIrp(Irp); - } + if (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) IoFreeIrp(Irp); } else { @@ -1163,6 +1114,8 @@ ASSERT(FALSE); #endif } + + /* Get out of here */ return; } @@ -1175,22 +1128,33 @@ } /* Check if we should exit because of a Deferred I/O (page 168) */ - if (Irp->Flags & IRP_DEFER_IO_COMPLETION && !Irp->PendingReturned) - { + if ((Irp->Flags & IRP_DEFER_IO_COMPLETION) && !(Irp->PendingReturned)) + { + /* + * Return without queuing the completion APC, since the caller will + * take care of doing its own optimized completion at PASSIVE_LEVEL. + */ return; } - /* Now queue the special APC */ + /* Get the thread and file object */ + Thread = Irp->Tail.Overlay.Thread; + FileObject = Irp->Tail.Overlay.OriginalFileObject; + + /* Make sure the IRP isn't cancelled */ if (!Irp->Cancel) { + /* Initialize the APC */ KeInitializeApc(&Irp->Tail.Apc, &Thread->Tcb, Irp->ApcEnvironment, IopCompleteRequest, NULL, - (PKNORMAL_ROUTINE) NULL, + NULL, KernelMode, NULL); + + /* Queue it */ KeInsertQueueApc(&Irp->Tail.Apc, FileObject, NULL, /* This is used for REPARSE stuff */ @@ -1199,17 +1163,20 @@ else { /* The IRP just got cancelled... does a thread still own it? */ - if ((Thread = Irp->Tail.Overlay.Thread)) - { - /* Yes! There is still hope! */ + Thread = Irp->Tail.Overlay.Thread; + if (Thread) + { + /* Yes! There is still hope! Initialize the APC */ KeInitializeApc(&Irp->Tail.Apc, &Thread->Tcb, Irp->ApcEnvironment, IopCompleteRequest, NULL, - (PKNORMAL_ROUTINE) NULL, + NULL, KernelMode, NULL); + + /* Queue it */ KeInsertQueueApc(&Irp->Tail.Apc, FileObject, NULL, /* This is used for REPARSE stuff */

1 0

[ion] 22703: - Completely reformat io.h to same style as ob.h and add I/O Tracing. - Fix irp.c file header - IopRemoveThreadIrp: - Get the DeviceObject and I/O Stack *before* going back to dispatch, otherwise race conditions will happen. - Don't complete and IRP if it's already been through two stacks. - Remove the IRP from the thread's IRP list before re-initializing the list, or else the IRP was lost. - Make sure we have an error log entry before writing to it.
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Fri Jun 30 03:52:45 2006 New Revision: 22703 URL: http://svn.reactos.org/svn/reactos?rev=22703&view=rev Log: - Completely reformat io.h to same style as ob.h and add I/O Tracing. - Fix irp.c file header - IopRemoveThreadIrp: - Get the DeviceObject and I/O Stack *before* going back to dispatch, otherwise race conditions will happen. - Don't complete and IRP if it's already been through two stacks. - Remove the IRP from the thread's IRP list before re-initializing the list, or else the IRP was lost. - Make sure we have an error log entry before writing to it. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/irp.c 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 Fri Jun 30 03:52:45 2006 @@ -1,54 +1,169 @@ -#ifndef __NTOSKRNL_INCLUDE_INTERNAL_IO_H -#define __NTOSKRNL_INCLUDE_INTERNAL_IO_H - -#include <ntdddisk.h> - -/* STRUCTURES ***************************************************************/ - -typedef struct _DISKENTRY -{ - LIST_ENTRY ListEntry; - ULONG DiskNumber; - ULONG Signature; - ULONG Checksum; - PDEVICE_OBJECT DeviceObject; -} DISKENTRY, *PDISKENTRY; - -#define PARTITION_TBL_SIZE 4 - -#include <pshpack1.h> - -typedef struct _PARTITION -{ - unsigned char BootFlags; /* bootable? 0=no, 128=yes */ - unsigned char StartingHead; /* beginning head number */ - unsigned char StartingSector; /* beginning sector number */ - unsigned char StartingCylinder; /* 10 bit nmbr, with high 2 bits put in begsect */ - unsigned char PartitionType; /* Operating System type indicator code */ - unsigned char EndingHead; /* ending head number */ - unsigned char EndingSector; /* ending sector number */ - unsigned char EndingCylinder; /* also a 10 bit nmbr, with same high 2 bit trick */ - unsigned int StartingBlock; /* first sector relative to start of disk */ - unsigned int SectorCount; /* number of sectors in partition */ -} PARTITION, *PPARTITION; - -typedef struct _PARTITION_SECTOR -{ - UCHAR BootCode[440]; /* 0x000 */ - ULONG Signature; /* 0x1B8 */ - UCHAR Reserved[2]; /* 0x1BC */ - PARTITION Partition[PARTITION_TBL_SIZE]; /* 0x1BE */ - USHORT Magic; /* 0x1FE */ -} PARTITION_SECTOR, *PPARTITION_SECTOR; - -#include <poppack.h> - -#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) - -extern POBJECT_TYPE IoCompletionType; -extern PDEVICE_NODE IopRootDeviceNode; - -/* This is like the IRP Overlay so we can optimize its insertion */ +/* +* PROJECT: ReactOS Kernel +* LICENSE: GPL - See COPYING in the top level directory +* FILE: ntoskrnl/include/io.h +* PURPOSE: Internal header for the I/O Manager +* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) +*/ +//#include "io_x.h" +#include "ntdddisk.h" + +// +// Define this if you want debugging support +// +#define _IO_DEBUG_ 0x00 + +// +// These define the Debug Masks Supported +// +#define IO_IRP_DEBUG 0x01 + +// +// Debug/Tracing support +// +#if _IO_DEBUG_ +#ifdef NEW_DEBUG_SYSTEM_IMPLEMENTED // enable when Debug Filters are implemented +#define IOTRACE DbgPrintEx +#else +#define IOTRACE(x, ...) \ + if (x & IopTraceLevel) DbgPrint(__VA_ARGS__) +#endif +#else +#define IOTRACE(x, ...) DPRINT(__VA_ARGS__) +#endif + +// +// FIXME: What is this? +// +#define IO_METHOD_FROM_CTL_CODE(ctlCode) (ctlCode&0x00000003) + +// +// Packet Types when piggybacking on the IRP Overlay +// +#define IrpCompletionPacket 0x1 +#define IrpMiniCompletionPacket 0x2 + +// +// Number of partition tables in the Boot Record +// +#define PARTITION_TBL_SIZE 4 + +// +// Returns the size of a CM_RESOURCE_LIST +// +#define CM_RESOURCE_LIST_SIZE(ResList) \ + (ResList->Count == 1) ? \ + FIELD_OFFSET( \ + CM_RESOURCE_LIST, \ + List[0].PartialResourceList. \ + PartialDescriptors[(ResList)-> \ + List[0]. \ + PartialResourceList. \ + Count]) \ + : \ + FIELD_OFFSET(CM_RESOURCE_LIST, List) + +/* + * VOID + * IopDeviceNodeSetFlag( + * PDEVICE_NODE DeviceNode, + * ULONG Flag); + */ +#define IopDeviceNodeSetFlag(DeviceNode, Flag) \ + ((DeviceNode)->Flags |= (Flag)) + +/* + * VOID + * IopDeviceNodeClearFlag( + * PDEVICE_NODE DeviceNode, + * ULONG Flag); + */ +#define IopDeviceNodeClearFlag(DeviceNode, Flag) \ + ((DeviceNode)->Flags &= ~(Flag)) + +/* + * BOOLEAN + * IopDeviceNodeHasFlag( + * PDEVICE_NODE DeviceNode, + * ULONG Flag); + */ +#define IopDeviceNodeHasFlag(DeviceNode, Flag) \ + (((DeviceNode)->Flags & (Flag)) > 0) + +/* + * VOID + * IopDeviceNodeSetUserFlag( + * PDEVICE_NODE DeviceNode, + * ULONG UserFlag); + */ +#define IopDeviceNodeSetUserFlag(DeviceNode, UserFlag) \ + ((DeviceNode)->UserFlags |= (UserFlag)) + +/* + * VOID + * IopDeviceNodeClearUserFlag( + * PDEVICE_NODE DeviceNode, + * ULONG UserFlag); + */ +#define IopDeviceNodeClearUserFlag(DeviceNode, UserFlag)\ + ((DeviceNode)->UserFlags &= ~(UserFlag)) + +/* + * BOOLEAN + * IopDeviceNodeHasUserFlag( + * PDEVICE_NODE DeviceNode, + * ULONG UserFlag); + */ +#define IopDeviceNodeHasUserFlag(DeviceNode, UserFlag) \ + (((DeviceNode)->UserFlags & (UserFlag)) > 0) + + /* + * VOID + * IopDeviceNodeSetProblem( + * PDEVICE_NODE DeviceNode, + * ULONG Problem); + */ +#define IopDeviceNodeSetProblem(DeviceNode, Problem) \ + ((DeviceNode)->Problem |= (Problem)) + +/* + * VOID + * IopDeviceNodeClearProblem( + * PDEVICE_NODE DeviceNode, + * ULONG Problem); + */ +#define IopDeviceNodeClearProblem(DeviceNode, Problem) \ + ((DeviceNode)->Problem &= ~(Problem)) + +/* + * BOOLEAN + * IopDeviceNodeHasProblem( + * PDEVICE_NODE DeviceNode, + * ULONG Problem); + */ +#define IopDeviceNodeHasProblem(DeviceNode, Problem) \ + (((DeviceNode)->Problem & (Problem)) > 0) + +/* + * VOID + * IopInitDeviceTreeTraverseContext( + * PDEVICETREE_TRAVERSE_CONTEXT DeviceTreeTraverseContext, + * PDEVICE_NODE DeviceNode, + * DEVICETREE_TRAVERSE_ROUTINE Action, + * PVOID Context); + */ +#define IopInitDeviceTreeTraverseContext( \ + _DeviceTreeTraverseContext, _DeviceNode, _Action, \ + _Context) { \ + (_DeviceTreeTraverseContext)->FirstDeviceNode = \ + (_DeviceNode); \ + (_DeviceTreeTraverseContext)->Action = (_Action); \ + (_DeviceTreeTraverseContext)->Context = (_Context); } + +// +// Special version of the IRP Overlay used to optimize I/O completion +// by not using up a separate structure. +// typedef struct _IO_COMPLETION_PACKET { struct @@ -65,12 +180,20 @@ IO_STATUS_BLOCK IoStatus; } IO_COMPLETION_PACKET, *PIO_COMPLETION_PACKET; +// +// Dummy File Object used inside the Open Packet so that OB knows how to +// deal with the Object Pointer even though it's not a real file. +// typedef struct _DUMMY_FILE_OBJECT { OBJECT_HEADER ObjectHeader; CHAR FileObjectBody[sizeof(FILE_OBJECT)]; } DUMMY_FILE_OBJECT, *PDUMMY_FILE_OBJECT; +// +// Open packet used as a context for Device/File parsing so that the parse +// routine can know what operation is being requested. +// typedef struct _OPEN_PACKET { CSHORT Type; @@ -102,8 +225,9 @@ //PIO_DRIVER_CREATE_CONTEXT DriverCreateContext; Vista only, needs ROS DDK Update } OPEN_PACKET, *POPEN_PACKET; - -/* List of Bus Type GUIDs */ +// +// List of Bus Type GUIDs +// typedef struct _IO_BUS_TYPE_GUID_LIST { ULONG GuidCount; @@ -112,145 +236,114 @@ } IO_BUS_TYPE_GUID_LIST, *PIO_BUS_TYPE_GUID_LIST; extern PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList; -/* Packet Types */ -#define IrpCompletionPacket 0x1 -#define IrpMiniCompletionPacket 0x2 - -/* - * VOID - * IopDeviceNodeSetFlag( - * PDEVICE_NODE DeviceNode, - * ULONG Flag); - */ -#define IopDeviceNodeSetFlag(DeviceNode, Flag) \ - ((DeviceNode)->Flags |= (Flag)) - -/* - * VOID - * IopDeviceNodeClearFlag( - * PDEVICE_NODE DeviceNode, - * ULONG Flag); - */ -#define IopDeviceNodeClearFlag(DeviceNode, Flag) \ - ((DeviceNode)->Flags &= ~(Flag)) - -/* - * BOOLEAN - * IopDeviceNodeHasFlag( - * PDEVICE_NODE DeviceNode, - * ULONG Flag); - */ -#define IopDeviceNodeHasFlag(DeviceNode, Flag) \ - (((DeviceNode)->Flags & (Flag)) > 0) - -/* - * VOID - * IopDeviceNodeSetUserFlag( - * PDEVICE_NODE DeviceNode, - * ULONG UserFlag); - */ -#define IopDeviceNodeSetUserFlag(DeviceNode, UserFlag) \ - ((DeviceNode)->UserFlags |= (UserFlag)) - -/* - * VOID - * IopDeviceNodeClearUserFlag( - * PDEVICE_NODE DeviceNode, - * ULONG UserFlag); - */ -#define IopDeviceNodeClearUserFlag(DeviceNode, UserFlag) \ - ((DeviceNode)->UserFlags &= ~(UserFlag)) - -/* - * BOOLEAN - * IopDeviceNodeHasUserFlag( - * PDEVICE_NODE DeviceNode, - * ULONG UserFlag); - */ -#define IopDeviceNodeHasUserFlag(DeviceNode, UserFlag) \ - (((DeviceNode)->UserFlags & (UserFlag)) > 0) - - /* - * VOID - * IopDeviceNodeSetProblem( - * PDEVICE_NODE DeviceNode, - * ULONG Problem); - */ -#define IopDeviceNodeSetProblem(DeviceNode, Problem) \ - ((DeviceNode)->Problem |= (Problem)) - -/* - * VOID - * IopDeviceNodeClearProblem( - * PDEVICE_NODE DeviceNode, - * ULONG Problem); - */ -#define IopDeviceNodeClearProblem(DeviceNode, Problem) \ - ((DeviceNode)->Problem &= ~(Problem)) - -/* - * BOOLEAN - * IopDeviceNodeHasProblem( - * PDEVICE_NODE DeviceNode, - * ULONG Problem); - */ -#define IopDeviceNodeHasProblem(DeviceNode, Problem) \ - (((DeviceNode)->Problem & (Problem)) > 0) - - -/* - Called on every visit of a node during a preorder-traversal of the device - node tree. - If the routine returns STATUS_UNSUCCESSFUL the traversal will stop and - STATUS_SUCCESS is returned to the caller who initiated the tree traversal. - Any other returned status code will be returned to the caller. If a status - code that indicates an error (other than STATUS_UNSUCCESSFUL) is returned, - the traversal is stopped immediately and the status code is returned to - the caller. - */ -typedef NTSTATUS (*DEVICETREE_TRAVERSE_ROUTINE)( - PDEVICE_NODE DeviceNode, - PVOID Context -); - -/* Context information for traversing the device tree */ +// +// Called on every visit of a node during a preorder-traversal of the device +// node tree. +// If the routine returns STATUS_UNSUCCESSFUL the traversal will stop and +// STATUS_SUCCESS is returned to the caller who initiated the tree traversal. +// Any other returned status code will be returned to the caller. If a status +// code that indicates an error (other than STATUS_UNSUCCESSFUL) is returned, +// the traversal is stopped immediately and the status code is returned to +// the caller. +// +typedef +NTSTATUS +(*DEVICETREE_TRAVERSE_ROUTINE)( + IN PDEVICE_NODE DeviceNode, + IN PVOID Context +); + +// +// Context information for traversing the device tree +// typedef struct _DEVICETREE_TRAVERSE_CONTEXT { - /* Current device node during a traversal */ + // + // Current device node during a traversal + // PDEVICE_NODE DeviceNode; - /* Initial device node where we start the traversal */ + + // + // Initial device node where we start the traversal + // PDEVICE_NODE FirstDeviceNode; - /* Action routine to be called for every device node */ + + // + // Action routine to be called for every device node + // DEVICETREE_TRAVERSE_ROUTINE Action; - /* Context passed to the action routine */ + + // + // Context passed to the action routine + // PVOID Context; } DEVICETREE_TRAVERSE_CONTEXT, *PDEVICETREE_TRAVERSE_CONTEXT; -/* - * VOID - * IopInitDeviceTreeTraverseContext( - * PDEVICETREE_TRAVERSE_CONTEXT DeviceTreeTraverseContext, - * PDEVICE_NODE DeviceNode, - * DEVICETREE_TRAVERSE_ROUTINE Action, - * PVOID Context); - */ -#define IopInitDeviceTreeTraverseContext( \ - _DeviceTreeTraverseContext, _DeviceNode, _Action, _Context) { \ - (_DeviceTreeTraverseContext)->FirstDeviceNode = (_DeviceNode); \ - (_DeviceTreeTraverseContext)->Action = (_Action); \ - (_DeviceTreeTraverseContext)->Context = (_Context); } - -VOID -PnpInit(VOID); - -VOID -PnpInit2(VOID); - -VOID -IopInitDriverImplementation(VOID); - -VOID -IopInitPnpNotificationImplementation(VOID); +// +// Internal Representation of a Disk +// +typedef struct _DISKENTRY +{ + LIST_ENTRY ListEntry; + ULONG DiskNumber; + ULONG Signature; + ULONG Checksum; + PDEVICE_OBJECT DeviceObject; +} DISKENTRY, *PDISKENTRY; + +// +// Partition Table Entry +// +#include <pshpack1.h> +typedef struct _PARTITION +{ + UCHAR BootFlags; + UCHAR StartingHead; + UCHAR StartingSector; + UCHAR StartingCylinder; + UCHAR PartitionType; + UCHAR EndingHead; + UCHAR EndingSector; + UCHAR EndingCylinder; + ULONG StartingBlock; + ULONG SectorCount; +} PARTITION, *PPARTITION; + +// +// Boot Record Structure +// +typedef struct _PARTITION_SECTOR +{ + UCHAR BootCode[440]; + ULONG Signature; + UCHAR Reserved[2]; + PARTITION Partition[PARTITION_TBL_SIZE]; + USHORT Magic; +} PARTITION_SECTOR, *PPARTITION_SECTOR; +#include <poppack.h> + +// +// PNP Routines +// +VOID +PnpInit( + VOID +); + +VOID +PnpInit2( + VOID +); + +VOID +IopInitDriverImplementation( + VOID +); + +VOID +IopInitPnpNotificationImplementation( + VOID +); VOID IopNotifyPlugPlayNotification( @@ -262,26 +355,108 @@ ); NTSTATUS -IopGetSystemPowerDeviceObject(PDEVICE_OBJECT *DeviceObject); +IopGetSystemPowerDeviceObject( + IN PDEVICE_OBJECT *DeviceObject +); NTSTATUS IopCreateDeviceNode( - PDEVICE_NODE ParentNode, - PDEVICE_OBJECT PhysicalDeviceObject, - PDEVICE_NODE *DeviceNode -); - -NTSTATUS -IopFreeDeviceNode(PDEVICE_NODE DeviceNode); - -VOID -IoInitCancelHandling(VOID); - -VOID -IoInitFileSystemImplementation(VOID); - -VOID -IoInitVpbImplementation(VOID); + IN PDEVICE_NODE ParentNode, + IN PDEVICE_OBJECT PhysicalDeviceObject, + OUT PDEVICE_NODE *DeviceNode +); + +NTSTATUS +IopFreeDeviceNode( + IN PDEVICE_NODE DeviceNode +); + +NTSTATUS +IopInitiatePnpIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIO_STATUS_BLOCK IoStatusBlock, + IN ULONG MinorFunction, + IN PIO_STACK_LOCATION Stack +); + +PDEVICE_NODE +FASTCALL +IopGetDeviceNode( + IN PDEVICE_OBJECT DeviceObject +); + +NTSTATUS +IopActionConfigureChildServices( + IN PDEVICE_NODE DeviceNode, + IN PVOID Context +); + +NTSTATUS +IopActionInitChildServices( + IN PDEVICE_NODE DeviceNode, + IN PVOID Context, + IN BOOLEAN BootDrivers +); + +NTSTATUS +IoCreateDriverList( + VOID +); + +NTSTATUS +IoDestroyDriverList( + VOID +); + +NTSTATUS +INIT_FUNCTION +IopInitPlugPlayEvents(VOID); + +NTSTATUS +IopQueueTargetDeviceEvent( + const GUID *Guid, + PUNICODE_STRING DeviceIds +); + +NTSTATUS +IopInitializePnpServices( + IN PDEVICE_NODE DeviceNode, + IN BOOLEAN BootDrivers) +; + +NTSTATUS +IopInvalidateDeviceRelations( + IN PDEVICE_NODE DeviceNode, + IN DEVICE_RELATION_TYPE Type +); + +// +// Initialization Routines +// +NTSTATUS +IoCreateArcNames( + VOID +); + +NTSTATUS +IoCreateSystemRootLink( + IN PCHAR ParameterLine +); + +// +// Device/Volume Routines +// +NTSTATUS +FASTCALL +IopInitializeDevice( + IN PDEVICE_NODE DeviceNode, + IN PDRIVER_OBJECT DriverObject +); + +NTSTATUS +IopStartDevice( + IN PDEVICE_NODE DeviceNode +); NTSTATUS IoMountVolume( @@ -290,116 +465,120 @@ ); PVOID -IoOpenSymlink(PVOID SymbolicLink); - -PVOID +IoOpenSymlink( + IN PVOID SymbolicLink +); + +PVOID IoOpenFileOnDevice( - PVOID SymbolicLink, - PWCHAR Name + IN PVOID SymbolicLink, + IN PWCHAR Name ); NTSTATUS STDCALL -IopCreateDevice( - PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes -); - -NTSTATUS +IopAttachVpb( + IN PDEVICE_OBJECT DeviceObject +); + +VOID +IoInitFileSystemImplementation( + VOID +); + +VOID +IoInitVpbImplementation( + VOID +); + +// +// Shutdown routines +// +VOID +IoInitShutdownNotification( + VOID +); + +VOID +IoShutdownRegisteredDevices( + VOID +); + +VOID +IoShutdownRegisteredFileSystems( + VOID +); + +// +// Boot logging support +// +VOID +IopInitBootLog( + IN BOOLEAN StartBootLog +); + +VOID +IopStartBootLog( + VOID +); + +VOID +IopStopBootLog( + VOID +); + +VOID +IopBootLog( + IN PUNICODE_STRING DriverName, + IN BOOLEAN Success +); + +VOID +IopSaveBootLogToFile( + VOID +); + +// +// I/O Cancellation Routines +// +VOID STDCALL -IopAttachVpb(PDEVICE_OBJECT DeviceObject); - -VOID -IoInitShutdownNotification(VOID); - -VOID -IoShutdownRegisteredDevices(VOID); - -VOID -IoShutdownRegisteredFileSystems(VOID); - -NTSTATUS -IoCreateArcNames(VOID); - -NTSTATUS -IoCreateSystemRootLink(PCHAR ParameterLine); - -NTSTATUS -IopInitiatePnpIrp( - PDEVICE_OBJECT DeviceObject, - PIO_STATUS_BLOCK IoStatusBlock, - ULONG MinorFunction, - PIO_STACK_LOCATION Stack -); - -NTSTATUS -IoCreateDriverList(VOID); - -NTSTATUS -IoDestroyDriverList(VOID); - -/* bootlog.c */ - -VOID -IopInitBootLog(BOOLEAN StartBootLog); - -VOID -IopStartBootLog(VOID); - -VOID -IopStopBootLog(VOID); - -VOID -IopBootLog( - PUNICODE_STRING DriverName, - BOOLEAN Success -); - -VOID -IopSaveBootLogToFile(VOID); - -/* cancel.c */ - -VOID +IoCancelThreadIo( + IN PETHREAD Thread +); + +VOID +IoInitCancelHandling( + VOID +); + +// +// Error Logging Routines +// + +NTSTATUS +IopInitErrorLog( + VOID +); + +// +// Raw File System MiniDriver +// +BOOLEAN +RawFsIsRawFileSystemDeviceObject( + IN PDEVICE_OBJECT DeviceObject +); + +NTSTATUS STDCALL -IoCancelThreadIo(PETHREAD Thread); - -/* errlog.c */ - -NTSTATUS -IopInitErrorLog(VOID); - -/* rawfs.c */ - -BOOLEAN -RawFsIsRawFileSystemDeviceObject(IN PDEVICE_OBJECT DeviceObject); - -NTSTATUS -STDCALL -RawFsDriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - - -/* pnpmgr.c */ - -PDEVICE_NODE -FASTCALL -IopGetDeviceNode(PDEVICE_OBJECT DeviceObject); - -NTSTATUS -IopActionConfigureChildServices(PDEVICE_NODE DeviceNode, - PVOID Context); - -NTSTATUS -IopActionInitChildServices(PDEVICE_NODE DeviceNode, - PVOID Context, - BOOLEAN BootDrivers); - - -/* pnproot.c */ - +RawFsDriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath +); + +// +// PnP Root MiniDriver +// NTSTATUS STDCALL PnpRootDriverEntry( @@ -408,47 +587,42 @@ ); NTSTATUS -PnpRootCreateDevice(PDEVICE_OBJECT *PhysicalDeviceObject); - -/* device.c */ - -NTSTATUS -FASTCALL -IopInitializeDevice( - PDEVICE_NODE DeviceNode, - PDRIVER_OBJECT DriverObject -); - -NTSTATUS -IopStartDevice(PDEVICE_NODE DeviceNode); - -/* driver.c */ - -VOID -FASTCALL -IopInitializeBootDrivers(VOID); - -VOID -FASTCALL -IopInitializeSystemDrivers(VOID); +PnpRootCreateDevice( + IN OUT PDEVICE_OBJECT *PhysicalDeviceObject +); + +// +// Driver Routines +// +VOID +FASTCALL +IopInitializeBootDrivers( + VOID +); + +VOID +FASTCALL +IopInitializeSystemDrivers( + VOID +); NTSTATUS FASTCALL IopCreateDriverObject( - PDRIVER_OBJECT *DriverObject, - PUNICODE_STRING ServiceName, - ULONG CreateAttributes, - BOOLEAN FileSystemDriver, - PVOID DriverImageStart, - ULONG DriverImageSize + OUT PDRIVER_OBJECT *DriverObject, + IN PUNICODE_STRING ServiceName, + IN ULONG CreateAttributes, + IN BOOLEAN FileSystemDriver, + IN PVOID DriverImageStart, + IN ULONG DriverImageSize ); NTSTATUS FASTCALL IopGetDriverObject( - PDRIVER_OBJECT *DriverObject, - PUNICODE_STRING ServiceName, - BOOLEAN FileSystem + OUT PDRIVER_OBJECT *DriverObject, + IN PUNICODE_STRING ServiceName, + IN BOOLEAN FileSystem ); NTSTATUS @@ -471,20 +645,25 @@ NTSTATUS FASTCALL IopAttachFilterDrivers( - PDEVICE_NODE DeviceNode, - BOOLEAN Lower -); - -VOID -FASTCALL -IopMarkLastReinitializeDriver(VOID); - -VOID -FASTCALL -IopReinitializeDrivers(VOID); - -/* file.c */ - + IN PDEVICE_NODE DeviceNode, + IN BOOLEAN Lower +); + +VOID +FASTCALL +IopMarkLastReinitializeDriver( + VOID +); + +VOID +FASTCALL +IopReinitializeDrivers( + VOID +); + +// +// File Routines +// NTSTATUS NTAPI IopParseDevice( @@ -517,29 +696,31 @@ VOID STDCALL -IopDeleteFile(PVOID ObjectBody); +IopDeleteFile( + IN PVOID ObjectBody +); NTSTATUS STDCALL IopSecurityFile( - PVOID ObjectBody, - SECURITY_OPERATION_CODE OperationCode, - SECURITY_INFORMATION SecurityInformation, - PSECURITY_DESCRIPTOR SecurityDescriptor, - PULONG BufferLength, - PSECURITY_DESCRIPTOR *OldSecurityDescriptor, - POOL_TYPE PoolType, - PGENERIC_MAPPING GenericMapping + IN PVOID ObjectBody, + IN SECURITY_OPERATION_CODE OperationCode, + IN SECURITY_INFORMATION SecurityInformation, + IN OUT PSECURITY_DESCRIPTOR SecurityDescriptor, + IN OUT PULONG BufferLength, + OUT PSECURITY_DESCRIPTOR *OldSecurityDescriptor, + IN POOL_TYPE PoolType, + IN OUT PGENERIC_MAPPING GenericMapping ); NTSTATUS STDCALL IopQueryNameFile( - PVOID ObjectBody, + IN PVOID ObjectBody, IN BOOLEAN HasName, - POBJECT_NAME_INFORMATION ObjectNameInfo, - ULONG Length, - PULONG ReturnLength, + OUT POBJECT_NAME_INFORMATION ObjectNameInfo, + IN ULONG Length, + OUT PULONG ReturnLength, IN KPROCESSOR_MODE PreviousMode ); @@ -553,54 +734,33 @@ IN ULONG SystemHandleCount ); -/* plugplay.c */ - -NTSTATUS -INIT_FUNCTION -IopInitPlugPlayEvents(VOID); - -NTSTATUS -IopQueueTargetDeviceEvent( - const GUID *Guid, - PUNICODE_STRING DeviceIds -); - -/* pnpmgr.c */ - -NTSTATUS -IopInitializePnpServices( - IN PDEVICE_NODE DeviceNode, - IN BOOLEAN BootDrivers) -; - -NTSTATUS -IopInvalidateDeviceRelations( - IN PDEVICE_NODE DeviceNode, - IN DEVICE_RELATION_TYPE Type -); - -/* timer.c */ -VOID -FASTCALL -IopInitTimerImplementation(VOID); +// +// I/O Timer Routines +// +VOID +FASTCALL +IopInitTimerImplementation( + VOID +); VOID STDCALL -IopRemoveTimerFromTimerList(IN PIO_TIMER Timer); - -/* iocomp.c */ -VOID -FASTCALL -IopInitIoCompletionImplementation(VOID); - -#define CM_RESOURCE_LIST_SIZE(ResList) \ - (ResList->Count == 1) ? \ - FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. \ - PartialDescriptors[(ResList)->List[0].PartialResourceList.Count]) \ - : \ - FIELD_OFFSET(CM_RESOURCE_LIST, List) - -/* xhal.c */ +IopRemoveTimerFromTimerList( + IN PIO_TIMER Timer +); + +// +// I/O Completion Routines +// +VOID +FASTCALL +IopInitIoCompletionImplementation( + VOID +); + +// +// I/O HAL Entrypoints +// NTSTATUS FASTCALL xHalQueryDriveLayout( @@ -618,7 +778,7 @@ OUT PVOID *Buffer ); -VOID +VOID FASTCALL xHalIoAssignDriveLetters( IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock, @@ -627,16 +787,16 @@ OUT PSTRING NtSystemPathString ); -NTSTATUS +NTSTATUS FASTCALL xHalIoReadPartitionTable( - PDEVICE_OBJECT DeviceObject, - ULONG SectorSize, - BOOLEAN ReturnRecognizedPartitions, - PDRIVE_LAYOUT_INFORMATION *PartitionBuffer -); - -NTSTATUS + IN PDEVICE_OBJECT DeviceObject, + IN ULONG SectorSize, + IN BOOLEAN ReturnRecognizedPartitions, + OUT PDRIVE_LAYOUT_INFORMATION *PartitionBuffer +); + +NTSTATUS FASTCALL xHalIoSetPartitionInformation( IN PDEVICE_OBJECT DeviceObject, @@ -645,7 +805,7 @@ IN ULONG PartitionType ); -NTSTATUS +NTSTATUS FASTCALL xHalIoWritePartitionTable( IN PDEVICE_OBJECT DeviceObject, @@ -655,4 +815,10 @@ IN PDRIVE_LAYOUT_INFORMATION PartitionBuffer ); -#endif +// +// Global I/O Data +// +extern POBJECT_TYPE IoCompletionType; +extern PDEVICE_NODE IopRootDeviceNode; +extern ULONG IopTraceLevel; + Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 03:52:45 2006 @@ -1,11 +1,11 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/io/irp.c - * PURPOSE: Handle IRPs - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - * David Welch (welch(a)mcmail.com) + * PURPOSE: IRP Handling Functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Gunnar Dalsnes + * Filip Navara (navaraf(a)reactos.org) */ /* INCLUDES ****************************************************************/ @@ -45,6 +45,8 @@ PETHREAD IrpThread; PLIST_ENTRY IrpEntry; PIO_ERROR_LOG_PACKET ErrorLogEntry; + PDEVICE_OBJECT DeviceObject = NULL; + PIO_STACK_LOCATION IoStackLocation; /* First, raise to APC to protect IrpList */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -61,26 +63,48 @@ /* Get the misbehaving IRP */ IrpEntry = IrpThread->IrpList.Flink; DeadIrp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); + IOTRACE(IO_IRP_DEBUG, + "%s - Deassociating IRP %p for %p\n", + __FUNCTION__, + DeadIrp, + IrpThread); + + /* Don't cancel the IRP if it's already been completed far */ + if (DeadIrp->CurrentLocation == (DeadIrp->StackCount + 2)) + { + /* Return */ + KeLowerIrql(OldIrql); + return; + } /* Disown the IRP! */ DeadIrp->Tail.Overlay.Thread = NULL; + RemoveHeadList(&IrpThread->IrpList); InitializeListHead(&DeadIrp->ThreadListEntry); - RemoveHeadList(&IrpThread->IrpList); - - /* Lower IRQL now */ + + /* Get the stack location and check if it's valid */ + IoStackLocation = IoGetCurrentIrpStackLocation(DeadIrp); + if (DeadIrp->CurrentLocation <= DeadIrp->StackCount) + { + /* Get the device object */ + DeviceObject = IoStackLocation->DeviceObject; + } + + /* Lower IRQL now, since we have the pointers we need */ KeLowerIrql(OldIrql); /* Check if we can send an Error Log Entry*/ - if (DeadIrp->CurrentLocation <= DeadIrp->StackCount) + if (DeviceObject) { /* Allocate an entry */ - ErrorLogEntry = IoAllocateErrorLogEntry( - IoGetCurrentIrpStackLocation(DeadIrp)->DeviceObject, - sizeof(IO_ERROR_LOG_PACKET)); - - /* Write the entry */ - ErrorLogEntry->ErrorCode = 0xBAADF00D; /* FIXME */ - IoWriteErrorLogEntry(ErrorLogEntry); + ErrorLogEntry = IoAllocateErrorLogEntry(DeviceObject, + sizeof(IO_ERROR_LOG_PACKET)); + if (ErrorLogEntry) + { + /* Write the entry */ + ErrorLogEntry->ErrorCode = 0xBAADF00D; /* FIXME */ + IoWriteErrorLogEntry(ErrorLogEntry); + } } } @@ -90,6 +114,11 @@ IN PFILE_OBJECT FileObject) { PMDL Mdl; + IOTRACE(IO_IRP_DEBUG, + "%s - Cleaning IRP %p for %p\n", + __FUNCTION__, + Irp, + FileObject); /* Check if there's an MDL */ while ((Mdl = Irp->MdlAddress)) @@ -99,15 +128,19 @@ IoFreeMdl(Mdl); } - /* Free the buffer */ + /* Check if the IRP has system buffer */ if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { + /* Free the buffer */ ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); } - /* Derefernce the User Event */ - if (Irp->UserEvent && !(Irp->Flags & IRP_SYNCHRONOUS_API) && FileObject) - { + /* Check if this IRP has a user event, a file object, and is async */ + if ((Irp->UserEvent) && + !(Irp->Flags & IRP_SYNCHRONOUS_API) && + (FileObject)) + { + /* Derefernce the User Event */ ObDereferenceObject(Irp->UserEvent); }

1 0

[ion] 22702: [FORMATTING] - Cleanup before I start working on it... there were lots of weird formatting errors caused by my old IDE back when I was working on it. [AUDIT] - The routines in this file mostly come from documented information in "NT File System Internals" by Rajeev Nagar which has pseudo-code for a lot of them, and other WDM Books and information.
by ion＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: ion Date: Fri Jun 30 03:01:09 2006 New Revision: 22702 URL: http://svn.reactos.org/svn/reactos?rev=22702&view=rev Log: [FORMATTING] - Cleanup before I start working on it... there were lots of weird formatting errors caused by my old IDE back when I was working on it. [AUDIT] - The routines in this file mostly come from documented information in "NT File System Internals" by Rajeev Nagar which has pseudo-code for a lot of them, and other WDM Books and information. Modified: trunk/reactos/ntoskrnl/io/irp.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2270… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 03:01:09 2006 @@ -17,27 +17,27 @@ /* PRIVATE FUNCTIONS ********************************************************/ VOID -STDCALL -IopFreeIrpKernelApc(PKAPC Apc, - PKNORMAL_ROUTINE *NormalRoutine, - PVOID *NormalContext, - PVOID *SystemArgument1, - PVOID *SystemArgument2) +NTAPI +IopFreeIrpKernelApc(IN PKAPC Apc, + IN PKNORMAL_ROUTINE *NormalRoutine, + IN PVOID *NormalContext, + IN PVOID *SystemArgument1, + IN PVOID *SystemArgument2) { /* Free the IRP */ IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); } VOID -STDCALL -IopAbortIrpKernelApc(PKAPC Apc) +NTAPI +IopAbortIrpKernelApc(IN PKAPC Apc) { /* Free the IRP */ IoFreeIrp(CONTAINING_RECORD(Apc, IRP, Tail.Apc)); } VOID -STDCALL +NTAPI IopRemoveThreadIrp(VOID) { KIRQL OldIrql; @@ -45,10 +45,10 @@ PETHREAD IrpThread; PLIST_ENTRY IrpEntry; PIO_ERROR_LOG_PACKET ErrorLogEntry; - + /* First, raise to APC to protect IrpList */ KeRaiseIrql(APC_LEVEL, &OldIrql); - + /* Get the Thread and check the list */ IrpThread = PsGetCurrentThread(); if (IsListEmpty(&IrpThread->IrpList)) @@ -57,26 +57,27 @@ KeLowerIrql(OldIrql); return; } - + /* Get the misbehaving IRP */ IrpEntry = IrpThread->IrpList.Flink; DeadIrp = CONTAINING_RECORD(IrpEntry, IRP, ThreadListEntry); - + /* Disown the IRP! */ DeadIrp->Tail.Overlay.Thread = NULL; InitializeListHead(&DeadIrp->ThreadListEntry); RemoveHeadList(&IrpThread->IrpList); - + /* Lower IRQL now */ KeLowerIrql(OldIrql); - + /* Check if we can send an Error Log Entry*/ if (DeadIrp->CurrentLocation <= DeadIrp->StackCount) { /* Allocate an entry */ - ErrorLogEntry = IoAllocateErrorLogEntry(IoGetCurrentIrpStackLocation(DeadIrp)->DeviceObject, - sizeof(IO_ERROR_LOG_PACKET)); - + ErrorLogEntry = IoAllocateErrorLogEntry( + IoGetCurrentIrpStackLocation(DeadIrp)->DeviceObject, + sizeof(IO_ERROR_LOG_PACKET)); + /* Write the entry */ ErrorLogEntry->ErrorCode = 0xBAADF00D; /* FIXME */ IoWriteErrorLogEntry(ErrorLogEntry); @@ -84,12 +85,12 @@ } VOID -STDCALL -IopCleanupIrp(PIRP Irp, - PFILE_OBJECT FileObject) +NTAPI +IopCleanupIrp(IN PIRP Irp, + IN PFILE_OBJECT FileObject) { PMDL Mdl; - + /* Check if there's an MDL */ while ((Mdl = Irp->MdlAddress)) { @@ -97,43 +98,33 @@ Irp->MdlAddress = Mdl->Next; IoFreeMdl(Mdl); } - + /* Free the buffer */ if (Irp->Flags & IRP_DEALLOCATE_BUFFER) { ExFreePoolWithTag(Irp->AssociatedIrp.SystemBuffer, TAG_SYS_BUF); } - + /* Derefernce the User Event */ if (Irp->UserEvent && !(Irp->Flags & IRP_SYNCHRONOUS_API) && FileObject) { ObDereferenceObject(Irp->UserEvent); } - + /* Dereference the File Object */ if (FileObject) ObDereferenceObject(FileObject); - + /* Free the IRP */ IoFreeIrp(Irp); } - -/* - * FUNCTION: Performs the second stage of irp completion for read/write irps - * - * Called as a special kernel APC kernel-routine or directly from IofCompleteRequest() - * - * Note that we'll never see irp's flagged IRP_PAGING_IO (IRP_MOUNT_OPERATION) - * or IRP_CLOSE_OPERATION (IRP_MJ_CLOSE and IRP_MJ_CLEANUP) here since their - * cleanup/completion is fully taken care of in IoCompleteRequest. - * -Gunnar - */ + VOID -STDCALL -IopCompleteRequest(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArgument2) +NTAPI +IopCompleteRequest(IN PKAPC Apc, + IN PKNORMAL_ROUTINE* NormalRoutine, + IN PVOID* NormalContext, + IN PVOID* SystemArgument1, + IN PVOID* SystemArgument2) { PFILE_OBJECT FileObject; PIRP Irp; @@ -214,7 +205,10 @@ /* Check if we should signal the File Object Event as well */ if (FileObject) { - /* If the File Object is SYNC, then we need to signal its event too */ + /* + * If the File Object is SYNC, then we need to + * signal its event too + */ if (FileObject->Flags & FO_SYNCHRONOUS_IO) { /* Set the Status */ @@ -224,6 +218,7 @@ KeSetEvent(&FileObject->Event, 0, FALSE); } } + /* Signal the Event */ KeSetEvent(UserEvent, 0, FALSE); @@ -240,20 +235,21 @@ /* Signal the File Object Instead */ KeSetEvent(&FileObject->Event, 0, FALSE); - } /* Now call the User APC if one was requested */ - if (Irp->Overlay.AsynchronousParameters.UserApcRoutine != NULL) + if (Irp->Overlay.AsynchronousParameters.UserApcRoutine) { KeInitializeApc(&Irp->Tail.Apc, KeGetCurrentThread(), CurrentApcEnvironment, IopFreeIrpKernelApc, IopAbortIrpKernelApc, - (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, + (PKNORMAL_ROUTINE)Irp-> + Overlay.AsynchronousParameters.UserApcRoutine, Irp->RequestorMode, - Irp->Overlay.AsynchronousParameters.UserApcContext); + Irp-> + Overlay.AsynchronousParameters.UserApcContext); KeInsertQueueApc(&Irp->Tail.Apc, Irp->UserIosb, @@ -273,7 +269,9 @@ } else { - /* Signal the Events only if PendingReturned and we have a File Object */ + /* + * Signal the Events only if PendingReturned and we have a File Object + */ if (FileObject && Irp->PendingReturned) { /* Check for SYNC IRP */ @@ -384,9 +382,11 @@ CurrentApcEnvironment, IopFreeIrpKernelApc, IopAbortIrpKernelApc, - (PKNORMAL_ROUTINE)Irp->Overlay.AsynchronousParameters.UserApcRoutine, + (PKNORMAL_ROUTINE)Irp-> + Overlay.AsynchronousParameters.UserApcRoutine, Irp->RequestorMode, - Irp->Overlay.AsynchronousParameters.UserApcContext); + Irp-> + Overlay.AsynchronousParameters.UserApcContext); KeInsertQueueApc(&Irp->Tail.Apc, Irp->UserIosb, @@ -399,7 +399,8 @@ /* Call the IO Completion Port if we have one, instead */ IoSetIoCompletion(FileObject->CompletionContext->Port, FileObject->CompletionContext->Key, - Irp->Overlay.AsynchronousParameters.UserApcContext, + Irp-> + Overlay.AsynchronousParameters.UserApcContext, Irp->IoStatus.Status, Irp->IoStatus.Information, FALSE); @@ -429,15 +430,9 @@ /* * @implemented - * - * FUNCTION: Allocates an IRP - * ARGUMENTS: - * StackSize = the size of the stack required for the irp - * ChargeQuota = Charge allocation to current threads quota - * RETURNS: Irp allocated */ PIRP -STDCALL +NTAPI IoAllocateIrp(CCHAR StackSize, BOOLEAN ChargeQuota) { @@ -447,56 +442,49 @@ UCHAR Flags = 0; PNPAGED_LOOKASIDE_LIST List = NULL; PP_NPAGED_LOOKASIDE_NUMBER ListType = LookasideSmallIrpList; - + /* Figure out which Lookaside List to use */ if ((StackSize <= 8) && (ChargeQuota == FALSE)) { - DPRINT("Using lookaside, %d\n", StackSize); /* Set Fixed Size Flag */ Flags = IRP_ALLOCATED_FIXED_SIZE; - + /* See if we should use big list */ if (StackSize != 1) { - DPRINT("Using large lookaside\n"); Size = IoSizeOfIrp(8); ListType = LookasideLargeIrpList; } - + /* Get the PRCB */ Prcb = KeGetCurrentPrcb(); - + /* Get the P List First */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[ListType].P; - + /* Attempt allocation */ List->L.TotalAllocates++; - DPRINT("Total allocates: %d\n", List->L.TotalAllocates); Irp = (PIRP)InterlockedPopEntrySList(&List->L.ListHead); - DPRINT("Alloc attempt on CPU list: %p\n", Irp); - + /* Check if the P List failed */ if (!Irp) { /* Let the balancer know */ List->L.AllocateMisses++; - DPRINT("Total misses: %d\n", List->L.AllocateMisses); - + /* Try the L List */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[ListType].L; List->L.TotalAllocates++; Irp = (PIRP)InterlockedPopEntrySList(&List->L.ListHead); - DPRINT("Alloc attempt on SYS list: %p\n", Irp); - } - } - + } + } + /* Check if we have to use the pool */ if (!Irp) { - DPRINT("Using pool\n"); /* Did we try lookaside and fail? */ if (Flags & IRP_ALLOCATED_FIXED_SIZE) List->L.AllocateMisses++; - + /* Check if we shoudl charge quota */ if (ChargeQuota) { @@ -509,23 +497,22 @@ /* Allocate the IRP With no Quota charge */ Irp = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_IRP); } - + /* Make sure it was sucessful */ - if (!Irp) return(NULL); + if (!Irp) return(NULL); } else { /* We have an IRP from Lookaside */ Flags |= IRP_LOOKASIDE_ALLOCATION; } - + /* Set Flag */ if (ChargeQuota) Flags |= IRP_QUOTA_CHARGED; - + /* Now Initialize it */ - DPRINT("irp allocated\n"); IoInitializeIrp(Irp, Size, StackSize); - + /* Set the Allocation Flags */ Irp->AllocationFlags = Flags; @@ -535,21 +522,9 @@ /* * @implemented - * - * FUNCTION: Allocates and sets up an IRP to be sent to lower level drivers - * ARGUMENTS: - * MajorFunction = One of IRP_MJ_READ, IRP_MJ_WRITE, - * IRP_MJ_FLUSH_BUFFERS or IRP_MJ_SHUTDOWN - * DeviceObject = Device object to send the irp to - * Buffer = Buffer into which data will be read or written - * Length = Length in bytes of the irp to be allocated - * StartingOffset = Starting offset on the device - * IoStatusBlock (OUT) = Storage for the result of the operation - * RETURNS: The IRP allocated on success, or - * NULL on failure */ PIRP -STDCALL +NTAPI IoBuildAsynchronousFsdRequest(ULONG MajorFunction, PDEVICE_OBJECT DeviceObject, PVOID Buffer, @@ -561,11 +536,6 @@ PIO_STACK_LOCATION StackPtr; LOCK_OPERATION AccessType; - DPRINT("IoBuildAsynchronousFsdRequest(MajorFunction %x, DeviceObject 0x%p, " - "Buffer 0x%p, Length %x, StartingOffset 0x%p, " - "IoStatusBlock 0x%p\n",MajorFunction,DeviceObject,Buffer,Length, - StartingOffset,IoStatusBlock); - /* Allocate IRP */ if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) return Irp; @@ -584,9 +554,8 @@ if (DeviceObject->Flags & DO_BUFFERED_IO) { /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - Length, - TAG_SYS_BUF); + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, Length, TAG_SYS_BUF); /* Set flags */ Irp->Flags = IRP_BUFFERED_IO | IRP_DEALLOCATE_BUFFER; @@ -608,7 +577,6 @@ { /* Use an MDL for Direct I/O */ Irp->MdlAddress = MmCreateMdl(NULL, Buffer, Length); - if (MajorFunction == IRP_MJ_READ) { @@ -657,7 +625,6 @@ } /* Set the Current Thread and IOSB */ - if (!IoStatusBlock) KEBUGCHECK(0); /* Temporary to catch illegal ROS Drivers */ Irp->UserIosb = IoStatusBlock; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -665,28 +632,11 @@ return Irp; } - -/* - * @implemented - * - * FUNCTION: Allocates and sets up an IRP to be sent to drivers - * ARGUMENTS: - * IoControlCode = Device io control code - * DeviceObject = Device object to send the irp to - * InputBuffer = Buffer from which data will be read by the driver - * InputBufferLength = Length in bytes of the input buffer - * OutputBuffer = Buffer into which data will be written by the driver - * OutputBufferLength = Length in bytes of the output buffer - * InternalDeviceIoControl = Determines weather - * IRP_MJ_INTERNAL_DEVICE_CONTROL or - * IRP_MJ_DEVICE_CONTROL will be used - * Event = Event used to notify the caller of completion - * IoStatusBlock (OUT) = Storage for the result of the operation - * RETURNS: The IRP allocated on success, or - * NULL on failure +/* + * @implemented */ PIRP -STDCALL +NTAPI IoBuildDeviceIoControlRequest (ULONG IoControlCode, PDEVICE_OBJECT DeviceObject, PVOID InputBuffer, @@ -702,13 +652,6 @@ ULONG BufferLength; LOCK_OPERATION AccessType; - DPRINT("IoBuildDeviceIoRequest(IoControlCode %x, DeviceObject 0x%p, " - "InputBuffer 0x%p, InputBufferLength %x, OutputBuffer 0x%p, " - "OutputBufferLength %x, InternalDeviceIoControl %x " - "Event 0x%p, IoStatusBlock 0x%p\n",IoControlCode,DeviceObject, - InputBuffer,InputBufferLength,OutputBuffer,OutputBufferLength, - InternalDeviceIoControl,Event,IoStatusBlock); - /* Allocate IRP */ if (!(Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE))) return Irp; @@ -717,29 +660,30 @@ /* Set the DevCtl Type */ StackPtr->MajorFunction = InternalDeviceIoControl ? - IRP_MJ_INTERNAL_DEVICE_CONTROL : IRP_MJ_DEVICE_CONTROL; + IRP_MJ_INTERNAL_DEVICE_CONTROL : + IRP_MJ_DEVICE_CONTROL; /* Set the IOCTL Data */ StackPtr->Parameters.DeviceIoControl.IoControlCode = IoControlCode; StackPtr->Parameters.DeviceIoControl.InputBufferLength = InputBufferLength; - StackPtr->Parameters.DeviceIoControl.OutputBufferLength = OutputBufferLength; + StackPtr->Parameters.DeviceIoControl.OutputBufferLength = + OutputBufferLength; /* Handle the Methods */ switch (IO_METHOD_FROM_CTL_CODE(IoControlCode)) { case METHOD_BUFFERED: - DPRINT("Using METHOD_BUFFERED!\n"); /* Select the right Buffer Length */ - BufferLength = InputBufferLength > OutputBufferLength ? InputBufferLength : OutputBufferLength; + BufferLength = InputBufferLength > OutputBufferLength ? + InputBufferLength : OutputBufferLength; /* Make sure there is one */ if (BufferLength) { /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - BufferLength, - TAG_SYS_BUF); + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, BufferLength, TAG_SYS_BUF); /* Fail if we couldn't */ if (Irp->AssociatedIrp.SystemBuffer == NULL) @@ -774,15 +718,15 @@ case METHOD_IN_DIRECT: case METHOD_OUT_DIRECT: - DPRINT("Using METHOD_IN/OUT DIRECT!\n"); /* Check if we got an input buffer */ if (InputBuffer) { /* Allocate the System Buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePoolWithTag(NonPagedPool, - InputBufferLength, - TAG_SYS_BUF); + Irp->AssociatedIrp.SystemBuffer = + ExAllocatePoolWithTag(NonPagedPool, + InputBufferLength, + TAG_SYS_BUF); /* Fail if we couldn't */ if (Irp->AssociatedIrp.SystemBuffer == NULL) @@ -861,7 +805,6 @@ } /* Now write the Event and IoSB */ - if (!IoStatusBlock) KEBUGCHECK(0); /* Temporary to catch illegal ROS Drivers */ Irp->UserIosb = IoStatusBlock; Irp->UserEvent = Event; @@ -875,23 +818,9 @@ /* * @implemented - * - * FUNCTION: Allocates and builds an IRP to be sent synchronously to lower - * level driver(s) - * ARGUMENTS: - * MajorFunction = Major function code, one of IRP_MJ_READ, - * IRP_MJ_WRITE, IRP_MJ_FLUSH_BUFFERS, IRP_MJ_SHUTDOWN - * DeviceObject = Target device object - * Buffer = Buffer containing data for a read or write - * Length = Length in bytes of the information to be transferred - * StartingOffset = Offset to begin the read/write from - * Event (OUT) = Will be set when the operation is complete - * IoStatusBlock (OUT) = Set to the status of the operation - * RETURNS: The IRP allocated on success, or - * NULL on failure */ PIRP -STDCALL +NTAPI IoBuildSynchronousFsdRequest(ULONG MajorFunction, PDEVICE_OBJECT DeviceObject, PVOID Buffer, @@ -902,11 +831,6 @@ { PIRP Irp; - DPRINT("IoBuildSynchronousFsdRequest(MajorFunction %x, DeviceObject 0x%p, " - "Buffer 0x%p, Length %x, StartingOffset 0x%p, Event 0x%p, " - "IoStatusBlock 0x%p\n",MajorFunction,DeviceObject,Buffer,Length, - StartingOffset,Event,IoStatusBlock); - /* Do the big work to set up the IRP */ Irp = IoBuildAsynchronousFsdRequest(MajorFunction, DeviceObject, @@ -927,7 +851,7 @@ * @implemented */ BOOLEAN -STDCALL +NTAPI IoCancelIrp(PIRP Irp) { KIRQL oldlvl; @@ -951,16 +875,11 @@ return(TRUE); } -/** +/* * @name IoCancelThreadIo - * - * Cancel all pending I/O request associated with specified thread. - * - * @param Thread - * Thread to cancel requests for. */ VOID -STDCALL +NTAPI IoCancelThreadIo(PETHREAD Thread) { PIRP Irp; @@ -977,7 +896,7 @@ /* Cancel it */ IoCancelIrp(Irp); } - + /* Wait 100 milliseconds */ Interval.QuadPart = -1000000; @@ -1011,8 +930,9 @@ * @implemented */ NTSTATUS -STDCALL -IoCallDriver (PDEVICE_OBJECT DeviceObject, PIRP Irp) +NTAPI +IoCallDriver(PDEVICE_OBJECT DeviceObject, + PIRP Irp) { /* Call fast call */ return IofCallDriver(DeviceObject, Irp); @@ -1023,7 +943,7 @@ */ #undef IoCompleteRequest VOID -STDCALL +NTAPI IoCompleteRequest(PIRP Irp, CCHAR PriorityBoost) { @@ -1035,7 +955,7 @@ * @implemented */ VOID -STDCALL +NTAPI IoEnqueueIrp(IN PIRP Irp) { IoQueueThreadIrp(Irp); @@ -1043,20 +963,15 @@ /* * @implemented - * - * FUNCTION: Sends an IRP to the next lower driver */ NTSTATUS FASTCALL IofCallDriver(PDEVICE_OBJECT DeviceObject, PIRP Irp) - { PDRIVER_OBJECT DriverObject; PIO_STACK_LOCATION Param; - DPRINT("IofCallDriver(DeviceObject 0x%p, Irp 0x%p)\n",DeviceObject,Irp); - /* Get the Driver Object */ DriverObject = DeviceObject->DriverObject; @@ -1066,13 +981,12 @@ /* Get the current one */ Param = IoGetCurrentIrpStackLocation(Irp); - DPRINT("IrpSp 0x0x%p\n", Param); - /* Get the Device Object */ Param->DeviceObject = DeviceObject; /* Call it */ - return DriverObject->MajorFunction[Param->MajorFunction](DeviceObject, Irp); + return DriverObject->MajorFunction[Param->MajorFunction](DeviceObject, + Irp); } #ifdef IoCompleteRequest @@ -1080,13 +994,6 @@ #endif /* * @implemented - * - * 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 - * ARGUMENTS: - * Irp = Irp to be cancelled - * PriorityBoost = Increment by which to boost the priority of the - * thread making the request */ VOID FASTCALL @@ -1099,9 +1006,6 @@ PETHREAD Thread = Irp->Tail.Overlay.Thread; NTSTATUS Status; PMDL Mdl; - - DPRINT("IofCompleteRequest(Irp 0x%p, PriorityBoost %d) Event 0x%p THread 0x%p\n", - Irp,PriorityBoost, Irp->UserEvent, PsGetCurrentThread()); ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); ASSERT(!Irp->CancelRoutine); @@ -1167,7 +1071,6 @@ ULONG MasterIrpCount; PIRP MasterIrp = Irp->AssociatedIrp.MasterIrp; - DPRINT("Handling Associated IRP\n"); /* This should never happen! */ ASSERT(IsListEmpty(&Irp->ThreadListEntry)); @@ -1190,7 +1093,6 @@ /* Windows NT File System Internals, page 165 */ if (Irp->Flags & (IRP_PAGING_IO|IRP_CLOSE_OPERATION)) { - DPRINT("Handling Paging or Close I/O\n"); /* This should never happen! */ ASSERT(IsListEmpty(&Irp->ThreadListEntry)); @@ -1198,14 +1100,12 @@ if (Irp->Flags & (IRP_SYNCHRONOUS_PAGING_IO | IRP_CLOSE_OPERATION)) { /* Set the I/O Status and Signal the Event */ - DPRINT("Handling Sync Paging or Close I/O\n"); *Irp->UserIosb = Irp->IoStatus; KeSetEvent(Irp->UserEvent, PriorityBoost, FALSE); /* Free the IRP for a Paging I/O Only, Close is handled by us */ if (Irp->Flags & IRP_SYNCHRONOUS_PAGING_IO) { - DPRINT("Handling Sync Paging I/O\n"); IoFreeIrp(Irp); } } @@ -1237,22 +1137,19 @@ Mdl = Irp->MdlAddress; while (Mdl) { - DPRINT("Unlocking MDL: 0x%p\n", Mdl); MmUnlockPages(Mdl); - Mdl = Mdl->Next; + Mdl = Mdl->Next; } /* Check if we should exit because of a Deferred I/O (page 168) */ if (Irp->Flags & IRP_DEFER_IO_COMPLETION && !Irp->PendingReturned) { - DPRINT("Quick return\n"); return; } /* Now queue the special APC */ if (!Irp->Cancel) { - DPRINT("KMODE APC QUEUE\n"); KeInitializeApc(&Irp->Tail.Apc, &Thread->Tcb, Irp->ApcEnvironment, @@ -1272,7 +1169,6 @@ if ((Thread = Irp->Tail.Overlay.Thread)) { /* Yes! There is still hope! */ - DPRINT("KMODE APC QUEUE\n"); KeInitializeApc(&Irp->Tail.Apc, &Thread->Tcb, Irp->ApcEnvironment, @@ -1298,7 +1194,7 @@ * @unimplemented */ BOOLEAN -STDCALL +NTAPI IoForwardIrpSynchronously(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -1308,13 +1204,9 @@ /* * @implemented - * - * FUNCTION: Releases a caller allocated irp - * ARGUMENTS: - * Irp = Irp to free */ VOID -STDCALL +NTAPI IoFreeIrp(PIRP Irp) { PNPAGED_LOOKASIDE_LIST List; @@ -1325,61 +1217,56 @@ if (!(Irp->AllocationFlags & IRP_ALLOCATED_FIXED_SIZE)) { /* Free it */ - DPRINT("Freeing pool IRP\n"); ExFreePool(Irp); } else { - DPRINT("Freeing Lookaside IRP\n"); - /* Check if this was a Big IRP */ if (Irp->StackCount != 1) { - DPRINT("Large IRP\n"); ListType = LookasideLargeIrpList; } - + /* Get the PRCB */ Prcb = KeGetCurrentPrcb(); - + /* Use the P List */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[ListType].P; List->L.TotalFrees++; - + /* Check if the Free was within the Depth or not */ if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) { /* Let the balancer know */ List->L.FreeMisses++; - + /* Use the L List */ List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[ListType].L; List->L.TotalFrees++; /* Check if the Free was within the Depth or not */ if (ExQueryDepthSList(&List->L.ListHead) >= List->L.Depth) - { + { /* All lists failed, use the pool */ List->L.FreeMisses++; ExFreePool(Irp); Irp = NULL; } } - + /* The free was within dhe Depth */ if (Irp) { - InterlockedPushEntrySList(&List->L.ListHead, (PSINGLE_LIST_ENTRY)Irp); - } - } - - DPRINT("Free done\n"); -} - -/* - * @implemented - */ -PEPROCESS STDCALL + InterlockedPushEntrySList(&List->L.ListHead, + (PSINGLE_LIST_ENTRY)Irp); + } + } +} + +/* + * @implemented + */ +PEPROCESS NTAPI IoGetRequestorProcess(IN PIRP Irp) { return(Irp->Tail.Overlay.Thread->ThreadsProcess); @@ -1389,7 +1276,7 @@ * @implemented */ ULONG -STDCALL +NTAPI IoGetRequestorProcessId(IN PIRP Irp) { return (ULONG)(IoGetRequestorProcess(Irp)->UniqueProcessId); @@ -1399,7 +1286,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoGetRequestorSessionId(IN PIRP Irp, OUT PULONG pSessionId) { @@ -1412,7 +1299,7 @@ * @implemented */ PIRP -STDCALL +NTAPI IoGetTopLevelIrp(VOID) { return (PIRP)PsGetCurrentThread()->TopLevelIrp; @@ -1420,22 +1307,14 @@ /* * @implemented - * - * FUNCTION: Initalizes an irp allocated by the caller - * ARGUMENTS: - * Irp = IRP to initalize - * PacketSize = Size in bytes of the IRP - * StackSize = Number of stack locations in the IRP */ VOID -STDCALL +NTAPI IoInitializeIrp(PIRP Irp, USHORT PacketSize, CCHAR StackSize) { ASSERT(Irp != NULL); - - DPRINT("IoInitializeIrp(StackSize %x, Irp 0x%p)\n",StackSize, Irp); /* Clear it */ RtlZeroMemory(Irp, PacketSize); @@ -1450,28 +1329,13 @@ /* Initialize the Thread List */ InitializeListHead(&Irp->ThreadListEntry); - - DPRINT("Irp->Tail.Overlay.CurrentStackLocation 0x%p\n", Irp->Tail.Overlay.CurrentStackLocation); -} - -/* - * NAME EXPORTED - * IoIsOperationSynchronous@4 - * - * DESCRIPTION - * Check if the I/O operation associated with the given IRP - * is synchronous. - * - * ARGUMENTS - * Irp Packet to check. - * - * RETURN VALUE - * TRUE if Irp's operation is synchronous; otherwise FALSE. - * +} + +/* * @implemented */ BOOLEAN -STDCALL +NTAPI IoIsOperationSynchronous(IN PIRP Irp) { /* Check the flags */ @@ -1492,7 +1356,7 @@ * @unimplemented */ BOOLEAN -STDCALL +NTAPI IoIsValidNameGraftingBuffer(IN PIRP Irp, IN PREPARSE_DATA_BUFFER ReparseBuffer) { @@ -1502,17 +1366,9 @@ /* * @implemented - * - * FUNCTION: Allocates and initializes an irp to associated with a master irp - * ARGUMENTS: - * Irp = Master irp - * StackSize = Number of stack locations to be allocated in the irp - * RETURNS: The irp allocated - * NOTE: The caller is responsible for incrementing - * Irp->AssociatedIrp.IrpCount. */ PIRP -STDCALL +NTAPI IoMakeAssociatedIrp(PIRP Irp, CCHAR StackSize) { @@ -1538,7 +1394,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoPageRead(PFILE_OBJECT FileObject, PMDL Mdl, PLARGE_INTEGER Offset, @@ -1548,9 +1404,6 @@ PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - - DPRINT("IoPageRead(FileObject 0x%p, Mdl 0x%p)\n", - FileObject, Mdl); /* Get the Device Object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); @@ -1567,7 +1420,10 @@ Irp->UserIosb = StatusBlock; Irp->UserEvent = Event; Irp->RequestorMode = KernelMode; - Irp->Flags = IRP_PAGING_IO | IRP_NOCACHE | IRP_SYNCHRONOUS_PAGING_IO | IRP_INPUT_OPERATION; + Irp->Flags = IRP_PAGING_IO | + IRP_NOCACHE | + IRP_SYNCHRONOUS_PAGING_IO | + IRP_INPUT_OPERATION; Irp->Tail.Overlay.OriginalFileObject = FileObject; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); @@ -1585,7 +1441,7 @@ * @implemented */ VOID -STDCALL +NTAPI IoQueueThreadIrp(IN PIRP Irp) { KIRQL OldIrql; @@ -1609,7 +1465,7 @@ * Reference: Chris Cant's "Writing WDM Device Drivers" */ VOID -STDCALL +NTAPI IoReuseIrp(IN OUT PIRP Irp, IN NTSTATUS Status) { @@ -1630,7 +1486,7 @@ * @implemented */ VOID -STDCALL +NTAPI IoSetTopLevelIrp(IN PIRP Irp) { PsGetCurrentThread()->TopLevelIrp = (ULONG)Irp; @@ -1640,7 +1496,7 @@ * @implemented */ NTSTATUS -STDCALL +NTAPI IoSynchronousPageWrite(PFILE_OBJECT FileObject, PMDL Mdl, PLARGE_INTEGER Offset, @@ -1650,9 +1506,6 @@ PIRP Irp; PIO_STACK_LOCATION StackPtr; PDEVICE_OBJECT DeviceObject; - - DPRINT("IoSynchronousPageWrite(FileObject 0x%p, Mdl 0x%p)\n", - FileObject, Mdl); /* Get the Device Object */ DeviceObject = IoGetRelatedDeviceObject(FileObject); Propchange: trunk/reactos/ntoskrnl/io/irp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[cwittich] 22701: fixed some warnings (msvc)
by cwittich＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: cwittich Date: Fri Jun 30 02:32:06 2006 New Revision: 22701 URL: http://svn.reactos.org/svn/reactos?rev=22701&view=rev Log: fixed some warnings (msvc) Modified: trunk/reactos/base/applications/notepad/dialog.c trunk/reactos/base/applications/notepad/main.c trunk/reactos/base/applications/notepad/settings.c Modified: trunk/reactos/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/dialog.c (original) +++ trunk/reactos/base/applications/notepad/dialog.c Fri Jun 30 02:32:06 2006 @@ -322,6 +322,8 @@ HWND hCombo; OFNOTIFY *pNotify; + UNREFERENCED_PARAMETER(wParam); + switch(msg) { case WM_INITDIALOG: @@ -362,11 +364,11 @@ hCombo = GetDlgItem(hDlg, ID_ENCODING); if (hCombo) - Globals.iEncoding = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); hCombo = GetDlgItem(hDlg, ID_EOLN); if (hCombo) - Globals.iEoln = SendMessage(hCombo, CB_GETCURSEL, 0, 0); + Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); } break; } @@ -453,7 +455,7 @@ printer.nMinPage = 1; /* we really need to calculate number of pages to set nMaxPage and nToPage */ printer.nToPage = 0; - printer.nMaxPage = -1; + printer.nMaxPage = (WORD) -1; /* Let commdlg manage copy settings */ printer.nCopies = (WORD)PD_USEDEVMODECOPIES; @@ -772,7 +774,7 @@ SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM) &dwStart, (LPARAM) &dwEnd); nLine = 1; - for (i = 0; pszText[i] && (i < dwStart); i++) + for (i = 0; pszText[i] && (i < (int) dwStart); i++) { if (pszText[i] == '\n') nLine++; @@ -803,10 +805,10 @@ TCHAR buff[MAX_PATH]; GetCaretPos(&point); - line = SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0); - ccol = SendMessage(Globals.hEdit, EM_CHARFROMPOS, (WPARAM)0, (LPARAM)MAKELPARAM(point.x, point.y)); + line = (int) SendMessage(Globals.hEdit, EM_LINEFROMCHAR, (WPARAM)-1, (LPARAM)0); + ccol = (int) SendMessage(Globals.hEdit, EM_CHARFROMPOS, (WPARAM)0, (LPARAM)MAKELPARAM(point.x, point.y)); ccol = LOWORD(ccol); - col = ccol - SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, (LPARAM)0); + col = ccol - (int) SendMessage(Globals.hEdit, EM_LINEINDEX, (WPARAM)line, (LPARAM)0); _stprintf(buff, TEXT("%S %d, %S %d"), Globals.szStatusBarLine, line+1, Globals.szStatusBarCol, col+1); SendMessage(Globals.hStatusBar, SB_SETTEXT, (WPARAM) SB_SIMPLEID, (LPARAM)buff); Modified: trunk/reactos/base/applications/notepad/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/main.c (original) +++ trunk/reactos/base/applications/notepad/main.c Fri Jun 30 02:32:06 2006 @@ -83,7 +83,7 @@ case CMD_ABOUT: DialogBox(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_ABOUTBOX), Globals.hMainWnd, - AboutDialogProc); + (DLGPROC) AboutDialogProc); break; case CMD_ABOUT_WINE: DIALOG_HelpAboutWine(); break; @@ -101,7 +101,7 @@ static BOOL NOTEPAD_FindTextAt(FINDREPLACE *pFindReplace, LPCTSTR pszText, int iTextLength, DWORD dwPosition) { BOOL bMatches; - int iTargetLength; + size_t iTargetLength; iTargetLength = _tcslen(pFindReplace->lpstrFindWhat); @@ -115,7 +115,7 @@ { if ((dwPosition > 0) && !_istspace(pszText[dwPosition-1])) bMatches = FALSE; - if ((dwPosition < iTextLength - 1) && !_istspace(pszText[dwPosition+1])) + if ((dwPosition < (DWORD) iTextLength - 1) && !_istspace(pszText[dwPosition+1])) bMatches = FALSE; } @@ -130,14 +130,14 @@ BOOL NOTEPAD_FindNext(FINDREPLACE *pFindReplace, BOOL bReplace, BOOL bShowAlert) { int iTextLength, iTargetLength; - int iAdjustment = 0; + size_t iAdjustment = 0; LPTSTR pszText = NULL; DWORD dwPosition, dwBegin, dwEnd; BOOL bMatches = FALSE; TCHAR szResource[128], szText[128]; BOOL bSuccess; - iTargetLength = _tcslen(pFindReplace->lpstrFindWhat); + iTargetLength = (int) _tcslen(pFindReplace->lpstrFindWhat); /* Retrieve the window text */ iTextLength = GetWindowTextLength(Globals.hEdit); @@ -151,7 +151,7 @@ } SendMessage(Globals.hEdit, EM_GETSEL, (WPARAM) &dwBegin, (LPARAM) &dwEnd); - if (bReplace && ((dwEnd - dwBegin) == iTargetLength)) + if (bReplace && ((dwEnd - dwBegin) == (DWORD) iTargetLength)) { if (NOTEPAD_FindTextAt(pFindReplace, pszText, iTextLength, dwBegin)) { @@ -164,7 +164,7 @@ { /* Find Down */ dwPosition = dwEnd; - while(dwPosition < iTextLength) + while(dwPosition < (DWORD) iTextLength) { bMatches = NOTEPAD_FindTextAt(pFindReplace, pszText, iTextLength, dwPosition); if (bMatches) @@ -189,7 +189,7 @@ { /* Found target */ if (dwPosition > dwBegin) - dwPosition += iAdjustment; + dwPosition += (DWORD) iAdjustment; SendMessage(Globals.hEdit, EM_SETSEL, dwPosition, dwPosition + iTargetLength); SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); bSuccess = TRUE; @@ -263,9 +263,11 @@ /*********************************************************************** * Enable/disable items on the menu based on control state */ -static VOID NOTEPAD_InitMenuPopup(HMENU menu, int index) +static VOID NOTEPAD_InitMenuPopup(HMENU menu, LPARAM index) { int enable; + + UNREFERENCED_PARAMETER(index); CheckMenuItem(GetMenu(Globals.hMainWnd), CMD_WRAP, MF_BYCOMMAND | (Globals.bWrapLongLines ? MF_CHECKED : MF_UNCHECKED)); @@ -278,7 +280,7 @@ SendMessage(Globals.hEdit, EM_CANUNDO, 0, 0) ? MF_ENABLED : MF_GRAYED); EnableMenuItem(menu, CMD_PASTE, IsClipboardFormatAvailable(CF_TEXT) ? MF_ENABLED : MF_GRAYED); - enable = SendMessage(Globals.hEdit, EM_GETSEL, 0, 0); + enable = (int) SendMessage(Globals.hEdit, EM_GETSEL, 0, 0); enable = (HIWORD(enable) == LOWORD(enable)) ? MF_GRAYED : MF_ENABLED; EnableMenuItem(menu, CMD_CUT, enable); EnableMenuItem(menu, CMD_COPY, enable); @@ -532,7 +534,10 @@ static const WCHAR className[] = {'N','P','C','l','a','s','s',0}; static const WCHAR winName[] = {'N','o','t','e','p','a','d',0}; - aFINDMSGSTRING = RegisterWindowMessage(FINDMSGSTRING); + UNREFERENCED_PARAMETER(prev); + UNREFERENCED_PARAMETER(cmdline); + + aFINDMSGSTRING = (ATOM) RegisterWindowMessage(FINDMSGSTRING); ZeroMemory(&Globals, sizeof(Globals)); Globals.hInstance = hInstance; @@ -585,5 +590,5 @@ } } SaveSettings(); - return msg.wParam; -} + return (int) msg.wParam; +} Modified: trunk/reactos/base/applications/notepad/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/settings.c (original) +++ trunk/reactos/base/applications/notepad/settings.c Fri Jun 30 02:32:06 2006 @@ -187,7 +187,7 @@ pszValueNameT = pszValueName; #endif - return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; + return RegSetValueEx(hKey, pszValueNameT, 0, REG_SZ, (LPBYTE) pszValue, (DWORD) _tcslen(pszValue) * sizeof(*pszValue)) == ERROR_SUCCESS; } void SaveSettings(void)

1 0

[cwittich] 22700: fixed some warnings (msvc)
by cwittich＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: cwittich Date: Fri Jun 30 02:12:40 2006 New Revision: 22700 URL: http://svn.reactos.org/svn/reactos?rev=22700&view=rev Log: fixed some warnings (msvc) Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c trunk/reactos/base/applications/msconfig/generalpage.c trunk/reactos/base/applications/msconfig/msconfig.c trunk/reactos/base/applications/msconfig/srvpage.c trunk/reactos/base/applications/msconfig/startuppage.c trunk/reactos/base/applications/msconfig/systempage.c Modified: trunk/reactos/base/applications/msconfig/freeldrpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/freeldrpage.c (original) +++ trunk/reactos/base/applications/msconfig/freeldrpage.c Fri Jun 30 02:12:40 2006 @@ -15,8 +15,8 @@ INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/generalpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/generalpage.c (original) +++ trunk/reactos/base/applications/msconfig/generalpage.c Fri Jun 30 02:12:40 2006 @@ -15,8 +15,8 @@ INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/msconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/msconfig.c (original) +++ trunk/reactos/base/applications/msconfig/msconfig.c Fri Jun 30 02:12:40 2006 @@ -192,9 +192,9 @@ INITCOMMONCONTROLSEX InitControls; - UNREFERENCED_PARAMETER(hPrevInstance) - UNREFERENCED_PARAMETER(lpCmdLine) - UNREFERENCED_PARAMETER(nCmdShow) + UNREFERENCED_PARAMETER(hPrevInstance); + UNREFERENCED_PARAMETER(lpCmdLine); + UNREFERENCED_PARAMETER(nCmdShow); InitControls.dwSize = sizeof(INITCOMMONCONTROLSEX); InitControls.dwICC = ICC_TAB_CLASSES | ICC_LISTVIEW_CLASSES; Modified: trunk/reactos/base/applications/msconfig/srvpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/srvpage.c (original) +++ trunk/reactos/base/applications/msconfig/srvpage.c Fri Jun 30 02:12:40 2006 @@ -22,8 +22,8 @@ TCHAR szTemp[256]; DWORD dwStyle; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/startuppage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.c (original) +++ trunk/reactos/base/applications/msconfig/startuppage.c Fri Jun 30 02:12:40 2006 @@ -23,8 +23,8 @@ TCHAR szTemp[256]; DWORD dwStyle; - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch (message) { case WM_INITDIALOG: Modified: trunk/reactos/base/applications/msconfig/systempage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/systempage.c (original) +++ trunk/reactos/base/applications/msconfig/systempage.c Fri Jun 30 02:12:40 2006 @@ -14,8 +14,8 @@ INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) { - UNREFERENCED_PARAMETER(lParam) - UNREFERENCED_PARAMETER(wParam) + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); switch (message) { case WM_INITDIALOG: hSystemDialog = hDlg;

1 0

[janderwald] 22699: * finished reading console options.c * thnx for everyone helping with this commit (you know who you are)
by janderwald＠svn.reactos.org 29 Jun '06

29 Jun '06

Author: janderwald Date: Fri Jun 30 01:40:22 2006 New Revision: 22699 URL: http://svn.reactos.org/svn/reactos?rev=22699&view=rev Log: * finished reading console options.c * thnx for everyone helping with this commit (you know who you are) Modified: trunk/reactos/dll/win32/console/console.c trunk/reactos/dll/win32/console/console.h trunk/reactos/dll/win32/console/options.c Modified: trunk/reactos/dll/win32/console/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.c (original) +++ trunk/reactos/dll/win32/console/console.c Fri Jun 30 01:40:22 2006 @@ -154,6 +154,13 @@ LPVOID lpvReserved) { UNREFERENCED_PARAMETER(lpvReserved) + + /* initialize global struct */ + memset(&g_ConsoleInfo, 0x0, sizeof(ConsoleInfo)); + g_ConsoleInfo.InsertMode = TRUE; + g_ConsoleInfo.HistoryBufferSize = 50; + g_ConsoleInfo.NumberOfHistoryBuffers = 5; + switch(dwReason) { case DLL_PROCESS_ATTACH: Modified: trunk/reactos/dll/win32/console/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/console.… ============================================================================== --- trunk/reactos/dll/win32/console/console.h (original) +++ trunk/reactos/dll/win32/console/console.h Fri Jun 30 01:40:22 2006 @@ -20,6 +20,7 @@ typedef struct TAGConsoleInfo { + LPSTR szProcessName; DWORD CursorSize; DWORD NumberOfHistoryBuffers; DWORD HistoryBufferSize; Modified: trunk/reactos/dll/win32/console/options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/options.… ============================================================================== --- trunk/reactos/dll/win32/console/options.c (original) +++ trunk/reactos/dll/win32/console/options.c Fri Jun 30 01:40:22 2006 @@ -42,9 +42,9 @@ DWORD dwNumSubKeys = 0; DWORD dwIndex; DWORD dwValueName; - DWORD dwBufferSize; + DWORD dwValue; TCHAR szValueName[MAX_PATH]; - BYTE szBuffer[MAX_PATH]; + DWORD Value; if ( RegOpenCurrentUser(KEY_READ, &hKey) != ERROR_SUCCESS ) return FALSE; @@ -60,49 +60,42 @@ for (dwIndex = 0; dwIndex < dwNumSubKeys; dwIndex++) { - dwBufferSize = MAX_PATH; + dwValue = sizeof(Value); dwValueName = MAX_PATH; - if ( RegEnumValue(hSubKey, dwIndex, szValueName, &dwValueName, NULL, NULL, szBuffer, &dwBufferSize) != ERROR_SUCCESS) + if ( RegEnumValue(hSubKey, dwIndex, szValueName, &dwValueName, NULL, NULL, (BYTE*)&Value, &dwValue) != ERROR_SUCCESS) break; if ( !_tcscmp(szValueName, _T("CursorSize")) ) { - int val = _ttoi((TCHAR*)szBuffer); - if ( val == 0x32) - g_ConsoleInfo.CursorSize = val; - else if ( val == 0x64 ) - g_ConsoleInfo.CursorSize = val; + if ( Value == 0x32) + g_ConsoleInfo.CursorSize = Value; + else if ( Value == 0x64 ) + g_ConsoleInfo.CursorSize = Value; } else if ( !_tcscmp(szValueName, _T("NumberOfHistoryBuffers")) ) { - int val = _ttoi((TCHAR*)szBuffer); - g_ConsoleInfo.NumberOfHistoryBuffers = val; + g_ConsoleInfo.NumberOfHistoryBuffers = Value; } else if ( !_tcscmp(szValueName, _T("HistoryBufferSize")) ) { - int val = _ttoi((TCHAR*)szBuffer); - g_ConsoleInfo.HistoryBufferSize = val; + g_ConsoleInfo.HistoryBufferSize = Value; } else if ( !_tcscmp(szValueName, _T("HistoryNoDup")) ) { - int val = _ttoi((TCHAR*)szBuffer); - g_ConsoleInfo.HistoryNoDup = val; + g_ConsoleInfo.HistoryNoDup = Value; } else if ( !_tcscmp(szValueName, _T("FullScreen")) ) { - int val = _ttoi((TCHAR*)szBuffer); - g_ConsoleInfo.FullScreen = val; + g_ConsoleInfo.FullScreen = Value; } else if ( !_tcscmp(szValueName, _T("QuickEdit")) ) { - int val = _ttoi((TCHAR*)szBuffer); - g_ConsoleInfo.QuickEdit = val; + g_ConsoleInfo.QuickEdit = Value; } else if ( !_tcscmp(szValueName, _T("InsertMode")) ) { - int val = _ttoi((TCHAR*)szBuffer); - g_ConsoleInfo.InsertMode = val; + g_ConsoleInfo.InsertMode = Value; } } @@ -204,23 +197,50 @@ BOOLEAN InitializeOptionsDialog(HWND hwndDlg) { STARTUPINFO StartupInfo; - + TCHAR szBuffer[MAX_PATH]; GetStartupInfo(&StartupInfo); + TCHAR * ptr; + DWORD length; if ( StartupInfo.lpTitle ) { - if ( InitializeOptionsFromReg(StartupInfo.lpTitle) ) + if ( !GetWindowsDirectory(szBuffer, MAX_PATH) ) + return FALSE; + + length = _tcslen(szBuffer); + if ( !_tcsncmp(szBuffer, StartupInfo.lpTitle, length) ) + { + // Windows XP SP2 uses unexpanded environment vars to get path + // i.e. c:\windows\system32\cmd.exe + // becomes + // %SystemRoot%_system32_cmd.exe + + _tcscpy(szBuffer, _T("\%SystemRoot\%")); + _tcsncpy(&szBuffer[12], &StartupInfo.lpTitle[length], _tcslen(StartupInfo.lpTitle) - length + 1); + + ptr = &szBuffer[12]; + while( (ptr = _tcsstr(ptr, _T("\\"))) ) + ptr[0] = _T('_'); + } + + + if ( InitializeOptionsFromReg(szBuffer) ) { UpdateDialogElements(hwndDlg); return TRUE; } - //TODO - // - // Windows XP uses unexpanded environment vars to get path - // i.e. c:\windows\system32\cmd.exe - // becomes - // %SystemRoot%_system32_cmd.exe - + UpdateDialogElements(hwndDlg); + + } + else + { + + if ( InitializeOptionsFromReg( _T("Console")) ) + { + UpdateDialogElements(hwndDlg); + return TRUE; + + } } return TRUE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs