Ros-diffs May 2015

ros-diffs@reactos.org

15 participants
500 discussions

[pschweitzer] 67914: [FASTFAT] [NTFS] Addendum to r67911

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 17:54:27 2015 New Revision: 67914 URL: http://svn.reactos.org/svn/reactos?rev=67914&view=rev Log: [FASTFAT] [NTFS] Addendum to r67911 Modified: trunk/reactos/drivers/filesystems/fastfat/close.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/close.c [iso-8859-1] Mon May 25 17:54:27 2015 @@ -89,7 +89,7 @@ #if 0 /* There occurs a dead look at the call to CcRosDeleteFileCache/ObDereferenceObject/VfatClose in CmLazyCloseThreadMain if VfatClose is execute asynchronous in a worker thread. */ - if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, IrpContext->Flags & IRPCONTEXT_CANWAIT)) + if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) #else if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, TRUE)) #endif Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Mon May 25 17:54:27 2015 @@ -655,7 +655,7 @@ } } - Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO); + Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); if (!Buffer) { Status = STATUS_INVALID_USER_BUFFER; @@ -926,7 +926,7 @@ OldFileSize = Fcb->RFCB.FileSize; - Buffer = VfatGetUserBuffer(IrpContext->Irp, IrpContext->Irp->Flags & IRP_PAGING_IO); + Buffer = VfatGetUserBuffer(IrpContext->Irp, BooleanFlagOn(IrpContext->Irp->Flags, IRP_PAGING_IO)); if (!Buffer) { Status = STATUS_INVALID_USER_BUFFER; Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Mon May 25 17:54:27 2015 @@ -196,7 +196,7 @@ DeviceExt = DeviceObject->DeviceExtension; ReadLength = Stack->Parameters.Read.Length; ReadOffset = Stack->Parameters.Read.ByteOffset; - Buffer = NtfsGetUserBuffer(Irp, Irp->Flags & IRP_PAGING_IO); + Buffer = NtfsGetUserBuffer(Irp, BooleanFlagOn(Irp->Flags, IRP_PAGING_IO)); Status = NtfsReadFile(DeviceExt, FileObject,

9 years, 3 months

[pschweitzer] 67913: [NTFS] Call NtfsGetUserBuffer() when required, don't reimplement the wheel everytime

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 17:45:04 2015 New Revision: 67913 URL: http://svn.reactos.org/svn/reactos?rev=67913&view=rev Log: [NTFS] Call NtfsGetUserBuffer() when required, don't reimplement the wheel everytime Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Mon May 25 17:45:04 2015 @@ -304,15 +304,8 @@ Ccb->Entry = 0; } - /* Determine Buffer for result */ - if (Irp->MdlAddress) - { - Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - } - else - { - Buffer = Irp->UserBuffer; - } + /* Get Buffer for result */ + Buffer = NtfsGetUserBuffer(Irp, FALSE); DPRINT("Buffer=%p tofind=%S\n", Buffer, Ccb->DirectorySearchPattern);

9 years, 3 months

[pschweitzer] 67912: [NTFS] Fix MmGetSystemAddressForMdlSafe() call, as it was done in r67808

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 17:43:04 2015 New Revision: 67912 URL: http://svn.reactos.org/svn/reactos?rev=67912&view=rev Log: [NTFS] Fix MmGetSystemAddressForMdlSafe() call, as it was done in r67808 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/misc.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h trunk/reactos/drivers/filesystems/ntfs/rw.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Mon May 25 17:43:04 2015 @@ -712,7 +712,7 @@ return STATUS_BUFFER_TOO_SMALL; } - BitmapBuffer = NtfsGetUserBuffer(Irp); + BitmapBuffer = NtfsGetUserBuffer(Irp, FALSE); if (Irp->RequestorMode == UserMode) { _SEH2_TRY Modified: trunk/reactos/drivers/filesystems/ntfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/misc.c [iso-8859-1] Mon May 25 17:43:04 2015 @@ -117,11 +117,12 @@ } PVOID -NtfsGetUserBuffer(PIRP Irp) +NtfsGetUserBuffer(PIRP Irp, + BOOLEAN Paging) { if (Irp->MdlAddress != NULL) { - return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, HighPagePriority); + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, (Paging ? HighPagePriority : NormalPagePriority)); } else { Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon May 25 17:43:04 2015 @@ -743,7 +743,8 @@ PIRP Irp); PVOID -NtfsGetUserBuffer(PIRP Irp); +NtfsGetUserBuffer(PIRP Irp, + BOOLEAN Paging); #if 0 BOOLEAN Modified: trunk/reactos/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/r… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/rw.c [iso-8859-1] Mon May 25 17:43:04 2015 @@ -196,7 +196,7 @@ DeviceExt = DeviceObject->DeviceExtension; ReadLength = Stack->Parameters.Read.Length; ReadOffset = Stack->Parameters.Read.ByteOffset; - Buffer = NtfsGetUserBuffer(Irp); + Buffer = NtfsGetUserBuffer(Irp, Irp->Flags & IRP_PAGING_IO); Status = NtfsReadFile(DeviceExt, FileObject,

9 years, 3 months

[pschweitzer] 67911: [FASTFAT] [NTFS] Remove useless cast and use appropriate macro. Spotted by Thomas

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 17:30:01 2015 New Revision: 67911 URL: http://svn.reactos.org/svn/reactos?rev=67911&view=rev Log: [FASTFAT] [NTFS] Remove useless cast and use appropriate macro. Spotted by Thomas Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c trunk/reactos/drivers/filesystems/fastfat/dir.c trunk/reactos/drivers/filesystems/fastfat/finfo.c trunk/reactos/drivers/filesystems/fastfat/rw.c trunk/reactos/drivers/filesystems/fastfat/volume.c trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/fastfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/cleanup.c [iso-8859-1] Mon May 25 17:30:01 2015 @@ -47,12 +47,12 @@ else { if(!ExAcquireResourceExclusiveLite(&pFcb->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { return STATUS_PENDING; } if(!ExAcquireResourceExclusiveLite(&pFcb->PagingIoResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { ExReleaseResourceLite(&pFcb->MainResource); return STATUS_PENDING; @@ -157,7 +157,7 @@ } if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { return VfatMarkIrpContextForQueue(IrpContext); } Modified: trunk/reactos/drivers/filesystems/fastfat/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/dir.c [iso-8859-1] Mon May 25 17:30:01 2015 @@ -422,7 +422,7 @@ Buffer = VfatGetUserBuffer(IrpContext->Irp, FALSE); if (!ExAcquireResourceSharedLite(&pFcb->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { Status = VfatLockUserBuffer(IrpContext->Irp, BufferLength, IoWriteAccess); if (NT_SUCCESS(Status)) @@ -505,7 +505,7 @@ DirContext.ShortNameU.MaximumLength = sizeof(ShortNameBuffer); if (!ExAcquireResourceExclusiveLite(&IrpContext->DeviceExt->DirResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { ExReleaseResourceLite(&pFcb->MainResource); return VfatMarkIrpContextForQueue(IrpContext); Modified: trunk/reactos/drivers/filesystems/fastfat/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/finfo.c [iso-8859-1] Mon May 25 17:30:01 2015 @@ -1377,7 +1377,7 @@ if (!(FCB->Flags & FCB_IS_PAGE_FILE)) { if (!ExAcquireResourceSharedLite(&FCB->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { return VfatMarkIrpContextForQueue(IrpContext); } @@ -1514,7 +1514,7 @@ if (FileInformationClass == FileRenameInformation) { if (!ExAcquireResourceExclusiveLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { return VfatMarkIrpContextForQueue(IrpContext); } @@ -1523,7 +1523,7 @@ if (!(FCB->Flags & FCB_IS_PAGE_FILE)) { if (!ExAcquireResourceExclusiveLite(&FCB->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { if (FileInformationClass == FileRenameInformation) { Modified: trunk/reactos/drivers/filesystems/fastfat/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/rw.c [iso-8859-1] Mon May 25 17:30:01 2015 @@ -887,7 +887,7 @@ if (Fcb->Flags & FCB_IS_PAGE_FILE) { if (!ExAcquireResourceSharedLite(Resource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { Resource = NULL; Status = STATUS_PENDING; @@ -897,7 +897,7 @@ else { if (!ExAcquireResourceExclusiveLite(Resource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { Resource = NULL; Status = STATUS_PENDING; Modified: trunk/reactos/drivers/filesystems/fastfat/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/volume.c [iso-8859-1] Mon May 25 17:30:01 2015 @@ -361,7 +361,7 @@ DPRINT("VfatQueryVolumeInformation(IrpContext %p)\n", IrpContext); if (!ExAcquireResourceSharedLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { DPRINT1("DirResource failed!\n"); return VfatMarkIrpContextForQueue(IrpContext); @@ -436,7 +436,7 @@ DPRINT("VfatSetVolumeInformation(IrpContext %p)\n", IrpContext); if (!ExAcquireResourceExclusiveLite(&((PDEVICE_EXTENSION)IrpContext->DeviceObject->DeviceExtension)->DirResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { return VfatMarkIrpContextForQueue(IrpContext); } Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Mon May 25 17:30:01 2015 @@ -247,7 +247,7 @@ BufferLength = Stack->Parameters.QueryFile.Length; if (!ExAcquireResourceSharedLite(&Fcb->MainResource, - (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) { return NtfsMarkIrpContextForQueue(IrpContext); }

9 years, 3 months

[pschweitzer] 67910: [NTFS] Acquire FCB resource (shared) before trying to attempt its data

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 17:06:00 2015 New Revision: 67910 URL: http://svn.reactos.org/svn/reactos?rev=67910&view=rev Log: [NTFS] Acquire FCB resource (shared) before trying to attempt its data Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/finfo.c [iso-8859-1] Mon May 25 17:06:00 2015 @@ -246,6 +246,12 @@ SystemBuffer = Irp->AssociatedIrp.SystemBuffer; BufferLength = Stack->Parameters.QueryFile.Length; + if (!ExAcquireResourceSharedLite(&Fcb->MainResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } + switch (FileInformationClass) { case FileStandardInformation: @@ -301,6 +307,8 @@ Status = STATUS_INVALID_PARAMETER; } + ExReleaseResourceLite(&Fcb->MainResource); + if (NT_SUCCESS(Status)) Irp->IoStatus.Information = Stack->Parameters.QueryFile.Length - BufferLength;

9 years, 3 months

[pschweitzer] 67909: [NTFS] If IRP can't wait, queue it

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 16:52:15 2015 New Revision: 67909 URL: http://svn.reactos.org/svn/reactos?rev=67909&view=rev Log: [NTFS] If IRP can't wait, queue it Modified: trunk/reactos/drivers/filesystems/ntfs/create.c Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Mon May 25 16:52:15 2015 @@ -428,6 +428,11 @@ DeviceExt = DeviceObject->DeviceExtension; + if (!(IrpContext->Flags & IRPCONTEXT_CANWAIT)) + { + return NtfsMarkIrpContextForQueue(IrpContext); + } + ExAcquireResourceExclusiveLite(&DeviceExt->DirResource, TRUE); Status = NtfsCreateFile(DeviceObject,

9 years, 3 months

[pschweitzer] 67908: [NTFS] Implement NtfsMarkIrpContextForQueue() which allows marking an IRP to queue it

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 16:52:02 2015 New Revision: 67908 URL: http://svn.reactos.org/svn/reactos?rev=67908&view=rev Log: [NTFS] Implement NtfsMarkIrpContextForQueue() which allows marking an IRP to queue it Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon May 25 16:52:02 2015 @@ -461,9 +461,17 @@ extern PNTFS_GLOBAL_DATA NtfsGlobalData; -//int CdfsStrcmpi( wchar_t *str1, wchar_t *str2 ); -//void CdfsWstrcpy( wchar_t *str1, wchar_t *str2, int max ); - +FORCEINLINE +NTSTATUS +NtfsMarkIrpContextForQueue(PNTFS_IRP_CONTEXT IrpContext) +{ + PULONG Flags = &IrpContext->Flags; + + *Flags &= ~IRPCONTEXT_COMPLETE; + *Flags |= IRPCONTEXT_QUEUE; + + return STATUS_PENDING; +} /* attrib.c */

9 years, 3 months

[tfaber] 67907: [WIN32K:NTUSER] - Use UserRefObjectCo in IntNotifyWinEvent to avoid a reference leak in case the call-out does not return - Sanitize list walk

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon May 25 15:28:06 2015 New Revision: 67907 URL: http://svn.reactos.org/svn/reactos?rev=67907&view=rev Log: [WIN32K:NTUSER] - Use UserRefObjectCo in IntNotifyWinEvent to avoid a reference leak in case the call-out does not return - Sanitize list walk Modified: trunk/reactos/win32ss/user/ntuser/event.c Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Mon May 25 15:28:06 2015 @@ -184,8 +184,9 @@ DWORD flags) { PEVENTHOOK pEH; - PLIST_ENTRY pLE; + PLIST_ENTRY ListEntry; PTHREADINFO pti, ptiCurrent; + USER_REFERENCE_ENTRY Ref; TRACE("IntNotifyWinEvent GlobalEvents = %p pWnd %p\n", GlobalEvents, pWnd); @@ -200,12 +201,13 @@ else pti = ptiCurrent; - pLE = GlobalEvents->Events.Flink; - pEH = CONTAINING_RECORD(pLE, EVENTHOOK, Chain); - do - { - if (!pEH) break; - UserReferenceObject(pEH); + ListEntry = GlobalEvents->Events.Flink; + ASSERT(ListEntry != &GlobalEvents->Events); + while (ListEntry != &GlobalEvents->Events) + { + pEH = CONTAINING_RECORD(ListEntry, EVENTHOOK, Chain); + ListEntry = ListEntry->Flink; + // Must be inside the event window. if ( Event >= pEH->eventMin && Event <= pEH->eventMax ) { @@ -217,6 +219,7 @@ (pEH->Flags & WINEVENT_SKIPOWNTHREAD && pEH->head.pti == pti) || pEH->head.pti->rpdesk != ptiCurrent->rpdesk ) ) // Same as hooks. { + UserRefObjectCo(pEH, &Ref); if (pEH->Flags & WINEVENT_INCONTEXT) { TRACE("In Event 0x%x, idObject %d hwnd %p\n", Event, idObject, pWnd ? UserHMGetHandle(pWnd) : NULL); @@ -241,12 +244,10 @@ idChild, PtrToUint(NtCurrentTeb()->ClientId.UniqueThread)); } + UserDerefObjectCo(pEH); } } - UserDereferenceObject(pEH); - pLE = pEH->Chain.Flink; - pEH = CONTAINING_RECORD(pLE, EVENTHOOK, Chain); - } while (pLE != &GlobalEvents->Events); + } } VOID

9 years, 3 months

[tfaber] 67906: [RTL][NTOSKRNL] - Don't cast CONTAINING_RECORD

by tfaber＠svn.reactos.org

Author: tfaber Date: Mon May 25 15:04:09 2015 New Revision: 67906 URL: http://svn.reactos.org/svn/reactos?rev=67906&view=rev Log: [RTL][NTOSKRNL] - Don't cast CONTAINING_RECORD Modified: trunk/reactos/lib/rtl/generictable.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/fsrtl/tunnel.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Mon May 25 15:04:09 2015 @@ -438,9 +438,9 @@ if (NextI == OrderedElement) { /* Return it */ - return &((PTABLE_ENTRY_HEADER)CONTAINING_RECORD(OrderedNode, - TABLE_ENTRY_HEADER, - ListEntry))->UserData; + return &CONTAINING_RECORD(OrderedNode, + TABLE_ENTRY_HEADER, + ListEntry)->UserData; } /* Now check if we're farther behind */ @@ -505,9 +505,9 @@ Table->WhichOrderedElement = NextI; /* Return the element */ - return &((PTABLE_ENTRY_HEADER)CONTAINING_RECORD(OrderedNode, - TABLE_ENTRY_HEADER, - ListEntry))->UserData; + return &CONTAINING_RECORD(OrderedNode, + TABLE_ENTRY_HEADER, + ListEntry)->UserData; } /* EOF */ Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c [iso-8859-1] Mon May 25 15:04:09 2015 @@ -918,8 +918,7 @@ CurrentEntry = Process->Pcb.ThreadListHead.Flink; while (CurrentEntry != &Process->Pcb.ThreadListHead) { - CurrentThread = (PETHREAD)CONTAINING_RECORD(CurrentEntry, KTHREAD, - ThreadListEntry); + CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, Tcb.ThreadListEntry); ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); Modified: trunk/reactos/ntoskrnl/fsrtl/tunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/tunnel.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/tunnel.c [iso-8859-1] Mon May 25 15:04:09 2015 @@ -105,7 +105,7 @@ while(Entry != &Cache->TimerQueue) { /* get node entry */ - CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); /* get next entry */ NextEntry = Entry->Flink; @@ -124,7 +124,7 @@ /* If we have too many entries */ while (Cache->NumEntries > TunnelMaxEntries) { - CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); FsRtlRemoveNodeFromTunnel(Cache, CurEntry, PoolList, &Rebalance); } } @@ -295,7 +295,7 @@ { /* and free them, one by one */ CurEntry = RemoveHeadList(PoolList); - CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + CurNode = CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, TimerQueueEntry); FsRtlFreeTunnelNode(CurNode, 0); } } @@ -609,7 +609,7 @@ CurEntry = Cache->Cache; while (CurEntry) { - CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, SplayInfo); + CurNode = CONTAINING_RECORD(CurEntry, TUNNEL_NODE_ENTRY, SplayInfo); if (CurNode->DirectoryKey > DirectoryKey) { @@ -647,7 +647,7 @@ /* delete any matching key */ do { - CurNode = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(LastEntry, TUNNEL_NODE_ENTRY, SplayInfo); + CurNode = CONTAINING_RECORD(LastEntry, TUNNEL_NODE_ENTRY, SplayInfo); Successors = RtlRealSuccessor(LastEntry); if (CurNode->DirectoryKey != DirectoryKey) @@ -704,7 +704,7 @@ while(Entry != &Cache->TimerQueue) { /* get node entry */ - CurEntry = (PTUNNEL_NODE_ENTRY)CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); + CurEntry = CONTAINING_RECORD(Entry, TUNNEL_NODE_ENTRY, TimerQueueEntry); /* get next entry */ NextEntry = Entry->Flink;

9 years, 3 months

[pschweitzer] 67905: [NTFS] Handle IRP_MJ_FILE_SYSTEM_CONTROL with the dispatch routine

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon May 25 12:55:51 2015 New Revision: 67905 URL: http://svn.reactos.org/svn/reactos?rev=67905&view=rev Log: [NTFS] Handle IRP_MJ_FILE_SYSTEM_CONTROL with the dispatch routine Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c trunk/reactos/drivers/filesystems/ntfs/fsctl.c trunk/reactos/drivers/filesystems/ntfs/ntfs.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dispatch.c [iso-8859-1] Mon May 25 12:55:51 2015 @@ -104,6 +104,10 @@ case IRP_MJ_CREATE: Status = NtfsCreate(IrpContext); break; + + case IRP_MJ_FILE_SYSTEM_CONTROL: + Status = NtfsFileSystemControl(IrpContext); + break; } ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Mon May 25 12:55:51 2015 @@ -866,20 +866,19 @@ NTSTATUS -NTAPI -NtfsFsdFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext) { - PIO_STACK_LOCATION Stack; NTSTATUS Status; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; DPRINT1("NtfsFileSystemControl() called\n"); - Stack = IoGetCurrentIrpStackLocation(Irp); - + DeviceObject = IrpContext->DeviceObject; + Irp = IrpContext->Irp; Irp->IoStatus.Information = 0; - switch (Stack->MinorFunction) + switch (IrpContext->MinorFunction) { case IRP_MN_KERNEL_CALL: DPRINT1("NTFS: IRP_MN_USER_FS_REQUEST\n"); @@ -901,14 +900,10 @@ break; default: - DPRINT1("NTFS FSC: MinorFunction %d\n", Stack->MinorFunction); + DPRINT1("NTFS FSC: MinorFunction %d\n", IrpContext->MinorFunction); Status = STATUS_INVALID_DEVICE_REQUEST; break; } - - Irp->IoStatus.Status = Status; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.c [iso-8859-1] Mon May 25 12:55:51 2015 @@ -131,7 +131,7 @@ DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = NtfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NtfsFsdFileSystemControl; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = NtfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = NtfsFsdDispatch; return; Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Mon May 25 12:55:51 2015 @@ -644,10 +644,8 @@ /* fsctl.c */ -DRIVER_DISPATCH NtfsFsdFileSystemControl; -NTSTATUS NTAPI -NtfsFsdFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NtfsFileSystemControl(PNTFS_IRP_CONTEXT IrpContext); /* mft.c */

9 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2015