Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 22728: In ObOpenObjectByPointer, always pass right mapping to SeCreateAccessState, instead of relying on a optional/incorrect parameter
by hpoussin＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: hpoussin Date: Sat Jul 1 01:34:53 2006 New Revision: 22728 URL: http://svn.reactos.org/svn/reactos?rev=22728&view=rev Log: In ObOpenObjectByPointer, always pass right mapping to SeCreateAccessState, instead of relying on a optional/incorrect parameter Modified: trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c Sat Jul 1 01:34:53 2006 @@ -1612,10 +1612,14 @@ IN KPROCESSOR_MODE AccessMode, OUT PHANDLE Handle) { + POBJECT_HEADER Header; NTSTATUS Status; ACCESS_STATE AccessState; AUX_DATA AuxData; PAGED_CODE(); + + /* Get the Header Info */ + Header = OBJECT_TO_OBJECT_HEADER(Object); /* Reference the object */ Status = ObReferenceObjectByPointer(Object, @@ -1632,7 +1636,7 @@ Status = SeCreateAccessState(&AccessState, &AuxData, DesiredAccess, - &ObjectType->TypeInfo.GenericMapping); + &Header->Type->TypeInfo.GenericMapping); if (!NT_SUCCESS(Status)) { /* Fail */

1 0

[ion] 22727: - Better organize some APIs that were a bit all over the place. No code/formatting changes.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 23:37:45 2006 New Revision: 22727 URL: http://svn.reactos.org/svn/reactos?rev=22727&view=rev Log: - Better organize some APIs that were a bit all over the place. No code/formatting changes. Added: trunk/reactos/ntoskrnl/io/util.c - copied, changed from r22693, trunk/reactos/ntoskrnl/io/share.c Removed: trunk/reactos/ntoskrnl/io/share.c Modified: trunk/reactos/ntoskrnl/io/device.c trunk/reactos/ntoskrnl/io/file.c trunk/reactos/ntoskrnl/io/fs.c trunk/reactos/ntoskrnl/io/iofunc.c trunk/reactos/ntoskrnl/io/iomgr.c trunk/reactos/ntoskrnl/io/irp.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/io/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/device.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/device.c (original) +++ trunk/reactos/ntoskrnl/io/device.c Fri Jun 30 23:37:45 2006 @@ -1105,16 +1105,4 @@ } } -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoValidateDeviceIoControlAccess(IN PIRP Irp, - IN ULONG RequiredAccess) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/io/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/file.c?rev=227… ============================================================================== --- trunk/reactos/ntoskrnl/io/file.c (original) +++ trunk/reactos/ntoskrnl/io/file.c Fri Jun 30 23:37:45 2006 @@ -1462,5 +1462,202 @@ FileInformation); } - +/* + * @unimplemented + */ +BOOLEAN STDCALL +IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK DesiredAccess, + IN ULONG OpenOptions, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) +{ + UNIMPLEMENTED; + return(FALSE); +} + +/* + * @implemented + */ +VOID STDCALL +IoUpdateShareAccess(PFILE_OBJECT FileObject, + PSHARE_ACCESS ShareAccess) +{ + PAGED_CODE(); + + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) + { + ShareAccess->OpenCount++; + + ShareAccess->Readers += FileObject->ReadAccess; + ShareAccess->Writers += FileObject->WriteAccess; + ShareAccess->Deleters += FileObject->DeleteAccess; + ShareAccess->SharedRead += FileObject->SharedRead; + ShareAccess->SharedWrite += FileObject->SharedWrite; + ShareAccess->SharedDelete += FileObject->SharedDelete; + } +} + + +/* + * @implemented + */ +NTSTATUS STDCALL +IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, + IN ULONG DesiredShareAccess, + IN PFILE_OBJECT FileObject, + IN PSHARE_ACCESS ShareAccess, + IN BOOLEAN Update) +{ + BOOLEAN ReadAccess; + BOOLEAN WriteAccess; + BOOLEAN DeleteAccess; + BOOLEAN SharedRead; + BOOLEAN SharedWrite; + BOOLEAN SharedDelete; + + PAGED_CODE(); + + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; + + FileObject->ReadAccess = ReadAccess; + FileObject->WriteAccess = WriteAccess; + FileObject->DeleteAccess = DeleteAccess; + + if (ReadAccess || WriteAccess || DeleteAccess) + { + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; + + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; + + if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || + (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || + (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || + ((ShareAccess->Readers != 0) && !SharedRead) || + ((ShareAccess->Writers != 0) && !SharedWrite) || + ((ShareAccess->Deleters != 0) && !SharedDelete)) + { + return(STATUS_SHARING_VIOLATION); + } + + if (Update) + { + ShareAccess->OpenCount++; + + ShareAccess->Readers += ReadAccess; + ShareAccess->Writers += WriteAccess; + ShareAccess->Deleters += DeleteAccess; + ShareAccess->SharedRead += SharedRead; + ShareAccess->SharedWrite += SharedWrite; + ShareAccess->SharedDelete += SharedDelete; + } + } + + return(STATUS_SUCCESS); +} + + +/* + * @implemented + */ +VOID STDCALL +IoRemoveShareAccess(IN PFILE_OBJECT FileObject, + IN PSHARE_ACCESS ShareAccess) +{ + PAGED_CODE(); + + if (FileObject->ReadAccess || + FileObject->WriteAccess || + FileObject->DeleteAccess) + { + ShareAccess->OpenCount--; + + ShareAccess->Readers -= FileObject->ReadAccess; + ShareAccess->Writers -= FileObject->WriteAccess; + ShareAccess->Deleters -= FileObject->DeleteAccess; + ShareAccess->SharedRead -= FileObject->SharedRead; + ShareAccess->SharedWrite -= FileObject->SharedWrite; + ShareAccess->SharedDelete -= FileObject->SharedDelete; + } +} + + +/* + * @implemented + */ +VOID STDCALL +IoSetShareAccess(IN ACCESS_MASK DesiredAccess, + IN ULONG DesiredShareAccess, + IN PFILE_OBJECT FileObject, + OUT PSHARE_ACCESS ShareAccess) +{ + BOOLEAN ReadAccess; + BOOLEAN WriteAccess; + BOOLEAN DeleteAccess; + BOOLEAN SharedRead; + BOOLEAN SharedWrite; + BOOLEAN SharedDelete; + + PAGED_CODE(); + + ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; + WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; + DeleteAccess = (DesiredAccess & DELETE) != 0; + + FileObject->ReadAccess = ReadAccess; + FileObject->WriteAccess = WriteAccess; + FileObject->DeleteAccess = DeleteAccess; + + if (!ReadAccess && !WriteAccess && !DeleteAccess) + { + ShareAccess->OpenCount = 0; + ShareAccess->Readers = 0; + ShareAccess->Writers = 0; + ShareAccess->Deleters = 0; + + ShareAccess->SharedRead = 0; + ShareAccess->SharedWrite = 0; + ShareAccess->SharedDelete = 0; + } + else + { + SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; + SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; + SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; + + FileObject->SharedRead = SharedRead; + FileObject->SharedWrite = SharedWrite; + FileObject->SharedDelete = SharedDelete; + + ShareAccess->OpenCount = 1; + ShareAccess->Readers = ReadAccess; + ShareAccess->Writers = WriteAccess; + ShareAccess->Deleters = DeleteAccess; + + ShareAccess->SharedRead = SharedRead; + ShareAccess->SharedWrite = SharedWrite; + ShareAccess->SharedDelete = SharedDelete; + } +} + +/* + * @unimplemented + */ +VOID +STDCALL +IoCancelFileOpen( + IN PDEVICE_OBJECT DeviceObject, + IN PFILE_OBJECT FileObject + ) +{ + UNIMPLEMENTED; +} /* EOF */ Modified: trunk/reactos/ntoskrnl/io/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/fs.c?rev=22727… ============================================================================== --- trunk/reactos/ntoskrnl/io/fs.c (original) +++ trunk/reactos/ntoskrnl/io/fs.c Fri Jun 30 23:37:45 2006 @@ -47,19 +47,6 @@ /* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ -VOID -STDCALL -IoCancelFileOpen( - IN PDEVICE_OBJECT DeviceObject, - IN PFILE_OBJECT FileObject - ) -{ - UNIMPLEMENTED; -} VOID INIT_FUNCTION IoInitFileSystemImplementation(VOID) @@ -422,40 +409,6 @@ } -/* - * @implemented - */ -PDEVICE_OBJECT STDCALL -IoGetDeviceToVerify(IN PETHREAD Thread) -/* - * FUNCTION: Returns a pointer to the device, representing a removable-media - * device, that is the target of the given thread's I/O request - */ -{ - return(Thread->DeviceToVerify); -} - - -/* - * @implemented - */ -VOID STDCALL -IoSetDeviceToVerify(IN PETHREAD Thread, - IN PDEVICE_OBJECT DeviceObject) -{ - Thread->DeviceToVerify = DeviceObject; -} - - -/* - * @implemented - */ -VOID STDCALL -IoSetHardErrorOrVerifyDevice(IN PIRP Irp, - IN PDEVICE_OBJECT DeviceObject) -{ - Irp->Tail.Overlay.Thread->DeviceToVerify = DeviceObject; -} /* Modified: trunk/reactos/ntoskrnl/io/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iofunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iofunc.c Fri Jun 30 23:37:45 2006 @@ -400,6 +400,84 @@ /* Return the Length and Status. ReturnedLength is NOT optional */ *ReturnedLength = IoStatusBlock.Information; return Status; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +IoSetInformation(IN PFILE_OBJECT FileObject, + IN FILE_INFORMATION_CLASS FileInformationClass, + IN ULONG Length, + IN PVOID FileInformation) +{ + IO_STATUS_BLOCK IoStatusBlock; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; + PIO_STACK_LOCATION StackPtr; + NTSTATUS Status; + + ASSERT(FileInformation != NULL); + + if (FileInformationClass == FileCompletionInformation) + { + return STATUS_NOT_IMPLEMENTED; + } + + + + Status = ObReferenceObjectByPointer(FileObject, + 0, /* FIXME - depends on the information class */ + IoFileObjectType, + KernelMode); + if (!NT_SUCCESS(Status)) + { + return(Status); + } + + DPRINT("FileObject 0x%p\n", FileObject); + + DeviceObject = FileObject->DeviceObject; + + Irp = IoAllocateIrp(DeviceObject->StackSize, + TRUE); + if (Irp == NULL) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Trigger FileObject/Event dereferencing */ + Irp->Tail.Overlay.OriginalFileObject = FileObject; + Irp->RequestorMode = KernelMode; + Irp->AssociatedIrp.SystemBuffer = FileInformation; + Irp->UserIosb = &IoStatusBlock; + Irp->UserEvent = &FileObject->Event; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + KeResetEvent( &FileObject->Event ); + + StackPtr = IoGetNextIrpStackLocation(Irp); + StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; + StackPtr->MinorFunction = 0; + StackPtr->Flags = 0; + StackPtr->Control = 0; + StackPtr->DeviceObject = DeviceObject; + StackPtr->FileObject = FileObject; + StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; + StackPtr->Parameters.SetFile.Length = Length; + + Status = IoCallDriver(FileObject->DeviceObject, Irp); + if (Status==STATUS_PENDING) + { + KeWaitForSingleObject(&FileObject->Event, + Executive, + KernelMode, + FileObject->Flags & FO_ALERTABLE_IO, + NULL); + Status = IoStatusBlock.Status; + } + + return Status; } /* NATIVE SERVICES ***********************************************************/ @@ -2342,3 +2420,4 @@ UNIMPLEMENTED; return(STATUS_NOT_IMPLEMENTED); } + Modified: trunk/reactos/ntoskrnl/io/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr.c Fri Jun 30 23:37:45 2006 @@ -34,7 +34,6 @@ FILE_GENERIC_EXECUTE, FILE_ALL_ACCESS}; -static KSPIN_LOCK CancelSpinLock; extern LIST_ENTRY ShutdownListHead; extern KSPIN_LOCK ShutdownListLock; extern NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; @@ -60,6 +59,7 @@ INIT_FUNCTION IoInitCancelHandling(VOID) { + extern KSPIN_LOCK CancelSpinLock; KeInitializeSpinLock(&CancelSpinLock); } @@ -479,88 +479,4 @@ NULL); } -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -VOID -STDCALL -IoAcquireCancelSpinLock(PKIRQL Irql) -{ - KeAcquireSpinLock(&CancelSpinLock,Irql); -} - -/* - * @implemented - */ -PVOID -STDCALL -IoGetInitialStack(VOID) -{ - return(PsGetCurrentThread()->Tcb.InitialStack); -} - -/* - * @implemented - */ -VOID -STDCALL -IoGetStackLimits(OUT PULONG LowLimit, - OUT PULONG HighLimit) -{ - *LowLimit = (ULONG)NtCurrentTeb()->Tib.StackLimit; - *HighLimit = (ULONG)NtCurrentTeb()->Tib.StackBase; -} - -/* - * @implemented - */ -BOOLEAN -STDCALL -IoIsSystemThread(IN PETHREAD Thread) -{ - /* Call the Ps Function */ - return PsIsSystemThread(Thread); -} - -/* - * @implemented - */ -BOOLEAN STDCALL -IoIsWdmVersionAvailable(IN UCHAR MajorVersion, - IN UCHAR MinorVersion) -{ - /* MinorVersion = 0x20 : WinXP - 0x10 : Win2k - 0x5 : WinMe - <0x5 : Win98 - - We report Win2k now - */ - if (MajorVersion <= 1 && MinorVersion <= 0x10) - return TRUE; - return FALSE; -} - -/* - * @implemented - */ -VOID -STDCALL -IoReleaseCancelSpinLock(KIRQL Irql) -{ - KeReleaseSpinLock(&CancelSpinLock,Irql); -} - -/* - * @implemented - */ -PEPROCESS -STDCALL -IoThreadToProcess(IN PETHREAD Thread) -{ - return(Thread->ThreadsProcess); -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/io/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irp.c?rev=2272… ============================================================================== --- trunk/reactos/ntoskrnl/io/irp.c (original) +++ trunk/reactos/ntoskrnl/io/irp.c Fri Jun 30 23:37:45 2006 @@ -837,7 +837,7 @@ /* Sync IRPs are queued to requestor thread's irp cancel/cleanup list */ IoQueueThreadIrp(Irp); - return(Irp); + return Irp; } /* Removed: trunk/reactos/ntoskrnl/io/share.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/share.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/share.c (original) +++ trunk/reactos/ntoskrnl/io/share.c (removed) @@ -1,333 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/share.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -VOID STDCALL -IoUpdateShareAccess(PFILE_OBJECT FileObject, - PSHARE_ACCESS ShareAccess) -{ - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += FileObject->ReadAccess; - ShareAccess->Writers += FileObject->WriteAccess; - ShareAccess->Deleters += FileObject->DeleteAccess; - ShareAccess->SharedRead += FileObject->SharedRead; - ShareAccess->SharedWrite += FileObject->SharedWrite; - ShareAccess->SharedDelete += FileObject->SharedDelete; - } -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess, - IN BOOLEAN Update) -{ - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (ReadAccess || WriteAccess || DeleteAccess) - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || - (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || - (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || - ((ShareAccess->Readers != 0) && !SharedRead) || - ((ShareAccess->Writers != 0) && !SharedWrite) || - ((ShareAccess->Deleters != 0) && !SharedDelete)) - { - return(STATUS_SHARING_VIOLATION); - } - - if (Update) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += ReadAccess; - ShareAccess->Writers += WriteAccess; - ShareAccess->Deleters += DeleteAccess; - ShareAccess->SharedRead += SharedRead; - ShareAccess->SharedWrite += SharedWrite; - ShareAccess->SharedDelete += SharedDelete; - } - } - - return(STATUS_SUCCESS); -} - - -/* - * @implemented - */ -VOID STDCALL -IoRemoveShareAccess(IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess) -{ - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount--; - - ShareAccess->Readers -= FileObject->ReadAccess; - ShareAccess->Writers -= FileObject->WriteAccess; - ShareAccess->Deleters -= FileObject->DeleteAccess; - ShareAccess->SharedRead -= FileObject->SharedRead; - ShareAccess->SharedWrite -= FileObject->SharedWrite; - ShareAccess->SharedDelete -= FileObject->SharedDelete; - } -} - - -/* - * @implemented - */ -VOID STDCALL -IoSetShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - OUT PSHARE_ACCESS ShareAccess) -{ - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (!ReadAccess && !WriteAccess && !DeleteAccess) - { - ShareAccess->OpenCount = 0; - ShareAccess->Readers = 0; - ShareAccess->Writers = 0; - ShareAccess->Deleters = 0; - - ShareAccess->SharedRead = 0; - ShareAccess->SharedWrite = 0; - ShareAccess->SharedDelete = 0; - } - else - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - ShareAccess->OpenCount = 1; - ShareAccess->Readers = ReadAccess; - ShareAccess->Writers = WriteAccess; - ShareAccess->Deleters = DeleteAccess; - - ShareAccess->SharedRead = SharedRead; - ShareAccess->SharedWrite = SharedWrite; - ShareAccess->SharedDelete = SharedDelete; - } -} - - -/* - * @implemented - */ -NTSTATUS STDCALL -IoCheckDesiredAccess(IN OUT PACCESS_MASK DesiredAccess, - IN ACCESS_MASK GrantedAccess) -{ - PAGED_CODE(); - - RtlMapGenericMask(DesiredAccess, - &IoFileObjectType->TypeInfo.GenericMapping); - - if ((~(*DesiredAccess) & GrantedAccess) != 0) - return STATUS_ACCESS_DENIED; - else - return STATUS_SUCCESS; -} - - -/* - * @unimplemented - */ -NTSTATUS STDCALL -IoCheckEaBufferValidity(IN PFILE_FULL_EA_INFORMATION EaBuffer, - IN ULONG EaLength, - OUT PULONG ErrorOffset) -{ - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); -} - - -/* - * @unimplemented - */ -NTSTATUS STDCALL -IoCheckFunctionAccess(IN ACCESS_MASK GrantedAccess, - IN UCHAR MajorFunction, - IN UCHAR MinorFunction, - IN ULONG IoControlCode, - IN PVOID ExtraData OPTIONAL, - IN PVOID ExtraData2 OPTIONAL) -{ - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); -} - - -/* - * @unimplemented - */ -NTSTATUS STDCALL -IoSetInformation(IN PFILE_OBJECT FileObject, - IN FILE_INFORMATION_CLASS FileInformationClass, - IN ULONG Length, - IN PVOID FileInformation) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; - - ASSERT(FileInformation != NULL); - - if (FileInformationClass == FileCompletionInformation) - { - return STATUS_NOT_IMPLEMENTED; - } - - - - Status = ObReferenceObjectByPointer(FileObject, - 0, /* FIXME - depends on the information class */ - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DPRINT("FileObject 0x%p\n", FileObject); - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FileInformation; - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &FileObject->Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - KeResetEvent( &FileObject->Event ); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; - StackPtr->Parameters.SetFile.Length = Length; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock.Status; - } - - return Status; -} - - -/* - * @unimplemented - */ -BOOLEAN STDCALL -IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ACCESS_MASK DesiredAccess, - IN ULONG OpenOptions, - OUT PIO_STATUS_BLOCK IoStatus, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) -{ - UNIMPLEMENTED; - return(FALSE); -} - -/* EOF */ Copied: trunk/reactos/ntoskrnl/io/util.c (from r22693, trunk/reactos/ntoskrnl/io/share.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/util.c?p2=trun… ============================================================================== --- trunk/reactos/ntoskrnl/io/share.c (original) +++ trunk/reactos/ntoskrnl/io/util.c Fri Jun 30 23:37:45 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/share.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/util.c + * PURPOSE: I/O Utility Functions + * PROGRAMMERS: <UNKNOWN> */ /* INCLUDES *****************************************************************/ @@ -14,180 +12,93 @@ #define NDEBUG #include <internal/debug.h> +/* DATA **********************************************************************/ + +KSPIN_LOCK CancelSpinLock; + /* FUNCTIONS *****************************************************************/ /* * @implemented */ -VOID STDCALL -IoUpdateShareAccess(PFILE_OBJECT FileObject, - PSHARE_ACCESS ShareAccess) +VOID +STDCALL +IoAcquireCancelSpinLock(PKIRQL Irql) { - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += FileObject->ReadAccess; - ShareAccess->Writers += FileObject->WriteAccess; - ShareAccess->Deleters += FileObject->DeleteAccess; - ShareAccess->SharedRead += FileObject->SharedRead; - ShareAccess->SharedWrite += FileObject->SharedWrite; - ShareAccess->SharedDelete += FileObject->SharedDelete; - } + KeAcquireSpinLock(&CancelSpinLock,Irql); } - /* * @implemented */ -NTSTATUS STDCALL -IoCheckShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess, - IN BOOLEAN Update) +PVOID +STDCALL +IoGetInitialStack(VOID) { - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (ReadAccess || WriteAccess || DeleteAccess) - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - if ((ReadAccess && (ShareAccess->SharedRead < ShareAccess->OpenCount)) || - (WriteAccess && (ShareAccess->SharedWrite < ShareAccess->OpenCount)) || - (DeleteAccess && (ShareAccess->SharedDelete < ShareAccess->OpenCount)) || - ((ShareAccess->Readers != 0) && !SharedRead) || - ((ShareAccess->Writers != 0) && !SharedWrite) || - ((ShareAccess->Deleters != 0) && !SharedDelete)) - { - return(STATUS_SHARING_VIOLATION); - } - - if (Update) - { - ShareAccess->OpenCount++; - - ShareAccess->Readers += ReadAccess; - ShareAccess->Writers += WriteAccess; - ShareAccess->Deleters += DeleteAccess; - ShareAccess->SharedRead += SharedRead; - ShareAccess->SharedWrite += SharedWrite; - ShareAccess->SharedDelete += SharedDelete; - } - } - - return(STATUS_SUCCESS); + return(PsGetCurrentThread()->Tcb.InitialStack); } - /* * @implemented */ -VOID STDCALL -IoRemoveShareAccess(IN PFILE_OBJECT FileObject, - IN PSHARE_ACCESS ShareAccess) +VOID +STDCALL +IoGetStackLimits(OUT PULONG LowLimit, + OUT PULONG HighLimit) { - PAGED_CODE(); - - if (FileObject->ReadAccess || - FileObject->WriteAccess || - FileObject->DeleteAccess) - { - ShareAccess->OpenCount--; - - ShareAccess->Readers -= FileObject->ReadAccess; - ShareAccess->Writers -= FileObject->WriteAccess; - ShareAccess->Deleters -= FileObject->DeleteAccess; - ShareAccess->SharedRead -= FileObject->SharedRead; - ShareAccess->SharedWrite -= FileObject->SharedWrite; - ShareAccess->SharedDelete -= FileObject->SharedDelete; - } + *LowLimit = (ULONG)NtCurrentTeb()->Tib.StackLimit; + *HighLimit = (ULONG)NtCurrentTeb()->Tib.StackBase; } - /* * @implemented */ -VOID STDCALL -IoSetShareAccess(IN ACCESS_MASK DesiredAccess, - IN ULONG DesiredShareAccess, - IN PFILE_OBJECT FileObject, - OUT PSHARE_ACCESS ShareAccess) +BOOLEAN +STDCALL +IoIsSystemThread(IN PETHREAD Thread) { - BOOLEAN ReadAccess; - BOOLEAN WriteAccess; - BOOLEAN DeleteAccess; - BOOLEAN SharedRead; - BOOLEAN SharedWrite; - BOOLEAN SharedDelete; - - PAGED_CODE(); - - ReadAccess = (DesiredAccess & (FILE_READ_DATA | FILE_EXECUTE)) != 0; - WriteAccess = (DesiredAccess & (FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0; - DeleteAccess = (DesiredAccess & DELETE) != 0; - - FileObject->ReadAccess = ReadAccess; - FileObject->WriteAccess = WriteAccess; - FileObject->DeleteAccess = DeleteAccess; - - if (!ReadAccess && !WriteAccess && !DeleteAccess) - { - ShareAccess->OpenCount = 0; - ShareAccess->Readers = 0; - ShareAccess->Writers = 0; - ShareAccess->Deleters = 0; - - ShareAccess->SharedRead = 0; - ShareAccess->SharedWrite = 0; - ShareAccess->SharedDelete = 0; - } - else - { - SharedRead = (DesiredShareAccess & FILE_SHARE_READ) != 0; - SharedWrite = (DesiredShareAccess & FILE_SHARE_WRITE) != 0; - SharedDelete = (DesiredShareAccess & FILE_SHARE_DELETE) != 0; - - FileObject->SharedRead = SharedRead; - FileObject->SharedWrite = SharedWrite; - FileObject->SharedDelete = SharedDelete; - - ShareAccess->OpenCount = 1; - ShareAccess->Readers = ReadAccess; - ShareAccess->Writers = WriteAccess; - ShareAccess->Deleters = DeleteAccess; - - ShareAccess->SharedRead = SharedRead; - ShareAccess->SharedWrite = SharedWrite; - ShareAccess->SharedDelete = SharedDelete; - } + /* Call the Ps Function */ + return PsIsSystemThread(Thread); } +/* + * @implemented + */ +BOOLEAN STDCALL +IoIsWdmVersionAvailable(IN UCHAR MajorVersion, + IN UCHAR MinorVersion) +{ + /* MinorVersion = 0x20 : WinXP + 0x10 : Win2k + 0x5 : WinMe + <0x5 : Win98 + + We report Win2k now + */ + if (MajorVersion <= 1 && MinorVersion <= 0x10) + return TRUE; + return FALSE; +} + +/* + * @implemented + */ +VOID +STDCALL +IoReleaseCancelSpinLock(KIRQL Irql) +{ + KeReleaseSpinLock(&CancelSpinLock,Irql); +} + +/* + * @implemented + */ +PEPROCESS +STDCALL +IoThreadToProcess(IN PETHREAD Thread) +{ + return(Thread->ThreadsProcess); +} /* * @implemented @@ -236,98 +147,52 @@ return(STATUS_NOT_IMPLEMENTED); } - /* * @unimplemented */ -NTSTATUS STDCALL -IoSetInformation(IN PFILE_OBJECT FileObject, - IN FILE_INFORMATION_CLASS FileInformationClass, - IN ULONG Length, - IN PVOID FileInformation) +NTSTATUS +STDCALL +IoValidateDeviceIoControlAccess(IN PIRP Irp, + IN ULONG RequiredAccess) { - IO_STATUS_BLOCK IoStatusBlock; - PIRP Irp; - PDEVICE_OBJECT DeviceObject; - PIO_STACK_LOCATION StackPtr; - NTSTATUS Status; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} - ASSERT(FileInformation != NULL); - - if (FileInformationClass == FileCompletionInformation) - { - return STATUS_NOT_IMPLEMENTED; - } - - - - Status = ObReferenceObjectByPointer(FileObject, - 0, /* FIXME - depends on the information class */ - IoFileObjectType, - KernelMode); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DPRINT("FileObject 0x%p\n", FileObject); - - DeviceObject = FileObject->DeviceObject; - - Irp = IoAllocateIrp(DeviceObject->StackSize, - TRUE); - if (Irp == NULL) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Trigger FileObject/Event dereferencing */ - Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = KernelMode; - Irp->AssociatedIrp.SystemBuffer = FileInformation; - Irp->UserIosb = &IoStatusBlock; - Irp->UserEvent = &FileObject->Event; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - KeResetEvent( &FileObject->Event ); - - StackPtr = IoGetNextIrpStackLocation(Irp); - StackPtr->MajorFunction = IRP_MJ_SET_INFORMATION; - StackPtr->MinorFunction = 0; - StackPtr->Flags = 0; - StackPtr->Control = 0; - StackPtr->DeviceObject = DeviceObject; - StackPtr->FileObject = FileObject; - StackPtr->Parameters.SetFile.FileInformationClass = FileInformationClass; - StackPtr->Parameters.SetFile.Length = Length; - - Status = IoCallDriver(FileObject->DeviceObject, Irp); - if (Status==STATUS_PENDING) - { - KeWaitForSingleObject(&FileObject->Event, - Executive, - KernelMode, - FileObject->Flags & FO_ALERTABLE_IO, - NULL); - Status = IoStatusBlock.Status; - } - - return Status; +/* + * @implemented + */ +VOID STDCALL +IoSetDeviceToVerify(IN PETHREAD Thread, + IN PDEVICE_OBJECT DeviceObject) +{ + Thread->DeviceToVerify = DeviceObject; } /* - * @unimplemented + * @implemented */ -BOOLEAN STDCALL -IoFastQueryNetworkAttributes(IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ACCESS_MASK DesiredAccess, - IN ULONG OpenOptions, - OUT PIO_STATUS_BLOCK IoStatus, - OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) +VOID STDCALL +IoSetHardErrorOrVerifyDevice(IN PIRP Irp, + IN PDEVICE_OBJECT DeviceObject) { - UNIMPLEMENTED; - return(FALSE); + Irp->Tail.Overlay.Thread->DeviceToVerify = DeviceObject; } +/* + * @implemented + */ +PDEVICE_OBJECT STDCALL +IoGetDeviceToVerify(IN PETHREAD Thread) +/* + * FUNCTION: Returns a pointer to the device, representing a removable-media + * device, that is the target of the given thread's I/O request + */ +{ + return(Thread->DeviceToVerify); +} + + + /* EOF */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Fri Jun 30 23:37:45 2006 @@ -189,7 +189,7 @@ <file>rawfs.c</file> <file>remlock.c</file> <file>resource.c</file> - <file>share.c</file> + <file>util.c</file> <file>symlink.c</file> <file>timer.c</file> <file>vpb.c</file>

1 0

[ion] 22726: [AUDIT] - These are yet more < 10 line wrappers. [FORMATTING] - Fixup file headers, formatting and some comments.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 23:09:39 2006 New Revision: 22726 URL: http://svn.reactos.org/svn/reactos?rev=22726&view=rev Log: [AUDIT] - These are yet more < 10 line wrappers. [FORMATTING] - Fixup file headers, formatting and some comments. Modified: trunk/reactos/ntoskrnl/io/adapter.c (contents, props changed) trunk/reactos/ntoskrnl/io/controller.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/io/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/adapter.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/io/adapter.c (original) +++ trunk/reactos/ntoskrnl/io/adapter.c Fri Jun 30 23:09:39 2006 @@ -1,11 +1,10 @@ -/* $Id$ - * - * 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/adapter.c - * PURPOSE: DMA handling - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for HAL Adapter APIs + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Filip Navara (navaraf(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -16,34 +15,35 @@ /* DATA **********************************************************************/ -POBJECT_TYPE IoAdapterObjectType = NULL; /* FIXME */ -POBJECT_TYPE IoDeviceHandlerObjectType = NULL; /* FIXME */ -ULONG IoDeviceHandlerObjectSize = 0; /* FIXME */ +POBJECT_TYPE IoAdapterObjectType; +POBJECT_TYPE IoDeviceHandlerObjectType; +ULONG IoDeviceHandlerObjectSize; /* FUNCTIONS *****************************************************************/ /* * @implemented */ -NTSTATUS STDCALL -IoAllocateAdapterChannel (PADAPTER_OBJECT AdapterObject, - PDEVICE_OBJECT DeviceObject, - ULONG NumberOfMapRegisters, - PDRIVER_CONTROL ExecutionRoutine, - PVOID Context) +NTSTATUS +NTAPI +IoAllocateAdapterChannel(IN PADAPTER_OBJECT AdapterObject, + IN PDEVICE_OBJECT DeviceObject, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine, + IN PVOID Context) { - DeviceObject->Queue.Wcb.DeviceObject = DeviceObject; - DeviceObject->Queue.Wcb.DeviceContext = Context; - DeviceObject->Queue.Wcb.CurrentIrp = DeviceObject->CurrentIrp; + PWAIT_CONTEXT_BLOCK Wcb = &DeviceObject->Queue.Wcb; - return HalAllocateAdapterChannel( AdapterObject, - &DeviceObject->Queue.Wcb, - NumberOfMapRegisters, - ExecutionRoutine); + /* Initialize the WCB */ + Wcb->DeviceObject = DeviceObject; + Wcb->DeviceContext = Context; + Wcb->CurrentIrp = DeviceObject->CurrentIrp; + + /* Call HAL */ + return HalAllocateAdapterChannel(AdapterObject, + Wcb, + NumberOfMapRegisters, + ExecutionRoutine); } - -/* NOTE: Missing IoXXXAdapter finctions in HAL.DLL */ - - /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/adapter.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/controller.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/controller.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/controller.c (original) +++ trunk/reactos/ntoskrnl/io/controller.c Fri Jun 30 23:09:39 2006 @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/contrller.c - * PURPOSE: Implements the controller object - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/controller.c + * PURPOSE: I/O Wrappers (called Controllers) for Kernel Device Queues + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -20,27 +19,16 @@ /* * @implemented - * - * FUNCTION: Sets up a call to a driver-supplied ControllerControl routine - * as soon as the device controller, represented by the given controller - * object, is available to carry out an I/O operation for the target device, - * represented by the given device object. - * ARGUMENTS: - * ControllerObject = Driver created controller object - * DeviceObject = Target device for the current irp - * ExecutionRoutine = Routine to be called when the device is available - * Context = Driver supplied context to be passed on to the above routine */ VOID -STDCALL -IoAllocateController(PCONTROLLER_OBJECT ControllerObject, - PDEVICE_OBJECT DeviceObject, - PDRIVER_CONTROL ExecutionRoutine, - PVOID Context) +NTAPI +IoAllocateController(IN PCONTROLLER_OBJECT ControllerObject, + IN PDEVICE_OBJECT DeviceObject, + IN PDRIVER_CONTROL ExecutionRoutine, + IN PVOID Context) { IO_ALLOCATION_ACTION Result; - - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT_IRQL(DISPATCH_LEVEL); /* Initialize the Wait Context Block */ DeviceObject->Queue.Wcb.DeviceContext = Context; @@ -50,36 +38,29 @@ if (!KeInsertDeviceQueue(&ControllerObject->DeviceWaitQueue, &DeviceObject->Queue.Wcb.WaitQueueEntry)); { + /* Call the execution routine */ Result = ExecutionRoutine(DeviceObject, DeviceObject->CurrentIrp, NULL, Context); - } - if (Result == DeallocateObject) - { - IoFreeController(ControllerObject); + /* Free the controller if this was requested */ + if (Result == DeallocateObject) IoFreeController(ControllerObject); } } /* * @implemented - * - * FUNCTION: Allocates memory and initializes a controller object - * ARGUMENTS: - * Size = Size (in bytes) to be allocated for the controller extension - * RETURNS: A pointer to the created object */ PCONTROLLER_OBJECT -STDCALL -IoCreateController(ULONG Size) - +NTAPI +IoCreateController(IN ULONG Size) { PCONTROLLER_OBJECT Controller; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE Handle; NTSTATUS Status; - ASSERT_IRQL(PASSIVE_LEVEL); + PAGED_CODE(); /* Initialize an empty OBA */ InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); @@ -123,15 +104,10 @@ /* * @implemented - * - * FUNCTION: Removes a given controller object from the system - * ARGUMENTS: - * ControllerObject = Controller object to be released */ VOID -STDCALL -IoDeleteController(PCONTROLLER_OBJECT ControllerObject) - +NTAPI +IoDeleteController(IN PCONTROLLER_OBJECT ControllerObject) { /* Just Dereference it */ ObDereferenceObject(ControllerObject); @@ -139,40 +115,33 @@ /* * @implemented - * - * FUNCTION: Releases a previously allocated controller object when a - * device has finished an I/O request - * ARGUMENTS: - * ControllerObject = Controller object to be released */ VOID -STDCALL -IoFreeController(PCONTROLLER_OBJECT ControllerObject) +NTAPI +IoFreeController(IN PCONTROLLER_OBJECT ControllerObject) { PKDEVICE_QUEUE_ENTRY QueueEntry; PDEVICE_OBJECT DeviceObject; IO_ALLOCATION_ACTION Result; /* Remove the Queue */ - if ((QueueEntry = KeRemoveDeviceQueue(&ControllerObject->DeviceWaitQueue))) + QueueEntry = KeRemoveDeviceQueue(&ControllerObject->DeviceWaitQueue); + if (QueueEntry) { /* Get the Device Object */ DeviceObject = CONTAINING_RECORD(QueueEntry, DEVICE_OBJECT, Queue.Wcb.WaitQueueEntry); + /* Call the routine */ Result = DeviceObject->Queue.Wcb.DeviceRoutine(DeviceObject, DeviceObject->CurrentIrp, NULL, - DeviceObject->Queue.Wcb.DeviceContext); - /* Check the result */ - if (Result == DeallocateObject) - { - /* Free it again */ - IoFreeController(ControllerObject); - } + DeviceObject-> + Queue.Wcb.DeviceContext); + /* Free the controller if this was requested */ + if (Result == DeallocateObject) IoFreeController(ControllerObject); } } - /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/controller.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22725: [FORMATTING] - Tabs->spaces and proper prototype formatting.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 23:01:01 2006 New Revision: 22725 URL: http://svn.reactos.org/svn/reactos?rev=22725&view=rev Log: [FORMATTING] - Tabs->spaces and proper prototype formatting. Modified: trunk/reactos/ntoskrnl/io/efi.c trunk/reactos/ntoskrnl/io/wmi.c Modified: trunk/reactos/ntoskrnl/io/efi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/efi.c?rev=2272… ============================================================================== --- trunk/reactos/ntoskrnl/io/efi.c (original) +++ trunk/reactos/ntoskrnl/io/efi.c Fri Jun 30 23:01:01 2006 @@ -1,107 +1,91 @@ /* - * 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/efi.c - * PURPOSE: EFI Unimplemented Function Calls - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PURPOSE: I/O Functions for EFI Machines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ #include <ntoskrnl.h> +#define NDEBUG #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ NTSTATUS -STDCALL -NtAddBootEntry( - IN PUNICODE_STRING EntryName, - IN PUNICODE_STRING EntryValue - ) +NTAPI +NtAddBootEntry(IN PUNICODE_STRING EntryName, + IN PUNICODE_STRING EntryValue) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS -STDCALL -NtDeleteBootEntry( - IN PUNICODE_STRING EntryName, - IN PUNICODE_STRING EntryValue - ) +NTAPI +NtDeleteBootEntry(IN PUNICODE_STRING EntryName, + IN PUNICODE_STRING EntryValue) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS -STDCALL -NtEnumerateBootEntries( - IN PVOID Buffer, - IN PULONG BufferLength - ) +NTAPI +NtEnumerateBootEntries(IN PVOID Buffer, + IN PULONG BufferLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS -STDCALL -NtQueryBootEntryOrder( - IN PULONG Ids, - IN PULONG Count - ) +NTAPI +NtQueryBootEntryOrder(IN PULONG Ids, + IN PULONG Count) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS -STDCALL -NtQueryBootOptions( - IN PBOOT_OPTIONS BootOptions, - IN PULONG BootOptionsLength - ) +NTAPI +NtQueryBootOptions(IN PBOOT_OPTIONS BootOptions, + IN PULONG BootOptionsLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS -STDCALL -NtSetBootEntryOrder( - IN PULONG Ids, - IN PULONG Count - ) +NTAPI +NtSetBootEntryOrder(IN PULONG Ids, + IN PULONG Count) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS -STDCALL -NtSetBootOptions( - IN PBOOT_OPTIONS BootOptions, - IN ULONG FieldsToChange - ) +NTAPI +NtSetBootOptions(IN PBOOT_OPTIONS BootOptions, + IN ULONG FieldsToChange) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS -STDCALL -NtTranslateFilePath( - PFILE_PATH InputFilePath, - ULONG OutputType, - PFILE_PATH OutputFilePath, - ULONG OutputFilePathLength - ) +NTAPI +NtTranslateFilePath(PFILE_PATH InputFilePath, + ULONG OutputType, + PFILE_PATH OutputFilePath, + ULONG OutputFilePathLength) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } /* EOF */ Modified: trunk/reactos/ntoskrnl/io/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/wmi.c?rev=2272… ============================================================================== --- trunk/reactos/ntoskrnl/io/wmi.c (original) +++ trunk/reactos/ntoskrnl/io/wmi.c Fri Jun 30 23:01:01 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * 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/wmi.c - * PURPOSE: Windows Management Instrumentation - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PURPOSE: I/O Windows Management Instrumentation (WMI) Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -20,240 +18,212 @@ * @unimplemented */ NTSTATUS -STDCALL -IoWMIRegistrationControl( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG Action - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIAllocateInstanceIds( - IN GUID *Guid, - IN ULONG InstanceCount, - OUT ULONG *FirstInstanceId - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMISuggestInstanceName( - IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, - IN PUNICODE_STRING SymbolicLinkName OPTIONAL, - IN BOOLEAN CombineNames, - OUT PUNICODE_STRING SuggestedInstanceName - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIWriteEvent( - IN PVOID WnodeEventItem - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL IoWMIOpenBlock( - IN GUID *DataBlockGuid, - IN ULONG DesiredAccess, - OUT PVOID *DataBlockObject - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL IoWMIQueryAllData( - IN PVOID DataBlockObject, - IN OUT ULONG *InOutBufferSize, - OUT PVOID OutBuffer -) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIQueryAllDataMultiple( - IN PVOID *DataBlockObjectList, - IN ULONG ObjectCount, - IN OUT ULONG *InOutBufferSize, - OUT PVOID OutBuffer -) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIQuerySingleInstance( - IN PVOID DataBlockObject, - IN PUNICODE_STRING InstanceName, - IN OUT ULONG *InOutBufferSize, - OUT PVOID OutBuffer -) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIQuerySingleInstanceMultiple( - IN PVOID *DataBlockObjectList, - IN PUNICODE_STRING InstanceNames, - IN ULONG ObjectCount, - IN OUT ULONG *InOutBufferSize, - OUT PVOID OutBuffer -) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMISetSingleInstance( - IN PVOID DataBlockObject, - IN PUNICODE_STRING InstanceName, - IN ULONG Version, - IN ULONG ValueBufferSize, - IN PVOID ValueBuffer - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMISetSingleItem( - IN PVOID DataBlockObject, - IN PUNICODE_STRING InstanceName, - IN ULONG DataItemId, - IN ULONG Version, - IN ULONG ValueBufferSize, - IN PVOID ValueBuffer - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIExecuteMethod( - IN PVOID DataBlockObject, - IN PUNICODE_STRING InstanceName, - IN ULONG MethodId, - IN ULONG InBufferSize, - IN OUT PULONG OutBufferSize, - IN OUT PUCHAR InOutBuffer - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMISetNotificationCallback( - IN PVOID Object, - IN WMI_NOTIFICATION_CALLBACK Callback, - IN PVOID Context - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIHandleToInstanceName( - IN PVOID DataBlockObject, - IN HANDLE FileHandle, - OUT PUNICODE_STRING InstanceName - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoWMIDeviceObjectToInstanceName( - IN PVOID DataBlockObject, - IN PDEVICE_OBJECT DeviceObject, - OUT PUNICODE_STRING InstanceName - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL +NTAPI +IoWMIRegistrationControl(IN PDEVICE_OBJECT DeviceObject, + IN ULONG Action) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIAllocateInstanceIds(IN GUID *Guid, + IN ULONG InstanceCount, + OUT ULONG *FirstInstanceId) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMISuggestInstanceName(IN PDEVICE_OBJECT PhysicalDeviceObject OPTIONAL, + IN PUNICODE_STRING SymbolicLinkName OPTIONAL, + IN BOOLEAN CombineNames, + OUT PUNICODE_STRING SuggestedInstanceName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIWriteEvent(IN PVOID WnodeEventItem) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIOpenBlock(IN GUID *DataBlockGuid, + IN ULONG DesiredAccess, + OUT PVOID *DataBlockObject) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIQueryAllData(IN PVOID DataBlockObject, + IN OUT ULONG *InOutBufferSize, + OUT PVOID OutBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIQueryAllDataMultiple(IN PVOID *DataBlockObjectList, + IN ULONG ObjectCount, + IN OUT ULONG *InOutBufferSize, + OUT PVOID OutBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIQuerySingleInstance(IN PVOID DataBlockObject, + IN PUNICODE_STRING InstanceName, + IN OUT ULONG *InOutBufferSize, + OUT PVOID OutBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIQuerySingleInstanceMultiple(IN PVOID *DataBlockObjectList, + IN PUNICODE_STRING InstanceNames, + IN ULONG ObjectCount, + IN OUT ULONG *InOutBufferSize, + OUT PVOID OutBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMISetSingleInstance(IN PVOID DataBlockObject, + IN PUNICODE_STRING InstanceName, + IN ULONG Version, + IN ULONG ValueBufferSize, + IN PVOID ValueBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMISetSingleItem(IN PVOID DataBlockObject, + IN PUNICODE_STRING InstanceName, + IN ULONG DataItemId, + IN ULONG Version, + IN ULONG ValueBufferSize, + IN PVOID ValueBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIExecuteMethod(IN PVOID DataBlockObject, + IN PUNICODE_STRING InstanceName, + IN ULONG MethodId, + IN ULONG InBufferSize, + IN OUT PULONG OutBufferSize, + IN OUT PUCHAR InOutBuffer) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMISetNotificationCallback(IN PVOID Object, + IN WMI_NOTIFICATION_CALLBACK Callback, + IN PVOID Context) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIHandleToInstanceName(IN PVOID DataBlockObject, + IN HANDLE FileHandle, + OUT PUNICODE_STRING InstanceName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoWMIDeviceObjectToInstanceName(IN PVOID DataBlockObject, + IN PDEVICE_OBJECT DeviceObject, + OUT PUNICODE_STRING InstanceName) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI NtTraceEvent(IN ULONG TraceHandle, IN ULONG Flags, IN ULONG TraceHeaderLength,

1 0

[ion] 22724: [AUDIT] - Irq.c is another lame wrapper. - Remlock's code was written by Filip Navara and is clean. My additions are based on wdm.h and only add size checks and fix two visible bugs. - Add basic support/detection for debug I/O remove blocks (we bugcheck if we identify one though). - Simplify IoReleaseRemoveLockAndWaitEx - Remove locks are SYNCH events, not Notification events! - Make sure IoConnectInterrupt returns NULL to the caller on failure.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 22:54:34 2006 New Revision: 22724 URL: http://svn.reactos.org/svn/reactos?rev=22724&view=rev Log: [AUDIT] - Irq.c is another lame wrapper. - Remlock's code was written by Filip Navara and is clean. My additions are based on wdm.h and only add size checks and fix two visible bugs. - Add basic support/detection for debug I/O remove blocks (we bugcheck if we identify one though). - Simplify IoReleaseRemoveLockAndWaitEx - Remove locks are SYNCH events, not Notification events! - Make sure IoConnectInterrupt returns NULL to the caller on failure. Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/irq.c (contents, props changed) trunk/reactos/ntoskrnl/io/remlock.c (contents, props changed) 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 22:54:34 2006 @@ -207,6 +207,27 @@ PIO_WORKITEM_ROUTINE WorkerRoutine; PVOID Context; } IO_WORKITEM, *PIO_WORKITEM; + +// +// I/O Wrapper around the Kernel Interrupt +// +typedef struct _IO_INTERRUPT +{ + KINTERRUPT FirstInterrupt; + PKINTERRUPT Interrupt[MAXIMUM_PROCESSORS]; + KSPIN_LOCK SpinLock; +} IO_INTERRUPT, *PIO_INTERRUPT; + +// +// To simplify matters, the kernel is made to support both the checked and free +// version of the I/O Remove Lock in the same binary. This structure includes +// both, since the DDK has the structure with a compile-time #ifdef. +// +typedef struct _EXTENDED_IO_REMOVE_LOCK +{ + IO_REMOVE_LOCK_COMMON_BLOCK Common; + IO_REMOVE_LOCK_DBG_BLOCK Dbg; +} EXTENDED_IO_REMOVE_LOCK, *PEXTENDED_IO_REMOVE_LOCK; // // Dummy File Object used inside the Open Packet so that OB knows how to Modified: trunk/reactos/ntoskrnl/io/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/irq.c?rev=2272… ============================================================================== --- trunk/reactos/ntoskrnl/io/irq.c (original) +++ trunk/reactos/ntoskrnl/io/irq.c Fri Jun 30 22:54:34 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * 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/irq.c - * PURPOSE: IRQ handling - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers (called Completion Ports) for Kernel Queues + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -14,58 +12,24 @@ #define NDEBUG #include <internal/debug.h> -/* TYPES ********************************************************************/ -typedef struct _IO_INTERRUPT -{ - KINTERRUPT FirstInterrupt; - PKINTERRUPT Interrupt[MAXIMUM_PROCESSORS]; - KSPIN_LOCK SpinLock; -} IO_INTERRUPT, *PIO_INTERRUPT; - /* FUNCTIONS *****************************************************************/ /* - * FUNCTION: Registers a driver's isr to be called when its device interrupts - * ARGUMENTS: - * InterruptObject (OUT) = Points to the interrupt object created on - * return - * ServiceRoutine = Routine to be called when the device interrupts - * ServiceContext = Parameter to be passed to ServiceRoutine - * SpinLock = Initalized spinlock that will be used to synchronize - * access between the isr and other driver routines. This is - * required if the isr handles more than one vector or the - * driver has more than one isr - * Vector = Interrupt vector to allocate - * (returned from HalGetInterruptVector) - * Irql = DIRQL returned from HalGetInterruptVector - * SynchronizeIrql = DIRQL at which the isr will execute. This must - * be the highest of all the DIRQLs returned from - * HalGetInterruptVector if the driver has multiple - * isrs - * InterruptMode = Specifies if the interrupt is LevelSensitive or - * Latched - * ShareVector = Specifies if the vector can be shared - * ProcessorEnableMask = Processors on the isr can run - * FloatingSave = TRUE if the floating point stack should be saved when - * the isr runs. Must be false for x86 drivers - * RETURNS: Status - * IRQL: PASSIVE_LEVEL - * * @implemented */ -NTSTATUS -STDCALL -IoConnectInterrupt(PKINTERRUPT* InterruptObject, - PKSERVICE_ROUTINE ServiceRoutine, - PVOID ServiceContext, - PKSPIN_LOCK SpinLock, - ULONG Vector, - KIRQL Irql, - KIRQL SynchronizeIrql, - KINTERRUPT_MODE InterruptMode, - BOOLEAN ShareVector, - KAFFINITY ProcessorEnableMask, - BOOLEAN FloatingSave) +NTSTATUS +NTAPI +IoConnectInterrupt(OUT PKINTERRUPT *InterruptObject, + IN PKSERVICE_ROUTINE ServiceRoutine, + IN PVOID ServiceContext, + IN PKSPIN_LOCK SpinLock, + IN ULONG Vector, + IN KIRQL Irql, + IN KIRQL SynchronizeIrql, + IN KINTERRUPT_MODE InterruptMode, + IN BOOLEAN ShareVector, + IN KAFFINITY ProcessorEnableMask, + IN BOOLEAN FloatingSave) { PKINTERRUPT Interrupt; PKINTERRUPT InterruptUsed; @@ -74,10 +38,10 @@ BOOLEAN FirstRun = TRUE; ULONG count; LONG i; - PAGED_CODE(); - DPRINT("IoConnectInterrupt(Vector %x)\n",Vector); + /* Assume failure */ + *InterruptObject = NULL; /* Convert the Mask */ ProcessorEnableMask &= ((1 << KeNumberProcessors) - 1); @@ -90,32 +54,25 @@ { if (ProcessorEnableMask & (1 << i)) count++; } - + /* Allocate the array of I/O Interrupts */ IoInterrupt = ExAllocatePoolWithTag(NonPagedPool, (count - 1)* sizeof(KINTERRUPT) + sizeof(IO_INTERRUPT), TAG_KINTERRUPT); - if (!IoInterrupt) return(STATUS_INSUFFICIENT_RESOURCES); + if (!IoInterrupt) return STATUS_INSUFFICIENT_RESOURCES; /* Select which Spinlock to use */ - if (SpinLock) - { - SpinLockUsed = SpinLock; - } - else - { - SpinLockUsed = &IoInterrupt->SpinLock; - } - + SpinLockUsed = SpinLock ? SpinLock : &IoInterrupt->SpinLock; + /* We first start with a built-in Interrupt inside the I/O Structure */ *InterruptObject = &IoInterrupt->FirstInterrupt; Interrupt = (PKINTERRUPT)(IoInterrupt + 1); FirstRun = TRUE; - + /* Start with a fresh structure */ RtlZeroMemory(IoInterrupt, sizeof(IO_INTERRUPT)); - + /* Now create all the interrupts */ for (i = 0; i < KeNumberProcessors; i++) { @@ -124,7 +81,7 @@ { /* Check which one we will use */ InterruptUsed = FirstRun ? &IoInterrupt->FirstInterrupt : Interrupt; - + /* Initialize it */ KeInitializeInterrupt(InterruptUsed, ServiceRoutine, @@ -137,7 +94,7 @@ ShareVector, i, FloatingSave); - + /* Connect it */ if (!KeConnectInterrupt(InterruptUsed)) { @@ -152,9 +109,11 @@ /* Far enough, so disconnect everything */ IoDisconnectInterrupt(&IoInterrupt->FirstInterrupt); } + + /* And fail */ return STATUS_INVALID_PARAMETER; } - + /* Now we've used up our First Run */ if (FirstRun) { @@ -173,39 +132,35 @@ } /* - * FUNCTION: Releases a drivers isr - * ARGUMENTS: - * InterruptObject = isr to release - * * @implemented */ VOID -STDCALL +NTAPI IoDisconnectInterrupt(PKINTERRUPT InterruptObject) - { LONG i; PIO_INTERRUPT IoInterrupt; - PAGED_CODE(); - + /* Get the I/O Interrupt */ - IoInterrupt = CONTAINING_RECORD(InterruptObject, - IO_INTERRUPT, + IoInterrupt = CONTAINING_RECORD(InterruptObject, + IO_INTERRUPT, FirstInterrupt); - + /* Disconnect the first one */ KeDisconnectInterrupt(&IoInterrupt->FirstInterrupt); /* Now disconnect the others */ for (i = 0; i < KeNumberProcessors; i++) { + /* Make sure one was registered */ if (IoInterrupt->Interrupt[i]) { + /* Disconnect it */ KeDisconnectInterrupt(&InterruptObject[i]); } } - + /* Free the I/O Interrupt */ ExFreePool(IoInterrupt); } Propchange: trunk/reactos/ntoskrnl/io/irq.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/remlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/remlock.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/io/remlock.c (original) +++ trunk/reactos/ntoskrnl/io/remlock.c Fri Jun 30 22:54:34 2006 @@ -1,17 +1,16 @@ -/* $Id$ - * - * 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/remlock.c - * PURPOSE: Remove Lock functions - * - * PROGRAMMERS: Filip Navara (xnavara(a)volny.cz) + * PURPOSE: Remove Lock Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Filip Navara (navaraf(a)reactos.org) */ /* INCLUDES ******************************************************************/ +#include <ntoskrnl.h> #define NDEBUG -#include <ntoskrnl.h> #include <internal/debug.h> /* FUNCTIONS *****************************************************************/ @@ -20,81 +19,139 @@ * @implemented */ VOID -STDCALL -IoInitializeRemoveLockEx( - IN PIO_REMOVE_LOCK RemoveLock, - IN ULONG AllocateTag, - IN ULONG MaxLockedMinutes, - IN ULONG HighWatermark, - IN ULONG RemlockSize) +NTAPI +IoInitializeRemoveLockEx(IN PIO_REMOVE_LOCK RemoveLock, + IN ULONG AllocateTag, + IN ULONG MaxLockedMinutes, + IN ULONG HighWatermark, + IN ULONG RemlockSize) { - DPRINT("IoInitializeRemoveLockEx called\n"); - RtlZeroMemory(RemoveLock, RemlockSize); - RemoveLock->Common.IoCount = 1; - KeInitializeEvent(&RemoveLock->Common.RemoveEvent, NotificationEvent, FALSE); + PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; + PAGED_CODE(); + + /* Check if this is a debug lock */ + if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + { + /* Clear the lock */ + RtlZeroMemory(Lock, RemlockSize); + + /* Setup debug parameters */ + Lock->Dbg.HighWatermark = HighWatermark; + Lock->Dbg.MaxLockedTicks = MaxLockedMinutes * 600000000; + Lock->Dbg.AllocateTag = AllocateTag; + KeInitializeSpinLock(&Lock->Dbg.Spin); + } + else + { + /* Otherwise, setup a free block */ + Lock->Common.Removed = FALSE; + Lock->Common.IoCount = 1; + KeInitializeEvent(&Lock->Common.RemoveEvent, + SynchronizationEvent, + FALSE); + } } /* * @implemented */ NTSTATUS -STDCALL -IoAcquireRemoveLockEx( - IN PIO_REMOVE_LOCK RemoveLock, - IN OPTIONAL PVOID Tag, - IN LPCSTR File, - IN ULONG Line, - IN ULONG RemlockSize) +NTAPI +IoAcquireRemoveLockEx(IN PIO_REMOVE_LOCK RemoveLock, + IN OPTIONAL PVOID Tag, + IN LPCSTR File, + IN ULONG Line, + IN ULONG RemlockSize) { - DPRINT("IoAcquireRemoveLockEx called\n"); - InterlockedIncrement(&RemoveLock->Common.IoCount); - if (RemoveLock->Common.Removed) - { - if (InterlockedDecrement(&RemoveLock->Common.IoCount) == 0) + PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; + + /* Increase the lock count */ + InterlockedIncrement(&Lock->Common.IoCount); + if (!Lock->Common.Removed) { - KeSetEvent(&RemoveLock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE); + /* Check what kind of lock this is */ + if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + { + /* FIXME: Not yet supported */ + DPRINT1("UNIMPLEMENTED\n"); + KEBUGCHECK(0); + } } - return STATUS_DELETE_PENDING; - } - return STATUS_SUCCESS; + else + { + /* Otherwise, decrement the count and check if it's gone */ + if (!InterlockedDecrement(&Lock->Common.IoCount)) + { + /* Signal the event */ + KeSetEvent(&Lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE); + } + + /* Return pending delete */ + return STATUS_DELETE_PENDING; + } + + /* Otherwise, return success */ + return STATUS_SUCCESS; } /* * @implemented */ VOID -STDCALL -IoReleaseRemoveLockEx( - IN PIO_REMOVE_LOCK RemoveLock, - IN PVOID Tag, - IN ULONG RemlockSize) +NTAPI +IoReleaseRemoveLockEx(IN PIO_REMOVE_LOCK RemoveLock, + IN PVOID Tag, + IN ULONG RemlockSize) { - LONG IoCount; + PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; - DPRINT("IoReleaseRemoveLockEx called\n"); - IoCount = InterlockedDecrement(&RemoveLock->Common.IoCount); - if (IoCount == 0) - { - KeSetEvent(&RemoveLock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE); - } + /* Check what kind of lock this is */ + if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + { + /* FIXME: Not yet supported */ + DPRINT1("UNIMPLEMENTED\n"); + KEBUGCHECK(0); + } + + /* Decrement the lock count */ + if (!InterlockedDecrement(&Lock->Common.IoCount)); + { + /* Signal the event */ + KeSetEvent(&Lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE); + } } /* * @implemented */ VOID -STDCALL -IoReleaseRemoveLockAndWaitEx( - IN PIO_REMOVE_LOCK RemoveLock, - IN PVOID Tag, - IN ULONG RemlockSize) +NTAPI +IoReleaseRemoveLockAndWaitEx(IN PIO_REMOVE_LOCK RemoveLock, + IN PVOID Tag, + IN ULONG RemlockSize) { - DPRINT("IoReleaseRemoveLockAndWaitEx called\n"); - RemoveLock->Common.Removed = TRUE; - InterlockedDecrement(&RemoveLock->Common.IoCount); - IoReleaseRemoveLockEx(RemoveLock, Tag, RemlockSize); - KeWaitForSingleObject(&RemoveLock->Common.RemoveEvent, Executive, KernelMode, - FALSE, NULL); + PEXTENDED_IO_REMOVE_LOCK Lock = (PEXTENDED_IO_REMOVE_LOCK)RemoveLock; + PAGED_CODE(); + + /* Remove the lock and decrement the count */ + Lock->Common.Removed = TRUE; + if (InterlockedDecrement(&Lock->Common.IoCount) > 0) + { + /* Wait for it */ + KeWaitForSingleObject(&Lock->Common.RemoveEvent, + Executive, + KernelMode, + FALSE, + NULL); + } + + /* Check what kind of lock this is */ + if (RemlockSize == sizeof(IO_REMOVE_LOCK_DBG_BLOCK)) + { + /* FIXME: Not yet supported */ + DPRINT1("UNIMPLEMENTED\n"); + KEBUGCHECK(0); + } } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/remlock.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22723: [AUDIT] - iocomp.c, event.c, iowork.c, mdl.c, timer.c, symlink.c are all simple wrappers around either executive, kernel or object manager code, and they are trivial implementations usually less then 10 lines and heavily documented in public sources.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 22:16:27 2006 New Revision: 22723 URL: http://svn.reactos.org/svn/reactos?rev=22723&view=rev Log: [AUDIT] - iocomp.c, event.c, iowork.c, mdl.c, timer.c, symlink.c are all simple wrappers around either executive, kernel or object manager code, and they are trivial implementations usually less then 10 lines and heavily documented in public sources. Modified: trunk/reactos/ntoskrnl/io/iocomp.c (props changed) Propchange: trunk/reactos/ntoskrnl/io/iocomp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22722: - Io*SymbolicLink should use OBJ_CASE_INSENSITIVE - Use DELETE instead of SYMBOLIC_LINK_ALL_ACCESS when deleting. - Fix formatting in timer.c - Clear the IO_TIMER structure when creating it.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 22:14:54 2006 New Revision: 22722 URL: http://svn.reactos.org/svn/reactos?rev=22722&view=rev Log: - Io*SymbolicLink should use OBJ_CASE_INSENSITIVE - Use DELETE instead of SYMBOLIC_LINK_ALL_ACCESS when deleting. - Fix formatting in timer.c - Clear the IO_TIMER structure when creating it. Modified: trunk/reactos/ntoskrnl/io/iocomp.c trunk/reactos/ntoskrnl/io/symlink.c (contents, props changed) trunk/reactos/ntoskrnl/io/timer.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iocomp.c Fri Jun 30 22:14:54 2006 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/io/event.c - * PURPOSE: I/O Wrappers for the Executive Event Functions + * FILE: ntoskrnl/io/iocomp.c + * PURPOSE: I/O Wrappers (called Completion Ports) for Kernel Queues * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Thomas Weidenmueller (w3seek(a)reactos.org) */ Modified: trunk/reactos/ntoskrnl/io/symlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/symlink.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/io/symlink.c (original) +++ trunk/reactos/ntoskrnl/io/symlink.c Fri Jun 30 22:14:54 2006 @@ -1,11 +1,10 @@ -/* $Id$ - * - * 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/symlink.c - * PURPOSE: Implements symbolic links - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for Symbolic Links + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -14,170 +13,106 @@ #define NDEBUG #include <internal/debug.h> - /* FUNCTIONS ****************************************************************/ -/********************************************************************** - * NAME EXPORTED - * IoCreateSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * +/* * @implemented */ -NTSTATUS STDCALL -IoCreateSymbolicLink(PUNICODE_STRING SymbolicLinkName, - PUNICODE_STRING DeviceName) +NTSTATUS +NTAPI +IoCreateSymbolicLink(IN PUNICODE_STRING SymbolicLinkName, + IN PUNICODE_STRING DeviceName) { - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); + /* Initialize the object attributes and create the link */ + InitializeObjectAttributes(&ObjectAttributes, + SymbolicLinkName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + NULL, + SePublicDefaultSd); + Status = ZwCreateSymbolicLinkObject(&Handle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + DeviceName); + if (NT_SUCCESS(Status)) ZwClose(Handle); - DPRINT("IoCreateSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n", - SymbolicLinkName, - DeviceName); - - InitializeObjectAttributes(&ObjectAttributes, - SymbolicLinkName, - OBJ_PERMANENT, - NULL, - SePublicDefaultSd); - - Status = ZwCreateSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - DeviceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwCreateSymbolicLinkObject() failed (Status %lx)\n", Status); - return(Status); - } - - ZwClose(Handle); - - return(STATUS_SUCCESS); + /* Return status */ + return Status; } - -/********************************************************************** - * NAME EXPORTED - * IoCreateUnprotectedSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * +/* * @implemented */ -NTSTATUS STDCALL -IoCreateUnprotectedSymbolicLink(PUNICODE_STRING SymbolicLinkName, - PUNICODE_STRING DeviceName) +NTSTATUS +NTAPI +IoCreateUnprotectedSymbolicLink(IN PUNICODE_STRING SymbolicLinkName, + IN PUNICODE_STRING DeviceName) { - SECURITY_DESCRIPTOR SecurityDescriptor; - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - NTSTATUS Status; + SECURITY_DESCRIPTOR SecurityDescriptor; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); + /* Create an SD */ + Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, + SECURITY_DESCRIPTOR_REVISION); + if (!NT_SUCCESS(Status)) return Status; - DPRINT("IoCreateUnprotectedSymbolicLink(SymbolicLinkName %wZ, DeviceName %wZ)\n", - SymbolicLinkName, - DeviceName); + /* Set the DACL */ + Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, + TRUE, + NULL, + TRUE); + if (!NT_SUCCESS(Status)) return Status; - Status = RtlCreateSecurityDescriptor(&SecurityDescriptor, - SECURITY_DESCRIPTOR_REVISION); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlCreateSecurityDescriptor() failed (Status %lx)\n", Status); - return(Status); - } + /* Initialize the object attributes and create the link */ + InitializeObjectAttributes(&ObjectAttributes, + SymbolicLinkName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + NULL, + &SecurityDescriptor); + Status = ZwCreateSymbolicLinkObject(&Handle, + SYMBOLIC_LINK_ALL_ACCESS, + &ObjectAttributes, + DeviceName); + if (NT_SUCCESS(Status)) ZwClose(Handle); - Status = RtlSetDaclSecurityDescriptor(&SecurityDescriptor, - TRUE, - NULL, - TRUE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("RtlSetDaclSecurityDescriptor() failed (Status %lx)\n", Status); - return(Status); - } - - InitializeObjectAttributes(&ObjectAttributes, - SymbolicLinkName, - OBJ_PERMANENT, - NULL, - &SecurityDescriptor); - - Status = ZwCreateSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes, - DeviceName); - if (!NT_SUCCESS(Status)) - { - DPRINT1("ZwCreateSymbolicLinkObject() failed (Status %lx)\n", Status); - return(Status); - } - - ZwClose(Handle); - - return(STATUS_SUCCESS); + /* Return status */ + return Status; } - -/********************************************************************** - * NAME EXPORTED - * IoDeleteSymbolicLink - * - * DESCRIPTION - * - * ARGUMENTS - * - * RETURN VALUE - * - * REVISIONS - * +/* * @implemented */ -NTSTATUS STDCALL -IoDeleteSymbolicLink(PUNICODE_STRING SymbolicLinkName) +NTSTATUS +NTAPI +IoDeleteSymbolicLink(IN PUNICODE_STRING SymbolicLinkName) { - OBJECT_ATTRIBUTES ObjectAttributes; - HANDLE Handle; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); - ASSERT_IRQL(PASSIVE_LEVEL); + /* Initialize the object attributes and open the link */ + InitializeObjectAttributes(&ObjectAttributes, + SymbolicLinkName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = ZwOpenSymbolicLinkObject(&Handle, DELETE, &ObjectAttributes); + if (!NT_SUCCESS(Status)) return Status; - DPRINT("IoDeleteSymbolicLink (SymbolicLinkName %S)\n", - SymbolicLinkName->Buffer); + /* Make the link temporary and close its handle */ + Status = ZwMakeTemporaryObject(Handle); + if (NT_SUCCESS(Status)) ZwClose(Handle); - InitializeObjectAttributes(&ObjectAttributes, - SymbolicLinkName, - OBJ_OPENLINK, - NULL, - NULL); - - Status = ZwOpenSymbolicLinkObject(&Handle, - SYMBOLIC_LINK_ALL_ACCESS, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - return(Status); - - Status = ZwMakeTemporaryObject(Handle); - ZwClose(Handle); - - return(Status); + /* Return status */ + return Status; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/symlink.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/timer.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/timer.c (original) +++ trunk/reactos/ntoskrnl/io/timer.c Fri Jun 30 22:14:54 2006 @@ -1,12 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/timer.c - * PURPOSE: IO timers - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Alex Ionescu (alex(a)relsoft.net) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/iocomp.c + * PURPOSE: I/O Wrappers for Executive Timers + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -28,196 +25,181 @@ /* Keep count of how many timers we have */ ULONG IopTimerCount = 0; -/* FUNCTIONS *****************************************************************/ - -static VOID STDCALL +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI IopTimerDispatch(IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - KIRQL OldIrql; - PLIST_ENTRY TimerEntry; - PIO_TIMER Timer; - ULONG i; - - DPRINT("Dispatching IO Timers. There are: %x \n", IopTimerCount); - - /* Check if any Timers are actualyl enabled as of now */ - if (IopTimerCount) { - - /* Lock the Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* Call the Timer Routine of each enabled Timer */ - for(TimerEntry = IopTimerQueueHead.Flink, i = IopTimerCount; - (TimerEntry != &IopTimerQueueHead) && i; - TimerEntry = TimerEntry->Flink) { - - Timer = CONTAINING_RECORD(TimerEntry, IO_TIMER, IoTimerList); - if (Timer->TimerEnabled) { - DPRINT("Dispatching a Timer Routine: 0x%p for Device Object: 0x%p \n", - Timer->TimerRoutine, - Timer->DeviceObject); - Timer->TimerRoutine(Timer->DeviceObject, Timer->Context); - i--; - } - } - - /* Unlock the Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); - } -} - -VOID -STDCALL -IopRemoveTimerFromTimerList( - IN PIO_TIMER Timer -) -{ - KIRQL OldIrql; - - /* Lock Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* Remove Timer from the List and Drop the Timer Count if Enabled */ - RemoveEntryList(&Timer->IoTimerList); - if (Timer->TimerEnabled) IopTimerCount--; - - /* Unlock the Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + KIRQL OldIrql; + PLIST_ENTRY TimerEntry; + PIO_TIMER Timer; + ULONG i; + + /* Check if any Timers are actualyl enabled as of now */ + if (IopTimerCount) + { + /* Lock the Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Call the Timer Routine of each enabled Timer */ + for (TimerEntry = IopTimerQueueHead.Flink, i = IopTimerCount; + (TimerEntry != &IopTimerQueueHead) && i; + TimerEntry = TimerEntry->Flink) + { + /* Get the timer and check if it's enabled */ + Timer = CONTAINING_RECORD(TimerEntry, IO_TIMER, IoTimerList); + if (Timer->TimerEnabled) + { + /* Call the timer routine */ + Timer->TimerRoutine(Timer->DeviceObject, Timer->Context); + i--; + } + } + + /* Unlock the Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); + } +} + +VOID +NTAPI +IopRemoveTimerFromTimerList(IN PIO_TIMER Timer) +{ + KIRQL OldIrql; + + /* Lock Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Remove Timer from the List and Drop the Timer Count if Enabled */ + RemoveEntryList(&Timer->IoTimerList); + if (Timer->TimerEnabled) IopTimerCount--; + + /* Unlock the Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); } VOID FASTCALL IopInitTimerImplementation(VOID) -/* FUNCTION: Initializes the IO Timer Object Implementation - * RETURNS: NOTHING - */ -{ - LARGE_INTEGER ExpireTime; - - /* Initialize Timer List Lock */ - KeInitializeSpinLock(&IopTimerLock); - - /* Initialize Timer List */ - InitializeListHead(&IopTimerQueueHead); - - /* Initialize the DPC/Timer which will call the other Timer Routines */ - ExpireTime.QuadPart = -10000000; - KeInitializeDpc(&IopTimerDpc, IopTimerDispatch, NULL); - KeInitializeTimerEx(&IopTimer, SynchronizationTimer); - KeSetTimerEx(&IopTimer, ExpireTime, 1000, &IopTimerDpc); -} +{ + LARGE_INTEGER ExpireTime; + + /* Initialize Timer List Lock */ + KeInitializeSpinLock(&IopTimerLock); + + /* Initialize Timer List */ + InitializeListHead(&IopTimerQueueHead); + + /* Initialize the DPC/Timer which will call the other Timer Routines */ + ExpireTime.QuadPart = -10000000; + KeInitializeDpc(&IopTimerDpc, IopTimerDispatch, NULL); + KeInitializeTimerEx(&IopTimer, SynchronizationTimer); + KeSetTimerEx(&IopTimer, ExpireTime, 1000, &IopTimerDpc); +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ NTSTATUS -STDCALL -IoInitializeTimer(PDEVICE_OBJECT DeviceObject, - PIO_TIMER_ROUTINE TimerRoutine, - PVOID Context) -/* - * FUNCTION: Sets up a driver-supplied IoTimer routine associated with a given - * device object - * ARGUMENTS: - * DeviceObject = Device object whose timer is be initialized - * TimerRoutine = Driver supplied routine which will be called once per - * second if the timer is active - * Context = Driver supplied context to be passed to the TimerRoutine - * RETURNS: Status - */ -{ - DPRINT("IoInitializeTimer() called for Device Object: 0x%p with Routine: 0x%p \n", DeviceObject, TimerRoutine); - - /* Allocate Timer */ - if (!DeviceObject->Timer) { - DeviceObject->Timer = ExAllocatePoolWithTag(NonPagedPool, - sizeof(IO_TIMER), - TAG_IO_TIMER); - if (!DeviceObject->Timer) return STATUS_INSUFFICIENT_RESOURCES; - - /* Set up the Timer Structure */ - DeviceObject->Timer->Type = IO_TYPE_TIMER; - DeviceObject->Timer->DeviceObject = DeviceObject; - } - - DeviceObject->Timer->TimerRoutine = TimerRoutine; - DeviceObject->Timer->Context = Context; - DeviceObject->Timer->TimerEnabled = FALSE; - - /* Add it to the Timer List */ - ExInterlockedInsertTailList(&IopTimerQueueHead, - &DeviceObject->Timer->IoTimerList, - &IopTimerLock); - - /* Return Success */ - DPRINT("IoInitializeTimer() Completed\n"); - return(STATUS_SUCCESS); +NTAPI +IoInitializeTimer(IN PDEVICE_OBJECT DeviceObject, + IN PIO_TIMER_ROUTINE TimerRoutine, + IN PVOID Context) +{ + PIO_TIMER IoTimer = DeviceObject->Timer; + PAGED_CODE(); + + /* Check if we don't have a timer yet */ + if (!IoTimer) + { + /* Allocate Timer */ + IoTimer = ExAllocatePoolWithTag(NonPagedPool, + sizeof(IO_TIMER), + TAG_IO_TIMER); + if (!IoTimer) return STATUS_INSUFFICIENT_RESOURCES; + + /* Set up the Timer Structure */ + RtlZeroMemory(IoTimer, sizeof(IO_TIMER)); + IoTimer->Type = IO_TYPE_TIMER; + IoTimer->DeviceObject = DeviceObject; + DeviceObject->Timer = IoTimer; + } + + /* Setup the timer routine and context */ + IoTimer->TimerRoutine = TimerRoutine; + IoTimer->Context = Context; + + /* Add it to the Timer List */ + ExInterlockedInsertTailList(&IopTimerQueueHead, + &IoTimer->IoTimerList, + &IopTimerLock); + + /* Return Success */ + return STATUS_SUCCESS; } /* * @implemented */ VOID -STDCALL -IoStartTimer(PDEVICE_OBJECT DeviceObject) -/* - * FUNCTION: Starts a timer so the driver-supplied IoTimer routine will be - * called once per second - * ARGUMENTS: - * DeviceObject = Device whose timer is to be started - */ -{ - KIRQL OldIrql; - - DPRINT("IoStartTimer for Device Object: 0x%p\n", DeviceObject); - - /* Lock Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* If the timer isn't already enabled, enable it and increase IO Timer Count*/ - if (!DeviceObject->Timer->TimerEnabled) { - DeviceObject->Timer->TimerEnabled = TRUE; - IopTimerCount++; - } - - /* Unlock Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); - DPRINT("IoStartTimer Completed for Device Object: 0x%p New Count: %x \n", DeviceObject, IopTimerCount); +NTAPI +IoStartTimer(IN PDEVICE_OBJECT DeviceObject) +{ + KIRQL OldIrql; + PIO_TIMER IoTimer = DeviceObject->Timer; + + /* Make sure the device isn't unloading */ + if (!(((PEXTENDED_DEVOBJ_EXTENSION)(DeviceObject->DeviceObjectExtension))-> + ExtensionFlags & (DOE_UNLOAD_PENDING | + DOE_DELETE_PENDING | + DOE_REMOVE_PENDING | + DOE_REMOVE_PROCESSED))) + { + /* Lock Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Check if the timer isn't already enabled */ + if (!IoTimer->TimerEnabled) + { + /* Enable it and increase the timer count */ + IoTimer->TimerEnabled = TRUE; + IopTimerCount++; + } + + /* Unlock Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); + } } /* * @implemented */ VOID -STDCALL +NTAPI IoStopTimer(PDEVICE_OBJECT DeviceObject) -/* - * FUNCTION: Disables for a specified device object so the driver-supplied - * IoTimer is not called - * ARGUMENTS: - * DeviceObject = Device whose timer is to be stopped - */ -{ - KIRQL OldIrql; - - DPRINT("IoStopTimer for Device Object: 0x%p\n", DeviceObject); - - /* Lock Timers */ - KeAcquireSpinLock(&IopTimerLock, &OldIrql); - - /* If the timer is enabled, disable it and decrease IO Timer Count*/ - if (DeviceObject->Timer->TimerEnabled) { - DeviceObject->Timer->TimerEnabled = FALSE; - IopTimerCount--; - } - - /* Unlock Timers */ - KeReleaseSpinLock(&IopTimerLock, OldIrql); - DPRINT("IoStopTimer Completed for Device Object: 0x%p New Count: %x \n", DeviceObject, IopTimerCount); -} - +{ + KIRQL OldIrql; + PIO_TIMER IoTimer = DeviceObject->Timer; + + /* Lock Timers */ + KeAcquireSpinLock(&IopTimerLock, &OldIrql); + + /* Check if the timer is enabled */ + if (IoTimer->TimerEnabled) + { + /* Disable it and decrease the timer count */ + IoTimer->TimerEnabled = FALSE; + IopTimerCount--; + } + + /* Unlock Timers */ + KeReleaseSpinLock(&IopTimerLock, OldIrql); +} /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/timer.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22721: - Fix formatting/function order - Use only one SEH block in NtRemoveIoCompletion - Get the completion status from the IRP, not from the Mini-Packet, if the completion came from an IRP and not a Mini-Packet.
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 21:53:00 2006 New Revision: 22721 URL: http://svn.reactos.org/svn/reactos?rev=22721&view=rev Log: - Fix formatting/function order - Use only one SEH block in NtRemoveIoCompletion - Get the completion status from the IRP, not from the Mini-Packet, if the completion came from an IRP and not a Mini-Packet. Modified: trunk/reactos/ntoskrnl/io/iocomp.c Modified: trunk/reactos/ntoskrnl/io/iocomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iocomp.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iocomp.c (original) +++ trunk/reactos/ntoskrnl/io/iocomp.c Fri Jun 30 21:53:00 2006 @@ -1,10 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/io/iocomp.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/io/event.c + * PURPOSE: I/O Wrappers for the Executive Event Functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Thomas Weidenmueller (w3seek(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -17,7 +17,7 @@ NPAGED_LOOKASIDE_LIST IoCompletionPacketLookaside; -static GENERIC_MAPPING IopCompletionMapping = +GENERIC_MAPPING IopCompletionMapping = { STANDARD_RIGHTS_READ | IO_COMPLETION_QUERY_STATE, STANDARD_RIGHTS_WRITE | IO_COMPLETION_MODIFY_STATE, @@ -25,50 +25,52 @@ IO_COMPLETION_ALL_ACCESS }; -static const INFORMATION_CLASS_INFO IoCompletionInfoClass[] = { - +static const INFORMATION_CLASS_INFO IoCompletionInfoClass[] = +{ /* IoCompletionBasicInformation */ - ICI_SQ_SAME( sizeof(IO_COMPLETION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), + ICI_SQ_SAME(sizeof(IO_COMPLETION_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY), }; -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ VOID -STDCALL +NTAPI IopFreeIoCompletionPacket(PIO_COMPLETION_PACKET Packet) { PKPRCB Prcb = KeGetCurrentPrcb(); PNPAGED_LOOKASIDE_LIST List; - + /* Use the P List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[LookasideCompletionList].P; + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].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[LookasideCompletionList].L; + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].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(Packet); } } - + /* The free was within dhe Depth */ InterlockedPushEntrySList(&List->L.ListHead, (PSINGLE_LIST_ENTRY)Packet); } VOID -STDCALL +NTAPI IopDeleteIoCompletion(PVOID ObjectBody) { PKQUEUE Queue = ObjectBody; @@ -77,19 +79,18 @@ PIRP Irp; PIO_COMPLETION_PACKET Packet; - DPRINT("IopDeleteIoCompletion()\n"); - /* Rundown the Queue */ FirstEntry = KeRundownQueue(Queue); - - /* Clean up the IRPs */ - if (FirstEntry) { - + if (FirstEntry) + { + /* Loop the packets */ CurrentEntry = FirstEntry; - do { - + do + { /* Get the Packet */ - Packet = CONTAINING_RECORD(CurrentEntry, IO_COMPLETION_PACKET, ListEntry); + Packet = CONTAINING_RECORD(CurrentEntry, + IO_COMPLETION_PACKET, + ListEntry); /* Go to next Entry */ CurrentEntry = CurrentEntry->Flink; @@ -110,93 +111,6 @@ } } -/* - * @implemented - */ -NTSTATUS -STDCALL -IoSetIoCompletion(IN PVOID IoCompletion, - IN PVOID KeyContext, - IN PVOID ApcContext, - IN NTSTATUS IoStatus, - IN ULONG_PTR IoStatusInformation, - IN BOOLEAN Quota) -{ - PKQUEUE Queue = (PKQUEUE)IoCompletion; - PNPAGED_LOOKASIDE_LIST List; - PKPRCB Prcb = KeGetCurrentPrcb(); - PIO_COMPLETION_PACKET Packet; - - /* Get the P List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[LookasideCompletionList].P; - - /* Try to allocate the Packet */ - List->L.TotalAllocates++; - Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); - - /* Check if that failed, use the L list if it did */ - if (!Packet) - { - /* Let the balancer know */ - List->L.AllocateMisses++; - - /* Get L List */ - List = (PNPAGED_LOOKASIDE_LIST)Prcb->PPLookasideList[LookasideCompletionList].L; - - /* Try to allocate the Packet */ - List->L.TotalAllocates++; - Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); - } - - /* Still failed, use pool */ - if (!Packet) - { - /* Let the balancer know */ - List->L.AllocateMisses++; - - /* Allocate from Nonpaged Pool */ - Packet = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Packet), IOC_TAG); - } - - /* Make sure we have one by now... */ - if (Packet) - { - /* Set up the Packet */ - Packet->PacketType = IrpMiniCompletionPacket; - Packet->Key = KeyContext; - Packet->Context = ApcContext; - Packet->IoStatus.Status = IoStatus; - Packet->IoStatus.Information = IoStatusInformation; - - /* Insert the Queue */ - KeInsertQueue(Queue, &Packet->ListEntry); - } - else - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Return Success */ - return STATUS_SUCCESS; -} - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -IoSetCompletionRoutineEx(IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PIO_COMPLETION_ROUTINE CompletionRoutine, - IN PVOID Context, - IN BOOLEAN InvokeOnSuccess, - IN BOOLEAN InvokeOnError, - IN BOOLEAN InvokeOnCancel) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - VOID FASTCALL IopInitIoCompletionImplementation(VOID) @@ -204,8 +118,6 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; UNICODE_STRING Name; - DPRINT("Creating IoCompletion Object Type\n"); - /* Initialize the Driver object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"IoCompletion"); @@ -219,34 +131,129 @@ ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &IoCompletionType); } -NTSTATUS -STDCALL +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoSetIoCompletion(IN PVOID IoCompletion, + IN PVOID KeyContext, + IN PVOID ApcContext, + IN NTSTATUS IoStatus, + IN ULONG_PTR IoStatusInformation, + IN BOOLEAN Quota) +{ + PKQUEUE Queue = (PKQUEUE)IoCompletion; + PNPAGED_LOOKASIDE_LIST List; + PKPRCB Prcb = KeGetCurrentPrcb(); + PIO_COMPLETION_PACKET Packet; + + /* Get the P List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].P; + + /* Try to allocate the Packet */ + List->L.TotalAllocates++; + Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + + /* Check if that failed, use the L list if it did */ + if (!Packet) + { + /* Let the balancer know */ + List->L.AllocateMisses++; + + /* Get L List */ + List = (PNPAGED_LOOKASIDE_LIST)Prcb-> + PPLookasideList[LookasideCompletionList].L; + + /* Try to allocate the Packet */ + List->L.TotalAllocates++; + Packet = (PVOID)InterlockedPopEntrySList(&List->L.ListHead); + } + + /* Still failed, use pool */ + if (!Packet) + { + /* Let the balancer know */ + List->L.AllocateMisses++; + + /* Allocate from Nonpaged Pool */ + Packet = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Packet), IOC_TAG); + } + + /* Make sure we have one by now... */ + if (Packet) + { + /* Set up the Packet */ + Packet->PacketType = IrpMiniCompletionPacket; + Packet->Key = KeyContext; + Packet->Context = ApcContext; + Packet->IoStatus.Status = IoStatus; + Packet->IoStatus.Information = IoStatusInformation; + + /* Insert the Queue */ + KeInsertQueue(Queue, &Packet->ListEntry); + } + else + { + /* Out of memory, fail */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Return Success */ + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoSetCompletionRoutineEx(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_COMPLETION_ROUTINE CompletionRoutine, + IN PVOID Context, + IN BOOLEAN InvokeOnSuccess, + IN BOOLEAN InvokeOnError, + IN BOOLEAN InvokeOnCancel) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI NtCreateIoCompletion(OUT PHANDLE IoCompletionHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN ULONG NumberOfConcurrentThreads) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN ULONG NumberOfConcurrentThreads) { PKQUEUE Queue; HANDLE hIoCompletionHandle; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - if (PreviousMode != KernelMode) { - - _SEH_TRY { - + /* Check if this was a user-mode call */ + if (PreviousMode != KernelMode) + { + /* Wrap probing in SEH */ + _SEH_TRY + { + /* Probe the handle */ ProbeForWriteHandle(IoCompletionHandle); - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if (!NT_SUCCESS(Status)) { - - return Status; - } + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; } /* Create the Object */ @@ -259,10 +266,8 @@ 0, 0, (PVOID*)&Queue); - - /* Check for success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Initialize the Queue */ KeInitializeQueue(Queue, NumberOfConcurrentThreads); @@ -273,16 +278,20 @@ 0, NULL, &hIoCompletionHandle); - - if (NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + /* Protect writing the handle in SEH */ + _SEH_TRY + { + /* Write the handle back */ *IoCompletionHandle = hIoCompletionHandle; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; } } @@ -291,7 +300,7 @@ } NTSTATUS -STDCALL +NTAPI NtOpenIoCompletion(OUT PHANDLE IoCompletionHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes) @@ -299,23 +308,26 @@ KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); HANDLE hIoCompletionHandle; NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); - if(PreviousMode != KernelMode) { - - _SEH_TRY { - + /* Check if this was a user-mode call */ + if (PreviousMode != KernelMode) + { + /* Wrap probing in SEH */ + _SEH_TRY + { + /* Probe the handle */ ProbeForWriteHandle(IoCompletionHandle); - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if(!NT_SUCCESS(Status)) { - - return Status; - } + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; } /* Open the Object */ @@ -326,25 +338,28 @@ DesiredAccess, NULL, &hIoCompletionHandle); - - if (NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + /* Protect writing the handle in SEH */ + _SEH_TRY + { + /* Write the handle back */ *IoCompletionHandle = hIoCompletionHandle; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; } /* Return Status */ return Status; } - -NTSTATUS -STDCALL +NTSTATUS +NTAPI NtQueryIoCompletion(IN HANDLE IoCompletionHandle, IN IO_COMPLETION_INFORMATION_CLASS IoCompletionInformationClass, OUT PVOID IoCompletionInformation, @@ -354,22 +369,18 @@ PKQUEUE Queue; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); /* Check buffers and parameters */ Status = DefaultQueryInfoBufferCheck(IoCompletionInformationClass, IoCompletionInfoClass, - sizeof(IoCompletionInfoClass) / sizeof(IoCompletionInfoClass[0]), + sizeof(IoCompletionInfoClass) / + sizeof(IoCompletionInfoClass[0]), IoCompletionInformation, IoCompletionInformationLength, ResultLength, PreviousMode); - if(!NT_SUCCESS(Status)) { - - DPRINT1("NtQueryMutant() failed, Status: 0x%x\n", Status); - return Status; - } + if (!NT_SUCCESS(Status)) return Status; /* Get the Object */ Status = ObReferenceObjectByHandle(IoCompletionHandle, @@ -378,41 +389,43 @@ PreviousMode, (PVOID*)&Queue, NULL); - - /* Check for Success */ - if (NT_SUCCESS(Status)) { - - _SEH_TRY { - + if (NT_SUCCESS(Status)) + { + /* Protect write in SEH */ + _SEH_TRY + { /* Return Info */ - ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)->Depth = KeReadStateQueue(Queue); + ((PIO_COMPLETION_BASIC_INFORMATION)IoCompletionInformation)-> + Depth = KeReadStateQueue(Queue); + + /* Dereference the queue */ ObDereferenceObject(Queue); /* Return Result Length if needed */ - if (ResultLength) { - + if (ResultLength) + { *ResultLength = sizeof(IO_COMPLETION_BASIC_INFORMATION); } - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; + } + _SEH_END; } /* Return Status */ return Status; } -/* - * Dequeues an I/O completion message from an I/O completion object - */ -NTSTATUS -STDCALL -NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, - OUT PVOID *CompletionKey, - OUT PVOID *CompletionContext, +NTSTATUS +NTAPI +NtRemoveIoCompletion(IN HANDLE IoCompletionHandle, + OUT PVOID *KeyContext, + OUT PVOID *ApcContext, OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER Timeout OPTIONAL) + IN PLARGE_INTEGER Timeout OPTIONAL) { LARGE_INTEGER SafeTimeout; PKQUEUE Queue; @@ -420,32 +433,41 @@ PLIST_ENTRY ListEntry; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; - + PIRP Irp; + PVOID Apc, Key; + IO_STATUS_BLOCK IoStatus; PAGED_CODE(); - if (PreviousMode != KernelMode) { - - _SEH_TRY { - - ProbeForWritePointer(CompletionKey); - ProbeForWritePointer(CompletionContext); + /* Check if the call was from user mode */ + if (PreviousMode != KernelMode) + { + /* Protect probes in SEH */ + _SEH_TRY + { + /* Probe the pointers */ + ProbeForWritePointer(KeyContext); + ProbeForWritePointer(ApcContext); + + /* Probe the I/O Status Block */ ProbeForWrite(IoStatusBlock, sizeof(IO_STATUS_BLOCK), sizeof(ULONG)); - if (Timeout != NULL) { - + if (Timeout) + { + /* Probe and capture the timeout */ SafeTimeout = ProbeForReadLargeInteger(Timeout); Timeout = &SafeTimeout; } - } _SEH_HANDLE { - + } + _SEH_HANDLE + { + /* Get the exception code */ Status = _SEH_GetExceptionCode(); - } _SEH_END; - - if (!NT_SUCCESS(Status)) { - - return Status; - } + } + _SEH_END; + + /* Fail on exception */ + if (!NT_SUCCESS(Status)) return Status; } /* Open the Object */ @@ -455,57 +477,66 @@ PreviousMode, (PVOID*)&Queue, NULL); - - /* Check for success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Remove queue */ ListEntry = KeRemoveQueue(Queue, PreviousMode, Timeout); /* If we got a timeout or user_apc back, return the status */ - if ((NTSTATUS)ListEntry == STATUS_TIMEOUT || (NTSTATUS)ListEntry == STATUS_USER_APC) { - + if (((NTSTATUS)ListEntry == STATUS_TIMEOUT) || + ((NTSTATUS)ListEntry == STATUS_USER_APC)) + { + /* Set this as the status */ Status = (NTSTATUS)ListEntry; - - } else { - + } + else + { /* Get the Packet Data */ - Packet = CONTAINING_RECORD(ListEntry, IO_COMPLETION_PACKET, ListEntry); + Packet = CONTAINING_RECORD(ListEntry, + IO_COMPLETION_PACKET, + ListEntry); /* Check if this is piggybacked on an IRP */ if (Packet->PacketType == IrpCompletionPacket) { /* Get the IRP */ - PIRP Irp = NULL; - Irp = CONTAINING_RECORD(ListEntry, IRP, Tail.Overlay.ListEntry); - - /* Return values to user */ - _SEH_TRY { - - *CompletionKey = Irp->Tail.CompletionKey; - *CompletionContext = Irp->Overlay.AsynchronousParameters.UserApcContext; - *IoStatusBlock = Packet->IoStatus; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - - Status = _SEH_GetExceptionCode(); - } _SEH_END; - + Irp = CONTAINING_RECORD(ListEntry, + IRP, + Tail.Overlay.ListEntry); + + /* Save values */ + Key = Irp->Tail.CompletionKey; + Apc = Irp->Overlay.AsynchronousParameters.UserApcContext; + IoStatus = Irp->IoStatus; + + /* Free the IRP */ IoFreeIrp(Irp); } else { - /* This is a user-mode generated or API generated mini-packet */ - _SEH_TRY { - - *CompletionKey = Packet->Key; - *CompletionContext = Packet->Context; - *IoStatusBlock = Packet->IoStatus; - } _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) { - Status = _SEH_GetExceptionCode(); - } _SEH_END; - + /* Save values */ + Key = Packet->Key; + Apc = Packet->Context; + IoStatus = Packet->IoStatus; + + /* Free the packet */ IopFreeIoCompletionPacket(Packet); } + + /* Enter SEH to write back the values */ + _SEH_TRY + { + /* Write the values to caller */ + *ApcContext = Apc; + *KeyContext = Key; + *IoStatusBlock = IoStatus; + } + _SEH_EXCEPT(_SEH_ExSystemExceptionFilter) + { + /* Get the exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; } /* Dereference the Object */ @@ -516,11 +547,8 @@ return Status; } -/* - * Queues an I/O completion message to an I/O completion object - */ -NTSTATUS -STDCALL +NTSTATUS +NTAPI NtSetIoCompletion(IN HANDLE IoCompletionPortHandle, IN PVOID CompletionKey, IN PVOID CompletionContext, @@ -529,7 +557,6 @@ { NTSTATUS Status; PKQUEUE Queue; - PAGED_CODE(); /* Get the Object */ @@ -539,10 +566,8 @@ ExGetPreviousMode(), (PVOID*)&Queue, NULL); - - /* Check for Success */ - if (NT_SUCCESS(Status)) { - + if (NT_SUCCESS(Status)) + { /* Set the Completion */ Status = IoSetIoCompletion(Queue, CompletionKey, @@ -550,6 +575,8 @@ CompletionStatus, CompletionInformation, TRUE); + + /* Dereference the object */ ObDereferenceObject(Queue); }

1 0

[hpoussin] 22720: Don't try to allocate 0 byte (spotted by Alex Ionescu)
by hpoussin＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: hpoussin Date: Fri Jun 30 21:38:12 2006 New Revision: 22720 URL: http://svn.reactos.org/svn/reactos?rev=22720&view=rev Log: Don't try to allocate 0 byte (spotted by Alex Ionescu) Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c Fri Jun 30 21:38:12 2006 @@ -432,45 +432,58 @@ LPWSTR lpPasswordW = NULL; DWORD dwDependenciesLength = 0; DWORD dwLength; + int len; LPSTR lpStr; - int len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); - lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpServiceNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, NULL, 0); - lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpDisplayNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, NULL, 0); - lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpBinaryPathNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpBinaryPathNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, NULL, 0); - lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpLoadOrderGroupW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); - - if (lpDependencies != NULL) + if (lpServiceName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, NULL, 0); + lpServiceNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceName, -1, lpServiceNameW, len); + } + + if (lpDisplayName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, NULL, 0); + lpDisplayNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpDisplayNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpDisplayNameW, len); + } + + if (lpBinaryPathName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpBinaryPathName, -1, NULL, 0); + lpBinaryPathNameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpBinaryPathNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDisplayName, -1, lpBinaryPathNameW, len); + } + + if (lpLoadOrderGroup) + { + len = MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, NULL, 0); + lpLoadOrderGroupW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpLoadOrderGroupW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpLoadOrderGroup, -1, lpLoadOrderGroupW, len); + } + + if (lpDependencies) { lpStr = (LPSTR)lpDependencies; while (*lpStr) @@ -480,33 +493,39 @@ lpStr = lpStr + dwLength; } dwDependenciesLength++; - } - - lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, dwDependenciesLength * sizeof(WCHAR)); - if (!lpDependenciesW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, dwDependenciesLength); - - len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); - lpServiceStartName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpServiceStartNameW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); - - len = MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, NULL, 0); - lpPasswordW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!lpPasswordW) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - goto cleanup; - } - MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, lpPasswordW, len); + + lpDependenciesW = HeapAlloc(GetProcessHeap(), 0, dwDependenciesLength * sizeof(WCHAR)); + if (!lpDependenciesW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpDependencies, -1, lpDependenciesW, dwDependenciesLength); + } + + if (lpServiceStartName) + { + len = MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, NULL, 0); + lpServiceStartName = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpServiceStartNameW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpServiceStartName, -1, lpServiceStartNameW, len); + } + + if (lpPassword) + { + len = MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, NULL, 0); + lpPasswordW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!lpPasswordW) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + goto cleanup; + } + MultiByteToWideChar(CP_ACP, 0, lpPassword, -1, lpPasswordW, len); + } RetVal = CreateServiceW(hSCManager, lpServiceNameW,

1 0

[ion] 22719: - Refactor Io*Event APIs to call an internal worker function instead of duplicating the same code twice. - Optimize Io*Work APIs and initialize the event on allocation, not on queue!!
by ion＠svn.reactos.org 30 Jun '06

30 Jun '06

Author: ion Date: Fri Jun 30 20:56:18 2006 New Revision: 22719 URL: http://svn.reactos.org/svn/reactos?rev=22719&view=rev Log: - Refactor Io*Event APIs to call an internal worker function instead of duplicating the same code twice. - Optimize Io*Work APIs and initialize the event on allocation, not on queue!! Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/event.c (contents, props changed) trunk/reactos/ntoskrnl/io/iowork.c (contents, props changed) 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 20:56:18 2006 @@ -196,6 +196,17 @@ PVOID Context; IO_STATUS_BLOCK IoStatus; } IO_COMPLETION_PACKET, *PIO_COMPLETION_PACKET; + +// +// I/O Wrapper around the Executive Work Item +// +typedef struct _IO_WORKITEM +{ + WORK_QUEUE_ITEM Item; + PDEVICE_OBJECT DeviceObject; + PIO_WORKITEM_ROUTINE WorkerRoutine; + PVOID Context; +} IO_WORKITEM, *PIO_WORKITEM; // // Dummy File Object used inside the Open Packet so that OB knows how to Modified: trunk/reactos/ntoskrnl/io/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/event.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/io/event.c (original) +++ trunk/reactos/ntoskrnl/io/event.c Fri Jun 30 20:56:18 2006 @@ -1,11 +1,10 @@ -/* $Id$ - * - * 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/event.c - * PURPOSE: Implements named events - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for the Executive Event Functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * Eric Kohl */ /* INCLUDES *****************************************************************/ @@ -13,92 +12,73 @@ #include <ntoskrnl.h> #include <internal/debug.h> -/* FUNCTIONS *****************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ + +PKEVENT +NTAPI +IopCreateEvent(IN PUNICODE_STRING EventName, + IN PHANDLE EventHandle, + IN EVENT_TYPE Type) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + PKEVENT Event; + HANDLE Handle; + NTSTATUS Status; + PAGED_CODE(); + + /* Initialize the object attributes */ + InitializeObjectAttributes(&ObjectAttributes, + EventName, + OBJ_OPENIF, + NULL, + NULL); + + /* Create the event */ + Status = ZwCreateEvent(&Handle, + EVENT_ALL_ACCESS, + &ObjectAttributes, + Type, + TRUE); + if (!NT_SUCCESS(Status)) return NULL; + + /* Get a handle to it */ + ObReferenceObjectByHandle(Handle, + 0, + ExEventObjectType, + KernelMode, + (PVOID*)&Event, + NULL); + + /* Dereference the extra count, and return the handle */ + ObDereferenceObject(Event); + *EventHandle = Handle; + return Event; +} + +/* PUBLIC FUNCTIONS **********************************************************/ /* * @implemented */ -PKEVENT STDCALL -IoCreateNotificationEvent(PUNICODE_STRING EventName, - PHANDLE EventHandle) +PKEVENT +NTAPI +IoCreateNotificationEvent(IN PUNICODE_STRING EventName, + IN PHANDLE EventHandle) { - OBJECT_ATTRIBUTES ObjectAttributes; - PKEVENT Event; - HANDLE Handle; - NTSTATUS Status; - - InitializeObjectAttributes(&ObjectAttributes, - EventName, - OBJ_OPENIF, - NULL, - NULL); - - Status = ZwCreateEvent(&Handle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - NotificationEvent, - TRUE); - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - ObReferenceObjectByHandle(Handle, - 0, - ExEventObjectType, - KernelMode, - (PVOID*)&Event, - NULL); - ObDereferenceObject(Event); - - *EventHandle = Handle; - - return Event; + /* Call the internal API */ + return IopCreateEvent(EventName, EventHandle, NotificationEvent); } /* * @implemented */ -PKEVENT STDCALL -IoCreateSynchronizationEvent(PUNICODE_STRING EventName, - PHANDLE EventHandle) +PKEVENT +NTAPI +IoCreateSynchronizationEvent(IN PUNICODE_STRING EventName, + IN PHANDLE EventHandle) { - OBJECT_ATTRIBUTES ObjectAttributes; - KPROCESSOR_MODE PreviousMode; - PKEVENT Event; - HANDLE Handle; - NTSTATUS Status; - - PreviousMode = ExGetPreviousMode(); - - InitializeObjectAttributes(&ObjectAttributes, - EventName, - OBJ_OPENIF, - NULL, - NULL); - - Status = ZwCreateEvent(&Handle, - EVENT_ALL_ACCESS, - &ObjectAttributes, - SynchronizationEvent, - TRUE); - - if (!NT_SUCCESS(Status)) - { - return NULL; - } - - ObReferenceObjectByHandle(Handle, - 0, - ExEventObjectType, - KernelMode, - (PVOID*)&Event, - NULL); - ObDereferenceObject(Event); - - *EventHandle = Handle; - - return Event; + /* Call the internal API */ + return IopCreateEvent(EventName, EventHandle, SynchronizationEvent); } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/event.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/iowork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iowork.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/io/iowork.c (original) +++ trunk/reactos/ntoskrnl/io/iowork.c Fri Jun 30 20:56:18 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * 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/iowork.c - * PURPOSE: Manage IO system work queues - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PURPOSE: I/O Wrappers for the Executive Work Item Functions + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Robert Dickenson (odin(a)pnc.com.au) */ @@ -15,80 +13,81 @@ #define NDEBUG #include <internal/debug.h> -/* TYPES ********************************************************************/ +/* PRIVATE FUNCTIONS *********************************************************/ -typedef struct _IO_WORKITEM +VOID +NTAPI +IopWorkItemCallback(IN PVOID Parameter) { - WORK_QUEUE_ITEM Item; - PDEVICE_OBJECT DeviceObject; - PIO_WORKITEM_ROUTINE WorkerRoutine; - PVOID Context; -} IO_WORKITEM; + PIO_WORKITEM IoWorkItem = (PIO_WORKITEM)Parameter; + PDEVICE_OBJECT DeviceObject = IoWorkItem->DeviceObject; + PAGED_CODE(); -/* FUNCTIONS ****************************************************************/ + /* Call the work routine */ + IoWorkItem->WorkerRoutine(DeviceObject, IoWorkItem->Context); -VOID STATIC STDCALL -IoWorkItemCallback(PVOID Parameter) + /* Dereferenece the device object */ + ObDereferenceObject(DeviceObject); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +IoQueueWorkItem(IN PIO_WORKITEM IoWorkItem, + IN PIO_WORKITEM_ROUTINE WorkerRoutine, + IN WORK_QUEUE_TYPE QueueType, + IN PVOID Context) { - PIO_WORKITEM IoWorkItem = (PIO_WORKITEM)Parameter; - PDEVICE_OBJECT DeviceObject = IoWorkItem->DeviceObject; - IoWorkItem->WorkerRoutine(IoWorkItem->DeviceObject, IoWorkItem->Context); - ObDereferenceObject(DeviceObject); + /* Make sure we're called at DISPATCH or lower */ + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Reference the device object */ + ObReferenceObject(IoWorkItem->DeviceObject); + + /* Setup the work item */ + IoWorkItem->WorkerRoutine = WorkerRoutine; + IoWorkItem->Context = Context; + + /* Queue the work item */ + ExQueueWorkItem(&IoWorkItem->Item, QueueType); } /* * @implemented */ -VOID STDCALL -IoQueueWorkItem(IN PIO_WORKITEM IoWorkItem, - IN PIO_WORKITEM_ROUTINE WorkerRoutine, - IN WORK_QUEUE_TYPE QueueType, - IN PVOID Context) -/* - * FUNCTION: Inserts a work item in a queue for one of the system worker - * threads to process - * ARGUMENTS: - * IoWorkItem = Item to insert - * QueueType = Queue to insert it in - */ +VOID +NTAPI +IoFreeWorkItem(IN PIO_WORKITEM IoWorkItem) { - ExInitializeWorkItem(&IoWorkItem->Item, IoWorkItemCallback, - (PVOID)IoWorkItem); - IoWorkItem->WorkerRoutine = WorkerRoutine; - IoWorkItem->Context = Context; - ObReferenceObjectByPointer(IoWorkItem->DeviceObject, - FILE_ALL_ACCESS, - NULL, - KernelMode); - ExQueueWorkItem(&IoWorkItem->Item, QueueType); + /* Free the work item */ + ExFreePool(IoWorkItem); } /* * @implemented */ -VOID STDCALL -IoFreeWorkItem(PIO_WORKITEM IoWorkItem) +PIO_WORKITEM +NTAPI +IoAllocateWorkItem(IN PDEVICE_OBJECT DeviceObject) { - ExFreePool(IoWorkItem); -} + PIO_WORKITEM IoWorkItem; -/* - * @implemented - */ -PIO_WORKITEM STDCALL -IoAllocateWorkItem(PDEVICE_OBJECT DeviceObject) -{ - PIO_WORKITEM IoWorkItem = NULL; + /* Allocate the work item */ + IoWorkItem = ExAllocatePoolWithTag(NonPagedPool, + sizeof(IO_WORKITEM), + TAG_IOWI); + if (!IoWorkItem) return NULL; - IoWorkItem = - ExAllocatePoolWithTag(NonPagedPool, sizeof(IO_WORKITEM), TAG_IOWI); - if (IoWorkItem == NULL) - { - return(NULL); - } - RtlZeroMemory(IoWorkItem, sizeof(IO_WORKITEM)); - IoWorkItem->DeviceObject = DeviceObject; - return(IoWorkItem); + /* Initialize it */ + IoWorkItem->DeviceObject = DeviceObject; + ExInitializeWorkItem(&IoWorkItem->Item, IopWorkItemCallback, IoWorkItem); + + /* Return it */ + return IoWorkItem; } /* EOF */ Propchange: trunk/reactos/ntoskrnl/io/iowork.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

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