Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[fireball] 39747: - Don't match tags if Tag is 0.
by fireball＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: fireball Date: Wed Feb 25 15:50:41 2009 New Revision: 39747 URL: http://svn.reactos.org/svn/reactos?rev=39747&view=rev Log: - Don't match tags if Tag is 0. Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=397… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Wed Feb 25 15:50:41 2009 @@ -261,7 +261,7 @@ else BlockTag = EiGetNonPagedPoolTag(Block); - if (BlockTag != Tag) + if (BlockTag != Tag && Tag != 0) KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, BlockTag, Tag); ExFreePool(Block);

1 0

[fireball] 39746: Alex Vlasov - blockdev.c: Implement misc helper functions. - direntry.c: Some changes to query dirents info for IRP_MJ_DIRECTORY_CONTROL, and the routine that locates a single dirent for IRP_MJ_CREATE. - fastfat.c: Implement queuing support (FatQueueRequest / FatDequeueRequest). - fat.c: Cleanup, use helper functions FatPin*Page. - fcb.c: Add FCB helper routines. - Header files: Change structures for future usage. - Add PSEH2 library usage.
by fireball＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: fireball Date: Wed Feb 25 15:25:06 2009 New Revision: 39746 URL: http://svn.reactos.org/svn/reactos?rev=39746&view=rev Log: Alex Vlasov - blockdev.c: Implement misc helper functions. - direntry.c: Some changes to query dirents info for IRP_MJ_DIRECTORY_CONTROL, and the routine that locates a single dirent for IRP_MJ_CREATE. - fastfat.c: Implement queuing support (FatQueueRequest / FatDequeueRequest). - fat.c: Cleanup, use helper functions FatPin*Page. - fcb.c: Add FCB helper routines. - Header files: Change structures for future usage. - Add PSEH2 library usage. Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c trunk/reactos/drivers/filesystems/fastfat_new/direntry.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fat.h trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fcb.c trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: drivers/filesystems/fastfat/blockdev.c * PURPOSE: Temporary sector reading support - * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) + * PROGRAMMERS: Alexey Vlasov */ /* INCLUDES *****************************************************************/ @@ -12,5 +12,460 @@ #include "fastfat.h" /* FUNCTIONS ***************************************************************/ +//FIXME: There is a conflicting function FatPerformDevIoCtrl doing same thing! +NTSTATUS +FatDiskIoControl_( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG IoCtlCode, + IN PVOID InputBuffer, + IN ULONG InputBufferSize, + IN OUT PVOID OutputBuffer, + IN OUT PULONG OutputBufferSize OPTIONAL) +{ + PIRP Irp; + KEVENT Event; + NTSTATUS Status; + ULONG OutBufferSize; + IO_STATUS_BLOCK IoStatus; + + /* Set out buffer size if it was supplied. */ + OutBufferSize = (ARGUMENT_PRESENT(OutputBufferSize) + ? 0 : *OutputBufferSize); + + /* Initialize event if the operation will be pended. */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Build the Irp. */ + Irp = IoBuildDeviceIoControlRequest(IoCtlCode, DeviceObject, + InputBuffer, InputBufferSize, OutputBuffer, OutBufferSize, + FALSE, &Event, &IoStatus); + if (Irp == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Send IRP to Disk Device */ + Status = IoCallDriver(DeviceObject, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = IoStatus.Status; + } + + /* Return output buffer length if required. */ + if (ARGUMENT_PRESENT(OutputBufferSize)) + *OutputBufferSize = IoStatus.Information; + return Status; +} + +PVOID +FatMapUserBuffer( + IN OUT PIRP Irp) +/* + * FUNCTION: + * + * + * ARGUMENTS: + * IrpContext = Pointer to FCB structure for the file. + * Irp = Pointer to the IRP structure + * RETURNS: Status Value. + * NOTES: + */ +{ + PVOID Address; + + if (Irp->MdlAddress == NULL) + return Irp->UserBuffer; + Address = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + if (Address == NULL) + ExRaiseStatus( STATUS_INVALID_USER_BUFFER ); + return Address; +} + +NTSTATUS +FatLockUserBuffer ( + IN PFAT_IRP_CONTEXT IrpContext, + IN LOCK_OPERATION Operation, + IN ULONG BufferLength) +/* + * FUNCTION: + * + * + * ARGUMENTS: + * IrpContext = Pointer to FCB structure for the file. + * Operation = Type of lock operation. + * BufferLength = Buffer length to be locked. + * RETURNS: Status Value. + * NOTES: + */ +{ + PMDL Mdl; + PIRP Irp; + NTSTATUS Status; + + Mdl = NULL; + Irp = IrpContext->Irp; + Status = STATUS_SUCCESS; + if (Irp->MdlAddress == NULL) + { + NTSTATUS Status; + Mdl = IoAllocateMdl(Irp->UserBuffer, + BufferLength, FALSE, FALSE, Irp); + if (Mdl == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + _SEH2_TRY + { + MmProbeAndLockPages(Mdl, + Irp->RequestorMode, Operation); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + IoFreeMdl( Mdl ); + Irp->MdlAddress = NULL; + } _SEH2_END + } + return Status; +} + +NTSTATUS +FatIoSyncCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PFAT_IO_CONTEXT IoContext; + + IoContext = (PFAT_IO_CONTEXT) Context; + + /* Check if this is an associated irp. */ + if (Irp != IoContext->Irp) + { + if (!NT_SUCCESS(Irp->IoStatus.Status)) + IoContext->Irp->IoStatus = Irp->IoStatus; + IoFreeMdl(Irp->MdlAddress); + IoFreeIrp(Irp); + if (InterlockedDecrement(&IoContext->RunCount) != 0) + return STATUS_MORE_PROCESSING_REQUIRED; + /* This was the last run, update master irp. */ + if (NT_SUCCESS(IoContext->Irp->IoStatus.Status)) + IoContext->Irp->IoStatus.Information = IoContext->Length; + } + + /* This is the last associated irp or a single irp IO. */ + if (NT_SUCCESS(IoContext->Irp->IoStatus.Status) && + !FlagOn(IoContext->Irp->Flags, IRP_PAGING_IO)) + { + /* Maintain FileObject CurrentByteOffset */ + IoContext->FileObject->CurrentByteOffset.QuadPart = + IoContext->Offset + IoContext->Irp->IoStatus.Information; + } + + /* Signal about completion. */ + KeSetEvent(&IoContext->Wait.SyncEvent, 0, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +FatIoAsyncCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + PFAT_IO_CONTEXT IoContext; + + IoContext = (PFAT_IO_CONTEXT) Context; + + /* Check if this is an associated irp. */ + if (Irp != IoContext->Irp) + { + if (!NT_SUCCESS(Irp->IoStatus.Status)) + IoContext->Irp->IoStatus = Irp->IoStatus; + IoFreeMdl(Irp->MdlAddress); + IoFreeIrp(Irp); + if (InterlockedDecrement(&IoContext->RunCount) != 0) + return STATUS_MORE_PROCESSING_REQUIRED; + /* This was the last run, update master irp. */ + if (NT_SUCCESS(IoContext->Irp->IoStatus.Status)) + IoContext->Irp->IoStatus.Information = IoContext->Length; + } + + + /* This is the last associated irp or a single irp IO. */ + if (NT_SUCCESS(IoContext->Irp->IoStatus.Status) && + !FlagOn(IoContext->Irp->Flags, IRP_PAGING_IO)) + { + /* Maintain FileObject Flags */ + if (IoGetCurrentIrpStackLocation(IoContext->Irp)->MajorFunction + == IRP_MJ_READ) + { + SetFlag(IoContext->FileObject->Flags, FO_FILE_FAST_IO_READ); + } + else + { + SetFlag(IoContext->FileObject->Flags, FO_FILE_MODIFIED); + } + } + if (IoContext->Wait.Async.Resource != NULL) + ExReleaseResourceForThreadLite( + IoContext->Wait.Async.Resource, + IoContext->Wait.Async.ResourceThreadId); + + if (IoContext->Wait.Async.PagingIoResource != NULL) + ExReleaseResourceForThreadLite( + IoContext->Wait.Async.PagingIoResource, + IoContext->Wait.Async.ResourceThreadId); + + IoMarkIrpPending(Irp); + ExFreePool(Context); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +FatPerformLboIo( + IN PFAT_IRP_CONTEXT IrpContext, + IN PLARGE_INTEGER Offset, + IN SIZE_T Length) +{ + BOOLEAN CanWait, ReadOperation; + PIO_STACK_LOCATION IoStack; + + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + ReadOperation = (IrpContext->Stack->MajorFunction == IRP_MJ_READ); + + /* Allocate completion context */ + IrpContext->FatIoContext = FsRtlAllocatePoolWithTag( + NonPagedPool, sizeof(FAT_IO_CONTEXT), (ULONG) 'xCoI'); + + if (IrpContext->FatIoContext == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlZeroMemory(IrpContext->FatIoContext, + sizeof(FAT_IO_CONTEXT)); + + /* Initialize event if we are supposed to wait. */ + if (CanWait) + { + KeInitializeEvent( + &IrpContext->FatIoContext->Wait.SyncEvent, + NotificationEvent, FALSE); + } + + /* Set the completion routine depending on wait semantics. */ + IoSetCompletionRoutine(IrpContext->Irp, + (CanWait + ? FatIoSyncCompletionRoutine + : FatIoAsyncCompletionRoutine), + IrpContext->FatIoContext, TRUE, TRUE, TRUE); + + /* Setup stack location. */ + IoStack = IoGetNextIrpStackLocation(IrpContext->Irp); + IoStack->MajorFunction = IrpContext->MajorFunction; + IoStack->Parameters.Read.Length = (ULONG) Length; + IoStack->Parameters.Read.ByteOffset = *Offset; + if (FlagOn(IrpContext->Flags, IRPCONTEXT_WRITETHROUGH)) + SetFlag(IoStack->Flags, SL_WRITE_THROUGH); + + IoCallDriver( + IrpContext->Vcb->TargetDeviceObject, + IrpContext->Irp); + if (CanWait) + { + KeWaitForSingleObject( + &IrpContext->FatIoContext->Wait.SyncEvent, + Executive, KernelMode, FALSE, NULL); + return IrpContext->Irp->IoStatus.Status; + } + SetFlag(IrpContext->Flags, IRPCONTEXT_STACK_IO_CONTEXT); + return STATUS_PENDING; +} + + + +NTSTATUS +FatPerformVirtualNonCachedIo( + IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb, + IN PLARGE_INTEGER Offset, + IN SIZE_T Length) +{ + NTSTATUS Status; + PIO_STACK_LOCATION IoStack; + LONGLONG Vbo, Lbo, RunLength; + ULONG RunCount, CleanupIndex, FirstIndex, BeyoundLastIndex; + BOOLEAN CanWait, ReadOperation; + PIRP* RunIrp; + PMDL Mdl; + + ASSERT(IrpContext->FatIoContext == NULL); + + + FirstIndex = CleanupIndex = 0; + CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + ReadOperation = (IrpContext->Stack->MajorFunction == IRP_MJ_READ); + Status = FatLockUserBuffer(IrpContext, + (ReadOperation ? IoWriteAccess : IoReadAccess), + Length); + if (!NT_SUCCESS(Status)) + goto FatIoPerformNonCachedCleanup; + Vbo = Offset->QuadPart; + RunLength = Length; + _SEH2_TRY + { + BeyoundLastIndex = FatScanFat(Fcb, Vbo, + &Lbo, &RunLength, &FirstIndex, CanWait); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(goto FatIoPerformNonCachedCleanup;) + }_SEH2_END + RunCount = BeyoundLastIndex - FirstIndex; + if (RunCount == 0) + { + Status = STATUS_END_OF_FILE; + goto FatIoPerformNonCachedCleanup; + } + Length = sizeof(FAT_IO_CONTEXT); + if (RunCount > 0x1) + Length += RunCount * sizeof(PIRP); + IrpContext->FatIoContext = FsRtlAllocatePoolWithTag( + NonPagedPool, Length, (ULONG) 'xCoI'); + if (IrpContext->FatIoContext == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FatIoPerformNonCachedCleanup; + } + RtlZeroMemory(IrpContext->FatIoContext, Length); + if (CanWait) + { + KeInitializeEvent( + &IrpContext->FatIoContext->Wait.SyncEvent, + NotificationEvent, FALSE); + } + if (RunCount == 0x1) + { + IoSetCompletionRoutine(IrpContext->Irp, + (CanWait ? FatIoSyncCompletionRoutine + : FatIoAsyncCompletionRoutine), + IrpContext->FatIoContext, TRUE, TRUE, TRUE); + IoStack = IoGetNextIrpStackLocation(IrpContext->Irp); + IoStack->MajorFunction = IrpContext->Stack->MajorFunction; + IoStack->Parameters.Read.Length = (ULONG) RunLength; + IoStack->Parameters.Read.ByteOffset.QuadPart = Lbo; + IoStack->Flags = FlagOn( + IrpContext->Stack->Flags, + SL_WRITE_THROUGH); + Status = IoCallDriver( + IrpContext->Vcb->TargetDeviceObject, + IrpContext->Irp); + goto FatIoPerformNonCachedComplete; + } + /* + * We already have the first run retrieved by FatiScanFat. + */ + for (RunIrp = &IrpContext->FatIoContext->Irp, + CleanupIndex = FirstIndex; + CleanupIndex < BeyoundLastIndex; + CleanupIndex ++, RunIrp ++) + { +#if DBG + LONGLONG NextVbo = Vbo + RunLength; + BOOLEAN RunExists; +#endif + /* + * Allocate Irp for the run. + */ + *RunIrp = IoMakeAssociatedIrp(IrpContext->Irp, + (CCHAR)(IrpContext->Vcb->TargetDeviceObject->StackSize + 1)); + if (*RunIrp == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FatIoPerformNonCachedCleanup; + } + CleanupIndex ++; + /* + * Build Mdl for the run range. + */ + Mdl = IoAllocateMdl( + Add2Ptr(IrpContext->Irp->UserBuffer, Vbo, PVOID), + (ULONG) RunLength, FALSE, FALSE, *RunIrp); + if (Mdl == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto FatIoPerformNonCachedCleanup; + } + IoBuildPartialMdl(IrpContext->Irp->MdlAddress, Mdl, + Add2Ptr(IrpContext->Irp->UserBuffer, Vbo, PVOID), + (ULONG) RunLength); + /* + * Setup IRP for each run. + */ + IoSetCompletionRoutine(IrpContext->Irp, + (CanWait ? FatIoSyncCompletionRoutine + : FatIoAsyncCompletionRoutine), + IrpContext->FatIoContext, TRUE, TRUE, TRUE); + IoStack = IoGetNextIrpStackLocation(*RunIrp); + IoStack->MajorFunction = IrpContext->Stack->MajorFunction; + IoStack->Parameters.Read.Length = (ULONG) RunLength; + IoStack->Parameters.Read.ByteOffset.QuadPart = Lbo; + + /* + * Propagate write-through to the associated IRPs + */ + if (FlagOn(IrpContext->Flags, IRPCONTEXT_WRITETHROUGH)) + SetFlag(IoStack->Flags, SL_WRITE_THROUGH); + /* + * Prepare for next iteration: + */ + #if DBG + RunExists = + #endif + FsRtlGetNextLargeMcbEntry(&Fcb->Mcb, CleanupIndex, &Vbo, &Lbo, &RunLength); + ASSERT(RunExists); + ASSERT(NextVbo == Vbo); + } + /* + * Send all IRPs to the volume device, we don't need to check + * status code because cleanup will be done + * by the completion routine in any case. + */ + for (RunIrp = &IrpContext->FatIoContext->Irp, + CleanupIndex = FirstIndex; + CleanupIndex < BeyoundLastIndex; + CleanupIndex ++, RunIrp ++) + { + IoCallDriver(IrpContext->Vcb->TargetDeviceObject, *RunIrp); + } + +FatIoPerformNonCachedComplete: + if (CanWait) + { + KeWaitForSingleObject( + &IrpContext->FatIoContext->Wait.SyncEvent, + Executive, KernelMode, FALSE, NULL); + return IrpContext->Irp->IoStatus.Status; + } + SetFlag(IrpContext->Flags, IRPCONTEXT_STACK_IO_CONTEXT); + return STATUS_PENDING; + /* + * The following block of code implements unwind logic + */ +FatIoPerformNonCachedCleanup: + if (IrpContext->FatIoContext != NULL) + { + RunIrp = &IrpContext->FatIoContext->Irp; + while (FirstIndex < CleanupIndex) + { + if ((*RunIrp)->MdlAddress != NULL) + IoFreeMdl((*RunIrp)->MdlAddress); + IoFreeIrp(*RunIrp); + FirstIndex ++; + RunIrp ++; + } + ExFreePool(IrpContext->FatIoContext); + IrpContext->FatIoContext = NULL; + } + return Status; +} /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/direntry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/direntry.c [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -12,37 +12,6 @@ #include "fastfat.h" /* PROTOTYPES ***************************************************************/ -#define BYTES_PER_DIRENT_LOG 0x05 - -typedef struct _FAT_ENUM_DIR_CONTEXT *PFAT_ENUM_DIR_CONTEXT; - -typedef ULONG (*PFAT_COPY_DIRENT_ROUTINE) (struct _FAT_ENUM_DIR_CONTEXT *, PDIR_ENTRY, PVOID); - -typedef struct _FAT_ENUM_DIR_CONTEXT -{ - PFILE_OBJECT FileObject; - LARGE_INTEGER PageOffset; - LONGLONG BeyondLastEntryOffset; - PVOID PageBuffer; - PBCB PageBcb; - - /* - * We should always cache short file name - * because we never know if there is a long - * name for the dirent and when we find out - * that our base dirent might become unpinned. - */ - UCHAR DirentFileName[RTL_FIELD_SIZE(DIR_ENTRY, FileName) + 1]; - PFAT_COPY_DIRENT_ROUTINE CopyDirent; - LONGLONG BytesPerClusterMask; - /* - * The following fields are - * set by the copy routine - */ - PULONG NextEntryOffset; - PULONG FileNameLength; - PWCHAR FileName; -} FAT_ENUM_DIR_CONTEXT; typedef enum _FILE_TIME_INDEX { @@ -51,10 +20,7 @@ FileLastWriteTime, FileChangeTime } FILE_TIME_INDEX; - -VOID -FatQueryFileTimes(OUT PLARGE_INTEGER FileTimes, - IN PDIR_ENTRY Dirent); + VOID Fat8dot3ToUnicodeString(OUT PUNICODE_STRING FileName, @@ -62,41 +28,426 @@ IN UCHAR Flags); ULONG -FatDirentToDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer); ULONG -FatDirentToFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToFullDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer); ULONG -FatDirentToIdFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToIdFullDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer); ULONG -FatDirentToBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToBothDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer); ULONG -FatDirentToIdBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToIdBothDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer); ULONG -FatDirentToNamesInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToNamesInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer); ULONG -FatDirentToObjectIdInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToObjectIdInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer); /* FUNCTIONS *****************************************************************/ + +#define FatQueryFileName(xInfo, xDirent) \ +{ \ + UNICODE_STRING FileName; \ + if (Info->FileNameLength == 0) \ + { \ + FileName.Buffer = Info->FileName; \ + FileName.MaximumLength = 0x18; \ + Fat8dot3ToUnicodeString(&FileName, \ + (xDirent)->FileName, (xDirent)->Case); \ + Info->FileNameLength = FileName.Length; \ + } \ +} + +#define FatQueryBothFileName(xInfo, xDirent) \ +{ \ + UNICODE_STRING FileName; \ + FileName.MaximumLength = 0x18; \ + if (Info->FileNameLength == 0) \ + { \ + FileName.Buffer = Info->FileName; \ + Fat8dot3ToUnicodeString(&FileName, \ + (xDirent)->FileName, (xDirent)->Case); \ + Info->FileNameLength = FileName.Length; \ + Info->ShortNameLength = 0; \ + } \ + else \ + { \ + FileName.Buffer = Info->ShortName; \ + Fat8dot3ToUnicodeString(&FileName, \ + (xDirent)->FileName, (xDirent)->Case); \ + Info->ShortNameLength = (CCHAR) FileName.Length; \ + } \ +} + +FORCEINLINE +UCHAR +FatLfnChecksum( + PUCHAR Buffer +) +{ + UCHAR Index, Chksum; + + for (Index = 0x1, Chksum = *Buffer; + Index < RTL_FIELD_SIZE(DIR_ENTRY, FileName); + Index ++) + { + Chksum = (((Chksum & 0x1) << 0x7) | (Chksum >> 0x1)) + + Buffer[Index]; + } + return Chksum; +} + +VOID +FatFindDirent(IN OUT PFAT_FIND_DIRENT_CONTEXT Context, + OUT PDIR_ENTRY* Dirent, + OUT PUNICODE_STRING LongFileName OPTIONAL) +{ + PDIR_ENTRY Entry, EndOfPage; + UCHAR SeqNum = 0, Checksum = 0; + PUNICODE_STRING FileName; + + /* Pin first page. */ + Entry = (PDIR_ENTRY) FatPinPage(&Context->Page, 0); + EndOfPage = FatPinEndOfPage(&Context->Page, PDIR_ENTRY); + + /* Run dirents. */ + FileName = NULL; + while (TRUE) + { + /* Check if we have entered the area of never used dirents */ + if (Entry->FileName[0] == FAT_DIRENT_NEVER_USED) + ExRaiseStatus(STATUS_OBJECT_NAME_NOT_FOUND); + + /* Just ignore entries marked as deleted */ + if (Entry->FileName[0] == FAT_DIRENT_DELETED) + goto FatFindDirentNext; + + /* Check if it's an lfn */ + if (Entry->Attributes == FAT_DIRENT_ATTR_LFN) + { + PLONG_FILE_NAME_ENTRY LfnEntry; + + FileName = LongFileName; + LfnEntry = (PLONG_FILE_NAME_ENTRY) Entry; + + /* Run lfns and collect file name if required */ + do { + PWSTR Lfn; + + /* Check if we just running lfn */ + if (FileName == NULL) + goto FatFindDirentRunLfn; + + /* Check for cluster index to be zero. */ + if (LfnEntry->Reserved != 0) + { + FileName = NULL; + goto FatFindDirentRunLfn; + } + + /* Check if this is the last lfn entry. */ + if (FlagOn(LfnEntry->SeqNum, FAT_FN_DIR_ENTRY_LAST)) + { + SeqNum = (LfnEntry->SeqNum & ~FAT_FN_DIR_ENTRY_LAST); + Checksum = LfnEntry->Checksum; + + /* Check if we exceed max number of lfns */ + if (SeqNum > (FAT_FN_MAX_DIR_ENTIES + 1)) + { + FileName = NULL; + goto FatFindDirentRunLfn; + } + + /* Setup maximal expected lfn length */ + FileName->Length = (SeqNum * FAT_LFN_NAME_LENGTH); + + /* Extend lfn buffer if needed */ + if (FileName->Length > FileName->MaximumLength) + { + Lfn = ExAllocatePoolWithTag(PagedPool, + LongFileName->Length, TAG_VFAT); + if (Lfn == NULL) + ExRaiseStatus(STATUS_INSUFFICIENT_RESOURCES); + if (FileName->Buffer != NULL) + ExFreePool(FileName->Buffer); + FileName->Buffer = Lfn; + FileName->MaximumLength = FileName->Length; + } + } + else if (!(LfnEntry->SeqNum == SeqNum + && LfnEntry->Checksum == Checksum)) + { + /* Wrong SeqNum or CheckSum. */ + FileName = NULL; + goto FatFindDirentRunLfn; + } + /* Gather file name */ + Lfn = Add2Ptr(FileName->Buffer, (SeqNum * FAT_LFN_NAME_LENGTH) + - sizeof(LfnEntry->NameC), PWSTR); + RtlCopyMemory(Lfn, LfnEntry->NameC, sizeof(LfnEntry->NameC)); + Lfn -= (sizeof(LfnEntry->NameB) / sizeof(WCHAR)); + RtlCopyMemory(Lfn, LfnEntry->NameB, sizeof(LfnEntry->NameB)); + Lfn -= (sizeof(LfnEntry->NameA) / sizeof(WCHAR)); + RtlCopyMemory(Lfn, LfnEntry->NameA, sizeof(LfnEntry->NameA)); + + /* If last lfn determine exact lfn length. */ + if (FlagOn(LfnEntry->SeqNum, FAT_FN_DIR_ENTRY_LAST)) + { + PWSTR LfnEnd = Add2Ptr(FileName->Buffer, + (FileName->Length - sizeof(WCHAR)), PWSTR); + + /* Trim trailing 0xffff's */ + while (LfnEnd > Lfn && *LfnEnd == 0xffff) --LfnEnd; + + /* Trim 0 terminator is the one is there. */ + if (*LfnEnd == 0x0) --LfnEnd; + + /* Set correct lfn size */ + FileName->Length = (USHORT)PtrOffset(FileName->Buffer, LfnEnd); + } + /* Setup validation for the next iteration */ + SeqNum = LfnEntry->SeqNum - 0x1; + Checksum = LfnEntry->Checksum; + +FatFindDirentRunLfn: + /* Get next dirent */ + LfnEntry ++; + if (LfnEntry > (PLONG_FILE_NAME_ENTRY) EndOfPage) + { + if (FatPinIsLastPage(&Context->Page)) + ExRaiseStatus(STATUS_OBJECT_NAME_NOT_FOUND); + LfnEntry = (PLONG_FILE_NAME_ENTRY) FatPinNextPage(&Context->Page); + EndOfPage = FatPinEndOfPage(&Context->Page, PDIR_ENTRY); + } + } + while (LfnEntry->Attributes == FAT_DIRENT_ATTR_LFN); + Entry = (PDIR_ENTRY) LfnEntry; + continue; + } + + /* If we've got here then this is a normal dirent */ + if (FileName != NULL && FileName->Length > 0) + { + /* Check if we have a correct lfn collected. */ + if (FatLfnChecksum(Entry->FileName) != Checksum) + { + FileName = NULL; + } + else + { + /* See if we were looking for this dirent. */ + if (!Context->Valid8dot3Name && + FsRtlAreNamesEqual(FileName, Context->FileName, TRUE, NULL)) + { + Fat8dot3ToUnicodeString(&Context->ShortName, Entry->FileName, Entry->Case); + *Dirent = Entry; + return; + } + } + } + + /* We surely have a short name, check if we were looking for that. */ + if (Context->Valid8dot3Name) + { + Fat8dot3ToUnicodeString(&Context->ShortName, + Entry->FileName, Entry->Case); + if (FsRtlAreNamesEqual(&Context->ShortName, Context->FileName, TRUE, NULL)) + { + if (ARGUMENT_PRESENT(LongFileName) && FileName == NULL) + LongFileName->Length = 0; + *Dirent = Entry; + return; + } + } + FileName = NULL; + +FatFindDirentNext: + Entry ++; + if (Entry > EndOfPage) + { + if (FatPinIsLastPage(&Context->Page)) + ExRaiseStatus(STATUS_OBJECT_NAME_NOT_FOUND); + Entry = (PDIR_ENTRY) FatPinNextPage(&Context->Page); + EndOfPage = FatPinEndOfPage(&Context->Page, PDIR_ENTRY); + } + } + /* Should never get here! */ + ASSERT(TRUE); +} + +VOID +FatEnumerateDirents(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, + IN SIZE_T Offset) +{ + PUCHAR Entry, EndOfPage; + PWSTR FileName; + USHORT FileNameLength; + USHORT FileNameMaximumLength; + PVOID InfoEntry; + UCHAR SeqNum = 0; + UCHAR Checksum = 0; + + /* Pin first page. */ + Entry = (PUCHAR)FatPinPage(&Context->Page, Offset); + EndOfPage = FatPinEndOfPage(&Context->Page, PUCHAR); + + /* Iterate dirents. */ + while (TRUE) + { + /* Check if we have entered the area of never used dirents */ + if (*Entry == FAT_DIRENT_NEVER_USED) + ExRaiseStatus(STATUS_NO_MORE_FILES); + + /* Just ignore entries marked as deleted */ + if (*Entry == FAT_DIRENT_DELETED) + goto FatEnumerateDirentsNext; + + /* Get info pointer. */ + InfoEntry = Add2Ptr(Context->Buffer, Context->Offset, PVOID); + + /* Check if info class has file name */ + if (Context->NameOffset == Context->LengthOffset) + { + FileName = NULL; + FileNameMaximumLength = 0; + } + else + { + FileName = Add2Ptr(InfoEntry, Context->NameOffset, PWSTR); + FileNameMaximumLength = (USHORT) (Context->Length + - Context->Offset + Context->NameOffset); + } + FileNameLength = 0; + + /* Check if it's an lfn */ + while (Entry[0xb] == FAT_DIRENT_ATTR_LFN) + { + PWSTR Lfn; + PLONG_FILE_NAME_ENTRY LfnEntry; + + /* Check if we just running lfn */ + if (FileNameMaximumLength == 0) + goto FatEnumerateDirentsRunLfn; + + LfnEntry = (PLONG_FILE_NAME_ENTRY) Entry; + + /* Check for cluster index to be zero. */ + if (LfnEntry->Reserved != 0) + { + FileNameMaximumLength = 0; + goto FatEnumerateDirentsRunLfn; + } + + /* Check if this is the last lfn entry. */ + if (FlagOn(LfnEntry->SeqNum, FAT_FN_DIR_ENTRY_LAST)) + { + SeqNum = (LfnEntry->SeqNum & ~FAT_FN_DIR_ENTRY_LAST); + Checksum = LfnEntry->Checksum; + + /* Check if we exceed max number of lfns */ + if (SeqNum > (FAT_FN_MAX_DIR_ENTIES + 1)) + { + FileNameMaximumLength = 0; + goto FatEnumerateDirentsRunLfn; + } + + /* Setup maximal expected lfn length */ + FileNameLength = SeqNum * FAT_LFN_NAME_LENGTH; + + /* Validate the maximal expected lfn length */ + if (FileNameLength > FileNameMaximumLength) + goto FatEnumerateDirentsRunLfn; + } + else if (!(LfnEntry->SeqNum == SeqNum + && LfnEntry->Checksum == Checksum)) + { + /* Wrong SeqNum or CheckSum. */ + FileNameMaximumLength = 0; + goto FatEnumerateDirentsRunLfn; + } + /* Gather file name */ + Lfn = Add2Ptr(FileName, (SeqNum * FAT_LFN_NAME_LENGTH) + - sizeof(LfnEntry->NameC), PWSTR); + RtlCopyMemory(Lfn, LfnEntry->NameC, sizeof(LfnEntry->NameC)); + Lfn -= (sizeof(LfnEntry->NameB) / sizeof(WCHAR)); + RtlCopyMemory(Lfn, LfnEntry->NameB, sizeof(LfnEntry->NameB)); + Lfn -= (sizeof(LfnEntry->NameA) / sizeof(WCHAR)); + RtlCopyMemory(Lfn, LfnEntry->NameA, sizeof(LfnEntry->NameA)); + + /* If last lfn determine exact lfn length. */ + if (FlagOn(LfnEntry->SeqNum, FAT_FN_DIR_ENTRY_LAST)) + { + PWSTR LfnEnd = Add2Ptr(FileName, FileNameLength + - sizeof(WCHAR), PWSTR); + + /* Trim trailing 0xffff's */ + while (LfnEnd > Lfn && *LfnEnd == 0xffff) --LfnEnd; + + /* Trim 0 terminator is the one is there. */ + if (*LfnEnd == 0x0) --LfnEnd; + + /* Set correct lfn size */ + FileNameLength = (USHORT)PtrOffset(FileName, LfnEnd); + } + /* Setup vaidation for the next iteration */ + SeqNum = LfnEntry->SeqNum - 0x1; + Checksum = LfnEntry->Checksum; +FatEnumerateDirentsRunLfn: + Entry = Add2Ptr(Entry, sizeof(DIR_ENTRY), PUCHAR); + if (Entry > EndOfPage) + { + if (FatPinIsLastPage(&Context->Page)) + ExRaiseStatus(STATUS_NO_MORE_FILES); + Entry = (PUCHAR) FatPinNextPage(&Context->Page); + EndOfPage = FatPinEndOfPage(&Context->Page, PUCHAR); + } + } + + /* if lfn was found, validate and commit. */ + if (FileNameLength > 0 && FatLfnChecksum(Entry) == Checksum) + { + *Add2Ptr(InfoEntry, Context->LengthOffset, PULONG) = FileNameLength; + } + else + { + *Add2Ptr(InfoEntry, Context->LengthOffset, PULONG) = 0; + } + /* TODO: Implement Filtering using Context->FileName & Context->CcbFlags. */ + + /* Copy the entry values. */ + Context->Offset += Context->CopyDirent((PFAT_ENUM_DIR_CONTEXT)Context, (PDIR_ENTRY) Entry, InfoEntry); + +FatEnumerateDirentsNext: + /* Get next entry */ + Entry = Add2Ptr(Entry, sizeof(DIR_ENTRY), PUCHAR); + if (Entry > EndOfPage) + { + if (FatPinIsLastPage(&Context->Page)) + ExRaiseStatus(STATUS_NO_MORE_FILES); + Entry = (PUCHAR) FatPinNextPage(&Context->Page); + EndOfPage = FatPinEndOfPage(&Context->Page, PUCHAR); + } + } +} FORCEINLINE VOID @@ -280,14 +631,13 @@ } ULONG -FatDirentToDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, +FatDirentToDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer) { PFILE_DIRECTORY_INFORMATION Info; - //UNICODE_STRING FileName; - Info = (PFILE_DIRECTORY_INFORMATION) Buffer; + Info->FileIndex = 0; /* Setup Attributes */ Info->FileAttributes = Dirent->Attributes; /* Setup times */ @@ -297,29 +647,20 @@ Info->AllocationSize.QuadPart = (Context->BytesPerClusterMask + Dirent->FileSize) & ~(Context->BytesPerClusterMask); - //FileName.Buffer = Info->ShortName; - //FileName.MaximumLength = sizeof(Info->ShortName); - // FatQueryShortName(&FileName, Dirent); - // Info->ShortNameLength = (CCHAR) FileName.Length; + FatQueryFileName(Info, Dirent); Info->NextEntryOffset = sizeof(*Info); - /* Associate LFN buffer and length pointers - * of this entry with the context. - */ - Context->NextEntryOffset = &Info->NextEntryOffset; - Context->FileName = Info->FileName; - Context->FileNameLength = &Info->FileNameLength; - return Info->NextEntryOffset; -} - -ULONG -FatDirentToFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + return Info->NextEntryOffset + Info->FileNameLength; +} + +ULONG +FatDirentToFullDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer) { PFILE_FULL_DIR_INFORMATION Info; - //UNICODE_STRING FileName; - Info = (PFILE_FULL_DIR_INFORMATION) Buffer; + Info->FileIndex = 0; + Info->EaSize = 0; /* Setup Attributes */ Info->FileAttributes = Dirent->Attributes; /* Setup times */ @@ -329,30 +670,21 @@ Info->AllocationSize.QuadPart = (Context->BytesPerClusterMask + Dirent->FileSize) & ~(Context->BytesPerClusterMask); - //FileName.Buffer = Info->ShortName; - //FileName.MaximumLength = sizeof(Info->ShortName); - // FatQueryShortName(&FileName, Dirent); - // Info->ShortNameLength = (CCHAR) FileName.Length; + FatQueryFileName(Info, Dirent); Info->NextEntryOffset = sizeof(*Info); - /* - * Associate LFN buffer and length pointers - * of this entry with the context. - */ - Context->NextEntryOffset = &Info->NextEntryOffset; - Context->FileName = Info->FileName; - Context->FileNameLength = &Info->FileNameLength; - return Info->NextEntryOffset; -} - -ULONG -FatDirentToIdFullDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + return Info->NextEntryOffset + Info->FileNameLength; +} + +ULONG +FatDirentToIdFullDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer) { PFILE_ID_FULL_DIR_INFORMATION Info; - //UNICODE_STRING FileName; - Info = (PFILE_ID_FULL_DIR_INFORMATION) Buffer; + Info->FileId.QuadPart = 0; + Info->FileIndex = 0; + Info->EaSize = 0; /* Setup Attributes */ Info->FileAttributes = Dirent->Attributes; /* Setup times */ @@ -362,30 +694,20 @@ Info->AllocationSize.QuadPart = (Context->BytesPerClusterMask + Dirent->FileSize) & ~(Context->BytesPerClusterMask); - //FileName.Buffer = Info->ShortName; - //FileName.MaximumLength = sizeof(Info->ShortName); - // FatQueryShortName(&FileName, Dirent); - // Info->ShortNameLength = (CCHAR) FileName.Length; + FatQueryFileName(Info, Dirent); Info->NextEntryOffset = sizeof(*Info); - /* - * Associate LFN buffer and length pointers - * of this entry with the context. - */ - Context->NextEntryOffset = &Info->NextEntryOffset; - Context->FileName = Info->FileName; - Context->FileNameLength = &Info->FileNameLength; - return Info->NextEntryOffset; -} - -ULONG -FatDirentToBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + return Info->NextEntryOffset + Info->FileNameLength; +} + +ULONG +FatDirentToBothDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer) { PFILE_BOTH_DIR_INFORMATION Info; - UNICODE_STRING FileName; - Info = (PFILE_BOTH_DIR_INFORMATION) Buffer; + Info->FileIndex = 0; + Info->EaSize = 0; /* Setup Attributes */ Info->FileAttributes = Dirent->Attributes; /* Setup times */ @@ -395,29 +717,21 @@ Info->AllocationSize.QuadPart = (Context->BytesPerClusterMask + Dirent->FileSize) & ~(Context->BytesPerClusterMask); - FileName.Buffer = Info->ShortName; - FileName.MaximumLength = sizeof(Info->ShortName); - Fat8dot3ToUnicodeString(&FileName, Dirent->FileName, Dirent->Case); - Info->ShortNameLength = (CCHAR) FileName.Length; + FatQueryBothFileName(Info, Dirent); Info->NextEntryOffset = sizeof(*Info); - /* Associate LFN buffer and length pointers - * of this entry with the context. - */ - Context->NextEntryOffset = &Info->NextEntryOffset; - Context->FileName = Info->FileName; - Context->FileNameLength = &Info->FileNameLength; - return Info->NextEntryOffset; -} - -ULONG -FatDirentToIdBothDirInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + return Info->NextEntryOffset + Info->FileNameLength; +} + +ULONG +FatDirentToIdBothDirInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer) { PFILE_ID_BOTH_DIR_INFORMATION Info; - UNICODE_STRING FileName; - Info = (PFILE_ID_BOTH_DIR_INFORMATION) Buffer; + Info->FileId.QuadPart = 0; + Info->FileIndex = 0; + Info->EaSize = 0; /* Setup Attributes */ Info->FileAttributes = Dirent->Attributes; /* Setup times */ @@ -427,151 +741,35 @@ Info->AllocationSize.QuadPart = (Context->BytesPerClusterMask + Dirent->FileSize) & ~(Context->BytesPerClusterMask); - FileName.Buffer = Info->ShortName; - FileName.MaximumLength = sizeof(Info->ShortName); - Fat8dot3ToUnicodeString(&FileName, Dirent->FileName, Dirent->Case); - Info->ShortNameLength = (CCHAR) FileName.Length; + FatQueryBothFileName(Info, Dirent); Info->NextEntryOffset = sizeof(*Info); - /* - * Associate LFN buffer and length pointers - * of this entry with the context. - */ - Context->NextEntryOffset = &Info->NextEntryOffset; - Context->FileName = Info->FileName; - Context->FileNameLength = &Info->FileNameLength; - return Info->NextEntryOffset; -} - -ULONG -FatDirentToNamesInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + return Info->NextEntryOffset + Info->FileNameLength; +} + +ULONG +FatDirentToNamesInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer) { PFILE_NAMES_INFORMATION Info; - Info = (PFILE_NAMES_INFORMATION) Buffer; -// FatQueryShortName(&FileName, Dirent); + Info->FileIndex = 0; + FatQueryFileName(Info, Dirent); Info->NextEntryOffset = sizeof(*Info); - /* Associate LFN buffer and length pointers - * of this entry with the context. - */ - Context->NextEntryOffset = &Info->NextEntryOffset; - Context->FileName = Info->FileName; - Context->FileNameLength = &Info->FileNameLength; - return Info->NextEntryOffset; -} - -ULONG -FatDirentToObjectIdInfo(IN OUT PFAT_ENUM_DIR_CONTEXT Context, + return Info->NextEntryOffset + Info->FileNameLength; +} + +ULONG +FatDirentToObjectIdInfo(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, IN PDIR_ENTRY Dirent, IN PVOID Buffer) { PFILE_OBJECTID_INFORMATION Info; - Info = (PFILE_OBJECTID_INFORMATION) Buffer; + Info->FileReference = 0; + ((PLONGLONG)Info->ObjectId)[0] = 0LL; + ((PLONGLONG)Info->ObjectId)[1] = 0LL; return sizeof(*Info); } -ULONG -FatEnumerateDirents(IN OUT PFAT_ENUM_DIR_CONTEXT Context, - IN ULONG Index, - IN BOOLEAN CanWait) -{ - LONGLONG PageOffset; - SIZE_T OffsetWithinPage, PageValidLength; - PUCHAR Entry, BeyondLastEntry; - /* Determine page offset and the offset within page - * for the first cluster. - */ - PageValidLength = PAGE_SIZE; - PageOffset = ((LONGLONG) Index) << BYTES_PER_DIRENT_LOG; - OffsetWithinPage = (SIZE_T) (PageOffset & (PAGE_SIZE - 1)); - PageOffset -= OffsetWithinPage; - /* Check if the context already has the required page mapped. - * Map the first page is necessary. - */ - if (PageOffset != Context->PageOffset.QuadPart) - { - Context->PageOffset.QuadPart = PageOffset; - if (Context->PageBcb != NULL) - { - CcUnpinData(Context->PageBcb); - Context->PageBcb = NULL; - } - if (!CcMapData(Context->FileObject, - &Context->PageOffset, - PAGE_SIZE, - CanWait, - &Context->PageBcb, - &Context->PageBuffer)) - { - Context->PageOffset.QuadPart = 0LL; - ExRaiseStatus(STATUS_CANT_WAIT); - } - } - Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PUCHAR); - /* Next Page Offset */ - PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyondLastEntryOffset) - { - PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - - Context->PageOffset.QuadPart); - } - BeyondLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); - while (TRUE) - { - do - { - if (*Entry == FAT_DIRENT_NEVER_USED) - return 0; // TODO: return something reasonable. - if (*Entry == FAT_DIRENT_DELETED) - { - continue; - } - if (Entry[0x0a] == FAT_DIRENT_ATTR_LFN) - { - PLONG_FILE_NAME_ENTRY Lfnent; - Lfnent = (PLONG_FILE_NAME_ENTRY) Entry; - } - else - { - PDIR_ENTRY Dirent; - Dirent = (PDIR_ENTRY) Entry; - RtlCopyMemory(Context->DirentFileName, - Dirent->FileName, - sizeof(Dirent->FileName)); - } - } while (++Entry < BeyondLastEntry); - /* Check if this is the last available entry */ - if (PageValidLength < PAGE_SIZE) - break; - /* We are getting beyond current page and - * are still in the continous run, map the next page. - */ - Context->PageOffset.QuadPart = PageOffset; - CcUnpinData(Context->PageBcb); - if (!CcMapData(Context->FileObject, - &Context->PageOffset, - PAGE_SIZE, - CanWait, - &Context->PageBcb, - &Context->PageBuffer)) - { - Context->PageBcb = NULL; - Context->PageOffset.QuadPart = 0LL; - ExRaiseStatus(STATUS_CANT_WAIT); - } - Entry = (PUCHAR) Context->PageBuffer; - /* Next Page Offset */ - PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyondLastEntryOffset) - { - PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - - Context->PageOffset.QuadPart); - } - BeyondLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PUCHAR); - } - return 0; -} - /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -16,6 +16,7 @@ FAT_GLOBAL_DATA FatGlobalData; /* FUNCTIONS ****************************************************************/ + NTSTATUS NTAPI @@ -110,7 +111,6 @@ /* Register and reference our filesystem */ IoRegisterFileSystem(DeviceObject); ObReferenceObject(DeviceObject); - return STATUS_SUCCESS; } @@ -221,5 +221,51 @@ } } - +VOID +NTAPI +FatDequeueRequest(IN PVOID Context) +{ + PFAT_IRP_CONTEXT IrpContext; + + IrpContext = (PFAT_IRP_CONTEXT) Context; + + /* Enter critical region. */ + FsRtlEnterFileSystem(); + + /* Handle top level IRP Correctly. */ + if (!FlagOn(IrpContext->Flags, IRPCONTEXT_TOPLEVEL)) + IoSetTopLevelIrp((PIRP) FSRTL_FSP_TOP_LEVEL_IRP); + + /* Enable Synchronous IO. */ + SetFlag(IrpContext->Flags, IRPCONTEXT_CANWAIT); + + /* Invoke the handler routine. */ + IrpContext->QueuedOperationHandler(IrpContext); + + /* Restore top level IRP. */ + IoSetTopLevelIrp(NULL); + + /* Leave critical region. */ + FsRtlExitFileSystem(); +} + +VOID +NTAPI +FatQueueRequest(IN PFAT_IRP_CONTEXT IrpContext, + IN PFAT_OPERATION_HANDLER OperationHandler) +{ + /* Save the worker routine. */ + IrpContext->QueuedOperationHandler = OperationHandler; + + /* Indicate if top level IRP was set. */ + if (IoGetTopLevelIrp() == IrpContext->Irp) + SetFlag(IrpContext->Flags, IRPCONTEXT_TOPLEVEL); + + /* Initialize work item. */ + ExInitializeWorkItem(&IrpContext->WorkQueueItem, + FatDequeueRequest, + IrpContext); + ExQueueWorkItem(&IrpContext->WorkQueueItem, + DelayedWorkQueue); +} /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -1,6 +1,7 @@ #include <ntifs.h> #include <ntdddisk.h> #include <debug.h> +#include <pseh/pseh2.h> #ifndef TAG #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) @@ -35,6 +36,23 @@ FatSetVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* ------------------------------------------------------ blockdev.c */ +NTSTATUS +NTAPI +FatPerformLboIo( + IN PFAT_IRP_CONTEXT IrpContext, + IN PLARGE_INTEGER Offset, + IN SIZE_T Length); + +NTSTATUS +FatPerformVirtualNonCachedIo( + IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB Fcb, + IN PLARGE_INTEGER Offset, + IN SIZE_T Length); + +PVOID +FatMapUserBuffer( + IN OUT PIRP Irp); /* ----------------------------------------------------------- dir.c */ @@ -45,6 +63,7 @@ NTSTATUS NTAPI FatCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp); + /* --------------------------------------------------------- close.c */ @@ -90,6 +109,11 @@ VOID NTAPI FatDestroyIrpContext(PFAT_IRP_CONTEXT IrpContext); +VOID +NTAPI +FatQueueRequest(IN PFAT_IRP_CONTEXT IrpContext, + IN PFAT_OPERATION_HANDLER OperationHandler); + VOID NTAPI FatCompleteRequest(PFAT_IRP_CONTEXT IrpContext OPTIONAL, PIRP Irp OPTIONAL, @@ -118,6 +142,14 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath); /* ----------------------------------------------------------- fat.c */ +PVOID +FatPinPage( + PFAT_PAGE_CONTEXT Context, + LONGLONG ByteOffset); + +PVOID +FatPinNextPage( + PFAT_PAGE_CONTEXT Context); NTSTATUS FatInitializeVcb( @@ -152,8 +184,50 @@ BOOLEAN Override); /* ------------------------------------------------------ direntry.c */ +VOID +FatFindDirent(IN OUT PFAT_FIND_DIRENT_CONTEXT Context, + OUT PDIR_ENTRY* Dirent, + OUT PUNICODE_STRING LongFileName OPTIONAL); + +VOID +FatEnumerateDirents(IN OUT PFAT_ENUM_DIRENT_CONTEXT Context, + IN SIZE_T Offset); + +VOID +FatQueryFileTimes(OUT PLARGE_INTEGER FileTimes, + IN PDIR_ENTRY Dirent); /* ----------------------------------------------------------- fcb.c */ +PFCB +FatLookupFcbByName( + IN PFCB ParentFcb, + IN PUNICODE_STRING Name); + +BOOLEAN +FatLinkFcbNames( + IN PFCB ParentFcb, + IN PFCB Fcb); + +VOID +FatUnlinkFcbNames( + IN PFCB ParentFcb, + IN PFCB Fcb); + +NTSTATUS +FatCreateFcb( + OUT PFCB* CreatedFcb, + IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB ParentFcb, + IN PDIR_ENTRY Dirent, + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING LongFileName OPTIONAL); + +NTSTATUS +FatOpenFcb( + OUT PFCB* Fcb, + IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB ParentFcb, + IN PUNICODE_STRING FileName); /* ------------------------------------------------------------ rw.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -5,6 +5,7 @@ <include base="fastfatn">.</include> <library>ntoskrnl</library> <library>hal</library> + <library>pseh</library> <file>blockdev.c</file> <file>cleanup.c</file> <file>close.c</file> Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -28,76 +28,9 @@ ((ULONG) ((xOffset - (xVcb)->DataArea) >> (xVcb)->BytesPerClusterLog) + 0x02) ULONG -FatScanFat12ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, +FatScanFat32ForContinousRun(IN OUT PFAT_PAGE_CONTEXT Context, IN OUT PULONG Index, IN BOOLEAN CanWait); - -ULONG -FatSetFat12ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait); - -ULONG -FatScanFat12ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatSetFat12ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatScanFat16ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait); - -ULONG -FatSetFat16ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait); - -ULONG -FatScanFat16ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatSetFat16ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatScanFat32ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait); - -ULONG -FatSetFat32ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait); - -ULONG -FatScanFat32ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait); - -ULONG -FatSetFat32ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait); BOOLEAN NTAPI @@ -105,27 +38,122 @@ /* VARIABLES ****************************************************************/ FAT_METHODS Fat12Methods = { - FatScanFat12ForContinousRun, - FatSetFat12ContinousRun, - FatScanFat16ForValueRun, - FatSetFat12ValueRun + NULL, + NULL, + NULL, + NULL }; FAT_METHODS Fat16Methods = { - FatScanFat16ForContinousRun, - FatSetFat16ContinousRun, - FatScanFat16ForValueRun, - FatSetFat16ValueRun + NULL, + NULL, + NULL, + NULL }; FAT_METHODS Fat32Methods = { FatScanFat32ForContinousRun, - FatSetFat32ContinousRun, - FatScanFat32ForValueRun, - FatSetFat32ValueRun + NULL, + NULL, + NULL }; /* FUNCTIONS ****************************************************************/ + +/** + * Pins the page containing ByteOffset byte. + * + * @param Context + * Keeps current BCB, Buffer pointer + * and maintains current and next page offset. + * + * @param ByteOffset + * Offset from the beginning of the data stream to be pinned. + * + * @return + * Pointer to the buffer starting with the specified ByteOffset. + */ +PVOID +FatPinPage( + PFAT_PAGE_CONTEXT Context, + LONGLONG ByteOffset) +{ + SIZE_T OffsetWithinPage; + + OffsetWithinPage = (SIZE_T) (ByteOffset & (PAGE_SIZE - 1)); + ByteOffset -= OffsetWithinPage; + if (ByteOffset != Context->Offset.QuadPart) + { + Context->Offset.QuadPart = ByteOffset; + if (Context->Bcb != NULL) + { + CcUnpinData(Context->Bcb); + Context->Bcb = NULL; + } + if (!CcMapData(Context->FileObject, + &Context->Offset, + PAGE_SIZE, + Context->CanWait, + &Context->Bcb, + &Context->Buffer)) + { + Context->Offset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + } + Context->EndOfPage.QuadPart = + Context->Offset.QuadPart + PAGE_SIZE; + if (Context->EndOfPage.QuadPart + > Context->EndOfData.QuadPart) + { + Context->ValidLength = (SIZE_T) + (Context->EndOfData.QuadPart + - Context->Offset.QuadPart); + } + else + { + Context->ValidLength = PAGE_SIZE; + } + return Add2Ptr(Context->Buffer, OffsetWithinPage, PVOID); +} + +/** + * Pins the next page of data stream. + * + * @param Context + * Keeps current BCB, Buffer pointer + * and maintains current and next page offset. + * + * @return + * Pointer to the buffer starting with the beginning of the next page. + */ +PVOID +FatPinNextPage( + PFAT_PAGE_CONTEXT Context) +{ + ASSERT ((Context->Offset.QuadPart % PAGE_SIZE) + != (Context->EndOfPage.QuadPart % PAGE_SIZE) + && Context->Bcb != NULL); + + ASSERT (Context->ValidLength == PAGE_SIZE); + + Context->Offset = Context->EndOfPage; + CcUnpinData(Context->Bcb); + if (!CcMapData(Context->FileObject, + &Context->Offset, + PAGE_SIZE, + Context->CanWait, + &Context->Bcb, + &Context->Buffer)) + { + Context->Bcb = NULL; + Context->Offset.QuadPart = 0LL; + ExRaiseStatus(STATUS_CANT_WAIT); + } + Context->EndOfPage.QuadPart = + Context->Offset.QuadPart + PAGE_SIZE; + return Context->Buffer; +} /** * Determines the index of the set bit. @@ -148,83 +176,11 @@ return (((Temp + (Temp >> 3)) & 030707070707) % 63); } -ULONG -FatScanFat12ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat12ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat12ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat12ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat16ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat16ContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatScanFat16ForValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN OUT PULONG Index, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - -ULONG -FatSetFat16ValueRun(IN OUT PFAT_SCAN_CONTEXT Context, - IN ULONG Index, - IN ULONG Length, - IN ULONG IndexValue, - IN BOOLEAN CanWait) -{ - ExRaiseStatus(STATUS_NOT_IMPLEMENTED); -} - /** * Scans FAT32 for continous chain of clusters * * @param Context - * Pointer to FAT_SCAN_CONTEXT. + * Pointer to FAT_PAGE_CONTEXT. * * @param Index * Supplies the Index of the first cluster @@ -241,79 +197,26 @@ * Raises STATUS_CANT_WAIT race condition. */ ULONG -FatScanFat32ForContinousRun(IN OUT PFAT_SCAN_CONTEXT Context, +FatScanFat32ForContinousRun(IN OUT PFAT_PAGE_CONTEXT Context, IN OUT PULONG Index, IN BOOLEAN CanWait) { - LONGLONG PageOffset; - SIZE_T OffsetWithinPage, PageValidLength; - PULONG Entry, BeyoudLastEntry; - /* Determine page offset and the offset within page - * for the first cluster. - */ - PageValidLength = PAGE_SIZE; - PageOffset = ((LONGLONG) *Index) << 0x2; - OffsetWithinPage = (SIZE_T) (PageOffset & (PAGE_SIZE - 1)); - PageOffset -= OffsetWithinPage; - /* Check if the context already has the required page mapped. - * Map the first page is necessary. - */ - if (PageOffset != Context->PageOffset.QuadPart) - { - Context->PageOffset.QuadPart = PageOffset; - if (Context->PageBcb != NULL) - { - CcUnpinData(Context->PageBcb); - Context->PageBcb = NULL; - } - if (!CcMapData(Context->FileObject, - &Context->PageOffset, - PAGE_SIZE, - CanWait, - &Context->PageBcb, - &Context->PageBuffer)) - { - Context->PageOffset.QuadPart = 0LL; - ExRaiseStatus(STATUS_CANT_WAIT); - } - } - Entry = Add2Ptr(Context->PageBuffer, OffsetWithinPage, PULONG); - /* Next Page Offset */ - PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyondLastEntryOffset) - PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - - Context->PageOffset.QuadPart); - BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); + PULONG Entry, EndOfPage; + + Entry = FatPinPage(Context, ((LONGLONG) *Index) << 0x2); + EndOfPage = FatPinEndOfPage(Context, PULONG); while (TRUE) { do { if ((*Entry & FAT_CLUSTER_LAST) != ++(*Index)) return (*Entry & FAT_CLUSTER_LAST); - } while (++Entry < BeyoudLastEntry); + } while (++Entry < EndOfPage); /* Check if this is the last available entry */ - if (PageValidLength < PAGE_SIZE) + if (FatPinIsLastPage(Context)) break; - /* We are getting beyond current page and - * are still in the continous run, map the next page. - */ - Context->PageOffset.QuadPart = PageOffset; - CcUnpinData(Context->PageBcb); - if (!CcMapData(Context->FileObject, - &Context->PageOffset, PAGE_SIZE, CanWait, - &Context->PageBcb, &Context->PageBuffer)) - { - Context->PageBcb = NULL; - Context->PageOffset.QuadPart = 0LL; - ExRaiseStatus(STATUS_CANT_WAIT); - } - Entry = (PULONG) Context->PageBuffer; - /* Next Page Offset */ - PageOffset = Context->PageOffset.QuadPart + PAGE_SIZE; - if (PageOffset > Context->BeyondLastEntryOffset) - PageValidLength = (SIZE_T) (Context->BeyondLastEntryOffset - - Context->PageOffset.QuadPart); - BeyoudLastEntry = Add2Ptr(Context->PageBuffer, PageValidLength, PULONG); + Entry = (PULONG) FatPinNextPage(Context); + EndOfPage = FatPinEndOfPage(Context, PULONG); } return (*Index - 1); } @@ -388,7 +291,7 @@ { LONGLONG CurrentLbo, CurrentVbo, BeyondLastVbo, CurrentLength; ULONG Entry, NextEntry, NumberOfEntries, CurrentIndex; - FAT_SCAN_CONTEXT Context; + FAT_PAGE_CONTEXT Context; PVCB Vcb; /* Some often used values */ @@ -428,8 +331,11 @@ CurrentIndex = 0L; CurrentVbo = 0LL; } + /* Initialize Context */ RtlZeroMemory(&Context, sizeof(Context)); - Context.FileObject = Vcb->VolumeFileObject; + Context.FileObject = Vcb->StreamFileObject; + Context.EndOfData.QuadPart = Vcb->BeyondLastClusterInFat; + while (CurrentVbo < BeyondLastVbo) { /* Locate Continous run starting with the current entry */ @@ -532,6 +438,10 @@ Vcb->BytesPerCluster = SectorsToBytes(Vcb, Vcb->Bpb.SectorsPerCluster); Vcb->BytesPerClusterLog = FatPowerOfTwo(Vcb->BytesPerCluster); Vcb->BeyondLastClusterInFat = ((LONGLONG) Vcb->Clusters) * Vcb->IndexDepth / 0x8; + + /* Update real volume size with the real value. */ + Vcb->Header.FileSize.QuadPart = + Vcb->Header.AllocationSize.QuadPart = SectorsToBytes(Vcb, Vcb->Sectors); } NTSTATUS @@ -558,18 +468,19 @@ /* Setup Vcb fields */ Vcb->TargetDeviceObject = TargetDeviceObject; ObReferenceObject(TargetDeviceObject); + Vcb->Vpb = Vpb; /* Setup FCB Header */ ExInitializeFastMutex(&Vcb->HeaderMutex); FsRtlSetupAdvancedHeader(&Vcb->Header, &Vcb->HeaderMutex); /* Create Volume File Object */ - Vcb->VolumeFileObject = IoCreateStreamFileObject(NULL, + Vcb->StreamFileObject = IoCreateStreamFileObject(NULL, Vcb->TargetDeviceObject); /* We have to setup all FCB fields needed for CC */ - Vcb->VolumeFileObject->FsContext = Vcb; - Vcb->VolumeFileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; + Vcb->StreamFileObject->FsContext = Vcb; + Vcb->StreamFileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; /* At least full boot sector should be available */ Vcb->Header.FileSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); @@ -578,7 +489,7 @@ Vcb->Header.ValidDataLength.LowPart = MAXULONG; /* Initialize CC */ - CcInitializeCacheMap(Vcb->VolumeFileObject, + CcInitializeCacheMap(Vcb->StreamFileObject, (PCC_FILE_SIZES)&Vcb->Header.AllocationSize, FALSE, &FatGlobalData.CacheMgrNoopCallbacks, @@ -592,7 +503,7 @@ * any of the parameters set further * in this routine. */ - if (CcMapData(Vcb->VolumeFileObject, + if (CcMapData(Vcb->StreamFileObject, &Offset, sizeof(PACKED_BOOT_SECTOR), TRUE, @@ -606,7 +517,7 @@ { Status = STATUS_UNRECOGNIZED_VOLUME; } - CopyUchar4(&Vpb->SerialNumber, BootSector->Id); + CopyUchar4(&Vcb->Vpb->SerialNumber, BootSector->Id); CcUnpinData(Bcb); } else @@ -641,12 +552,12 @@ ZeroSize.QuadPart = 0LL; /* Close volume file */ - if (Vcb->VolumeFileObject != NULL) + if (Vcb->StreamFileObject != NULL) { /* Uninitialize CC. */ - CcUninitializeCacheMap(Vcb->VolumeFileObject, &ZeroSize, NULL); - ObDereferenceObject(Vcb->VolumeFileObject); - Vcb->VolumeFileObject = NULL; + CcUninitializeCacheMap(Vcb->StreamFileObject, &ZeroSize, NULL); + ObDereferenceObject(Vcb->StreamFileObject); + Vcb->StreamFileObject = NULL; } /* Free notifications stuff */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.h [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -248,7 +248,7 @@ // sizeof = 0x020 typedef struct _LONG_FILE_NAME_ENTRY { - UCHAR Index; + UCHAR SeqNum; UCHAR NameA[10]; UCHAR Attributes; UCHAR Type; @@ -259,7 +259,13 @@ } LONG_FILE_NAME_ENTRY, *PLONG_FILE_NAME_ENTRY; // sizeof = 0x020 -#define FAT_FN_DIR_ENTRY_TERM_INDEX 0x40 +#define FAT_LFN_NAME_LENGTH \ + (RTL_FIELD_SIZE(LONG_FILE_NAME_ENTRY, NameA) \ + + RTL_FIELD_SIZE(LONG_FILE_NAME_ENTRY, NameB) \ + + RTL_FIELD_SIZE(LONG_FILE_NAME_ENTRY, NameC)) + +#define FAT_FN_DIR_ENTRY_LAST 0x40 +#define FAT_FN_MAX_DIR_ENTIES 0x14 #define FAT_BYTES_PER_DIRENT 0x20 #define FAT_BYTES_PER_DIRENT_LOG 0x05 Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -3,7 +3,10 @@ typedef struct _FAT_SCAN_CONTEXT *PFAT_SCAN_CONTEXT; typedef struct _FAT_IO_CONTEXT *PFAT_IO_CONTEXT; +typedef struct _FAT_IRP_CONTEXT *PFAT_IRP_CONTEXT; typedef PVOID PBCB; + +typedef NTSTATUS (*PFAT_OPERATION_HANDLER) (PFAT_IRP_CONTEXT); typedef struct _FAT_GLOBAL_DATA { @@ -22,6 +25,39 @@ LARGE_INTEGER DefaultFileTime; } FAT_GLOBAL_DATA; +typedef struct _FAT_PAGE_CONTEXT +{ + PFILE_OBJECT FileObject; + LARGE_INTEGER EndOfData; + LARGE_INTEGER Offset; + LARGE_INTEGER EndOfPage; + SIZE_T ValidLength; + PVOID Buffer; + PBCB Bcb; + BOOLEAN CanWait; +} FAT_PAGE_CONTEXT, *PFAT_PAGE_CONTEXT; + +#define FatPinSetupContext(xContext, xFcb, CanWait) \ +{ \ + (xContext)->FileObject = (xFcb)->StreamFileObject; \ + (xContext)->EndOfData = (xFcb)->Header.FileSize; \ + (xContext)->Offset.QuadPart = -1LL; \ + (xContext)->Bcb = NULL; \ + (xContext)->CanWait = CanWait; \ +} + +#define FatPinCleanupContext(xContext) \ + if ((xContext)->Bcb != NULL) { \ + CcUnpinData((xContext)->Bcb); \ + (xContext)->Bcb = NULL; \ + } \ + +#define FatPinEndOfPage(xContext, xType) \ + Add2Ptr((xContext)->Buffer, (xContext)->ValidLength, xType) + +#define FatPinIsLastPage(xContext) \ + ((xContext)->ValidLength != PAGE_SIZE) + #define IRPCONTEXT_CANWAIT 0x0001 #define IRPCONTEXT_PENDINGRETURNED 0x0002 #define IRPCONTEXT_STACK_IO_CONTEXT 0x0004 @@ -38,18 +74,23 @@ ULONG Flags; struct _VCB *Vcb; ULONG PinCount; + FAT_PAGE_CONTEXT Page; struct _FAT_IO_CONTEXT *FatIoContext; - WORK_QUEUE_ITEM WorkQueueItem; + PFAT_OPERATION_HANDLER QueuedOperationHandler; PIO_STACK_LOCATION Stack; KEVENT Event; -} FAT_IRP_CONTEXT, *PFAT_IRP_CONTEXT; +} FAT_IRP_CONTEXT; typedef struct _FAT_IO_CONTEXT { PMDL ZeroMdl; - PIRP MasterIrp; - LONG IrpCount; + PIRP Irp; + LONG RunCount; + SIZE_T Length; + LONGLONG Offset; + PFILE_OBJECT FileObject; + union { struct @@ -57,19 +98,16 @@ PERESOURCE Resource; PERESOURCE PagingIoResource; ERESOURCE_THREAD ResourceThreadId; - ULONG RequestedByteCount; - PFILE_OBJECT FileObject; - BOOLEAN ReadOperation; } Async; KEVENT SyncEvent; } Wait; - PIRP Irp[0]; + PIRP AssociatedIrp[0]; } FAT_IO_CONTEXT; -typedef ULONG (*PFAT_SCANFAT_FOR_CONTINOUS_RUN_ROUTINE) (struct _FAT_SCAN_CONTEXT*, PULONG, BOOLEAN); -typedef ULONG (*PFAT_SETFAT_CONTINOUS_RUN_ROUTINE) (PFAT_SCAN_CONTEXT, ULONG, ULONG, BOOLEAN); -typedef ULONG (*PFAT_SCANFAT_FOR_VALUE_RUN_ROUTINE) (PFAT_SCAN_CONTEXT, PULONG, ULONG, BOOLEAN); -typedef ULONG (*PFAT_SETFAT_VALUE_RUN_ROUTINE) (PFAT_SCAN_CONTEXT, ULONG, ULONG, ULONG, BOOLEAN); +typedef ULONG (*PFAT_SCANFAT_FOR_CONTINOUS_RUN_ROUTINE) (PFAT_PAGE_CONTEXT, PULONG, BOOLEAN); +typedef ULONG (*PFAT_SETFAT_CONTINOUS_RUN_ROUTINE) (PFAT_PAGE_CONTEXT, ULONG, ULONG, BOOLEAN); +typedef ULONG (*PFAT_SCANFAT_FOR_VALUE_RUN_ROUTINE) (PFAT_PAGE_CONTEXT, PULONG, ULONG, BOOLEAN); +typedef ULONG (*PFAT_SETFAT_VALUE_RUN_ROUTINE) (PFAT_PAGE_CONTEXT, ULONG, ULONG, ULONG, BOOLEAN); typedef struct _FAT_METHODS { PFAT_SCANFAT_FOR_CONTINOUS_RUN_ROUTINE ScanContinousRun; @@ -78,7 +116,7 @@ PFAT_SETFAT_VALUE_RUN_ROUTINE SetValueRun; } FAT_METHODS, *PFAT_METHODS; -#define FAT_NTC_VCB (USHORT)TAG('F', 'V', 0, 0); +#define FAT_NTC_VCB (USHORT) TAG('F', 'V', 0, 0) /* Volume Control Block */ typedef struct _VCB @@ -87,9 +125,10 @@ FAST_MUTEX HeaderMutex; SECTION_OBJECT_POINTERS SectionObjectPointers; - PFILE_OBJECT VolumeFileObject; + PFILE_OBJECT StreamFileObject; PDEVICE_OBJECT TargetDeviceObject; LIST_ENTRY VcbLinks; + PVPB Vpb; /* Notifications support */ PNOTIFY_SYNC NotifySync; @@ -186,10 +225,14 @@ FCB_NAME_LINK FileName[0x2]; /* Buffer for the short name */ WCHAR ShortNameBuffer[0xc]; + /* File basic info */ + FILE_BASIC_INFORMATION BasicInfo; union { struct { + /* Directory data stream (just handy to have it). */ + PFILE_OBJECT StreamFileObject; /* Bitmap to search for free dirents. */ /* RTL_BITMAP Bitmap; */ PRTL_SPLAY_LINKS SplayLinks; @@ -197,13 +240,56 @@ }; } FCB, *PFCB; +typedef struct _FAT_ENUM_DIRENT_CONTEXT *PFAT_ENUM_DIRENT_CONTEXT; +typedef struct _FAT_ENUM_DIR_CONTEXT *PFAT_ENUM_DIR_CONTEXT; + +typedef ULONG (*PFAT_COPY_DIRENT_ROUTINE) (PFAT_ENUM_DIR_CONTEXT, PDIR_ENTRY, PVOID); + +typedef struct _FAT_ENUM_DIRENT_CONTEXT +{ + FAT_PAGE_CONTEXT Page; + + /* Copy dirent to dirinfo */ + PFAT_COPY_DIRENT_ROUTINE CopyDirent; + LONGLONG BytesPerClusterMask; + + /* Info buffer characteristics */ + PVOID Buffer; + SIZE_T Offset; + SIZE_T Length; + + /* Criteria */ + PUNICODE_STRING FileName; + UCHAR CcbFlags; + + /* Lfn buffer/length offsets */ + ULONG LengthOffset; + ULONG NameOffset; +} FAT_ENUM_DIRENT_CONTEXT; + +typedef struct _FAT_FIND_DIRENT_CONTEXT +{ + FAT_PAGE_CONTEXT Page; + UNICODE_STRING ShortName; + WCHAR ShortNameBuffer[0x18]; + /* Criteria */ + PUNICODE_STRING FileName; + BOOLEAN Valid8dot3Name; +} FAT_FIND_DIRENT_CONTEXT, *PFAT_FIND_DIRENT_CONTEXT; + typedef struct _CCB { LARGE_INTEGER CurrentByteOffset; ULONG Entry; UNICODE_STRING SearchPattern; + UCHAR Flags; } CCB, *PCCB; + +#define CCB_SEARCH_RETURN_SINGLE_ENTRY 0x01 +#define CCB_SEARCH_PATTERN_LEGAL_8DOT3 0x02 +#define CCB_SEARCH_PATTERN_HAS_WILD_CARD 0x04 +#define CCB_DASD_IO 0x10 extern FAT_GLOBAL_DATA FatGlobalData; #endif//__STRUCT_H__ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fcb.c [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -1,9 +1,9 @@ /* * PROJECT: ReactOS FAT file system driver * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/filesystems/fastfat/rw.c - * PURPOSE: Read/write support - * PROGRAMMERS: + * FILE: drivers/filesystems/fastfat/fcb.c + * PURPOSE: FCB manipulation routines. + * PROGRAMMERS: Alexey Vlasov */ /* INCLUDES *****************************************************************/ @@ -13,5 +13,316 @@ /* FUNCTIONS ****************************************************************/ - +/** + * Locates FCB by the supplied name in the cache trie of fcbs. + * + * @param ParentFcb + * Supplies a pointer to the parent FCB + * + * @param Name + * Supplied a name of the FCB to be located in cache. + * + * @return + * Pointer to the found FCB or NULL. + */ +PFCB +FatLookupFcbByName( + IN PFCB ParentFcb, + IN PUNICODE_STRING Name) +{ + PFCB_NAME_LINK Node; + PRTL_SPLAY_LINKS Links; + + /* Get sub-trie root node from the parent FCB */ + Links = ParentFcb->Dcb.SplayLinks; + while (Links != NULL) + { + LONG Comparison; + + Node = CONTAINING_RECORD(Links, FCB_NAME_LINK, Links); + + /* + * Compare the name stored in the node + * and determine the direction to walk. + */ + Comparison = RtlCompareUnicodeString(&Node->String, Name, TRUE); + if (Comparison > 0) { + /* Left child */ + Links = RtlLeftChild(&Node->Links); + } + else if (Comparison < 0) + { + /* Right child */ + Links = RtlRightChild(&Node->Links); + } + else + { + /* Strings are equal, we have found the node! */ + break; + } + } + + /* The case when nothing was found. */ + if (Links == NULL) + return NULL; + + /* Cast node to the FCB structure. */ + return CONTAINING_RECORD(Links, FCB, FileName[Node->Type]); +} + +/** + * Inserts FCB into FCBs cache trie. + * + * @param ParentFcb + * Supplies a pointer to the parent FCB + * + * @param Fcb + * Supplied a pointer to the being inserted FCB. + * + * @return + * TRUE if the FCB was successfully inserted, + * FASLE in the case of name collision. + */ +BOOLEAN +FatLinkFcbNames( + IN PFCB ParentFcb, + IN PFCB Fcb) +{ + PFCB_NAME_LINK Name; + PRTL_SPLAY_LINKS Links; + + /* None of the parameters can be NULL */ + ASSERT(ParentFcb != NULL && Fcb != NULL); + + /* Get root links of the parent FCB. */ + Links = ParentFcb->Dcb.SplayLinks; + + /* + * Get first file name + * (short name for FAT because it's always there. + */ + Name = Fcb->FileName; + + /* + * Check if ParentDcb links are initialized, + * at least one child FCB is cached. + */ + if (Links == NULL) + { + ParentFcb->Dcb.SplayLinks = Links = &Name->Links; + RtlInitializeSplayLinks(Links); + + /* Check if we have more names to cache. */ + if ((++Name)->String.Length == 0) + return TRUE; + } + /* Lookup for the insertion point in the trie. */ + do + { + LONG Comparison; + PFCB_NAME_LINK Node; + PRTL_SPLAY_LINKS PrevLinks; + + PrevLinks = Links; + Node = CONTAINING_RECORD(Links, FCB_NAME_LINK, Links); + Comparison = RtlCompareUnicodeString(&Node->String, &Name->String, TRUE); + if (Comparison > 0) { + Links = RtlLeftChild(&Node->Links); + if (Links == NULL) + { + RtlInsertAsLeftChild(PrevLinks, &Name->Links); + break; + } + } + else if (Comparison < 0) + { + Links = RtlRightChild(&Node->Links); + if (Links == NULL) + { + RtlInsertAsRightChild(PrevLinks, &Name->Links); + break; + } + } + else + { + return FALSE; + } + + /* Possibly switch to the second (lfn) name and cache that. */ + } while (Name == Fcb->FileName && (++Name)->String.Length > 0); + return TRUE; +} + +/** + * Unlinks FCB from the FCBs cache trie. + * + * @param ParentFcb + * Supplies a pointer to the parent FCB + * + * @param Fcb + * Supplied a pointer to the being unlinked FCB. + * + * @return + * VOID + */ +VOID +FatUnlinkFcbNames( + IN PFCB ParentFcb, + IN PFCB Fcb) +{ + /* See if there is an lfn and unlink that. */ + if (Fcb->FileName[FcbLongName].String.Length > 0) + ParentFcb->Dcb.SplayLinks = + RtlDelete(&Fcb->FileName[FcbLongName].Links); + + /* See if there is a short name and unlink that. */ + if (Fcb->FileName[FcbShortName].String.Length > 0) + ParentFcb->Dcb.SplayLinks = + RtlDelete(&Fcb->FileName[FcbShortName].Links); +} + +NTSTATUS +FatCreateFcb( + OUT PFCB* CreatedFcb, + IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB ParentFcb, + IN PDIR_ENTRY Dirent, + IN PUNICODE_STRING FileName, + IN PUNICODE_STRING LongFileName OPTIONAL) +{ + NTSTATUS Status; + PFCB Fcb; + + /* Allocate FCB structure. */ + Fcb = (PFCB) ExAllocateFromNPagedLookasideList(&FatGlobalData.NonPagedFcbList); + if (Fcb == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(Fcb, sizeof(FCB)); + + /* Setup FCB Advanced Header. */ + Fcb->Header.NodeTypeCode = FAT_NTC_FCB; + Fcb->Header.NodeByteSize = sizeof(*Fcb); + ExInitializeResourceLite(&Fcb->Resource); + Fcb->Header.Resource = &Fcb->Resource; + ExInitializeResourceLite(&Fcb->PagingIoResource); + Fcb->Header.PagingIoResource = &Fcb->PagingIoResource; + ExInitializeFastMutex(&Fcb->HeaderMutex); + FsRtlSetupAdvancedHeader(&Fcb->Header, &Fcb->HeaderMutex); + Fcb->Header.FileSize.QuadPart = Dirent->FileSize; + Fcb->Header.ValidDataLength.QuadPart = Dirent->FileSize; + Fcb->Header.IsFastIoPossible = FastIoIsNotPossible; + + /* Setup main fields. */ + FsRtlInitializeFileLock(&Fcb->Lock, NULL, NULL); + FsRtlInitializeLargeMcb(&Fcb->Mcb, PagedPool); + Fcb->Vcb = IrpContext->Vcb; + Fcb->ParentFcb = ParentFcb; + Fcb->FirstCluster = Dirent->FirstCluster + | (Dirent->FirstClusterOfFileHi << 0x10); + + /* Setup basic info. */ + Fcb->BasicInfo.FileAttributes = Dirent->Attributes; + FatQueryFileTimes(&Fcb->BasicInfo.CreationTime, Dirent); + + /* Setup short name since always present in FAT. */ + Fcb->FileName[FcbShortName].Type = FcbShortName; + Fcb->FileName[FcbShortName].String.Buffer = Fcb->ShortNameBuffer; + Fcb->FileName[FcbShortName].String.MaximumLength = 0x0c; + Fcb->FileName[FcbShortName].String.Length = FileName->Length; + RtlCopyMemory(Fcb->ShortNameBuffer, FileName->Buffer, FileName->Length); + + /* Just swap optional lfn. */ + if (ARGUMENT_PRESENT(LongFileName) && LongFileName->Length > 0) + { + Fcb->FileName[FcbLongName].Type = FcbLongName; + Fcb->FileName[FcbLongName].String = *LongFileName; + RtlZeroMemory(LongFileName, sizeof(UNICODE_STRING)); + } + + /* Put FCB into cache trie. */ + if (!FatLinkFcbNames(ParentFcb, Fcb)) + { + Status = STATUS_OBJECT_NAME_COLLISION; + goto FsdFatCreateFcbCleanup; + } + *CreatedFcb = Fcb; + + /* We are done! */ + return STATUS_SUCCESS; + +FsdFatCreateFcbCleanup: + if (ARGUMENT_PRESENT(LongFileName) && + Fcb->FileName[FcbLongName].String.Buffer != NULL) + { + /* Swap lfn back to the input parameter */ + *LongFileName = Fcb->FileName[FcbLongName].String; + } + ExFreeToNPagedLookasideList(&FatGlobalData.NonPagedFcbList, Fcb); + return Status; +} + +NTSTATUS +FatOpenFcb( + OUT PFCB* Fcb, + IN PFAT_IRP_CONTEXT IrpContext, + IN PFCB ParentFcb, + IN PUNICODE_STRING FileName) +{ + FAT_FIND_DIRENT_CONTEXT Context; + UNICODE_STRING LongFileName; + PDIR_ENTRY Dirent; + NTSTATUS Status; + + // TODO: _SEH_TRY { + if (ParentFcb->Dcb.StreamFileObject == NULL) + { + PFILE_OBJECT FileObject; + PVPB Vpb; + + Vpb = IrpContext->Vcb->Vpb; + + /* Create stream file object */ + FileObject = IoCreateStreamFileObject(NULL, Vpb->RealDevice); + FileObject->Vpb = Vpb; + FileObject->SectionObjectPointer = &ParentFcb->SectionObjectPointers; + FileObject->FsContext = ParentFcb; + FileObject->FsContext2 = NULL; + + /* Store it in parent fcb */ + ParentFcb->Dcb.StreamFileObject = FileObject; + + } + + /* Check if cache is initialized. */ + if (ParentFcb->Dcb.StreamFileObject->PrivateCacheMap == NULL ) + { + CcInitializeCacheMap(ParentFcb->Dcb.StreamFileObject, + (PCC_FILE_SIZES) &ParentFcb->Header.AllocationSize, + TRUE, + &FatGlobalData.CacheMgrNoopCallbacks, + ParentFcb); + } + + /* Page context */ + Context.Page.FileObject = ParentFcb->Dcb.StreamFileObject; + Context.Page.EndOfData = ParentFcb->Header.FileSize; + Context.Page.Offset.QuadPart = -1LL; + Context.Page.Bcb = NULL; + Context.Page.CanWait = BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT); + Context.Page.EndOfData = ParentFcb->Header.FileSize; + + /* Search context */ + Context.ShortName.Length = 0; + Context.ShortName.Buffer = Context.ShortNameBuffer; + Context.ShortName.MaximumLength = sizeof(Context.ShortNameBuffer); + Context.FileName = FileName; + Context.Valid8dot3Name = RtlIsNameLegalDOS8Dot3(FileName, NULL, NULL); + + /* Locate the dirent */ + FatFindDirent(&Context, &Dirent, &LongFileName); + + Status = FatCreateFcb(Fcb, IrpContext, ParentFcb, Dirent, + &Context.ShortName, &LongFileName); + return Status; +} /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fsctl.c [iso-8859-1] Wed Feb 25 15:25:06 2009 @@ -112,7 +112,7 @@ if (!NT_SUCCESS(Status)) goto FatMountVolumeCleanup; - VolumeDevice->DeviceObject.SectorSize = DiskGeometry.BytesPerSector; + VolumeDevice->DeviceObject.SectorSize = (USHORT) DiskGeometry.BytesPerSector; /* Signal we're done with initializing */ VolumeDevice->DeviceObject.Flags &= ~DO_DEVICE_INITIALIZING; @@ -128,7 +128,7 @@ VolumeDevice->Vcb.MediaChangeCount = MediaChangeCount; /* Notify about volume mount */ - FsRtlNotifyVolumeEvent(VolumeDevice->Vcb.VolumeFileObject, FSRTL_VOLUME_MOUNT); + FsRtlNotifyVolumeEvent(VolumeDevice->Vcb.StreamFileObject, FSRTL_VOLUME_MOUNT); /* Return success */ return STATUS_SUCCESS;

1 0

[janderwald] 39745: - Remove sb16 driver entry
by janderwald＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: janderwald Date: Wed Feb 25 12:29:13 2009 New Revision: 39745 URL: http://svn.reactos.org/svn/reactos?rev=39745&view=rev Log: - Remove sb16 driver entry Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Wed Feb 25 12:29:13 2009 @@ -922,21 +922,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\kbdclass\Parameters","ConnectMultiplePorts",0x00010001,1 HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E96B-E325-11CE-BFC1-08002BE10318}","UpperFilters",0x00010000,"kbdclass" -; SB16 driver -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Group",0x00000000,"Base" -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ServiceType",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Start",0x00010001,0x00000004 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ImagePath",0x00020000,"system32\drivers\sndblst.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","DmaChannel",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","DmaChannel16",0x00010001,0x00000005 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","Port",0x00010001,0x00000220 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","Interrupt",0x00010001,0x00000005 -;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0","DSP Version",0x00010001,0x00000401 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0\Devices","SBWaveIn0",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\sndblst\Parameters\Device0\Devices","SBWaveOut0",0x00010001,0x00000002 - ; MPU-401 MIDI driver HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","Group",0x00000000,"Base" HKLM,"SYSTEM\CurrentControlSet\Services\mpu401","ServiceType",0x00010001,0x00000001

1 0

[silverblade] 39744: Move sb16_nt4 and sndblst out of the way in preparation of a decent rewrite. I made both of these, they are both incomplete. Neither are included in the build at present. They'll be removed eventually, once I've finished on the new version.
by silverblade＠svn.reactos.org 25 Feb '09

25 Feb '09

Author: silverblade Date: Wed Feb 25 12:10:46 2009 New Revision: 39744 URL: http://svn.reactos.org/svn/reactos?rev=39744&view=rev Log: Move sb16_nt4 and sndblst out of the way in preparation of a decent rewrite. I made both of these, they are both incomplete. Neither are included in the build at present. They'll be removed eventually, once I've finished on the new version. Added: trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/ (props changed) - copied from r39731, trunk/reactos/drivers/multimedia/audio/sb16_nt4/ trunk/reactos/drivers/multimedia/audio/sndblst.old/ (props changed) - copied from r39731, trunk/reactos/drivers/multimedia/audio/sndblst/ Removed: trunk/reactos/drivers/multimedia/audio/sb16_nt4/ trunk/reactos/drivers/multimedia/audio/sndblst/ Propchange: trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Feb 25 12:10:46 2009 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/multimedia/audio/sb16_nt4.old/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: trunk/reactos/drivers/multimedia/audio/sndblst.old/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Feb 25 12:10:46 2009 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/drivers/multimedia/audio/sndblst.old/ ------------------------------------------------------------------------------ svn:mergeinfo =

1 0

[cfinck] 39743: - Add a BuildBot aggregator script for getting the test result information from the BuildBot logs - Make the WineTest class functions more general, so that they can be used for the aggregator script - Show the comment in the results (option added to rosautotest in r39698) - Add an option to search for test results by user - Make the result information order consistent - Support searching for results by pressing the Return key - Update translations accordingly (Polish translation
by cfinck＠svn.reactos.org 24 Feb '09

24 Feb '09

Author: cfinck Date: Wed Feb 25 01:24:06 2009 New Revision: 39743 URL: http://svn.reactos.org/svn/reactos?rev=39743&view=rev Log: - Add a BuildBot aggregator script for getting the test result information from the BuildBot logs - Make the WineTest class functions more general, so that they can be used for the aggregator script - Show the comment in the results (option added to rosautotest in r39698) - Add an option to search for test results by user - Make the result information order consistent - Support searching for results by pressing the Return key - Update translations accordingly (Polish translation updated by Mariusz Przybylski, pay7n(a)o2.pl) - Add "utils.php" to the Web Service for sharing stuff between different callers - Coding style adjustments: Use camelCase for class functions as it's done in Danny's RosCMS v4 Added: trunk/web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php (with props) trunk/web/reactos.org/htdocs/testman/webservice/utils.inc.php (with props) Modified: trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php trunk/web/reactos.org/htdocs/testman/ajax-search.php trunk/web/reactos.org/htdocs/testman/compare.php trunk/web/reactos.org/htdocs/testman/detail.php trunk/web/reactos.org/htdocs/testman/index.php trunk/web/reactos.org/htdocs/testman/js/index.js.php trunk/web/reactos.org/htdocs/testman/lang/de.inc.php trunk/web/reactos.org/htdocs/testman/lang/en.inc.php trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php trunk/web/reactos.org/htdocs/testman/webservice/index.php trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php Modified: trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/shared/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/shared/lang/pl.inc.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -6,6 +6,7 @@ COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Maciej Bialas Olaf Siejka + Mariusz Przybylski charset=utf-8 without BOM */ @@ -13,7 +14,7 @@ $shared_langres = array( "language" => "JÄzyk", - "rangeinfo" => "MoÅ¼esz wprowadziÄ numer wersji (np. %s) lub przedziaÅ wersji (np. %s-%s)", + "rangeinfo" => "MoÅ¼esz wprowadziÄ numer rewizji (np. %s) lub przedziaÅ rewizji (np. %s-%s)", "firstpage_title" => "PrzejdÅº do pierwszej strony", "prevpage_title" => "Poprzednia strona", Modified: trunk/web/reactos.org/htdocs/testman/ajax-search.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/aja… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/ajax-search.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -8,7 +8,7 @@ header("Content-type: text/xml"); - if(!isset($_GET["startrev"]) || !isset($_GET["endrev"]) || !isset($_GET["platform"])) + if(!isset($_GET["startrev"]) || !isset($_GET["endrev"]) || !isset($_GET["user"]) || !isset($_GET["platform"])) die("<error>Necessary information not specified!</error>"); @@ -28,28 +28,33 @@ // Prepare the WHERE clause $where = ""; - if($_GET["startrev"] || $_GET["startid"] || $_GET["platform"]) + if($_GET["startrev"] || $_GET["startid"] || $_GET["user"] || $_GET["platform"]) { // Begin the WHERE clause with "WHERE 1 ", so we can begin all following statements with AND :-) $where = "WHERE 1 "; if($_GET["startrev"]) - $where .= "AND revision >= " . (int)$_GET["startrev"] . " AND revision <= " . (int)$_GET["endrev"] . " "; + $where .= "AND r.revision >= " . (int)$_GET["startrev"] . " AND r.revision <= " . (int)$_GET["endrev"] . " "; if($_GET["startid"]) - $where .= "AND id >= " . (int)$_GET["startid"] . " "; + $where .= "AND r.id >= " . (int)$_GET["startid"] . " "; + + if($_GET["user"]) + $where .= "AND u.user_name LIKE " . $dbh->quote($_GET["user"] . "%") . " "; if($_GET["platform"]) - $where .= "AND platform LIKE " . $dbh->quote($_GET["platform"] . "%") . " "; + $where .= "AND r.platform LIKE " . $dbh->quote($_GET["platform"] . "%") . " "; } - // Prepare the ORDER clause + // Prepare some clauses + $tables = "FROM " . DB_TESTMAN . ".winetest_runs r JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id "; $order = "ORDER BY revision ASC, id ASC "; echo "<results>"; // First determine how many results we would get in total with this query - $stmt = $dbh->query("SELECT COUNT(*) FROM " . DB_TESTMAN . ".winetest_runs " . $where) or die("<error>Query failed #1</error>"); + $stmt = $dbh->query("SELECT COUNT(*) " . $tables . $where) or die("<error>Query failed #1</error>"); + $result_count = $stmt->fetchColumn(); if($result_count > RESULTS_PER_PAGE) @@ -76,11 +81,8 @@ if($_GET["resultlist"]) { $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " . - "FROM " . DB_TESTMAN . ".winetest_runs r " . - "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . - $where . - $order . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " . + $tables . $where . $order . "LIMIT " . RESULTS_PER_PAGE ) or die("<error>Query failed #2</error>"); @@ -101,6 +103,7 @@ printf("<user>%s</user>", htmlspecialchars($row["user_name"])); printf("<revision>%d</revision>", $row["revision"]); printf("<platform>%s</platform>", GetPlatformString($row["platform"])); + printf("<comment>%s</comment>", htmlspecialchars($row["comment"])); echo "</result>"; $last_revision = $row["revision"]; @@ -109,16 +112,17 @@ else { // Get the first and last revision belonging to this call - $stmt = $dbh->query("SELECT id, revision FROM " . DB_TESTMAN . ".winetest_runs " . $where . $order . "LIMIT 1") or die("<error>Query failed #3</error>"); + $stmt = $dbh->query("SELECT r.id, r.revision " . $tables . $where . $order . "LIMIT 1") or die("<error>Query failed #3</error>"); $row = $stmt->fetch(PDO::FETCH_ASSOC); $first_id = $row["id"]; $first_revision = $row["revision"]; - $stmt = $dbh->query("SELECT revision FROM " . DB_TESTMAN . ".winetest_runs " . $where . $order . "LIMIT " . ($result_count - 1) . ", 1") or die("<error>Query failed #4</error>"); + $stmt = $dbh->query("SELECT r.revision " . $tables . $where . $order . "LIMIT " . ($result_count - 1) . ", 1") or die("<error>Query failed #4</error>"); $last_revision = $stmt->fetchColumn(); } - $stmt = $dbh->query("SELECT id FROM " . DB_TESTMAN . ".winetest_runs " . $where . $order . "LIMIT " . $result_count . ", 1") or die("<error>Query failed #5</error>"); + // Get the next ID (= the first ID after our limit) + $stmt = $dbh->query("SELECT r.id " . $tables . $where . $order . "LIMIT " . $result_count . ", 1") or die("<error>Query failed #5</error>"); $next_id = $stmt->fetchColumn(); } Modified: trunk/web/reactos.org/htdocs/testman/compare.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/com… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/compare.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/compare.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -170,7 +170,7 @@ $row = $stmt->fetch(PDO::FETCH_ASSOC); echo '<th onmousedown="ResultHead_OnMouseDown(this)">'; - printf($testman_langres["resulthead"], $row["revision"], GetPlatformString($row["platform"]), $row["user_name"], GetDateString($row["timestamp"])); + printf($testman_langres["resulthead"], $row["revision"], GetDateString($row["timestamp"]), $row["user_name"], GetPlatformString($row["platform"])); echo '</th>'; } Modified: trunk/web/reactos.org/htdocs/testman/detail.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/det… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/detail.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/detail.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -53,7 +53,7 @@ // Get information about this result $stmt = $dbh->prepare( - "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, u.user_name " . + "SELECT e.log, e.count, e.todo, e.failures, e.skipped, s.module, s.test, UNIX_TIMESTAMP(r.timestamp) timestamp, r.revision, r.platform, u.user_name, r.comment " . "FROM " . DB_TESTMAN . ".winetest_results e " . "JOIN " . DB_TESTMAN . ".winetest_suites s ON e.suite_id = s.id " . "JOIN " . DB_TESTMAN . ".winetest_runs r ON e.test_id = r.id " . @@ -106,16 +106,20 @@ <td><?php echo $row["revision"]; ?></td> </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> - <td class="info"><?php echo $testman_langres["platform"]; ?>:</td> - <td><?php echo GetPlatformString($row["platform"]); ?></td> + <td class="info"><?php echo $testman_langres["date"]; ?>:</td> + <td><?php echo GetDateString($row["timestamp"]); ?></td> </tr> <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> <td class="info"><?php echo $testman_langres["user"]; ?>:</td> <td><?php echo $row["user_name"]; ?></td> </tr> <tr class="odd" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> - <td class="info"><?php echo $testman_langres["date"]; ?>:</td> - <td><?php echo GetDateString($row["timestamp"]); ?></td> + <td class="info"><?php echo $testman_langres["platform"]; ?>:</td> + <td><?php echo GetPlatformString($row["platform"]); ?></td> + </tr> + <tr class="even" onmouseover="Row_OnMouseOver(this)" onmouseout="Row_OnMouseOut(this)"> + <td class="info"><?php echo $testman_langres["comment"]; ?>:</td> + <td><?php echo GetPlatformString($row["comment"]); ?></td> </tr> </table> Modified: trunk/web/reactos.org/htdocs/testman/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/ind… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/index.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -93,10 +93,11 @@ <thead> <tr class="head"> <th class="TestCheckbox"></th> + <th><?php echo $testman_langres["revision"]; ?></th> <th><?php echo $testman_langres["date"]; ?></th> - <th><?php echo $testman_langres["revision"]; ?></th> <th><?php echo $testman_langres["user"]; ?></th> <th><?php echo $testman_langres["platform"]; ?></th> + <th><?php echo $testman_langres["comment"]; ?></th> </tr> </thead> <tbody> @@ -112,7 +113,7 @@ } $stmt = $dbh->query( - "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform " . + "SELECT r.id, UNIX_TIMESTAMP(r.timestamp) timestamp, u.user_name, r.revision, r.platform, r.comment " . "FROM " . DB_TESTMAN . ".winetest_runs r " . "JOIN " . DB_ROSCMS . ".users u ON r.user_id = u.user_id " . "ORDER BY revision DESC, id DESC " . @@ -128,10 +129,11 @@ printf('<tr class="%s" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">', ($oddeven ? "odd" : "even")); printf('<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_%s" /></td>', $row["id"]); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', $row["revision"]); printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetDateString($row["timestamp"])); - printf('<td onclick="Result_OnCellClick(this)">%s</td>', $row["revision"]); printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["user_name"])); printf('<td onclick="Result_OnCellClick(this)">%s</td>', GetPlatformString($row["platform"])); + printf('<td onclick="Result_OnCellClick(this)">%s</td>', htmlspecialchars($row["comment"])); echo "</tr>"; $oddeven = !$oddeven; @@ -170,17 +172,23 @@ <table id="searchform"> <tr> - <td><?php echo $testman_langres["search_revision"]; ?>:</td> + <td><?php echo $testman_langres["revision"]; ?>:</td> <td> - <input type="text" id="search_revision" value="" size="12" onkeyup="SearchRevisionInput_OnKeyUp(this)" /><br /> + <input type="text" id="search_revision" value="" size="12" onkeypress="SearchInputs_OnKeyPress(event)" onkeyup="SearchRevisionInput_OnKeyUp(this)" /><br /> <img src="../shared/images/info.gif" alt="" /> <?php printf($shared_langres["rangeinfo"], $rev, ($rev - 50), $rev); ?> </td> </tr> <tr> - <td><?php echo $testman_langres["search_platform"]; ?>:</td> + <td><?php echo $testman_langres["user"]; ?>:</td> <td> - <select id="search_platform" size="1"> + <input type="text" id="search_user" value="" size="24" onkeypress="SearchInputs_OnKeyPress(event)" /> + </td> + </tr> + <tr> + <td><?php echo $testman_langres["platform"]; ?>:</td> + <td> + <select id="search_platform" size="1" onkeypress="SearchInputs_OnKeyPress(event)"> <option></option> <option value="reactos">ReactOS</option> <option value="5.0">Windows 2000</option> Modified: trunk/web/reactos.org/htdocs/testman/js/index.js.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/js/… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/js/index.js.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/js/index.js.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -106,6 +106,19 @@ UpdateSelectedResults(checkbox); } +function SearchInputs_OnKeyPress(event) +{ + // IE vs. other browsers again + if(window.event) + var KeyCode = window.event.keyCode; + else + var KeyCode = event.which; + + // Submit the search form in case the user pressed the Return key + if(KeyCode == 13) + SearchButton_OnClick(); +} + function SearchRevisionInput_OnKeyUp(elem) { var val = elem.value.replace(/[^[0-9-]/g, ""); @@ -172,12 +185,23 @@ data["startrev"] = inputbox_startrev; data["endrev"] = inputbox_endrev; + data["user"] = document.getElementById("search_user").value; data["platform"] = document.getElementById("search_platform").value; data["resultlist"] = 1; data["requesttype"] = REQUESTTYPE_FULLLOAD; SearchCall(); +} + +function GetTagData(RootElement, TagName) +{ + var Child = RootElement.getElementsByTagName(TagName)[0].firstChild; + + if(!Child) + return ""; + + return Child.data; } function SearchCallback(HttpRequest) @@ -258,10 +282,11 @@ html += '<thead><tr class="head">'; html += '<th class="TestCheckbox"><\/th>'; + html += '<th><?php echo addslashes($testman_langres["revision"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["date"]); ?><\/th>'; - html += '<th><?php echo addslashes($testman_langres["revision"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["user"]); ?><\/th>'; html += '<th><?php echo addslashes($testman_langres["platform"]); ?><\/th>'; + html += '<th><?php echo addslashes($testman_langres["comment"]); ?><\/th>'; html += '<\/tr><\/thead>'; html += '<tbody>'; @@ -277,18 +302,20 @@ for(var i = 0; i < results.length; i++) { - var ResultID = results[i].getElementsByTagName("id")[0].firstChild.data; - var ResultDate = results[i].getElementsByTagName("date")[0].firstChild.data; - var ResultUser = results[i].getElementsByTagName("user")[0].firstChild.data; - var ResultRevision = results[i].getElementsByTagName("revision")[0].firstChild.data; - var ResultPlatform = results[i].getElementsByTagName("platform")[0].firstChild.data; + var ResultID = GetTagData(results[i], "id"); + var ResultRevision = GetTagData(results[i], "revision"); + var ResultDate = GetTagData(results[i], "date"); + var ResultUser = GetTagData(results[i], "user"); + var ResultPlatform = GetTagData(results[i], "platform"); + var ResultComment = GetTagData(results[i], "comment"); html += '<tr class="' + (oddeven ? "odd" : "even") + '" onmouseover="Result_OnMouseOver(this)" onmouseout="Result_OnMouseOut(this)">'; html += '<td><input onclick="Result_OnCheckboxClick(this)" type="checkbox" name="test_' + ResultID + '" \/><\/td>'; + html += '<td onclick="Result_OnCellClick(this)">' + ResultRevision + '<\/td>'; html += '<td onclick="Result_OnCellClick(this)">' + ResultDate + '<\/td>'; - html += '<td onclick="Result_OnCellClick(this)">' + ResultRevision + '<\/td>'; html += '<td onclick="Result_OnCellClick(this)">' + ResultUser + '<\/td>'; html += '<td onclick="Result_OnCellClick(this)">' + ResultPlatform + '<\/td>'; + html += '<td onclick="Result_OnCellClick(this)">' + ResultComment + '<\/td>'; html += '<\/tr>'; oddeven = !oddeven; Modified: trunk/web/reactos.org/htdocs/testman/lang/de.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/lang/de.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/lang/de.inc.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -21,12 +21,11 @@ "revision" => "Revision", "user" => "Benutzer", "platform" => "Plattform", + "comment" => "Kommentar", "search_header" => "Nach Testergebnissen suchen", - "search_revision" => "Revision", - "search_platform" => "Plattform", "search_button" => "Suchen", - "searching" => "Testergebnisse werden gesucht...", + "searching" => "Testergebnisse werden gesucht", "foundresults" => "%s Ergebnisse gefunden!", "noresults" => "Keine Suchergebnisse!", @@ -49,13 +48,13 @@ "difference" => "Unterschied zum vorherigen Ergebnis", "testsuite" => "Test Suite", - "resulthead" => "Revision %d<br />unter %s<br />von %s<br />am %s", + "resulthead" => "Revision %d<br />am %s<br />von %s<br />unter %s", // Result Details page "detail_title" => "Ergebnis-Details", "thisresult" => "Informationen Ã¼ber dieses Ergebnis", "log" => "Log", - "associatedtest" => "Information Ã¼ber den zugeordneten Test", + "associatedtest" => "Informationen Ã¼ber den zugeordneten Test", ); ?> Modified: trunk/web/reactos.org/htdocs/testman/lang/en.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/lang/en.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/lang/en.inc.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -21,11 +21,9 @@ "revision" => "Revision", "user" => "User", "platform" => "Platform", + "comment" => "Comment", "search_header" => "Search for Test Results", - "search_revision" => "Revision", - "rangeinfo" => "You can enter a revision number (e.g. %s) or a revision range (e.g. %s-%s)", - "search_platform" => "Platform", "search_button" => "Search", "searching" => "Searching for Test Results", @@ -50,7 +48,7 @@ "difference" => "Difference to the previous result", "testsuite" => "Test Suite", - "resulthead" => "Revision %d<br />under %s<br />by %s<br />at %s", + "resulthead" => "Revision %d<br />at %s<br />by %s<br />under %s", // Result Details page "detail_title" => "Result Details", Modified: trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/lan… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/lang/pl.inc.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -5,6 +5,7 @@ PURPOSE: Translation COPYRIGHT: Copyright 2008-2009 Colin Finck <colin(a)reactos.org> TRANSLATOR: Maciej Bialas + Mariusz Przybylski charset=utf-8 without BOM */ @@ -16,23 +17,21 @@ "index_intro" => "Ten interfejs pozwala Tobie znaleÅºÄ, zobaczyÄ i porÃ³wnaÄ wyniki przeprowadzanych automatycznie testÃ³w regresji.", "js_disclaimer" => "Musisz wÅÄczyÄ obsÅugÄ JavaScriptu, aby uÅ¼ywaÄ tego interfejsu!", - "lastresults_header" => "Ostatnich 10 wynikÃ³w testÃ³w", + "lastresults_header" => "10 ostatnich wynikÃ³w testÃ³w", "date" => "Data", - "revision" => "Wydanie", + "revision" => "Rewizja", "user" => "UÅ¼ytkownik", "platform" => "Platforma", + "comment" => "Komentarz", - "search_header" => "Szukaj w wynikach testÃ³w", - "search_revision" => "Wydanie", - "rangeinfo" => "MoÅ¼esz wprowadziÄ numer wydania (np. %s) lub przedziaÅ (np. %s-%s)", - "search_platform" => "Platforma", + "search_header" => "Szukaj wynikÃ³w testÃ³w", "search_button" => "Szukaj", "searching" => "Trwa szukanie w wynikach testÃ³w", "foundresults" => "Znaleziono %s wynikÃ³w!", "noresults" => "Brak wynikÃ³w wyszukiwania!", - "status" => "<b>%s</b> testÃ³w zaznaczonych do porÃ³wnania", + "status" => "<b>%s</b> testÃ³w wybranych do porÃ³wnania", "compare_button" => "PorÃ³wnaj", "noselection" => "Nie wybraÅeÅ/aÅ Å¼adnych wynikÃ³w!", @@ -45,18 +44,18 @@ "legend" => "Legenda", "totaltests" => "Wszystkie testy", "failedtests" => "Nieudane", - "todotests" => "Oznaczone jako ToDo", + "todotests" => "Oznaczone jako TODO", "skippedtests" => "PominiÄte", "difference" => "RÃ³Å¼nica wzglÄdem poprzedniego wyniku", "testsuite" => "Zestaw testÃ³w", - "resulthead" => "Wydanie %d<br />pod %s<br />przez %s<br /> %s", + "resulthead" => "Rewizja %d<br />dnia %s<br />przez %s<br /> na %s", // Result Details page - "detail_title" => "SzczegÃ³Åy wynikÃ³w", + "detail_title" => "SzczegÃ³Åy wyniku", - "thisresult" => "Informacje o tych wynikach", + "thisresult" => "Informacje o tym wyniku", "log" => "Dziennik", - "associatedtest" => "Informacja o powiÄzanych testach", + "associatedtest" => "Informacje o powiÄzanym teÅcie", ); ?> Added: trunk/web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php (added) +++ trunk/web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -1,0 +1,122 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Aggregator for the Debug Log of ReactOS BuildBot Buildslaves + COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> +*/ + + require_once("../config.inc.php"); + require_once("utils.inc.php"); + + if(!isset($_GET["username"]) || !isset($_GET["password"]) || !isset($_GET["slavename"]) || !is_numeric($_GET["platform"]) || !is_numeric($_GET["build"])) + die("Necessary information not specified!"); + + try + { + $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); + } + catch(PDOException $e) + { + // Give no exact error message here, so no server internals are exposed + die("Could not establish the DB connection"); + } + + $user_id = VerifyLogin($_GET["username"], $_GET["password"]); + + // Make sure nobody runs this script multiple times for the same build + $stmt = $dbh->prepare("SELECT COUNT(*) FROM " . DB_TESTMAN . ".winetest_runs WHERE comment = :comment"); + $stmt->bindValue(":comment", "Build " . $_GET["build"]); + $stmt->execute() or die("SQL failed #1"); + + if($stmt->fetchColumn()) + die("The script already processed this build before!"); + + // Read the Buildslave test log + $fp = @fopen("http://reactos.org:8010/builders/" . $_GET["slavename"] . "/builds/" . $_GET["build"] . "/steps/test/logs/stdio/text", "r"); + + if(!$fp) + die("Could not open the test log!"); + + // Get the revision + do + { + $line = fgets($fp); + } + while(!preg_match("#.+ ReactOS .+ $Build [0-9]+-r([0-9]+)$#", $line, $matches) && !feof($fp)); + + $revision = $matches[1]; + + if(!$revision) + die("Got no revision"); + + // Create a WineTest object for accessing the database + $t = new WineTest(); + + + // Get the log for each test + $line = ""; + $test_id = 0; + + while(!feof($fp)) + { + // Find the line with the test information + while(substr($line, 0, 27) != "Running Wine Test, Module: " && !feof($fp)) + $line = fgets($fp); + + // We might reach end of file here, we're done in this case + if(feof($fp)) + break; + + // Parse the test line + if(!preg_match("#Running Wine Test, Module: (.+), Test: (.+)#", $line, $matches)) + die("Wine Test line is invalid!"); + + // Get a Suite ID for this combination + $suite_id = $t->getSuiteId($matches[1], $matches[2]); + + // If an error occured, $suite_id will contain the error message + if(!is_numeric($suite_id)) + die($suite_id); + + // Now get the real log + $log = ""; + + do + { + $line = fgets($fp); + + // If this test misses the summary line for some reason, check whether we reached the next test already. + // If so, already break the loop here, so that this line won't be on the log for this test. + if(substr($line, 0, 27) == "Running Wine Test, Module: ") + break; + + $log .= $line; + } + while(strpos($line, " tests executed (") === false && substr($line, 0, 9) != "[SYSREG] " && !feof($fp)); + + // Did we already get a Test ID for this run? + if(!$test_id) + { + $test_id = $t->getTestId($revision, "reactos." . $_GET["platform"], "Build " . $_GET["build"]); + + // If an error occured, $test_id will contain the error message + if(!is_numeric($test_id)) + die($test_id); + } + + // Finally submit the log + $return = $t->submit($test_id, $suite_id, $log); + + // If an error occured, $return will contain the error message + if($return != "OK") + die($return); + } + + // If we have a Test ID, finish this test run and terminate with the return message from that function + // Otherwise we couldn't find any test information in this log + if($test_id) + die($t->finish($test_id)); + else + die("Found no test information in this log!"); +?> Propchange: trunk/web/reactos.org/htdocs/testman/webservice/buildbot_aggregator.php ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/web/reactos.org/htdocs/testman/webservice/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/webservice/index.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -7,27 +7,11 @@ */ require_once("../config.inc.php"); + require_once("utils.inc.php"); - // All classes are autoloaded through this magic function - function __autoload($class) - { - require_once("lib/$class.class.php"); - } - - // What one of these classes has to look like - interface Test - { - public function GetTestID(); - public function Submit(); - public function Finish(); - } - - - // Entry point if(!isset($_POST["username"]) || !isset($_POST["password"]) || !isset($_POST["testtype"])) die("Necessary information not specified!"); - // Check the login credentials try { $dbh = new PDO("mysql:host=" . DB_HOST, DB_USER, DB_PASS); @@ -37,23 +21,8 @@ // Give no exact error message here, so no server internals are exposed die("Could not establish the DB connection"); } - - $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = MD5(:password) AND user_account_enabled = 'yes'"); - $stmt->bindParam(":username", $_POST["username"]); - $stmt->bindParam(":password", $_POST["password"]); - $stmt->execute() or die("SQL failed #1"); - $user_id = (int)$stmt->fetchColumn(); - if(!$user_id) - die("Invalid Login credentials!"); - - // Check if the user is permitted to submit test results - $stmt = $dbh->prepare("SELECT COUNT(*) FROM " . DB_TESTMAN . ".permitted_users WHERE user_id = :userid"); - $stmt->bindParam(":userid", $user_id); - $stmt->execute() or die("SQL failed #2"); - - if(!$stmt->fetchColumn()) - die("User is not permitted to submit test results"); + $user_id = VerifyLogin($_POST["username"], $_POST["password"]); switch($_POST["testtype"]) { @@ -68,10 +37,10 @@ // What shall we do? switch($_POST["action"]) { - case "gettestid": die($t->GetTestID()); - case "getsuiteid": die($t->GetSuiteID()); - case "submit": die($t->Submit()); - case "finish": die($t->Finish()); + case "gettestid": die($t->getTestId($_POST["revision"], $_POST["platform"], $_POST["comment"])); + case "getsuiteid": die($t->getSuiteId($_POST["module"], $_POST["test"])); + case "submit": die($t->submit($_POST["testid"], $_POST["suiteid"], $_POST["log"])); + case "finish": die($t->finish($_POST["testid"])); default: die("Invalid action"); Modified: trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/testman/webservice/lib/WineTest.class.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -8,35 +8,36 @@ class WineTest implements Test { - public function GetTestID() + public function getTestId($revision, $platform, $comment) { global $dbh; global $user_id; - if(!isset($_POST["revision"]) || !isset($_POST["platform"])) + if(!isset($revision) || !isset($platform)) return "Necessary sub-information not specified!"; // Add a new Test ID with the given information - $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_runs (user_id, revision, platform) VALUES (:userid, :revision, :platform)"); + $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_runs (user_id, revision, platform, comment) VALUES (:userid, :revision, :platform, :comment)"); $stmt->bindParam(":userid", $user_id); - $stmt->bindParam(":revision", $_POST["revision"]); - $stmt->bindParam(":platform", $_POST["platform"]); + $stmt->bindParam(":revision", $revision); + $stmt->bindParam(":platform", $platform); + $stmt->bindParam(":comment", $comment); $stmt->execute() or die("GetTestID(): SQL failed #1"); return $dbh->lastInsertId(); } - public function GetSuiteID() + public function getSuiteId($module, $test) { global $dbh; - if(!isset($_POST["module"]) || !isset($_POST["test"])) + if(!isset($module) || !isset($test)) return "Necessary sub-information not specified!"; // Determine whether we already have a suite ID for this combination $stmt = $dbh->prepare("SELECT id FROM " . DB_TESTMAN . ".winetest_suites WHERE module = :module AND test = :test"); - $stmt->bindParam(":module", $_POST["module"]); - $stmt->bindParam(":test", $_POST["test"]); + $stmt->bindParam(":module", $module); + $stmt->bindParam(":test", $test); $stmt->execute() or die("GetSuiteID(): SQL failed #1"); $id = $stmt->fetchColumn(); @@ -45,41 +46,48 @@ // Add this combination to the table and return the ID for it $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_suites (module, test) VALUES (:module, :test)"); - $stmt->bindParam(":module", $_POST["module"]); - $stmt->bindParam(":test", $_POST["test"]); + $stmt->bindParam(":module", $module); + $stmt->bindParam(":test", $test); $stmt->execute() or die("GetSuiteID(): SQL failed #2"); return $dbh->lastInsertId(); } - public function Submit() + public function submit($test_id, $suite_id, $log) { global $dbh; global $user_id; - if(!isset($_POST["testid"]) || !isset($_POST["suiteid"]) || !isset($_POST["log"])) + if(!isset($test_id) || !isset($suite_id) || !isset($log)) return "Necessary sub-information not specified!"; // Make sure we may add information to the test with this Test ID $stmt = $dbh->prepare("SELECT COUNT(*) FROM " . DB_TESTMAN . ".winetest_runs WHERE id = :testid AND finished = 0 AND user_id = :userid"); - $stmt->bindParam(":testid", $_POST["testid"]); + $stmt->bindParam(":testid", $test_id); $stmt->bindParam(":userid", $user_id); $stmt->execute() or die("Submit(): SQL failed #1"); if(!$stmt->fetchColumn()) return "No such test or no permissions!"; - // Validate and parse the log - $line = strrchr($_POST["log"], ":"); + // Parse the log + $line = strrchr($log, ":"); - if(sscanf($line, ": %u tests executed (%u marked as todo, %u %s%u skipped.", $count, $todo, $failures, $ignore, $skipped) != 5) - return "Log is invalid!"; + if(!$line || sscanf($line, ": %u tests executed (%u marked as todo, %u %s%u skipped.", $count, $todo, $failures, $ignore, $skipped) != 5) + { + // We found no summary line, so the test probably crashed + // Indicate this by setting count to -1 and set the rest to zero. + $count = -1; + $todo = 0; + $failures = 0; + $skipped = 0; + } // Add the information into the DB $stmt = $dbh->prepare("INSERT INTO " . DB_TESTMAN . ".winetest_results (test_id, suite_id, log, count, todo, failures, skipped) VALUES (:testid, :suiteid, :log, :count, :todo, :failures, :skipped)"); - $stmt->bindValue(":testid", (int)$_POST["testid"]); - $stmt->bindValue(":suiteid", (int)$_POST["suiteid"]); - $stmt->bindParam(":log", $_POST["log"]); + $stmt->bindValue(":testid", (int)$test_id); + $stmt->bindValue(":suiteid", (int)$suite_id); + $stmt->bindParam(":log", $log); $stmt->bindParam(":count", $count); $stmt->bindParam(":todo", $todo); $stmt->bindParam(":failures", $failures); @@ -89,18 +97,18 @@ return "OK"; } - public function Finish() + public function finish($test_id) { global $dbh; global $user_id; - if(!isset($_POST["testid"])) + if(!isset($test_id)) return "Necessary sub-information not specified!"; // Mark this test as finished, so no more results can be submitted for it $stmt = $dbh->prepare("UPDATE " . DB_TESTMAN . ".winetest_runs SET finished = 1 WHERE id = :testid AND user_id = :userid"); $stmt->bindParam(":userid", $user_id); - $stmt->bindParam(":testid", $_POST["testid"]); + $stmt->bindParam(":testid", $test_id); $stmt->execute() or die("Finish(): SQL failed #1"); if(!$stmt->rowCount()) Added: trunk/web/reactos.org/htdocs/testman/webservice/utils.inc.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/testman/web… ============================================================================== --- trunk/web/reactos.org/htdocs/testman/webservice/utils.inc.php (added) +++ trunk/web/reactos.org/htdocs/testman/webservice/utils.inc.php [iso-8859-1] Wed Feb 25 01:24:06 2009 @@ -1,0 +1,48 @@ +<?php +/* + PROJECT: ReactOS Web Test Manager + LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation + PURPOSE: Miscellaneous utility functions for the Web Service + COPYRIGHT: Copyright 2009 Colin Finck <colin(a)reactos.org> +*/ + + // What one of these classes has to look like + interface Test + { + public function getTestId($revision, $platform, $comment); + public function getSuiteId($module, $test); + public function submit($test_id, $suite_id, $log); + public function finish($test_id); + } + + // All classes are autoloaded through this magic function + function __autoload($class) + { + require_once("lib/$class.class.php"); + } + + function VerifyLogin($username, $password) + { + global $dbh; + + // Check the login credentials + $stmt = $dbh->prepare("SELECT user_id FROM " . DB_ROSCMS . ".users WHERE user_name = :username AND user_roscms_password = MD5(:password) AND user_account_enabled = 'yes'"); + $stmt->bindParam(":username", $username); + $stmt->bindParam(":password", $password); + $stmt->execute() or die("SQL failed #1"); + $user_id = (int)$stmt->fetchColumn(); + + if(!$user_id) + die("Invalid Login credentials!"); + + // Check if the user is permitted to submit test results + $stmt = $dbh->prepare("SELECT COUNT(*) FROM " . DB_TESTMAN . ".permitted_users WHERE user_id = :userid"); + $stmt->bindParam(":userid", $user_id); + $stmt->execute() or die("SQL failed #2"); + + if(!$stmt->fetchColumn()) + die("User is not permitted to submit test results"); + + return $user_id; + } +?> Propchange: trunk/web/reactos.org/htdocs/testman/webservice/utils.inc.php ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[jmorlan] 39742: Implement complete support for FOR command (including /D, /F, /L, and /R switches). cmd is now close to being able to run RosBE 1.3's initialization without errors.
by jmorlan＠svn.reactos.org 24 Feb '09

24 Feb '09

Author: jmorlan Date: Tue Feb 24 23:29:18 2009 New Revision: 39742 URL: http://svn.reactos.org/svn/reactos?rev=39742&view=rev Log: Implement complete support for FOR command (including /D, /F, /L, and /R switches). cmd is now close to being able to run RosBE 1.3's initialization without errors. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/parser.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Tue Feb 24 23:29:18 2009 @@ -187,12 +187,6 @@ if (bc->params) cmd_free(bc->params); - - if (bc->forproto) - cmd_free(bc->forproto); - - if (bc->ffind) - cmd_free(bc->ffind); UndoRedirection(bc->RedirList, NULL); FreeRedirection(bc->RedirList); @@ -270,9 +264,8 @@ bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->shiftlevel = 0; - bc->ffind = NULL; bc->forvar = _T('\0'); - bc->forproto = NULL; + bc->forvarcount = 0; bc->params = BatchParams (firstword, param); // // Allocate enough memory to hold the params and copy them over without modifications @@ -351,76 +344,6 @@ if (bc == NULL) return NULL; - /* If its a FOR context... */ - if (bc->forvar) - { - LPTSTR sp = bc->forproto; /* pointer to prototype command */ - LPTSTR dp = textline; /* Place to expand protoype */ - LPTSTR fv = FindArg (0); /* Next list element */ - - /* End of list so... */ - if ((fv == NULL) || (*fv == _T('\0'))) - { - /* just exit this context */ - ExitBatch (NULL); - continue; - } - - if (_tcscspn (fv, _T("?*")) == _tcslen (fv)) - { - /* element is wild file */ - bc->shiftlevel++; /* No use it and shift list */ - } - else - { - /* Wild file spec, find first (or next) file name */ - if (bc->ffind) - { - /* First already done so do next */ - - fv = FindNextFile (bc->hFind, bc->ffind) ? bc->ffind->cFileName : NULL; - } - else - { - /* For first find, allocate a find first block */ - if ((bc->ffind = (LPWIN32_FIND_DATA)cmd_alloc (sizeof (WIN32_FIND_DATA))) == NULL) - { - error_out_of_memory(); - return NULL; - } - - bc->hFind = FindFirstFile (fv, bc->ffind); - - fv = !(bc->hFind==INVALID_HANDLE_VALUE) ? bc->ffind->cFileName : NULL; - } - - if (fv == NULL) - { - /* Null indicates no more files.. */ - cmd_free (bc->ffind); /* free the buffer */ - bc->ffind = NULL; - bc->shiftlevel++; /* On to next list element */ - continue; - } - } - - /* At this point, fv points to parameter string */ - bc->forvalue = fv; - - /* Double up % signs so they will get through the parser intact */ - while (*sp) - { - if (*sp == _T('%')) - *dp++ = _T('%'); - *dp++ = *sp++; - } - - *dp++ = _T('\n'); - *dp = _T('\0'); - - return textline; - } - if (!FileGetString (bc->hBatchFile, textline, sizeof (textline) / sizeof (textline[0]) - 1)) { TRACE ("ReadBatchLine(): Reached EOF!\n"); Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Tue Feb 24 23:29:18 2009 @@ -10,18 +10,16 @@ typedef struct tagBATCHCONTEXT { struct tagBATCHCONTEXT *prev; - LPWIN32_FIND_DATA ffind; HANDLE hBatchFile; TCHAR BatchFilePath[MAX_PATH]; - LPTSTR forproto; LPTSTR params; LPTSTR raw_params; /* Holds the raw params given by the input */ INT shiftlevel; BOOL bEcho; /* Preserve echo flag across batch calls */ - HANDLE hFind; /* Preserve find handle when doing a for */ REDIRECTION *RedirList; TCHAR forvar; - LPTSTR forvalue; + UINT forvarcount; + LPTSTR *forvalues; } BATCH_CONTEXT, *LPBATCH_CONTEXT; Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/call.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/call.c [iso-8859-1] Tue Feb 24 23:29:18 2009 @@ -84,7 +84,7 @@ bc->params = NULL; bc->shiftlevel = 0; bc->forvar = 0; /* HBP004 */ - bc->forproto = NULL; /* HBP004 */ + bc->forvarcount = 0; bc->RedirList = NULL; ParseCommandLine (param); Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Feb 24 23:29:18 2009 @@ -913,6 +913,9 @@ break; case C_IF: Success = ExecuteIf(Cmd); + break; + case C_FOR: + Success = ExecuteFor(Cmd); break; } @@ -1271,14 +1274,15 @@ { /* This might be a variable. Search the list of contexts for it */ BATCH_CONTEXT *Ctx = bc; - while (Ctx && Ctx->forvar != Src[1]) + while (Ctx && (UINT)(Src[1] - Ctx->forvar) >= Ctx->forvarcount) Ctx = Ctx->prev; if (Ctx) { /* Found it */ - if (Dest + _tcslen(Ctx->forvalue) > DestEnd) + LPTSTR Value = Ctx->forvalues[Src[1] - Ctx->forvar]; + if (Dest + _tcslen(Value) > DestEnd) return FALSE; - Dest = _stpcpy(Dest, Ctx->forvalue); + Dest = _stpcpy(Dest, Value); Src += 2; continue; } Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Tue Feb 24 23:29:18 2009 @@ -237,7 +237,12 @@ /* Prototypes for FOR.C */ +#define FOR_DIRS 1 /* /D */ +#define FOR_F 2 /* /F */ +#define FOR_LOOP 4 /* /L */ +#define FOR_RECURSIVE 8 /* /R */ INT cmd_for (LPTSTR); +BOOL ExecuteFor(struct _PARSED_COMMAND *Cmd); /* Prototypes for FREE.C */ @@ -342,7 +347,7 @@ /* Prototypes from PARSER.C */ -enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_IFFAILURE, C_IFSUCCESS, C_PIPE, C_IF }; +enum { C_COMMAND, C_QUIET, C_BLOCK, C_MULTI, C_IFFAILURE, C_IFSUCCESS, C_PIPE, C_IF, C_FOR }; typedef struct _PARSED_COMMAND { struct _PARSED_COMMAND *Subcommands; @@ -363,6 +368,14 @@ TCHAR *LeftArg; TCHAR *RightArg; } If; + struct + { + BYTE Switches; + TCHAR Variable; + LPTSTR Params; + LPTSTR List; + struct tagBATCHCONTEXT *Context; + } For; }; } PARSED_COMMAND; PARSED_COMMAND *ParseCommand(LPTSTR Line); Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/for.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/for.c [iso-8859-1] Tue Feb 24 23:29:18 2009 @@ -33,27 +33,9 @@ #include <precomp.h> -/* - * Perform FOR command. - * - * First check syntax is correct : FOR %v IN ( <list> ) DO <command> - * v must be alphabetic, <command> must not be empty. - * - * If all is correct build a new bcontext structure which preserves - * the necessary information so that readbatchline can expand - * each the command prototype for each list element. - * - * You might look on a FOR as being a called batch file with one line - * per list element. - */ - +/* FOR is a special command, so this function is only used for showing help now */ INT cmd_for (LPTSTR param) { - LPBATCH_CONTEXT lpNew; - LPTSTR pp; - TCHAR var; - TCHAR szMsg[RC_STRING_MAX_SIZE]; - TRACE ("cmd_for (\'%s\')\n", debugstr_aw(param)); if (!_tcsncmp (param, _T("/?"), 2)) @@ -62,87 +44,459 @@ return 0; } - /* Check that first element is % then an alpha char followed by space */ - if ((*param != _T('%')) || !_istalpha (*(param + 1)) || !_istspace (*(param + 2))) - { - LoadString( CMD_ModuleHandle, STRING_FOR_ERROR, szMsg, RC_STRING_MAX_SIZE); - error_syntax (szMsg); - return 1; - } - - param++; - var = *param++; /* Save FOR var name */ - - while (_istspace (*param)) - param++; - - /* Check next element is 'IN' */ - if ((_tcsnicmp (param, _T("in"), 2) != 0) || !_istspace (*(param + 2))) - { - LoadString(CMD_ModuleHandle, STRING_FOR_ERROR1, szMsg, RC_STRING_MAX_SIZE); - error_syntax(szMsg); - return 1; - } - - param += 2; - while (_istspace (*param)) - param++; - - /* Folowed by a '(', find also matching ')' */ - if ((*param != _T('(')) || (NULL == (pp = _tcsrchr (param, _T(')'))))) - { - LoadString(CMD_ModuleHandle, STRING_FOR_ERROR2, szMsg, RC_STRING_MAX_SIZE); - error_syntax(szMsg); - return 1; - } - - *pp++ = _T('\0'); - param++; /* param now points at null terminated list */ - - while (_istspace (*pp)) - pp++; - - /* Check DO follows */ - if ((_tcsnicmp (pp, _T("do"), 2) != 0) || !_istspace (*(pp + 2))) - { - LoadString(CMD_ModuleHandle, STRING_FOR_ERROR3, szMsg, RC_STRING_MAX_SIZE); - error_syntax(szMsg); - return 1; - } - - pp += 2; - while (_istspace (*pp)) - pp++; - - /* Check that command tail is not empty */ - if (*pp == _T('\0')) - { - LoadString(CMD_ModuleHandle, STRING_FOR_ERROR4, szMsg, RC_STRING_MAX_SIZE); - error_syntax(szMsg); - return 1; - } - - /* OK all is correct, build a bcontext.... */ - lpNew = (LPBATCH_CONTEXT)cmd_alloc (sizeof (BATCH_CONTEXT)); + error_syntax(param); + return 1; +} + +/* Get the next element of the FOR's list */ +static BOOL GetNextElement(TCHAR **pStart, TCHAR **pEnd) +{ + TCHAR *p = *pEnd; + BOOL InQuotes = FALSE; + while (_istspace(*p)) + p++; + if (!*p) + return FALSE; + *pStart = p; + while (*p && (InQuotes || !_istspace(*p))) + InQuotes ^= (*p++ == _T('"')); + *pEnd = p; + return TRUE; +} + +/* Execute a single instance of a FOR command */ +static void RunInstance(PARSED_COMMAND *Cmd) +{ + if (bEcho && Cmd->Subcommands->Type != C_QUIET) + { + ConOutChar(_T('\n')); + PrintPrompt(); + EchoCommand(Cmd->Subcommands); + ConOutChar(_T('\n')); + } + /* Just run the command (variable expansion is done in DoDelayedExpansion) */ + ExecuteCommand(Cmd->Subcommands); +} + +/* Check if this FOR should be terminated early */ +static BOOL Exiting(PARSED_COMMAND *Cmd) +{ + /* Someone might have removed our context by calling ExitBatch */ + return bCtrlBreak || bc != Cmd->For.Context; +} + +/* Read the contents of a text file into memory, + * dynamically allocating enough space to hold it all */ +static LPTSTR ReadFileContents(FILE *InputFile, TCHAR *Buffer) +{ + DWORD Len = 0; + DWORD AllocLen = 1000; + LPTSTR Contents = cmd_alloc(AllocLen * sizeof(TCHAR)); + if (!Contents) + return NULL; + + while (_fgetts(Buffer, CMDLINE_LENGTH, InputFile)) + { + DWORD CharsRead = _tcslen(Buffer); + while (Len + CharsRead >= AllocLen) + { + Contents = cmd_realloc(Contents, (AllocLen *= 2) * sizeof(TCHAR)); + if (!Contents) + return NULL; + } + _tcscpy(&Contents[Len], Buffer); + Len += CharsRead; + } + + Contents[Len] = _T('\0'); + return Contents; +} + +static BOOL ForF(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) +{ + LPTSTR Delims = _T(" \t"); + TCHAR Eol = _T(';'); + INT SkipLines = 0; + DWORD Tokens = (1 << 1); + BOOL RemainderVar = FALSE; + TCHAR StringQuote = _T('"'); + TCHAR CommandQuote = _T('\''); + LPTSTR Variables[32]; + TCHAR *Start, *End; + INT i; + + if (Cmd->For.Params) + { + TCHAR Quote = 0; + TCHAR *Param = Cmd->For.Params; + if (*Param == _T('"') || *Param == _T('\'')) + Quote = *Param++; + + while (*Param && *Param != Quote) + { + if (*Param <= _T(' ')) + { + Param++; + } + else if (_tcsnicmp(Param, _T("delims="), 7) == 0) + { + Param += 7; + /* delims=xxx: Specifies the list of characters that separate tokens */ + Delims = Param; + while (*Param && *Param != Quote) + { + if (*Param == _T(' ')) + { + TCHAR *FirstSpace = Param; + Param += _tcsspn(Param, _T(" ")); + /* Exclude trailing spaces if this is not the last parameter */ + if (*Param && *Param != Quote) + *FirstSpace = _T('\0'); + break; + } + Param++; + } + if (*Param == Quote) + *Param++ = _T('\0'); + } + else if (_tcsnicmp(Param, _T("eol="), 4) == 0) + { + Param += 4; + /* eol=c: Lines starting with this character (may be + * preceded by delimiters) are skipped. */ + Eol = *Param; + if (Eol != _T('\0')) + Param++; + } + else if (_tcsnicmp(Param, _T("skip="), 5) == 0) + { + /* skip=n: Number of lines to skip at the beginning of each file */ + SkipLines = _tcstol(Param + 5, &Param, 0); + if (SkipLines <= 0) + goto error; + } + else if (_tcsnicmp(Param, _T("tokens="), 7) == 0) + { + Param += 7; + /* tokens=x,y,m-n: List of token numbers (must be between + * 1 and 31) that will be assigned into variables. */ + Tokens = 0; + while (*Param && *Param != Quote && *Param != _T('*')) + { + INT First = _tcstol(Param, &Param, 0); + INT Last = First; + if (First < 1) + goto error; + if (*Param == _T('-')) + { + /* It's a range of tokens */ + Last = _tcstol(Param + 1, &Param, 0); + if (Last < First || Last > 31) + goto error; + } + Tokens |= (2 << Last) - (1 << First); + + if (*Param != _T(',')) + break; + Param++; + } + /* With an asterisk at the end, an additional variable + * will be created to hold the remainder of the line + * (after the last token specified). */ + if (*Param == _T('*')) + { + RemainderVar = TRUE; + Param++; + } + } + else if (_tcsnicmp(Param, _T("useback"), 7) == 0) + { + Param += 7; + /* usebackq: Use alternate quote characters */ + StringQuote = _T('\''); + CommandQuote = _T('`'); + /* Can be written as either "useback" or "usebackq" */ + if (_totlower(*Param) == _T('q')) + Param++; + } + else + { + error: + error_syntax(Param); + return FALSE; + } + } + } + + /* Count how many variables will be set: one for each token, + * plus maybe one for the remainder */ + bc->forvarcount = RemainderVar; + for (i = 1; i < 32; i++) + bc->forvarcount += (Tokens >> i & 1); + bc->forvalues = Variables; + + if (*List == StringQuote || *List == CommandQuote) + { + /* Treat the entire "list" as one single element */ + Start = List; + End = &List[_tcslen(List)]; + goto single_element; + } + + End = List; + while (GetNextElement(&Start, &End)) + { + FILE *InputFile; + LPTSTR FullInput, In, NextLine; + INT Skip; + single_element: + + if (*Start == StringQuote && End[-1] == StringQuote) + { + /* Input given directly as a string */ + End[-1] = _T('\0'); + FullInput = cmd_dup(Start + 1); + } + else if (*Start == CommandQuote && End[-1] == CommandQuote) + { + /* Read input from a command */ + End[-1] = _T('\0'); + InputFile = _tpopen(Start + 1, _T("r")); + if (!InputFile) + { + error_bad_command(); + return FALSE; + } + FullInput = ReadFileContents(InputFile, Buffer); + _pclose(InputFile); + } + else + { + /* Read input from a file */ + TCHAR Temp = *End; + *End = _T('\0'); + StripQuotes(Start); + InputFile = _tfopen(Start, _T("r")); + *End = Temp; + if (!InputFile) + { + error_sfile_not_found(Start); + return FALSE; + } + FullInput = ReadFileContents(InputFile, Buffer); + fclose(InputFile); + } + + if (!FullInput) + { + error_out_of_memory(); + return FALSE; + } + + /* Loop over the input line by line */ + In = FullInput; + Skip = SkipLines; + do + { + DWORD RemainingTokens = Tokens; + LPTSTR *CurVar = Variables; + + NextLine = _tcschr(In, _T('\n')); + if (NextLine) + *NextLine++ = _T('\0'); + + if (--Skip >= 0) + continue; + + /* Ignore lines where the first token starts with the eol character */ + In += _tcsspn(In, Delims); + if (*In == Eol) + continue; + + while ((RemainingTokens >>= 1) != 0) + { + /* Save pointer to this token in a variable if requested */ + if (RemainingTokens & 1) + *CurVar++ = In; + /* Find end of token */ + In += _tcscspn(In, Delims); + /* Nul-terminate it and advance to next token */ + if (*In) + { + *In++ = _T('\0'); + In += _tcsspn(In, Delims); + } + } + /* Save pointer to remainder of line */ + *CurVar = In; + + /* Don't run unless the line had enough tokens to fill at least one variable */ + if (*Variables[0]) + RunInstance(Cmd); + } while (!Exiting(Cmd) && (In = NextLine) != NULL); + cmd_free(FullInput); + } + + return TRUE; +} + +/* FOR /L: Do a numeric loop */ +static void ForLoop(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer) +{ + enum { START, STEP, END }; + INT params[3] = { 0, 0, 0 }; + INT i; + + TCHAR *Start, *End = List; + for (i = 0; i < 3 && GetNextElement(&Start, &End); i++) + params[i] = _tcstol(Start, NULL, 0); + + i = params[START]; + while (!Exiting(Cmd) && + (params[STEP] >= 0 ? (i <= params[END]) : (i >= params[END]))) + { + _itot(i, Buffer, 10); + RunInstance(Cmd); + i += params[STEP]; + } +} + +/* Process a FOR in one directory. Stored in Buffer (up to BufPos) is a + * string which is prefixed to each element of the list. In a normal FOR + * it will be empty, but in FOR /R it will be the directory name. */ +static void ForDir(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) +{ + TCHAR *Start, *End = List; + while (!Exiting(Cmd) && GetNextElement(&Start, &End)) + { + if (BufPos + (End - Start) > &Buffer[CMDLINE_LENGTH]) + continue; + memcpy(BufPos, Start, (End - Start) * sizeof(TCHAR)); + BufPos[End - Start] = _T('\0'); + + if (_tcschr(BufPos, _T('?')) || _tcschr(BufPos, _T('*'))) + { + WIN32_FIND_DATA w32fd; + HANDLE hFind; + TCHAR *FilePart; + + StripQuotes(BufPos); + hFind = FindFirstFile(Buffer, &w32fd); + if (hFind == INVALID_HANDLE_VALUE) + continue; + FilePart = _tcsrchr(BufPos, _T('\\')); + FilePart = FilePart ? FilePart + 1 : BufPos; + do + { + if (w32fd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) + continue; + if (!(w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) + != !(Cmd->For.Switches & FOR_DIRS)) + continue; + if (_tcscmp(w32fd.cFileName, _T(".")) == 0 || + _tcscmp(w32fd.cFileName, _T("..")) == 0) + continue; + _tcscpy(FilePart, w32fd.cFileName); + RunInstance(Cmd); + } while (!Exiting(Cmd) && FindNextFile(hFind, &w32fd)); + FindClose(hFind); + } + else + { + RunInstance(Cmd); + } + } +} + +/* FOR /R: Process a FOR in each directory of a tree, recursively. */ +static void ForRecursive(PARSED_COMMAND *Cmd, LPTSTR List, TCHAR *Buffer, TCHAR *BufPos) +{ + HANDLE hFind; + WIN32_FIND_DATA w32fd; + + if (BufPos[-1] != _T('\\')) + { + *BufPos++ = _T('\\'); + *BufPos = _T('\0'); + } + + ForDir(Cmd, List, Buffer, BufPos); + + _tcscpy(BufPos, _T("*")); + hFind = FindFirstFile(Buffer, &w32fd); + if (hFind == INVALID_HANDLE_VALUE) + return; + do + { + if (!(w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if (_tcscmp(w32fd.cFileName, _T(".")) == 0 || + _tcscmp(w32fd.cFileName, _T("..")) == 0) + continue; + ForRecursive(Cmd, List, Buffer, _stpcpy(BufPos, w32fd.cFileName)); + } while (!Exiting(Cmd) && FindNextFile(hFind, &w32fd)); + FindClose(hFind); +} + +BOOL +ExecuteFor(PARSED_COMMAND *Cmd) +{ + TCHAR Buffer[CMDLINE_LENGTH]; /* Buffer to hold the variable value */ + LPTSTR BufferPtr = Buffer; + LPBATCH_CONTEXT lpNew; + BOOL Success = TRUE; + LPTSTR List = DoDelayedExpansion(Cmd->For.List); + + if (!List) + return FALSE; + + /* Create our pseudo-batch-context */ + lpNew = cmd_alloc(sizeof(BATCH_CONTEXT)); + if (!lpNew) + return FALSE; + Cmd->For.Context = lpNew; lpNew->prev = bc; bc = lpNew; bc->hBatchFile = INVALID_HANDLE_VALUE; - bc->ffind = NULL; bc->raw_params = NULL; - bc->params = BatchParams (_T(""), param); /* Split out list */ + bc->params = NULL; bc->shiftlevel = 0; - bc->forvar = var; - bc->forproto = cmd_dup (pp); + bc->forvar = Cmd->For.Variable; + bc->forvarcount = 1; + bc->forvalues = &BufferPtr; if (bc->prev) bc->bEcho = bc->prev->bEcho; else bc->bEcho = bEcho; bc->RedirList = NULL; - - return 0; + if (Cmd->For.Switches & FOR_F) + { + Success = ForF(Cmd, List, Buffer); + } + else if (Cmd->For.Switches & FOR_LOOP) + { + ForLoop(Cmd, List, Buffer); + } + else if (Cmd->For.Switches & FOR_RECURSIVE) + { + DWORD Len = GetFullPathName(Cmd->For.Params ? Cmd->For.Params : _T("."), + MAX_PATH, Buffer, NULL); + ForRecursive(Cmd, List, Buffer, &Buffer[Len]); + } + else + { + ForDir(Cmd, List, Buffer, Buffer); + } + + /* Remove our context, unless someone already did that */ + if (bc == lpNew) + ExitBatch(NULL); + + cmd_free(List); + return Success; } /* EOF */ Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Tue Feb 24 23:29:18 2009 @@ -413,6 +413,115 @@ return Cmd; } +/* Parse a FOR command. + * Syntax is: FOR [options] %var IN (list) DO command */ +static PARSED_COMMAND *ParseFor(void) +{ + PARSED_COMMAND *Cmd = cmd_alloc(sizeof(PARSED_COMMAND)); + TCHAR List[CMDLINE_LENGTH]; + TCHAR *Pos = List; + + memset(Cmd, 0, sizeof(PARSED_COMMAND)); + Cmd->Type = C_FOR; + + while (1) + { + if (_tcsicmp(CurrentToken, _T("/D")) == 0) + Cmd->For.Switches |= FOR_DIRS; + else if (_tcsicmp(CurrentToken, _T("/F")) == 0) + { + Cmd->For.Switches |= FOR_F; + if (!Cmd->For.Params) + { + ParseToken(0, STANDARD_SEPS); + if (CurrentToken[0] == _T('/') || CurrentToken[0] == _T('%')) + break; + Cmd->For.Params = cmd_dup(CurrentToken); + } + } + else if (_tcsicmp(CurrentToken, _T("/L")) == 0) + Cmd->For.Switches |= FOR_LOOP; + else if (_tcsicmp(CurrentToken, _T("/R")) == 0) + { + Cmd->For.Switches |= FOR_RECURSIVE; + if (!Cmd->For.Params) + { + ParseToken(0, STANDARD_SEPS); + if (CurrentToken[0] == _T('/') || CurrentToken[0] == _T('%')) + break; + StripQuotes(CurrentToken); + Cmd->For.Params = cmd_dup(CurrentToken); + } + } + else + break; + ParseToken(0, STANDARD_SEPS); + } + + /* Make sure there aren't two different switches specified + * at the same time, unless they're /D and /R */ + if ((Cmd->For.Switches & (Cmd->For.Switches - 1)) != 0 + && Cmd->For.Switches != (FOR_DIRS | FOR_RECURSIVE)) + { + goto error; + } + + /* Variable name should be % and just one other character */ + if (CurrentToken[0] != _T('%') || _tcslen(CurrentToken) != 2) + goto error; + Cmd->For.Variable = CurrentToken[1]; + + ParseToken(0, STANDARD_SEPS); + if (_tcsicmp(CurrentToken, _T("in")) != 0) + goto error; + + if (ParseToken(_T('('), STANDARD_SEPS) != TOK_BEGIN_BLOCK) + goto error; + + while (1) + { + int Type; + + /* Pretend we're inside a block so the tokenizer will stop on ')' */ + InsideBlock++; + Type = ParseToken(0, STANDARD_SEPS); + InsideBlock--; + + if (Type == TOK_END_BLOCK) + break; + + if (Type != TOK_NORMAL) + goto error; + + if (Pos != List) + *Pos++ = _T(' '); + + if (Pos + _tcslen(CurrentToken) >= &List[CMDLINE_LENGTH]) + goto error; + Pos = _stpcpy(Pos, CurrentToken); + } + *Pos = _T('\0'); + Cmd->For.List = cmd_dup(List); + + ParseToken(0, STANDARD_SEPS); + if (_tcsicmp(CurrentToken, _T("do")) != 0) + goto error; + + Cmd->Subcommands = ParseCommandOp(C_OP_LOWEST); + if (Cmd->Subcommands == NULL) + { + FreeCommand(Cmd); + return NULL; + } + + return Cmd; + +error: + FreeCommand(Cmd); + ParseError(); + return NULL; +} + static PARSED_COMMAND *ParseCommandPart(void) { TCHAR ParsedLine[CMDLINE_LENGTH]; @@ -486,7 +595,8 @@ TailOffset = Pos - ParsedLine; /* Check for special forms */ - if (_tcsicmp(ParsedLine, _T("if")) == 0) + if (_tcsicmp(ParsedLine, _T("for")) == 0 || + _tcsicmp(ParsedLine, _T("if")) == 0) { ParseToken(0, STANDARD_SEPS); /* Do special parsing only if it's not followed by /? */ @@ -498,7 +608,7 @@ FreeRedirection(RedirList); return NULL; } - return ParseIf(); + return _totlower(*ParsedLine) == _T('f') ? ParseFor() : ParseIf(); } Pos = _stpcpy(Pos, _T(" /?")); } @@ -665,6 +775,17 @@ EchoCommand(Sub->Next); } break; + case C_FOR: + ConOutPrintf(_T("for")); + if (Cmd->For.Switches & FOR_DIRS) ConOutPrintf(_T(" /D")); + if (Cmd->For.Switches & FOR_F) ConOutPrintf(_T(" /F")); + if (Cmd->For.Switches & FOR_LOOP) ConOutPrintf(_T(" /L")); + if (Cmd->For.Switches & FOR_RECURSIVE) ConOutPrintf(_T(" /R")); + if (Cmd->For.Params) + ConOutPrintf(_T(" %s"), Cmd->For.Params); + ConOutPrintf(_T(" %%%c in (%s) do "), Cmd->For.Variable, Cmd->For.List); + EchoCommand(Cmd->Subcommands); + break; } for (Redir = Cmd->Redirections; Redir; Redir = Redir->Next) @@ -688,5 +809,10 @@ cmd_free(Cmd->If.LeftArg); cmd_free(Cmd->If.RightArg); } + else if (Cmd->Type == C_FOR) + { + cmd_free(Cmd->For.Params); + cmd_free(Cmd->For.List); + } cmd_free(Cmd); }

1 0

[dchapyshev] 39741: - Update wineimport script
by dchapyshev＠svn.reactos.org 24 Feb '09

24 Feb '09

Author: dchapyshev Date: Tue Feb 24 22:22:53 2009 New Revision: 39741 URL: http://svn.reactos.org/svn/reactos?rev=39741&view=rev Log: - Update wineimport script Modified: trunk/tools/wineimport.cmd Modified: trunk/tools/wineimport.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/wineimport.cmd?rev=39741&r1=… ============================================================================== --- trunk/tools/wineimport.cmd [iso-8859-1] (original) +++ trunk/tools/wineimport.cmd [iso-8859-1] Tue Feb 24 22:22:53 2009 @@ -147,15 +147,13 @@ ) ) IF EXIST "%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec" ( - ECHO ^<importlibrary definition="%WINE_MODULE_NAME%.spec.def" /^> + ECHO ^<importlibrary definition="%WINE_MODULE_NAME%.spec" /^> ) ECHO ^<include base="%WINE_SHORT_NAME%"^>.^</include^> IF "%WINE_IS_EXE%" == "0" ( ECHO ^<include base="ReactOS"^>include/reactos/wine^</include^> ECHO ^<define name="__WINESRC__" /^> ) -ECHO ^<define name="WINVER"^>0x600^</define^> -ECHO ^<define name="_WIN32_WINNT"^>0x600^</define^> SET WINE_FULL_LINE= SET WINE_END_PREC_LINE= SET WINE_VARTYPE=0 @@ -175,9 +173,6 @@ ) IF "%WINE_IS_EXE%" == "1" ( ECHO ^<file^>testlist.c^</file^> -) -IF EXIST "%WINE_RELATIVE_WINE%\%WINE_MODULE_NAME%.spec" ( - ECHO ^<file^>%WINE_MODULE_NAME%.spec^</file^> ) FOR %%j IN (%WINE_LIBRARIES%) DO ( ECHO ^<library^>%%j^</library^>

1 0

[janderwald] 39740: - Fix enumerating of KSDATARANGES - Increment pin instance count when a new pin is created - Complete IRP on close request for filter - Make sure IRP Status block is set when completing played stream IRP - Silence debug prints - Enumerating number of channels and data formats should now work
by janderwald＠svn.reactos.org 24 Feb '09

24 Feb '09

Author: janderwald Date: Tue Feb 24 21:38:39 2009 New Revision: 39740 URL: http://svn.reactos.org/svn/reactos?rev=39740&view=rev Log: - Fix enumerating of KSDATARANGES - Increment pin instance count when a new pin is created - Complete IRP on close request for filter - Make sure IRP Status block is set when completing played stream IRP - Silence debug prints - Enumerating number of channels and data formats should now work Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -112,7 +112,7 @@ KSP_PIN * Pin; KSMULTIPLE_ITEM * Item; PIO_STACK_LOCATION IoStack; - ULONG Size; + ULONG Size, Index; PVOID Buffer; IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -161,8 +161,11 @@ Irp->IoStatus.Information = 0; break; } - - Size = sizeof(KSMULTIPLE_ITEM) + sizeof(KSDATARANGE) * Descriptor[Pin->PinId].DataRangesCount; + Size = sizeof(KSMULTIPLE_ITEM); + for (Index = 0; Index < Descriptor[Pin->PinId].DataRangesCount; Index++) + { + Size += Descriptor[Pin->PinId].DataRanges[Index]->FormatSize; + } if (IoStack->Parameters.DeviceIoControl.OutputBufferLength < Size) { @@ -174,7 +177,13 @@ Item = (KSMULTIPLE_ITEM*)Buffer; Item->Size = Size; Item->Count = Descriptor[Pin->PinId].DataRangesCount; - RtlMoveMemory((PVOID)(Item + 1), Descriptor[Pin->PinId].DataRanges, Descriptor[Pin->PinId].DataRangesCount * sizeof(KSDATARANGE)); + + Data = (PUCHAR)(Item +1); + for (Index = 0; Index < Descriptor[Pin->PinId].DataRangesCount; Index++) + { + RtlMoveMemory(Data, Descriptor[Pin->PinId].DataRanges[Index], Descriptor[Pin->PinId].DataRanges[Index]->FormatSize); + Data = ((PUCHAR)Data + Descriptor[Pin->PinId].DataRanges[Index]->FormatSize); + } Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Size; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -129,6 +129,10 @@ /* store result */ *OutTarget = (IIrpTarget*)Pin; + + /* increment current instance count */ + Descriptor->Factory.Instances[ConnectDetails->PinId].CurrentPinInstanceCount++; + return Status; } @@ -144,8 +148,8 @@ { PIO_STACK_LOCATION IoStack; ISubdevice *SubDevice = NULL; - SUBDEVICE_DESCRIPTOR * Descriptor = NULL; - NTSTATUS Status; + SUBDEVICE_DESCRIPTOR * Descriptor; + NTSTATUS Status; #if defined(DBG) IPortFilterWaveCyclicImpl * This = (IPortFilterWaveCyclicImpl *)iface; #endif @@ -155,8 +159,8 @@ ASSERT(This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&SubDevice) == STATUS_SUCCESS); ASSERT(SubDevice != NULL); - Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); - ASSERT(Status == STATUS_SUCCESS); + Status = SubDevice->lpVtbl->GetDescriptor(SubDevice, &Descriptor); + ASSERT(Status == STATUS_SUCCESS); ASSERT(Descriptor != NULL); SubDevice->lpVtbl->Release(SubDevice); @@ -213,6 +217,14 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { + DPRINT1("IPortFilterWaveCyclic_fnClose entered\n"); + + //FIXME + //close all pin instances + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -102,7 +102,7 @@ ULONG MaxGlobalInstanceCount; ULONG MaxFilterInstanceCount; ULONG MinFilterInstanceCount; - ULONG CurrentFilterInstanceCount; + ULONG CurrentPinInstanceCount; }PIN_INSTANCE_INFO, *PPIN_INSTANCE_INFO; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -124,6 +124,8 @@ { if (This->ActiveIrp) { + This->ActiveIrp->IoStatus.Status = STATUS_SUCCESS; + This->ActiveIrp->IoStatus.Information = This->ActiveIrpBufferSize; IoCompleteRequest(This->ActiveIrp, IO_SOUND_INCREMENT); } @@ -167,7 +169,7 @@ Status = This->Stream->lpVtbl->GetPosition(This->Stream, &Position); - DPRINT1("Position %u BufferSize %u ActiveIrpOffset %u\n", Position, This->CommonBufferSize, This->ActiveIrpOffset); + DPRINT("Position %u BufferSize %u ActiveIrpOffset %u\n", Position, This->CommonBufferSize, This->ActiveIrpOffset); if (Position < This->CommonBufferOffset) { @@ -176,7 +178,7 @@ BytesToCopy = min(BufferLength, IrpLength); - DPRINT1("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + DPRINT("Copying %u Remaining %u\n", BytesToCopy, IrpLength); if (BytesToCopy) { @@ -193,7 +195,7 @@ IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; BytesToCopy = min(BufferLength, IrpLength); - DPRINT1("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + DPRINT("Copying %u Remaining %u\n", BytesToCopy, IrpLength); if (BytesToCopy) { @@ -209,13 +211,13 @@ IrpLength = This->ActiveIrpBufferSize - This->ActiveIrpOffset; BytesToCopy = min(BufferLength, IrpLength); - DPRINT1("Copying %u Remaining %u\n", BytesToCopy, IrpLength); + DPRINT("Copying %u Remaining %u\n", BytesToCopy, IrpLength); if (!BytesToCopy) - { + { This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE); return; - } + } This->DmaChannel->lpVtbl->CopyTo(This->DmaChannel, (PUCHAR)This->CommonBuffer + This->CommonBufferOffset, @@ -567,6 +569,12 @@ } UNIMPLEMENTED + DbgBreakPoint(); + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; } @@ -619,8 +627,15 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - - return STATUS_UNSUCCESSFUL; + DPRINT1("IPortPinWaveCyclic_fnClose\n"); + + //FIXME + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; } /* Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -624,7 +624,7 @@ *Descriptor = This->SubDeviceDescriptor; - DPRINT1("ISubDevice_GetDescriptor this %p desc %p\n", This, This->SubDeviceDescriptor); + DPRINT("ISubDevice_GetDescriptor this %p desc %p\n", This, This->SubDeviceDescriptor); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -9,7 +9,7 @@ #include <ntddk.h> #include <portcls.h> -#define YDEBUG +#define NDEBUG #include <debug.h> #include <dmusicks.h> Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -25,7 +25,7 @@ else Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxFilterInstanceCount; - Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentFilterInstanceCount; + Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount; Irp->IoStatus.Information = sizeof(KSPIN_CINSTANCES); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -222,7 +222,6 @@ RtlStringFromGUID(&Property->Set, &GuidString); DPRINT1("Unhandeled property: Set %S Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); - DbgBreakPoint(); RtlFreeUnicodeString(&GuidString); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -33,7 +33,7 @@ IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; InterlockedDecrement(&This->ref); - DPRINT1("IRegistryKey_fnRelease ref %u this %p entered\n", This->ref, This); + DPRINT("IRegistryKey_fnRelease ref %u this %p entered\n", This->ref, This); if (This->ref == 0) { if (This->hKey) @@ -55,7 +55,7 @@ OUT PVOID* Output) { IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_fnQueryInterface entered\n"); + DPRINT("IRegistryKey_fnQueryInterface entered\n"); if (IsEqualGUIDAligned(refiid, &IID_IRegistryKey)) { *Output = (PVOID)&This->lpVtbl; @@ -64,7 +64,7 @@ } DPRINT("IRegistryKey_QueryInterface: This %p unknown iid\n", This, This->ref); -KeBugCheckEx(0,0,0,0,0); + DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -74,7 +74,7 @@ IN IRegistryKey* iface) { IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_fnDeleteKey entered\n"); + DPRINT("IRegistryKey_fnDeleteKey entered\n"); return ZwDeleteKey(This->hKey); } @@ -89,7 +89,7 @@ OUT PULONG ResultLength) { IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_fnEnumerateKey entered\n"); + DPRINT("IRegistryKey_fnEnumerateKey entered\n"); return ZwEnumerateKey(This->hKey, Index, KeyInformationClass, KeyInformation, Length, ResultLength); } @@ -104,7 +104,7 @@ OUT PULONG ResultLength) { IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_fnEnumerateKeyValue entered\n"); + DPRINT("IRegistryKey_fnEnumerateKeyValue entered\n"); return ZwEnumerateValueKey(This->hKey, Index, KeyValueInformationClass, KeyValueInformation, Length, ResultLength); } @@ -124,13 +124,16 @@ HANDLE hKey; IRegistryKeyImpl * NewThis, *This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_fnNewSubKey entered\n"); + DPRINT("IRegistryKey_fnNewSubKey entered %S\n", SubKeyName); InitializeObjectAttributes(&Attributes, SubKeyName, 0, This->hKey, NULL); Status = ZwCreateKey(&hKey, KEY_READ | KEY_WRITE, &Attributes, 0, NULL, 0, Disposition); if (!NT_SUCCESS(Status)) + { + DPRINT1("IRegistryKey_fnNewSubKey failed with %x\n", Status); + DbgBreakPoint(); return Status; - + } NewThis = AllocateItem(NonPagedPool, sizeof(IRegistryKeyImpl), TAG_PORTCLASS); if (!NewThis) @@ -143,11 +146,11 @@ OuterUnknown->lpVtbl->AddRef(OuterUnknown); NewThis->hKey = hKey; - NewThis->ref = 2; + NewThis->ref = 1; NewThis->lpVtbl = &vt_IRegistryKey; *RegistrySubKey = (PREGISTRYKEY)&NewThis->lpVtbl; - DPRINT1("IRegistryKey_fnNewSubKey RESULT %p\n", *RegistrySubKey ); + DPRINT("IRegistryKey_fnNewSubKey RESULT %p\n", *RegistrySubKey ); return STATUS_SUCCESS; } @@ -162,7 +165,7 @@ OUT PULONG ResultLength) { IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_fnQueryKey entered\n"); + DPRINT("IRegistryKey_fnQueryKey entered\n"); return ZwQueryKey(This->hKey, KeyInformationClass, KeyInformation, Length, ResultLength); } @@ -173,8 +176,9 @@ IN PRTL_QUERY_REGISTRY_TABLE QueryTable, IN PVOID Context OPTIONAL) { - IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_QueryRegistryValues: This %p\n", This); + //IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; + UNIMPLEMENTED + DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -204,7 +208,7 @@ ) { IRegistryKeyImpl * This = (IRegistryKeyImpl*)iface; - DPRINT1("IRegistryKey_fnSetValueKey entered\n"); + DPRINT1("IRegistryKey_fnSetValueKey entered %S\n", ValueName->Buffer); return ZwSetValueKey(This->hKey, ValueName, 0, Type, Data, DataSize); } @@ -245,7 +249,7 @@ IRegistryKeyImpl * This; PPCLASS_DEVICE_EXTENSION DeviceExt; - DPRINT1("PcNewRegistryKey entered\n"); + DPRINT("PcNewRegistryKey entered\n"); if (!OutRegistryKey) return STATUS_INVALID_PARAMETER; @@ -290,7 +294,8 @@ else if (RegistryKeyType == DeviceInterfaceRegistryKey) { /* FIXME */ - DPRINT1("fixme\n"); + UNIMPLEMENTED + DbgBreakPoint(); } if (!NT_SUCCESS(Status)) @@ -313,7 +318,7 @@ This->ref = 2; *OutRegistryKey = (PREGISTRYKEY)&This->lpVtbl; - DPRINT1("PcNewRegistryKey result %p\n", *OutRegistryKey); + DPRINT("PcNewRegistryKey result %p\n", *OutRegistryKey); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -147,7 +147,8 @@ IN PPCFILTER_DESCRIPTOR FilterDescription) { SUBDEVICE_DESCRIPTOR * Descriptor; - ULONG Index; + ULONG Index, SubIndex; + PKSDATARANGE DataRange; NTSTATUS Status = STATUS_INSUFFICIENT_RESOURCES; Descriptor = AllocateItem(NonPagedPool, sizeof(SUBDEVICE_DESCRIPTOR), TAG_PORTCLASS); @@ -164,7 +165,6 @@ if (FilterPropertiesCount) { - /// FIXME /// handle driver properties Descriptor->FilterPropertySet.Properties = AllocateItem(NonPagedPool, sizeof(KSPROPERTY_SET) * FilterPropertiesCount, TAG_PORTCLASS); @@ -198,7 +198,31 @@ for(Index = 0; Index < FilterDescription->PinCount; Index++) { RtlMoveMemory(&Descriptor->Factory.KsPinDescriptor[Index], &FilterDescription->Pins[Index].KsPinDescriptor, FilterDescription->PinSize); - Descriptor->Factory.Instances[Index].CurrentFilterInstanceCount = 0; + + if (FilterDescription->Pins[Index].KsPinDescriptor.DataRangesCount) + { + Descriptor->Factory.KsPinDescriptor[Index].DataRanges = AllocateItem(NonPagedPool, FilterDescription->Pins[Index].KsPinDescriptor.DataRangesCount * sizeof(PKSDATARANGE), TAG_PORTCLASS); + if(!Descriptor->Factory.KsPinDescriptor[Index].DataRanges) + goto cleanup; + + for (SubIndex = 0; SubIndex < FilterDescription->Pins[Index].KsPinDescriptor.DataRangesCount; SubIndex++) + { + DataRange = AllocateItem(NonPagedPool, FilterDescription->Pins[Index].KsPinDescriptor.DataRanges[SubIndex]->FormatSize, TAG_PORTCLASS); + if (!DataRange) + goto cleanup; + + RtlMoveMemory(DataRange, + FilterDescription->Pins[Index].KsPinDescriptor.DataRanges[SubIndex], + FilterDescription->Pins[Index].KsPinDescriptor.DataRanges[SubIndex]->FormatSize); + + ((PKSDATAFORMAT*)Descriptor->Factory.KsPinDescriptor[Index].DataRanges)[SubIndex] = DataRange; + + } + + Descriptor->Factory.KsPinDescriptor[Index].DataRangesCount = FilterDescription->Pins[Index].KsPinDescriptor.DataRangesCount; + } + + Descriptor->Factory.Instances[Index].CurrentPinInstanceCount = 0; Descriptor->Factory.Instances[Index].MaxFilterInstanceCount = FilterDescription->Pins[Index].MaxFilterInstanceCount; Descriptor->Factory.Instances[Index].MaxGlobalInstanceCount = FilterDescription->Pins[Index].MaxGlobalInstanceCount; Descriptor->Factory.Instances[Index].MinFilterInstanceCount = FilterDescription->Pins[Index].MinFilterInstanceCount; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Tue Feb 24 21:38:39 2009 @@ -351,7 +351,7 @@ } } - if (DataRangeAudio->MaximumBitsPerSample <= 16 && DataRangeAudio->MaximumBitsPerSample >= 16) + if (DataRangeAudio->MinimumBitsPerSample <= 16 && DataRangeAudio->MaximumBitsPerSample >= 16) { Result |= Mono16Bit; if (DataRangeAudio->MaximumChannels >= 2) @@ -449,26 +449,31 @@ IsEqualGUIDAligned(&DataRangeAudio->DataRange.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM) && IsEqualGUIDAligned(&DataRangeAudio->DataRange.Specifier, &KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)) { + DPRINT("Min Sample %u Max Sample %u Min Bits %u Max Bits %u Max Channel %u\n", DataRangeAudio->MinimumSampleFrequency, DataRangeAudio->MaximumSampleFrequency, + DataRangeAudio->MinimumBitsPerSample, DataRangeAudio->MaximumBitsPerSample, DataRangeAudio->MaximumChannels); + dwFormats |= CheckFormatSupport(DataRangeAudio, 11025, WAVE_FORMAT_1M08, WAVE_FORMAT_1S08, WAVE_FORMAT_1M16, WAVE_FORMAT_1S16); dwFormats |= CheckFormatSupport(DataRangeAudio, 22050, WAVE_FORMAT_2M08, WAVE_FORMAT_2S08, WAVE_FORMAT_2M16, WAVE_FORMAT_2S16); dwFormats |= CheckFormatSupport(DataRangeAudio, 44100, WAVE_FORMAT_4M08, WAVE_FORMAT_4S08, WAVE_FORMAT_4M16, WAVE_FORMAT_4S16); dwFormats |= CheckFormatSupport(DataRangeAudio, 48000, WAVE_FORMAT_48M08, WAVE_FORMAT_48S08, WAVE_FORMAT_48M16, WAVE_FORMAT_48S16); dwFormats |= CheckFormatSupport(DataRangeAudio, 96000, WAVE_FORMAT_96M08, WAVE_FORMAT_96S08, WAVE_FORMAT_96M16, WAVE_FORMAT_96S16); + wChannels = DataRangeAudio->MaximumChannels; dwSupport = WAVECAPS_VOLUME; //FIXME get info from nodes } } } - + DataRange = (PKSDATARANGE)((PUCHAR)DataRange + DataRange->FormatSize); } DeviceInfo->u.WaveOutCaps.dwFormats = dwFormats; DeviceInfo->u.WaveOutCaps.dwSupport = dwSupport; DeviceInfo->u.WaveOutCaps.wChannels = wChannels; + DeviceInfo->u.WaveOutCaps.szPname[0] = L'\0'; + ExFreePool(MultipleItem); - return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); }

1 0

[janderwald] 39739: - Explictly use unicode structures
by janderwald＠svn.reactos.org 24 Feb '09

24 Feb '09

Author: janderwald Date: Tue Feb 24 21:05:07 2009 New Revision: 39739 URL: http://svn.reactos.org/svn/reactos?rev=39739&view=rev Log: - Explictly use unicode structures Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/interface.h [iso-8859-1] Tue Feb 24 21:05:07 2009 @@ -39,9 +39,9 @@ union { WAVEFORMATEX WaveFormatEx; - WAVEOUTCAPS WaveOutCaps; - AUXCAPS AuxCaps; - WAVEINCAPS WaveInCaps; + WAVEOUTCAPSW WaveOutCaps; + AUXCAPSW AuxCaps; + WAVEINCAPSW WaveInCaps; }u; }WDMAUD_DEVICE_INFO, *PWDMAUD_DEVICE_INFO;

1 0

[fireball] 39738: - Make SystemProcessInformation return required size if buffer is too small. Matches Windows XP behavior. See issue #4087 for more details.
by fireball＠svn.reactos.org 24 Feb '09

24 Feb '09

Author: fireball Date: Tue Feb 24 17:02:39 2009 New Revision: 39738 URL: http://svn.reactos.org/svn/reactos?rev=39738&view=rev Log: - Make SystemProcessInformation return required size if buffer is too small. Matches Windows XP behavior. See issue #4087 for more details. Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c 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] Tue Feb 24 17:02:39 2009 @@ -716,6 +716,7 @@ NTSTATUS Status = STATUS_SUCCESS; PUNICODE_STRING ProcessImageName; PWCHAR szSrc; + BOOLEAN Overflow = FALSE; _SEH2_TRY { @@ -726,11 +727,12 @@ *ReqSize = sizeof(SYSTEM_PROCESS_INFORMATION); + /* Check for overflow */ if (Size < sizeof(SYSTEM_PROCESS_INFORMATION)) - { - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small - } - RtlZeroMemory(Spi, Size); + Overflow = TRUE; + + /* Zero user's buffer */ + if (!Overflow) RtlZeroMemory(Spi, Size); SystemProcess = PsIdleProcess; Process = SystemProcess; @@ -784,90 +786,86 @@ TotalSize += CurrentSize + ImageNameMaximumLength; + /* Check for overflow */ if (TotalSize > Size) + Overflow = TRUE; + + /* Fill system information */ + if (!Overflow) { - *ReqSize = TotalSize; - ObDereferenceObject(Process); - - /* Release the memory allocated by SeLocateProcessImageName */ - if (NT_SUCCESS(Status)) ExFreePool(ProcessImageName); - - _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); // in case buffer size is too small + SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure + SpiCurrent->NumberOfThreads = ThreadsCount; + SpiCurrent->CreateTime = Process->CreateTime; + SpiCurrent->ImageName.Length = ImageNameLength; + SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; + SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); + + /* Copy name to the end of the struct */ + if(Process != PsIdleProcess) + { + if (szSrc) + { + RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); + + /* Release the memory allocated by SeLocateProcessImageName */ + ExFreePool(ProcessImageName); + } + else if (Process->ImageFileName) + { + RtlInitAnsiString(&ImageName, Process->ImageFileName); + RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); + } + } + else + { + RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); + } + + SpiCurrent->BasePriority = Process->Pcb.BasePriority; + SpiCurrent->UniqueProcessId = Process->UniqueProcessId; + SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; + SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); + SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; + SpiCurrent->VirtualSize = Process->VirtualSize; + SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; + SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; + SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; + SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; + SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; + SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; + SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; + SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; + SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; + SpiCurrent->PrivatePageCount = Process->CommitCharge; + ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); + + CurrentEntry = Process->ThreadListHead.Flink; + while (CurrentEntry != &Process->ThreadListHead) + { + CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, + ThreadListEntry); + + ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); + ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); + ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; + ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; + ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; + ThreadInfo->ClientId = CurrentThread->Cid; + ThreadInfo->Priority = CurrentThread->Tcb.Priority; + ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; + ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; + ThreadInfo->ThreadState = CurrentThread->Tcb.State; + ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; + + ThreadInfo++; + CurrentEntry = CurrentEntry->Flink; + } + + /* Query total user/kernel times of a process */ + TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); + SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); + SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); } - - /* Fill system information */ - SpiCurrent->NextEntryOffset = CurrentSize + ImageNameMaximumLength; // relative offset to the beginnnig of the next structure - SpiCurrent->NumberOfThreads = ThreadsCount; - SpiCurrent->CreateTime = Process->CreateTime; - SpiCurrent->ImageName.Length = ImageNameLength; - SpiCurrent->ImageName.MaximumLength = ImageNameMaximumLength; - SpiCurrent->ImageName.Buffer = (void*)(Current + CurrentSize); - - /* Copy name to the end of the struct */ - if(Process != PsIdleProcess) - { - if (szSrc) - { - RtlCopyMemory(SpiCurrent->ImageName.Buffer, szSrc, SpiCurrent->ImageName.Length); - - /* Release the memory allocated by SeLocateProcessImageName */ - ExFreePool(ProcessImageName); - } - else if (Process->ImageFileName) - { - RtlInitAnsiString(&ImageName, Process->ImageFileName); - RtlAnsiStringToUnicodeString(&SpiCurrent->ImageName, &ImageName, FALSE); - } - } - else - { - RtlInitUnicodeString(&SpiCurrent->ImageName, NULL); - } - - SpiCurrent->BasePriority = Process->Pcb.BasePriority; - SpiCurrent->UniqueProcessId = Process->UniqueProcessId; - SpiCurrent->InheritedFromUniqueProcessId = Process->InheritedFromUniqueProcessId; - SpiCurrent->HandleCount = ObGetProcessHandleCount(Process); - SpiCurrent->PeakVirtualSize = Process->PeakVirtualSize; - SpiCurrent->VirtualSize = Process->VirtualSize; - SpiCurrent->PageFaultCount = Process->Vm.PageFaultCount; - SpiCurrent->PeakWorkingSetSize = Process->Vm.PeakWorkingSetSize; - SpiCurrent->WorkingSetSize = Process->Vm.WorkingSetSize; - SpiCurrent->QuotaPeakPagedPoolUsage = Process->QuotaPeak[0]; - SpiCurrent->QuotaPagedPoolUsage = Process->QuotaUsage[0]; - SpiCurrent->QuotaPeakNonPagedPoolUsage = Process->QuotaPeak[1]; - SpiCurrent->QuotaNonPagedPoolUsage = Process->QuotaUsage[1]; - SpiCurrent->PagefileUsage = Process->QuotaUsage[2]; - SpiCurrent->PeakPagefileUsage = Process->QuotaPeak[2]; - SpiCurrent->PrivatePageCount = Process->CommitCharge; - ThreadInfo = (PSYSTEM_THREAD_INFORMATION)(SpiCurrent + 1); - - CurrentEntry = Process->ThreadListHead.Flink; - while (CurrentEntry != &Process->ThreadListHead) - { - CurrentThread = CONTAINING_RECORD(CurrentEntry, ETHREAD, - ThreadListEntry); - - ThreadInfo->KernelTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.KernelTime, KeMaximumIncrement); - ThreadInfo->UserTime.QuadPart = UInt32x32To64(CurrentThread->Tcb.UserTime, KeMaximumIncrement); - ThreadInfo->CreateTime.QuadPart = CurrentThread->CreateTime.QuadPart; - ThreadInfo->WaitTime = CurrentThread->Tcb.WaitTime; - ThreadInfo->StartAddress = (PVOID) CurrentThread->StartAddress; - ThreadInfo->ClientId = CurrentThread->Cid; - ThreadInfo->Priority = CurrentThread->Tcb.Priority; - ThreadInfo->BasePriority = CurrentThread->Tcb.BasePriority; - ThreadInfo->ContextSwitches = CurrentThread->Tcb.ContextSwitches; - ThreadInfo->ThreadState = CurrentThread->Tcb.State; - ThreadInfo->WaitReason = CurrentThread->Tcb.WaitReason; - - ThreadInfo++; - CurrentEntry = CurrentEntry->Flink; - } - - /* Query total user/kernel times of a process */ - TotalKernel = KeQueryRuntimeProcess(&Process->Pcb, &TotalUser); - SpiCurrent->UserTime.QuadPart = UInt32x32To64(TotalUser, KeMaximumIncrement); - SpiCurrent->KernelTime.QuadPart = UInt32x32To64(TotalKernel, KeMaximumIncrement); /* Handle idle process entry */ if (Process == PsIdleProcess) Process = NULL; @@ -876,7 +874,8 @@ ThreadsCount = 0; if ((Process == SystemProcess) || (Process == NULL)) { - SpiCurrent->NextEntryOffset = 0; + if (!Overflow) + SpiCurrent->NextEntryOffset = 0; break; } else @@ -894,6 +893,9 @@ Status = _SEH2_GetExceptionCode(); } _SEH2_END + + if (Overflow) + Status = STATUS_INFO_LENGTH_MISMATCH; *ReqSize = TotalSize; return Status;

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009