Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 34626: - Fix wrong paths to some rosapps utils.
by fireball＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: fireball Date: Mon Jul 21 04:11:30 2008 New Revision: 34626 URL: http://svn.reactos.org/svn/reactos?rev=34626&view=rev Log: - Fix wrong paths to some rosapps utils. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Jul 21 04:11:30 2008 @@ -573,16 +573,15 @@ modules\rosapps\applications\cmdutils\touch\touch.exe 1 optional modules\rosapps\applications\cmdutils\uptime\uptime.exe 1 optional modules\rosapps\applications\cmdutils\y\y.exe 1 optional -modules\rosapps\applications\devutils\cputointel\cputointel.exe 1 optional modules\rosapps\applications\devutils\gdb2\gdb2.exe 1 optional modules\rosapps\applications\devutils\gdihv\gdihv.exe 1 optional modules\rosapps\applications\devutils\genguid\genguid.exe 1 optional +modules\rosapps\applications\devutils\gettype\gettype.exe 1 optional modules\rosapps\applications\devutils\roswebparser\roswebparser.exe 1 optional modules\rosapps\applications\devutils\zoomin\zoomin.exe 1 optional modules\rosapps\applications\downloader\downloader.exe 1 optional modules\rosapps\applications\downloader\downloader.xml 1 optional modules\rosapps\applications\fontview\fontview.exe 1 optional -modules\rosapps\applications\gettype\gettype.exe 1 optional modules\rosapps\applications\imagesoft\imagesoft.exe 1 optional modules\rosapps\applications\net\ncftp\ncftp.exe 1 optional modules\rosapps\applications\net\netreg\netreg.exe 1 optional

1 0

[ros-arm-bringup] 34625: - Implement RamdiskReadWrite. - Implement RamdiskReadWriteReal. - We now have a working copy loop for both read and write operations. - Need to implement RamdiskMapPages and RamdiskUnmapPages -- then we'll nearly be done!
by ros-arm-bringup＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: ros-arm-bringup Date: Mon Jul 21 01:35:39 2008 New Revision: 34625 URL: http://svn.reactos.org/svn/reactos?rev=34625&view=rev Log: - Implement RamdiskReadWrite. - Implement RamdiskReadWriteReal. - We now have a working copy loop for both read and write operations. - Need to implement RamdiskMapPages and RamdiskUnmapPages -- then we'll nearly be done! Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Mon Jul 21 01:35:39 2008 @@ -832,6 +832,165 @@ } } +PVOID +NTAPI +RamdiskMapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension, + IN LARGE_INTEGER Offset, + IN ULONG Length, + OUT PULONG OutputLength) +{ + DPRINT1("Mapping %lx bytes at %I64x\n", Length, Offset.QuadPart); + UNIMPLEMENTED; + while (TRUE); + return NULL; +} + +PVOID +NTAPI +RamdiskUnmapPages(IN PRAMDISK_DRIVE_EXTENSION DeviceExtension, + IN PVOID BaseAddress, + IN LARGE_INTEGER Offset, + IN ULONG Length) +{ + UNIMPLEMENTED; + while (TRUE); + return NULL; +} + +NTSTATUS +NTAPI +RamdiskReadWriteReal(IN PIRP Irp, + IN PRAMDISK_DRIVE_EXTENSION DeviceExtension) +{ + PMDL Mdl; + PVOID CurrentBase, SystemVa, BaseAddress; + PIO_STACK_LOCATION IoStackLocation; + LARGE_INTEGER CurrentOffset; + ULONG BytesRead, BytesLeft, CopyLength; + PVOID Source, Destination; + NTSTATUS Status; + + // + // Get the MDL and check if it's mapped + // + Mdl = Irp->MdlAddress; + if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) + { + // + // Use the mapped address + // + SystemVa = Mdl->MappedSystemVa; + } + else + { + // + // Map it ourselves + // + SystemVa = MmMapLockedPagesSpecifyCache(Mdl, + 0, + MmCached, + NULL, + 0, + NormalPagePriority); + } + + // + // Make sure we were able to map it + // + CurrentBase = SystemVa; + if (!SystemVa) return STATUS_INSUFFICIENT_RESOURCES; + + // + // Initialize default + // + Irp->IoStatus.Information = 0; + + // + // Get the I/O Stack Location and capture the data + // + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + CurrentOffset = IoStackLocation->Parameters.Read.ByteOffset; + BytesLeft = IoStackLocation->Parameters.Read.Length; + if (!BytesLeft) return STATUS_INVALID_PARAMETER; + + // + // Do the copy loop + // + DPRINT1("Initiating copy loop for %lx bytes at %p\n", BytesLeft, SystemVa); + while (TRUE) + { + // + // Map the pages + // + BaseAddress = RamdiskMapPages(DeviceExtension, + CurrentOffset, + BytesLeft, + &BytesRead); + if (!BaseAddress) return STATUS_INSUFFICIENT_RESOURCES; + + // + // Update our lengths + // + Irp->IoStatus.Information += BytesRead; + CopyLength = BytesRead; + + // + // Check if this was a read or write + // + Status = STATUS_SUCCESS; + if (IoStackLocation->MajorFunction == IRP_MJ_READ) + { + // + // Set our copy parameters + // + Destination = CurrentBase; + Source = BaseAddress; + goto DoCopy; + } + else if (IoStackLocation->MajorFunction == IRP_MJ_WRITE) + { + // + // Set our copy parameters + // + Destination = BaseAddress; + Source = CurrentBase; +DoCopy: + // + // Copy the data + // + RtlCopyMemory(Destination, Source, CopyLength); + } + else + { + // + // Prepare us for failure + // + BytesLeft = CopyLength; + Status = STATUS_INVALID_PARAMETER; + } + + // + // Unmap the pages + // + RamdiskUnmapPages(DeviceExtension, + BaseAddress, + CurrentOffset, + BytesRead); + + // + // Update offset and bytes left + // + BytesLeft -= BytesRead; + CurrentOffset.QuadPart += BytesRead; + CurrentBase = (PVOID)((ULONG_PTR)CurrentBase + BytesRead); + + // + // Check if we're done + // + if (!BytesLeft) return Status; + } +} + NTSTATUS NTAPI RamdiskOpenClose(IN PDEVICE_OBJECT DeviceObject, @@ -851,9 +1010,89 @@ RamdiskReadWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; + PRAMDISK_DRIVE_EXTENSION DeviceExtension; + ULONG Length; + LARGE_INTEGER ByteOffset; + PIO_STACK_LOCATION IoStackLocation; + NTSTATUS Status, ReturnStatus; + + // + // Get the device extension and make sure this isn't a bus + // + DeviceExtension = DeviceObject->DeviceExtension; + if (DeviceExtension->Type == RamdiskBus) + { + // + // Fail + // + Status = STATUS_INVALID_DEVICE_REQUEST; + goto Complete; + } + + // + // Capture parameters + // + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + Length = IoStackLocation->Parameters.Read.Length; + ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; + + // + // FIXME: Validate offset + // + + // + // FIXME: Validate sector + // + + // + // Validate write + // + if ((IoStackLocation->MajorFunction == IRP_MJ_WRITE) && + (DeviceExtension->DiskOptions.Readonly)) + { + // + // Fail, this is read-only + // + Status = STATUS_MEDIA_WRITE_PROTECTED; + goto Complete; + } + + // + // See if we want to do this sync or async + // + if (DeviceExtension->DiskType > FILE_DEVICE_CD_ROM) + { + // + // Do it sync + // + Status = RamdiskReadWriteReal(Irp, DeviceExtension); + goto Complete; + } + + // + // Queue it to the worker + // + Status = SendIrpToThread(DeviceObject, Irp); + ReturnStatus = STATUS_PENDING; + + // + // Check if we're pending or not + // + if (Status != STATUS_PENDING) + { +Complete: + // + // Complete the IRP + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + ReturnStatus = Status; + } + + // + // Return to caller + // + return ReturnStatus; } NTSTATUS

1 0

[arty] 34624: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Forgot to remove UnlockRequest in last patch
by arty＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: arty Date: Mon Jul 21 00:44:10 2008 New Revision: 34624 URL: http://svn.reactos.org/svn/reactos?rev=34624&view=rev Log: Patch by Cameron Gutman (aicommander <at> gmail <dot> com) - Forgot to remove UnlockRequest in last patch Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Mon Jul 21 00:44:10 2008 @@ -283,7 +283,6 @@ EventSelectInfo->Events)); if( !SocketAcquireStateLock( FCB ) ) { - UnlockRequest( Irp, IrpSp ); return LostSocket( Irp, TRUE ); } @@ -329,7 +328,6 @@ } if( !SocketAcquireStateLock( FCB ) ) { - UnlockRequest( Irp, IrpSp ); return LostSocket( Irp, TRUE ); }

1 0

[ros-arm-bringup] 34623: - Fix ARM exports to make up for the recent i386 changes. - Implement MmGetPageProtect. MDL Probe And Lock now works. - We get to RamdiskReadWrite now!
by ros-arm-bringup＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 20:41:04 2008 New Revision: 34623 URL: http://svn.reactos.org/svn/reactos?rev=34623&view=rev Log: - Fix ARM exports to make up for the recent i386 changes. - Implement MmGetPageProtect. MDL Probe And Lock now works. - We get to RamdiskReadWrite now! Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c trunk/reactos/ntoskrnl/ntoskrnl_arm.def Modified: trunk/reactos/ntoskrnl/mm/arm/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/arm/stubs.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/arm/stubs.c [iso-8859-1] Sun Jul 20 20:41:04 2008 @@ -642,10 +642,9 @@ IN PVOID Address) { // - // TODO - // - UNIMPLEMENTED; - return 0; + // We don't enforce any protection on the pages -- they are all RWX + // + return PAGE_READWRITE; } VOID Modified: trunk/reactos/ntoskrnl/ntoskrnl_arm.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_arm.def?… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_arm.def [iso-8859-1] Sun Jul 20 20:41:04 2008 @@ -746,7 +746,7 @@ NlsMbCodePageTag DATA NlsMbOemCodePageTag DATA NlsOemCodePage DATA -NlsOemLeadByteInfo DATA +NlsOemLeadByteInfo=_NlsOemLeadByteInfo NtAddAtom NtAdjustPrivilegesToken NtAlertThread

1 0

[ros-arm-bringup] 34622: - Get rid of 3 days of work due to complaints from our legal guy.
by ros-arm-bringup＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 20:15:07 2008 New Revision: 34622 URL: http://svn.reactos.org/svn/reactos?rev=34622&view=rev Log: - Get rid of 3 days of work due to complaints from our legal guy. Removed: trunk/reactos/drivers/filesystems/cdfs_new/

1 0

[ros-arm-bringup] 34621: - Implement IOCTL_CDROM_GET_LAST_SESSION and IOCTL_CDROM_READ_TOC. - The formet is a hack to support ReactOS' cdfs.
by ros-arm-bringup＠svn.reactos.org 21 Jul '08

21 Jul '08

Author: ros-arm-bringup Date: Sun Jul 20 20:12:17 2008 New Revision: 34621 URL: http://svn.reactos.org/svn/reactos?rev=34621&view=rev Log: - Implement IOCTL_CDROM_GET_LAST_SESSION and IOCTL_CDROM_READ_TOC. - The formet is a hack to support ReactOS' cdfs. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Jul 20 20:12:17 2008 @@ -28,6 +28,14 @@ #include <debug.h> /* GLOBALS ********************************************************************/ + +#define RAMDISK_SESSION_SIZE \ + FIELD_OFFSET(CDROM_TOC, TrackData) + sizeof(TRACK_DATA) + +#define RAMDISK_TOC_SIZE \ + FIELD_OFFSET(CDROM_TOC, TrackData) + 2 * sizeof(TRACK_DATA) + +#define TOC_DATA_TRACK (0x04) typedef enum _RAMDISK_DEVICE_TYPE { @@ -857,6 +865,7 @@ PIO_STACK_LOCATION IoStackLocation = IoGetCurrentIrpStackLocation(Irp); PRAMDISK_BUS_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; ULONG Information; + PCDROM_TOC Toc; // // Grab the remove lock @@ -934,11 +943,87 @@ UNIMPLEMENTED; while (TRUE); break; - + + // + // Hack to support ReactOS's broken CDFS + // + case IOCTL_CDROM_GET_LAST_SESSION: + + // + // Validate the length + // + if (IoStackLocation->Parameters.DeviceIoControl. + OutputBufferLength < RAMDISK_SESSION_SIZE) + { + // + // Invalid length + // + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + // + // Fill out the TOC + // + Toc = Irp->AssociatedIrp.SystemBuffer; + Toc->Length[0] = 0; + Toc->Length[1] = RAMDISK_SESSION_SIZE - sizeof(Toc->Length); + Toc->FirstTrack = 1; + Toc->LastTrack = 1; + Toc->TrackData[0].Adr = 1; + Toc->TrackData[0].Control = TOC_DATA_TRACK; + Toc->TrackData[0].TrackNumber = 1; + Toc->TrackData[0].Address[0] = + Toc->TrackData[0].Address[1] = + Toc->TrackData[0].Address[2] = + Toc->TrackData[0].Address[3] = 0; + + // + // We're done + // + Status = STATUS_SUCCESS; + Information = RAMDISK_SESSION_SIZE; + break; + case IOCTL_CDROM_READ_TOC: - UNIMPLEMENTED; - while (TRUE); + // + // Validate the length + // + DPRINT1("Output: %lx\n", IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength); + if (IoStackLocation->Parameters.DeviceIoControl. + OutputBufferLength < sizeof(CDROM_TOC)) + { + // + // Invalid length + // + Status = STATUS_BUFFER_TOO_SMALL; + break; + } + + // + // Clear the TOC + // + Toc = Irp->AssociatedIrp.SystemBuffer; + RtlZeroMemory(Toc, sizeof(CDROM_TOC)); + + // + // Fill it out + // + DPRINT1("TOC: %d\n", RAMDISK_TOC_SIZE); + Toc->Length[0] = 0; + Toc->Length[1] = RAMDISK_TOC_SIZE - sizeof(Toc->Length); + Toc->FirstTrack = 1; + Toc->LastTrack = 1; + Toc->TrackData[0].Adr = 1; + Toc->TrackData[0].Control = TOC_DATA_TRACK; + Toc->TrackData[0].TrackNumber = 1; + + // + // We're done + // + Status = STATUS_SUCCESS; + Information = RAMDISK_TOC_SIZE; break; case IOCTL_DISK_SET_PARTITION_INFO:

1 0

[tkreuzer] 34620: rbuild files use tab indentation
by tkreuzer＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: tkreuzer Date: Sun Jul 20 18:21:16 2008 New Revision: 34620 URL: http://svn.reactos.org/svn/reactos?rev=34620&view=rev Log: rbuild files use tab indentation Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Sun Jul 20 18:21:16 2008 @@ -6,5 +6,5 @@ <library>hal</library> <file>ramdisk.c</file> <file>ramdisk.rc</file> - <compilerflag>-fms-extensions</compilerflag> + <compilerflag>-fms-extensions</compilerflag> </module>

1 0

[jmorlan] 34619: Fix KeInsertQueueApc error checking
by jmorlan＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: jmorlan Date: Sun Jul 20 18:00:18 2008 New Revision: 34619 URL: http://svn.reactos.org/svn/reactos?rev=34619&view=rev Log: Fix KeInsertQueueApc error checking Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3461… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sun Jul 20 18:00:18 2008 @@ -724,7 +724,7 @@ KiAcquireApcLock(Thread, &ApcLock); /* Make sure we can Queue APCs and that this one isn't already inserted */ - if (!(Thread->ApcQueueable) && (Apc->Inserted)) + if (!(Thread->ApcQueueable) || (Apc->Inserted)) { /* Fail */ State = FALSE;

1 0

[jmorlan] 34618: KiMoveApcState: Fix reversal of RepairList arguments. (Bug 1720)
by jmorlan＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: jmorlan Date: Sun Jul 20 17:48:06 2008 New Revision: 34618 URL: http://svn.reactos.org/svn/reactos?rev=34618&view=rev Log: KiMoveApcState: Fix reversal of RepairList arguments. (Bug 1720) Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/apc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/apc.c?rev=3461… ============================================================================== --- trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/apc.c [iso-8859-1] Sun Jul 20 17:48:06 2008 @@ -519,8 +519,8 @@ RtlCopyMemory(NewState, OldState, KAPC_STATE_ACTUAL_LENGTH); /* Repair Lists */ - RepairList(NewState->ApcListHead, OldState->ApcListHead, KernelMode); - RepairList(NewState->ApcListHead, OldState->ApcListHead, UserMode); + RepairList(OldState->ApcListHead, NewState->ApcListHead, KernelMode); + RepairList(OldState->ApcListHead, NewState->ApcListHead, UserMode); } /* PUBLIC FUNCTIONS **********************************************************/

1 0

[pschweitzer] 34617: Switched two more files to PSEH
by pschweitzer＠svn.reactos.org 20 Jul '08

20 Jul '08

Author: pschweitzer Date: Sun Jul 20 15:33:18 2008 New Revision: 34617 URL: http://svn.reactos.org/svn/reactos?rev=34617&view=rev Log: Switched two more files to PSEH Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ext3fsd/fileinfo.c [iso-8859-1] Sun Jul 20 15:33:18 2008 @@ -4,7 +4,8 @@ * FILE: fileinfo.c * PROGRAMMER: Matt Wu <mattwu(a)163.com> * HOMEPAGE: http://ext2.yeah.net - * UPDATE HISTORY: + * UPDATE HISTORY: 15 Jul 2008 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) + * Replaced SEH support with PSEH support */ /* INCLUDES *****************************************************************/ @@ -16,6 +17,38 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ + +VOID +Ext2QueryFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_FCB Fcb, + IN BOOLEAN FcbResourceAcquired ); + +VOID +Ext2SetFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_VCB Vcb, + IN PFILE_OBJECT FileObject, + IN PEXT2_FCB Fcb, + IN ULONG NotifyFilter, + IN BOOLEAN VcbMainResourceAcquired, + IN BOOLEAN FcbMainResourceAcquired, + IN BOOLEAN FcbPagingIoResourceAcquired, + IN BOOLEAN CacheInitialized ); + +VOID +Ext2DeleteFileFinal ( + IN PEXT2_VCB Vcb, + IN PEXT2_MCB Mcb, + IN PEXT2_FCB Dcb, + IN PEXT2_FCB Fcb, + IN BOOLEAN VcbResourceAcquired, + IN BOOLEAN FcbPagingIoAcquired, + IN BOOLEAN FcbResourceAcquired, + IN BOOLEAN DcbResourceAcquired, + IN BOOLEAN bNewDcb ); #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, Ext2QueryFileInformation) @@ -27,6 +60,46 @@ #pragma alloc_text(PAGE, Ext2DeleteFile) #endif + +/* FUNCTIONS ***************************************************************/ + + +_SEH_DEFINE_LOCALS(Ext2QueryFileInformationFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PNTSTATUS pStatus; + PEXT2_FCB Fcb; + BOOLEAN FcbResourceAcquired; +}; + +_SEH_FINALLYFUNC(Ext2QueryFileInformationFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2QueryFileInformationFinal); + Ext2QueryFileInformationFinal(_SEH_VAR(IrpContext), _SEH_VAR(pStatus), + _SEH_VAR(Fcb), _SEH_VAR(FcbResourceAcquired)); +} + +VOID +Ext2QueryFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_FCB Fcb, + IN BOOLEAN FcbResourceAcquired + ) +{ + if (FcbResourceAcquired) { + ExReleaseResourceLite(&Fcb->MainResource); + } + + if (!IrpContext->ExceptionInProgress) { + if (*pStatus == STATUS_PENDING || + *pStatus == STATUS_CANT_WAIT) { + *pStatus = Ext2QueueRequest(IrpContext); + } else { + Ext2CompleteIrpContext(IrpContext, *pStatus); + } + } +} NTSTATUS Ext2QueryFileInformation (IN PEXT2_IRP_CONTEXT IrpContext) @@ -42,9 +115,13 @@ FILE_INFORMATION_CLASS FileInformationClass; ULONG Length; PVOID Buffer; - BOOLEAN FcbResourceAcquired = FALSE; - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2QueryFileInformationFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(FcbResourceAcquired) = FALSE; ASSERT(IrpContext != NULL); @@ -58,15 +135,16 @@ // if (IsExt2FsDevice(DeviceObject)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } FileObject = IrpContext->FileObject; Fcb = (PEXT2_FCB) FileObject->FsContext; + _SEH_VAR(Fcb) = Fcb; if (Fcb == NULL) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } // @@ -74,13 +152,13 @@ // if (Fcb->Identifier.Type == EXT2VCB) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } if(!((Fcb->Identifier.Type == EXT2FCB) && (Fcb->Identifier.Size == sizeof(EXT2_FCB)))) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } Vcb = Fcb->Vcb; @@ -92,10 +170,10 @@ )) { Status = STATUS_PENDING; - __leave; + _SEH_LEAVE; } - FcbResourceAcquired = TRUE; + _SEH_VAR(FcbResourceAcquired) = TRUE; } Ccb = (PEXT2_CCB) FileObject->FsContext2; @@ -122,7 +200,7 @@ if (Length < sizeof(FILE_BASIC_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileBasicInformation = (PFILE_BASIC_INFORMATION) Buffer; @@ -148,7 +226,7 @@ if (Length < sizeof(FILE_STANDARD_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FSI = (PFILE_STANDARD_INFORMATION) Buffer; @@ -182,7 +260,7 @@ if (Length < sizeof(FILE_INTERNAL_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileInternalInformation = (PFILE_INTERNAL_INFORMATION) Buffer; @@ -202,7 +280,7 @@ if (Length < sizeof(FILE_EA_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileEaInformation = (PFILE_EA_INFORMATION) Buffer; @@ -222,7 +300,7 @@ if (Length < sizeof(FILE_NAME_INFORMATION) + Fcb->Mcb->ShortName.Length - sizeof(WCHAR)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileNameInformation = (PFILE_NAME_INFORMATION) Buffer; @@ -246,7 +324,7 @@ if (Length < sizeof(FILE_POSITION_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FilePositionInformation = (PFILE_POSITION_INFORMATION) Buffer; @@ -272,7 +350,7 @@ if (Length < sizeof(FILE_ALL_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FileAllInformation = (PFILE_ALL_INFORMATION) Buffer; @@ -335,7 +413,7 @@ Fcb->Mcb->ShortName.Length - sizeof(WCHAR)) { Irp->IoStatus.Information = sizeof(FILE_ALL_INFORMATION); Status = STATUS_BUFFER_OVERFLOW; - __leave; + _SEH_LEAVE; } FileNameInformation->FileNameLength = Fcb->Mcb->ShortName.Length; @@ -368,7 +446,7 @@ if (Length < sizeof(FILE_NETWORK_OPEN_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } PFNOI = (PFILE_NETWORK_OPEN_INFORMATION) Buffer; @@ -405,7 +483,7 @@ if (Length < sizeof(FILE_ATTRIBUTE_TAG_INFORMATION)) { Status = STATUS_INFO_LENGTH_MISMATCH; - __leave; + _SEH_LEAVE; } FATI = (PFILE_ATTRIBUTE_TAG_INFORMATION) Buffer; @@ -430,25 +508,88 @@ break; } - } __finally { - - if (FcbResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); - } - - if (!IrpContext->ExceptionInProgress) { - if (Status == STATUS_PENDING || - Status == STATUS_CANT_WAIT) { - Status = Ext2QueueRequest(IrpContext); - } else { - Ext2CompleteIrpContext(IrpContext, Status); - } - } - } - + } + _SEH_FINALLY(Ext2QueryFileInformationFinal_PSEH) + _SEH_END; + return Status; } +_SEH_DEFINE_LOCALS(Ext2SetFileInformationFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PNTSTATUS pStatus; + PEXT2_VCB Vcb; + PFILE_OBJECT FileObject; + PEXT2_FCB Fcb; + ULONG NotifyFilter; + BOOLEAN VcbMainResourceAcquired; + BOOLEAN FcbMainResourceAcquired; + BOOLEAN FcbPagingIoResourceAcquired; + BOOLEAN CacheInitialized; +}; + +_SEH_FINALLYFUNC(Ext2SetFileInformationFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2SetFileInformationFinal); + Ext2SetFileInformationFinal(_SEH_VAR(IrpContext), _SEH_VAR(pStatus), + _SEH_VAR(Vcb), _SEH_VAR(FileObject), _SEH_VAR(Fcb), + _SEH_VAR(NotifyFilter), _SEH_VAR(VcbMainResourceAcquired), + _SEH_VAR(FcbMainResourceAcquired), + _SEH_VAR(FcbPagingIoResourceAcquired), + _SEH_VAR(CacheInitialized)); +} + +VOID +Ext2SetFileInformationFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PEXT2_VCB Vcb, + IN PFILE_OBJECT FileObject, + IN PEXT2_FCB Fcb, + IN ULONG NotifyFilter, + IN BOOLEAN VcbMainResourceAcquired, + IN BOOLEAN FcbMainResourceAcquired, + IN BOOLEAN FcbPagingIoResourceAcquired, + IN BOOLEAN CacheInitialized + ) +{ + if (FcbPagingIoResourceAcquired) { + ExReleaseResourceLite(&Fcb->PagingIoResource); + } + + if (NT_SUCCESS(*pStatus) && (NotifyFilter != 0)) { + Ext2NotifyReportChange( + IrpContext, + Vcb, + Fcb->Mcb, + NotifyFilter, + FILE_ACTION_MODIFIED ); + + } + + if (FcbMainResourceAcquired) { + ExReleaseResourceLite(&Fcb->MainResource); + } + + if (CacheInitialized) { + CcUninitializeCacheMap(FileObject, NULL, NULL); + } + + if (VcbMainResourceAcquired) { + ExReleaseResourceLite(&Vcb->MainResource); + } + + if (!IrpContext->ExceptionInProgress) { + if (*pStatus == STATUS_PENDING || + *pStatus == STATUS_CANT_WAIT ) { + DbgBreak(); + *pStatus = Ext2QueueRequest(IrpContext); + } else { + Ext2CompleteIrpContext(IrpContext, *pStatus); + } + } +} NTSTATUS Ext2SetFileInformation (IN PEXT2_IRP_CONTEXT IrpContext) @@ -463,17 +604,19 @@ PIO_STACK_LOCATION IoStackLocation; FILE_INFORMATION_CLASS FileInformationClass; - ULONG NotifyFilter = 0; - ULONG Length; PVOID Buffer; - BOOLEAN VcbMainResourceAcquired = FALSE; - BOOLEAN FcbMainResourceAcquired = FALSE; - BOOLEAN FcbPagingIoResourceAcquired = FALSE; - BOOLEAN CacheInitialized = FALSE; - - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2SetFileInformationFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(NotifyFilter) = 0; + _SEH_VAR(VcbMainResourceAcquired) = FALSE; + _SEH_VAR(FcbMainResourceAcquired) = FALSE; + _SEH_VAR(FcbPagingIoResourceAcquired) = FALSE; + _SEH_VAR(CacheInitialized) = FALSE; ASSERT(IrpContext != NULL); @@ -486,7 +629,7 @@ // if (IsExt2FsDevice(DeviceObject)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } /* check io stack location of irp stack */ @@ -499,12 +642,13 @@ /* check Vcb */ Vcb = (PEXT2_VCB) DeviceObject->DeviceExtension; + _SEH_VAR(Vcb) = Vcb; ASSERT(Vcb != NULL); ASSERT((Vcb->Identifier.Type == EXT2VCB) && (Vcb->Identifier.Size == sizeof(EXT2_VCB))); if (!IsMounted(Vcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } /* we need grab Vcb in case it's a rename operation */ @@ -513,18 +657,20 @@ &Vcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT) )) { Status = STATUS_PENDING; - __leave; - } - VcbMainResourceAcquired = TRUE; + _SEH_LEAVE; + } + _SEH_VAR(VcbMainResourceAcquired) = TRUE; } FileObject = IrpContext->FileObject; + _SEH_VAR(FileObject) = FileObject; Fcb = (PEXT2_FCB) FileObject->FsContext; + _SEH_VAR(Fcb) = Fcb; // This request is issued to volumes, just return success if (Fcb == NULL || Fcb->Identifier.Type == EXT2VCB) { Status = STATUS_SUCCESS; - __leave; + _SEH_LEAVE; } ASSERT((Fcb->Identifier.Type == EXT2FCB) && @@ -532,7 +678,7 @@ if (IsFlagOn(Fcb->Flags, FCB_FILE_DELETED)) { Status = STATUS_FILE_DELETED; - __leave; + _SEH_LEAVE; } Ccb = (PEXT2_CCB) FileObject->FsContext2; @@ -551,7 +697,7 @@ NULL ); if (Status != STATUS_SUCCESS) { - __leave; + _SEH_LEAVE; } // @@ -570,17 +716,17 @@ &Fcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT) )) { Status = STATUS_PENDING; - __leave; + _SEH_LEAVE; } - FcbMainResourceAcquired = TRUE; + _SEH_VAR(FcbMainResourceAcquired) = TRUE; } if (IsFlagOn(Vcb->Flags, VCB_READ_ONLY)) { if (FileInformationClass != FilePositionInformation) { Status = STATUS_MEDIA_WRITE_PROTECTED; - __leave; + _SEH_LEAVE; } } @@ -592,10 +738,10 @@ IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT) )) { Status = STATUS_PENDING; DbgBreak(); - __leave; + _SEH_LEAVE; } - FcbPagingIoResourceAcquired = TRUE; + _SEH_VAR(FcbPagingIoResourceAcquired) = TRUE; } /* @@ -616,19 +762,19 @@ if (FBI->CreationTime.QuadPart != 0 && FBI->CreationTime.QuadPart != -1) { Ext2Inode->i_ctime = Ext2LinuxTime(FBI->CreationTime); Fcb->Mcb->CreationTime = Ext2NtTime(Ext2Inode->i_ctime); - NotifyFilter |= FILE_NOTIFY_CHANGE_CREATION; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_CREATION; } if (FBI->LastAccessTime.QuadPart != 0 && FBI->LastAccessTime.QuadPart != -1) { Ext2Inode->i_atime = Ext2LinuxTime(FBI->LastAccessTime); Fcb->Mcb->LastAccessTime = Ext2NtTime(Ext2Inode->i_atime); - NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_ACCESS; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_LAST_ACCESS; } if (FBI->LastWriteTime.QuadPart != 0 && FBI->LastWriteTime.QuadPart != -1) { Ext2Inode->i_mtime = Ext2LinuxTime(FBI->LastWriteTime); Fcb->Mcb->LastWriteTime = Ext2NtTime(Ext2Inode->i_mtime); - NotifyFilter |= FILE_NOTIFY_CHANGE_LAST_WRITE; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_LAST_WRITE; SetFlag(Ccb->Flags, CCB_LAST_WRITE_UPDATED); } @@ -639,7 +785,7 @@ if (FBI->FileAttributes != 0) { BOOLEAN bIsDirectory = IsDirectory(Fcb); - NotifyFilter |= FILE_NOTIFY_CHANGE_ATTRIBUTES; + _SEH_VAR(NotifyFilter) |= FILE_NOTIFY_CHANGE_ATTRIBUTES; if (IsFlagOn(FBI->FileAttributes, FILE_ATTRIBUTE_READONLY)) { Ext2SetReadOnly(Fcb->Inode->i_mode); @@ -659,14 +805,14 @@ } } - if (NotifyFilter != 0) { + if (_SEH_VAR(NotifyFilter) != 0) { if ( Ext2SaveInode( IrpContext, Vcb, Fcb->Mcb->iNo, Ext2Inode)) { Status = STATUS_SUCCESS; } } - ClearFlag(NotifyFilter, FILE_NOTIFY_CHANGE_LAST_ACCESS); + ClearFlag(_SEH_VAR(NotifyFilter), FILE_NOTIFY_CHANGE_LAST_ACCESS); Status = STATUS_SUCCESS; } @@ -679,7 +825,7 @@ if (IsDirectory(Fcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } else { Status = STATUS_SUCCESS; } @@ -698,7 +844,7 @@ &(Ext2Global->CacheManagerNoOpCallbacks), Fcb ); - CacheInitialized = TRUE; + _SEH_VAR(CacheInitialized) = TRUE; } /* get user specified allocationsize aligned with BLOCK_SIZE */ @@ -721,7 +867,7 @@ Status = Ext2ExpandFile(IrpContext, Vcb, Fcb->Mcb, &AllocationSize); Fcb->Header.AllocationSize = AllocationSize; - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } else if (AllocationSize.QuadPart < Fcb->Header.AllocationSize.QuadPart) { @@ -743,7 +889,7 @@ } } - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; Fcb->Header.AllocationSize.QuadPart = AllocationSize.QuadPart; if (Fcb->Header.FileSize.QuadPart > AllocationSize.QuadPart) { Fcb->Header.FileSize.QuadPart = AllocationSize.QuadPart; @@ -764,11 +910,11 @@ Status = STATUS_USER_MAPPED_FILE; DbgBreak(); - __leave; + _SEH_LEAVE; } } - if (NotifyFilter) { + if (_SEH_VAR(NotifyFilter)) { SetFlag(FileObject->Flags, FO_FILE_MODIFIED); SetLongFlag(Fcb->Flags, FCB_FILE_MODIFIED); @@ -795,7 +941,7 @@ if (IsDirectory(Fcb)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } else { Status = STATUS_SUCCESS; } @@ -814,7 +960,7 @@ &(Ext2Global->CacheManagerNoOpCallbacks), Fcb ); - CacheInitialized = TRUE; + _SEH_VAR(CacheInitialized) = TRUE; } AllocationSize = Fcb->Header.AllocationSize; @@ -826,7 +972,7 @@ if (IoStackLocation->Parameters.SetFile.AdvanceOnly) { if (IsFlagOn(Fcb->Flags, FCB_DELETE_PENDING)) { - __leave; + _SEH_LEAVE; } if (EndOfFile.QuadPart > Fcb->Header.FileSize.QuadPart) { @@ -840,11 +986,11 @@ if (S_ISREG(Fcb->Inode->i_mode)) { Fcb->Inode->i_size_high = (__u32)(EndOfFile.HighPart); } - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; goto FileEndChanged; } - __leave; + _SEH_LEAVE; } /* check if file blocks are allocated in Ext2Create */ @@ -862,7 +1008,7 @@ Fcb->Mcb, &(Fcb->Header.AllocationSize) ); - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } else if (FileSize.QuadPart == AllocationSize.QuadPart) { @@ -913,7 +1059,7 @@ } } - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } if (NT_SUCCESS(Status)) { @@ -935,7 +1081,7 @@ SetFlag(FileObject->Flags, FO_FILE_MODIFIED); SetLongFlag(Fcb->Flags, FCB_FILE_MODIFIED); - NotifyFilter = FILE_NOTIFY_CHANGE_SIZE; + _SEH_VAR(NotifyFilter) = FILE_NOTIFY_CHANGE_SIZE; } FileEndChanged: @@ -981,7 +1127,7 @@ if (Length < sizeof(FILE_POSITION_INFORMATION)) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } FilePositionInformation = (PFILE_POSITION_INFORMATION) Buffer; @@ -990,14 +1136,14 @@ (FilePositionInformation->CurrentByteOffset.LowPart & DeviceObject->AlignmentRequirement) ) { Status = STATUS_INVALID_PARAMETER; - __leave; + _SEH_LEAVE; } FileObject->CurrentByteOffset = FilePositionInformation->CurrentByteOffset; Status = STATUS_SUCCESS; - __leave; + _SEH_LEAVE; } break; @@ -1013,44 +1159,9 @@ Status = STATUS_INVALID_PARAMETER;/* STATUS_INVALID_INFO_CLASS; */ } - } __finally { - - if (FcbPagingIoResourceAcquired) { - ExReleaseResourceLite(&Fcb->PagingIoResource); - } - - if (NT_SUCCESS(Status) && (NotifyFilter != 0)) { - Ext2NotifyReportChange( - IrpContext, - Vcb, - Fcb->Mcb, - NotifyFilter, - FILE_ACTION_MODIFIED ); - - } - - if (FcbMainResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); - } - - if (CacheInitialized) { - CcUninitializeCacheMap(FileObject, NULL, NULL); - } - - if (VcbMainResourceAcquired) { - ExReleaseResourceLite(&Vcb->MainResource); - } - - if (!IrpContext->ExceptionInProgress) { - if (Status == STATUS_PENDING || - Status == STATUS_CANT_WAIT ) { - DbgBreak(); - Status = Ext2QueueRequest(IrpContext); - } else { - Ext2CompleteIrpContext(IrpContext, Status); - } - } - } + } + _SEH_FINALLY(Ext2SetFileInformationFinal_PSEH) + _SEH_END; return Status; } @@ -1780,6 +1891,69 @@ return EXT2_FT_REG_FILE; } +_SEH_DEFINE_LOCALS(Ext2DeleteFileFinal) +{ + PEXT2_VCB Vcb; + PEXT2_MCB Mcb; + PEXT2_FCB Dcb; + PEXT2_FCB Fcb; + BOOLEAN VcbResourceAcquired; + BOOLEAN FcbPagingIoAcquired; + BOOLEAN FcbResourceAcquired; + BOOLEAN DcbResourceAcquired; + BOOLEAN bNewDcb; +}; + +_SEH_FINALLYFUNC(Ext2DeleteFileFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2DeleteFileFinal); + Ext2DeleteFileFinal(_SEH_VAR(Vcb), _SEH_VAR(Mcb), _SEH_VAR(Dcb), + _SEH_VAR(Fcb), _SEH_VAR(VcbResourceAcquired), + _SEH_VAR(FcbPagingIoAcquired), _SEH_VAR(FcbResourceAcquired), + _SEH_VAR(DcbResourceAcquired), _SEH_VAR(bNewDcb)); +} + +VOID +Ext2DeleteFileFinal ( + IN PEXT2_VCB Vcb, + IN PEXT2_MCB Mcb, + IN PEXT2_FCB Dcb, + IN PEXT2_FCB Fcb, + IN BOOLEAN VcbResourceAcquired, + IN BOOLEAN FcbPagingIoAcquired, + IN BOOLEAN FcbResourceAcquired, + IN BOOLEAN DcbResourceAcquired, + IN BOOLEAN bNewDcb + ) +{ + if (FcbPagingIoAcquired) { + ExReleaseResourceLite(&Fcb->PagingIoResource); + } + + if (FcbResourceAcquired) { + ExReleaseResourceLite(&Fcb->MainResource); + } + + if (DcbResourceAcquired) { + ExReleaseResourceLite(&Dcb->MainResource); + } + + if (Dcb) { + ClearLongFlag(Dcb->Flags, FCB_STATE_BUSY); + if (bNewDcb) { + if (Ext2DerefXcb(&Dcb->ReferenceCount) == 0) { + Ext2FreeFcb(Dcb); + } else { + DEBUG(DL_ERR, ( "Ext2DeleteFile: Dcb %wZ used by other threads.\n", + &Mcb->FullName )); + } + } + } + if (VcbResourceAcquired) { + ExReleaseResourceLite(&Vcb->MainResource); + } +} + NTSTATUS Ext2DeleteFile( PEXT2_IRP_CONTEXT IrpContext, @@ -1793,13 +1967,6 @@ NTSTATUS Status = STATUS_UNSUCCESSFUL; - BOOLEAN VcbResourceAcquired = FALSE; - BOOLEAN FcbPagingIoAcquired = FALSE; - BOOLEAN FcbResourceAcquired = FALSE; - BOOLEAN DcbResourceAcquired = FALSE; - - BOOLEAN bNewDcb = FALSE; - LARGE_INTEGER SysTime; DEBUG(DL_INF, ( "Ext2DeleteFile: File %wZ (%xh) will be deleted!\n", @@ -1818,22 +1985,33 @@ } } - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2DeleteFileFinal); + _SEH_VAR(Vcb) = Vcb; + _SEH_VAR(Mcb) = Mcb; + _SEH_VAR(Dcb) = Dcb; + _SEH_VAR(Fcb) = Fcb; + _SEH_VAR(VcbResourceAcquired) = FALSE; + _SEH_VAR(FcbPagingIoAcquired) = FALSE; + _SEH_VAR(FcbResourceAcquired) = FALSE; + _SEH_VAR(DcbResourceAcquired) = FALSE; + _SEH_VAR(bNewDcb) = FALSE; ExAcquireResourceExclusiveLite(&Vcb->MainResource, TRUE); - VcbResourceAcquired = TRUE; + _SEH_VAR(VcbResourceAcquired) = TRUE; if (!(Dcb = Mcb->Parent->Fcb)) { Dcb = Ext2AllocateFcb(Vcb, Mcb->Parent); if (Dcb) { Ext2ReferXcb(&Dcb->ReferenceCount); - bNewDcb = TRUE; + _SEH_VAR(bNewDcb) = TRUE; } } if (Dcb) { SetLongFlag(Dcb->Flags, FCB_STATE_BUSY); - DcbResourceAcquired = + _SEH_VAR(DcbResourceAcquired) = ExAcquireResourceExclusiveLite(&Dcb->MainResource, TRUE); /* remove it's entry form it's parent */ @@ -1848,10 +2026,10 @@ if (NT_SUCCESS(Status)) { if (Fcb) { - FcbResourceAcquired = + _SEH_VAR(FcbResourceAcquired) = ExAcquireResourceExclusiveLite(&Fcb->MainResource, TRUE); - FcbPagingIoAcquired = + _SEH_VAR(FcbPagingIoAcquired) = ExAcquireResourceExclusiveLite(&Fcb->PagingIoResource, TRUE); } @@ -1873,7 +2051,7 @@ } if (!NT_SUCCESS(Status)) { - __leave; + _SEH_LEAVE; } if (IsMcbSymlink(Mcb)) { @@ -1941,35 +2119,9 @@ Ext2RemoveMcb(Vcb, Mcb); } - } __finally { - - if (FcbPagingIoAcquired) { - ExReleaseResourceLite(&Fcb->PagingIoResource); - } - - if (FcbResourceAcquired) { - ExReleaseResourceLite(&Fcb->MainResource); - } - - if (DcbResourceAcquired) { - ExReleaseResourceLite(&Dcb->MainResource); - } - - if (Dcb) { - ClearLongFlag(Dcb->Flags, FCB_STATE_BUSY); - if (bNewDcb) { - if (Ext2DerefXcb(&Dcb->ReferenceCount) == 0) { - Ext2FreeFcb(Dcb); - } else { - DEBUG(DL_ERR, ( "Ext2DeleteFile: Dcb %wZ used by other threads.\n", - &Mcb->FullName )); - } - } - } - if (VcbResourceAcquired) { - ExReleaseResourceLite(&Vcb->MainResource); - } - } + } + _SEH_FINALLY(Ext2DeleteFileFinal_PSEH) + _SEH_END; DEBUG(DL_INF, ( "Ext2DeleteFile: %wZ Succeed... EXT2SB->S_FREE_BLOCKS = %xh .\n", &Mcb->FullName, Vcb->SuperBlock->s_free_blocks_count)); Modified: branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/filesystems/… ============================================================================== --- branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c [iso-8859-1] (original) +++ branches/pierre-fsd/drivers/filesystems/ext3fsd/flush.c [iso-8859-1] Sun Jul 20 15:33:18 2008 @@ -4,7 +4,8 @@ * FILE: flush.c * PROGRAMMER: Matt Wu <mattwu(a)163.com> * HOMEPAGE: http://ext2.yeah.net - * UPDATE HISTORY: + * UPDATE HISTORY: 15 Jul 2008 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) + * Replaced SEH support with PSEH support */ /* INCLUDES *****************************************************************/ @@ -16,6 +17,16 @@ extern PEXT2_GLOBAL Ext2Global; /* DEFINITIONS *************************************************************/ + +VOID +Ext2FlushFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp, + IN PEXT2_VCB Vcb, + IN PEXT2_FCBVCB FcbOrVcb, + IN BOOLEAN MainResourceAcquired ); #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, Ext2FlushFile) @@ -25,6 +36,9 @@ #endif +/* FUNCTIONS ***************************************************************/ + + NTSTATUS Ext2FlushCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, @@ -138,6 +152,71 @@ return IoStatus.Status; } +_SEH_DEFINE_LOCALS(Ext2FlushFinal) +{ + PEXT2_IRP_CONTEXT IrpContext; + PNTSTATUS pStatus; + PIRP Irp; + PIO_STACK_LOCATION IrpSp; + PEXT2_VCB Vcb; + PEXT2_FCBVCB FcbOrVcb; + BOOLEAN MainResourceAcquired; +}; + +_SEH_FINALLYFUNC(Ext2FlushFinal_PSEH) +{ + _SEH_ACCESS_LOCALS(Ext2FlushFinal); + Ext2FlushFinal(_SEH_VAR(IrpContext), _SEH_VAR(pStatus), _SEH_VAR(Irp), + _SEH_VAR(IrpSp), _SEH_VAR(Vcb), _SEH_VAR(FcbOrVcb), + _SEH_VAR(MainResourceAcquired)); +} + +VOID +Ext2FlushFinal ( + IN PEXT2_IRP_CONTEXT IrpContext, + IN PNTSTATUS pStatus, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp, + IN PEXT2_VCB Vcb, + IN PEXT2_FCBVCB FcbOrVcb, + IN BOOLEAN MainResourceAcquired + ) +{ + if (MainResourceAcquired) { + ExReleaseResourceLite(&FcbOrVcb->MainResource); + } + + if (!IrpContext->ExceptionInProgress) { + + if (Vcb && Irp && IrpSp && (!IsFlagOn(Vcb->Flags, VCB_READ_ONLY))) { + + // Call the disk driver to flush the physial media. + NTSTATUS DriverStatus; + PIO_STACK_LOCATION NextIrpSp; + + NextIrpSp = IoGetNextIrpStackLocation(Irp); + + *NextIrpSp = *IrpSp; + + IoSetCompletionRoutine( Irp, + Ext2FlushCompletionRoutine, + NULL, + TRUE, + TRUE, + TRUE ); + + DriverStatus = IoCallDriver(Vcb->TargetDeviceObject, Irp); + + *pStatus = (DriverStatus == STATUS_INVALID_DEVICE_REQUEST) ? + *pStatus : DriverStatus; + + IrpContext->Irp = Irp = NULL; + } + + Ext2CompleteIrpContext(IrpContext, *pStatus); + } +} + NTSTATUS Ext2Flush (IN PEXT2_IRP_CONTEXT IrpContext) { @@ -154,9 +233,16 @@ PDEVICE_OBJECT DeviceObject = NULL; - BOOLEAN MainResourceAcquired = FALSE; - - __try { + _SEH_TRY { + + _SEH_DECLARE_LOCALS(Ext2FlushFinal); + _SEH_VAR(IrpContext) = IrpContext; + _SEH_VAR(pStatus) = &Status; + _SEH_VAR(Irp) = NULL; + _SEH_VAR(IrpSp) = NULL; + _SEH_VAR(Vcb) = NULL; + _SEH_VAR(FcbOrVcb) = NULL; + _SEH_VAR(MainResourceAcquired) = FALSE; ASSERT(IrpContext); @@ -170,10 +256,11 @@ // if (IsExt2FsDevice(DeviceObject)) { Status = STATUS_INVALID_DEVICE_REQUEST; - __leave; + _SEH_LEAVE; } Vcb = (PEXT2_VCB) DeviceObject->DeviceExtension; + _SEH_VAR(Vcb) = Vcb; ASSERT(Vcb != NULL); ASSERT((Vcb->Identifier.Type == EXT2VCB) && (Vcb->Identifier.Size == sizeof(EXT2_VCB))); @@ -182,27 +269,30 @@ if ( IsFlagOn(Vcb->Flags, VCB_READ_ONLY) || IsFlagOn(Vcb->Flags, VCB_WRITE_PROTECTED)) { Status = STATUS_SUCCESS; - __leave; + _SEH_LEAVE; } Irp = IrpContext->Irp; + _SEH_VAR(Irp) = Irp; IrpSp = IoGetCurrentIrpStackLocation(Irp); + _SEH_VAR(IrpSp) = IrpSp; FileObject = IrpContext->FileObject; FcbOrVcb = (PEXT2_FCBVCB) FileObject->FsContext; + _SEH_VAR(FcbOrVcb) = FcbOrVcb; ASSERT(FcbOrVcb != NULL); Ccb = (PEXT2_CCB) FileObject->FsContext2; if (Ccb == NULL) { Status = STATUS_SUCCESS; - __leave; - } - - MainResourceAcquired = + _SEH_LEAVE; + } + + _SEH_VAR(MainResourceAcquired) = ExAcquireResourceExclusiveLite(&FcbOrVcb->MainResource, IsFlagOn(IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT)); - ASSERT(MainResourceAcquired); + ASSERT(_SEH_VAR(MainResourceAcquired)); DEBUG(DL_USR, ("Ext2Flush-pre: total mcb records=%u\n", FsRtlNumberOfRunsInLargeMcb(&Vcb->Extents))); @@ -211,7 +301,7 @@ Ext2VerifyVcb(IrpContext, Vcb); Status = Ext2FlushFiles(IrpContext, (PEXT2_VCB)(FcbOrVcb), FALSE); if (NT_SUCCESS(Status)) { - __leave; + _SEH_LEAVE; } Status = Ext2FlushVolume(IrpContext, (PEXT2_VCB)(FcbOrVcb), FALSE); @@ -237,42 +327,9 @@ FsRtlNumberOfRunsInLargeMcb(&Vcb->Extents))); - } __finally { - - if (MainResourceAcquired) { - ExReleaseResourceLite(&FcbOrVcb->MainResource); - } - - if (!IrpContext->ExceptionInProgress) { - - if (Vcb && Irp && IrpSp && (!IsFlagOn(Vcb->Flags, VCB_READ_ONLY))) { - - // Call the disk driver to flush the physial media. - NTSTATUS DriverStatus; - PIO_STACK_LOCATION NextIrpSp; - - NextIrpSp = IoGetNextIrpStackLocation(Irp); - - *NextIrpSp = *IrpSp; - - IoSetCompletionRoutine( Irp, - Ext2FlushCompletionRoutine, - NULL, - TRUE, - TRUE, - TRUE ); - - DriverStatus = IoCallDriver(Vcb->TargetDeviceObject, Irp); - - Status = (DriverStatus == STATUS_INVALID_DEVICE_REQUEST) ? - Status : DriverStatus; - - IrpContext->Irp = Irp = NULL; - } - - Ext2CompleteIrpContext(IrpContext, Status); - } - } + } + _SEH_FINALLY(Ext2FlushFinal_PSEH) + _SEH_END; return Status; -} +}

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