Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[hbirr] 13277: - Fixed the directory index of a file for FATX.

by hbirr＠svn.reactos.com

- Fixed the directory index of a file for FATX. - Replaced VfatSupersedeFile with VfatSetAllocationSizeInformation. - Check for the file size before each call to CcMapData. W2K doesn't like it to map over the end of a directory. Modified: trunk/reactos/drivers/fs/vfat/create.c _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-01-25 21:05:38 UTC (rev 13276) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-01-25 21:07:32 UTC (rev 13277) @@ -231,15 +231,20 @@ rcFcb = vfatGrabFCBFromTable(DeviceExt, &PathNameU); if (rcFcb) { - if(rcFcb->startIndex >= DirContext->DirIndex) + ULONG startIndex = rcFcb->startIndex; + if ((rcFcb->Flags & FCB_IS_FATX_ENTRY) && !vfatFCBIsRoot(Parent)) { + startIndex += 2; + } + if(startIndex >= DirContext->DirIndex) + { RtlCopyUnicodeString(&DirContext->LongNameU, &rcFcb->LongNameU); RtlCopyUnicodeString(&DirContext->ShortNameU, &rcFcb->ShortNameU); RtlCopyMemory(&DirContext->DirEntry, &rcFcb->entry, sizeof(DIR_ENTRY)); DirContext->StartIndex = rcFcb->startIndex; DirContext->DirIndex = rcFcb->dirIndex; DPRINT("FindFile: new Name %wZ, DirIndex %d (%d)\n", - &DirContext->LongNameU, DirContext->DirIndex, DirContext->StartIndex); + &DirContext->LongNameU, DirContext->DirIndex, DirContext->StartIndex); Status = STATUS_SUCCESS; } else @@ -428,55 +433,6 @@ return Status; } -VOID STATIC -VfatSupersedeFile(PDEVICE_EXTENSION DeviceExt, PFILE_OBJECT FileObject, - PVFATFCB Fcb) -{ - ULONG Cluster, NextCluster; - NTSTATUS Status; - - if (Fcb->Flags & FCB_IS_FATX_ENTRY) - { - Fcb->entry.FatX.FileSize = 0; - Cluster = Fcb->entry.FatX.FirstCluster; - Fcb->entry.FatX.FirstCluster = 0; - } - else - { - Fcb->entry.Fat.FileSize = 0; - if (DeviceExt->FatInfo.FatType == FAT32) - { - Cluster = Fcb->entry.Fat.FirstCluster + Fcb->entry.Fat.FirstClusterHigh * 65536; - } - else - { - Cluster = Fcb->entry.Fat.FirstCluster; - } - Fcb->entry.Fat.FirstCluster = 0; - Fcb->entry.Fat.FirstClusterHigh = 0; - } - Fcb->LastOffset = Fcb->LastCluster = 0; - VfatUpdateEntry (Fcb); - if (Fcb->RFCB.FileSize.QuadPart > 0) - { - Fcb->RFCB.AllocationSize.QuadPart = 0; - Fcb->RFCB.FileSize.QuadPart = 0; - Fcb->RFCB.ValidDataLength.QuadPart = 0; - /* Notify cache manager about the change in file size if caching is - initialized on the file stream */ - if (FileObject->SectionObjectPointer->SharedCacheMap != NULL) - { - CcSetFileSizes(FileObject, (PCC_FILE_SIZES)&Fcb->RFCB.AllocationSize); - } - } - while (Cluster != 0xffffffff && Cluster > 1) - { - Status = GetNextCluster (DeviceExt, Cluster, &NextCluster); - WriteCluster (DeviceExt, Cluster, 0); - Cluster = NextCluster; - } -} - NTSTATUS VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp) /* @@ -734,7 +690,9 @@ /* Supersede the file */ if (RequestedDisposition == FILE_SUPERSEDE) { - VfatSupersedeFile(DeviceExt, FileObject, pFcb); + LARGE_INTEGER AllocationSize; + AllocationSize.QuadPart = 0LL; + VfatSetAllocationSizeInformation(FileObject, pFcb, DeviceExt, &AllocationSize); Irp->IoStatus.Information = FILE_SUPERSEDED; } else if (RequestedDisposition == FILE_OVERWRITE || RequestedDisposition == FILE_OVERWRITE_IF)

19 years, 9 months

[hbirr] 13284: - Fixed the directory index of a file for FATX.

by hbirr＠svn.reactos.com

- Fixed the directory index of a file for FATX. - Check for the file size before eache call to CcMapData. W2K doesnt like to map over the end of a directory. Modified: trunk/reactos/drivers/fs/vfat/direntry.c _____ Modified: trunk/reactos/drivers/fs/vfat/direntry.c --- trunk/reactos/drivers/fs/vfat/direntry.c 2005-01-25 21:13:28 UTC (rev 13283) +++ trunk/reactos/drivers/fs/vfat/direntry.c 2005-01-25 21:14:57 UTC (rev 13284) @@ -175,7 +175,8 @@ { CcUnpinData(*pContext); } - if (!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { *pContext = NULL; return STATUS_NO_MORE_ENTRIES; @@ -204,7 +205,8 @@ { CcUnpinData(*pContext); FileOffset.u.LowPart -= PAGE_SIZE; - if (!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { CHECKPOINT; *pContext = NULL; @@ -228,7 +230,8 @@ { CcUnpinData(*pContext); FileOffset.u.LowPart += PAGE_SIZE; - if (!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { CHECKPOINT; *pContext = NULL; @@ -325,7 +328,8 @@ { CcUnpinData(*pContext); FileOffset.u.LowPart += PAGE_SIZE; - if (!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { CHECKPOINT; *pContext = NULL; @@ -361,7 +365,6 @@ ULONG DirIndex = DirContext->DirIndex; FileOffset.u.HighPart = 0; - FileOffset.u.LowPart = ROUND_DOWN(DirContext->DirIndex * sizeof(FATX_DIR_ENTRY), PAGE_SIZE); if (!vfatFCBIsRoot(pDirFcb)) { @@ -403,7 +406,9 @@ { CcUnpinData(*pContext); } - if (!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + FileOffset.u.LowPart = ROUND_DOWN(DirIndex * sizeof(FATX_DIR_ENTRY), PAGE_SIZE); + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { *pContext = NULL; return STATUS_NO_MORE_ENTRIES; @@ -412,33 +417,35 @@ fatxDirEntry = (PFATX_DIR_ENTRY)(*pPage) + DirIndex % FATX_ENTRIES_PER_PAGE; - DirContext->StartIndex = DirIndex; + DirContext->StartIndex = DirContext->DirIndex; while (TRUE) { - if (FATX_ENTRY_END(fatxDirEntry)) - { - CcUnpinData(*pContext); - *pContext = NULL; - return STATUS_NO_MORE_ENTRIES; - } + if (FATX_ENTRY_END(fatxDirEntry)) + { + CcUnpinData(*pContext); + *pContext = NULL; + return STATUS_NO_MORE_ENTRIES; + } - if (!FATX_ENTRY_DELETED(fatxDirEntry)) - { - RtlCopyMemory(&DirContext->DirEntry.FatX, fatxDirEntry, sizeof(FATX_DIR_ENTRY)); - break; + if (!FATX_ENTRY_DELETED(fatxDirEntry)) + { + RtlCopyMemory(&DirContext->DirEntry.FatX, fatxDirEntry, sizeof(FATX_DIR_ENTRY)); + break; } - DirContext->DirIndex++; - DirContext->StartIndex++; - if ((DirContext->DirIndex % FATX_ENTRIES_PER_PAGE) == 0) + DirContext->DirIndex++; + DirContext->StartIndex++; + DirIndex++; + if ((DirIndex % FATX_ENTRIES_PER_PAGE) == 0) { CcUnpinData(*pContext); FileOffset.u.LowPart += PAGE_SIZE; - if (!CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) + if (FileOffset.u.LowPart >= pDirFcb->RFCB.FileSize.u.LowPart || + !CcMapData(pDirFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, pContext, pPage)) { CHECKPOINT; - *pContext = NULL; - return STATUS_NO_MORE_ENTRIES; + *pContext = NULL; + return STATUS_NO_MORE_ENTRIES; } fatxDirEntry = (PFATX_DIR_ENTRY)*pPage; }

19 years, 9 months

[hbirr] 13283: - Print the major function codes if debug prints are enabled.

by hbirr＠svn.reactos.com

- Print the major function codes if debug prints are enabled. Modified: trunk/reactos/drivers/fs/vfat/misc.c _____ Modified: trunk/reactos/drivers/fs/vfat/misc.c --- trunk/reactos/drivers/fs/vfat/misc.c 2005-01-25 21:12:52 UTC (rev 13282) +++ trunk/reactos/drivers/fs/vfat/misc.c 2005-01-25 21:13:28 UTC (rev 13283) @@ -13,6 +13,41 @@ #define NDEBUG #include "vfat.h" +/* GLOBALS ******************************************************************/ + +const char* MajorFunctionNames[] = +{ + "IRP_MJ_CREATE", + "IRP_MJ_CREATE_NAMED_PIPE", + "IRP_MJ_CLOSE", + "IRP_MJ_READ", + "IRP_MJ_WRITE", + "IRP_MJ_QUERY_INFORMATION", + "IRP_MJ_SET_INFORMATION", + "IRP_MJ_QUERY_EA", + "IRP_MJ_SET_EA", + "IRP_MJ_FLUSH_BUFFERS", + "IRP_MJ_QUERY_VOLUME_INFORMATION", + "IRP_MJ_SET_VOLUME_INFORMATION", + "IRP_MJ_DIRECTORY_CONTROL", + "IRP_MJ_FILE_SYSTEM_CONTROL", + "IRP_MJ_DEVICE_CONTROL", + "IRP_MJ_INTERNAL_DEVICE_CONTROL", + "IRP_MJ_SHUTDOWN", + "IRP_MJ_LOCK_CONTROL", + "IRP_MJ_CLEANUP", + "IRP_MJ_CREATE_MAILSLOT", + "IRP_MJ_QUERY_SECURITY", + "IRP_MJ_SET_SECURITY", + "IRP_MJ_POWER", + "IRP_MJ_SYSTEM_CONTROL", + "IRP_MJ_DEVICE_CHANGE", + "IRP_MJ_QUERY_QUOTA", + "IRP_MJ_SET_QUOTA", + "IRP_MJ_PNP", + "IRP_MJ_MAXIMUM_FUNCTION" +}; + /* FUNCTIONS ****************************************************************/ static LONG QueueCount = 0; @@ -57,10 +92,11 @@ return Status; } -NTSTATUS VfatDispatchRequest ( - IN PVFAT_IRP_CONTEXT IrpContext) +NTSTATUS +VfatDispatchRequest (IN PVFAT_IRP_CONTEXT IrpContext) { - DPRINT ("VfatDispatchRequest (IrpContext %x), MajorFunction %x\n", IrpContext, IrpContext->MajorFunction); + DPRINT ("VfatDispatchRequest (IrpContext %x), is called for %s\n", IrpContext, + IrpContext->MajorFunction >= IRP_MJ_MAXIMUM_FUNCTION ? "????" : MajorFunctionNames[IrpContext->MajorFunction]); ASSERT(IrpContext);

19 years, 9 months

[hbirr] 13282: - Allow the second device name RosFat to make it possible to load vfatfs on W2k if fastfat is already loaded.

by hbirr＠svn.reactos.com

- Allow the second device name RosFat to make it possible to load vfatfs on W2k if fastfat is already loaded. - Moved the initialisation of the callback and fast io functions to fastio.c. Modified: trunk/reactos/drivers/fs/vfat/iface.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2005-01-25 21:11:46 UTC (rev 13281) +++ trunk/reactos/drivers/fs/vfat/iface.c 2005-01-25 21:12:52 UTC (rev 13282) @@ -49,7 +49,6 @@ { PDEVICE_OBJECT DeviceObject; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); - PFAST_IO_DISPATCH pFastIoDispatch; NTSTATUS Status; Status = IoCreateDevice(DriverObject, @@ -61,7 +60,23 @@ &DeviceObject); if (!NT_SUCCESS(Status)) { - return (Status); + if (Status == STATUS_OBJECT_NAME_EXISTS || + Status == STATUS_OBJECT_NAME_COLLISION) + { + /* Try an other name, if 'Fat' is already in use. 'Fat' is also used by fastfat.sys on W2K */ + RtlInitUnicodeString(&DeviceName, L"\\RosFat"); + Status = IoCreateDevice(DriverObject, + sizeof(VFAT_GLOBAL_DATA), + &DeviceName, + FILE_DEVICE_DISK_FILE_SYSTEM, + 0, + FALSE, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + return (Status); + } + } } VfatGlobalData = DeviceObject->DeviceExtension; RtlZeroMemory (VfatGlobalData, sizeof(VFAT_GLOBAL_DATA)); @@ -95,9 +110,8 @@ VfatGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = VfatReleaseFromReadAhead; /* Fast I/O */ - DriverObject->FastIoDispatch = pFastIoDispatch = &VfatGlobalData->FastIoDispatch; - pFastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); - pFastIoDispatch->FastIoCheckIfPossible = VfatFastIoCheckIfPossible; + VfatInitFastIoRoutines(&VfatGlobalData->FastIoDispatch); + DriverObject->FastIoDispatch = &VfatGlobalData->FastIoDispatch; /* Private lists */ ExInitializeNPagedLookasideList(&VfatGlobalData->FcbLookasideList, _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-25 21:11:46 UTC (rev 13281) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-25 21:12:52 UTC (rev 13282) @@ -511,15 +511,8 @@ /* --------------------------------------------------------- fastio.c */ -BOOLEAN NTAPI -VfatFastIoCheckIfPossible(IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Lenght, - IN BOOLEAN Wait, - IN ULONG LockKey, - IN BOOLEAN CheckForReadOperation, - OUT PIO_STATUS_BLOCK IoStatus, - IN PDEVICE_OBJECT DeviceObject); +VOID +VfatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch); BOOLEAN NTAPI VfatAcquireForLazyWrite(IN PVOID Context,

19 years, 9 months

[hbirr] 13281: - Fixed some problems to recognize a FATX partition on a non xbox (Should be tested on a real xbox).

by hbirr＠svn.reactos.com

- Fixed some problems to recognize a FATX partition on a non xbox (Should be tested on a real xbox). - Fixed the calculation of the number of clusters. Modified: trunk/reactos/drivers/fs/vfat/fsctl.c _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-25 21:10:42 UTC (rev 13280) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-25 21:11:46 UTC (rev 13281) @@ -130,130 +130,129 @@ { *RecognizedFS = TRUE; } - if (*RecognizedFS == FALSE) + if (*RecognizedFS) { - return STATUS_SUCCESS; - } - Boot = ExAllocatePool(NonPagedPool, DiskGeometry.BytesPerSector); - if (Boot == NULL) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - - Offset.QuadPart = 0; - - /* Try to recognize FAT12/FAT16/FAT32 partitions */ - Status = VfatReadDisk(DeviceToMount, &Offset, DiskGeometry.BytesPerSector, (PUCHAR) Boot, FALSE); - if (NT_SUCCESS(Status)) - { - if (Boot->Signatur1 != 0xaa55) + Boot = ExAllocatePool(NonPagedPool, DiskGeometry.BytesPerSector); + if (Boot == NULL) { - *RecognizedFS = FALSE; + return STATUS_INSUFFICIENT_RESOURCES; } - if (*RecognizedFS && - Boot->BytesPerSector != 512 && - Boot->BytesPerSector != 1024 && - Boot->BytesPerSector != 2048 && - Boot->BytesPerSector != 4096) - { - DPRINT1("BytesPerSector %d\n", Boot->BytesPerSector); - *RecognizedFS = FALSE; - } - if (*RecognizedFS && - Boot->FATCount != 1 && - Boot->FATCount != 2) + Offset.QuadPart = 0; + + /* Try to recognize FAT12/FAT16/FAT32 partitions */ + Status = VfatReadDisk(DeviceToMount, &Offset, DiskGeometry.BytesPerSector, (PUCHAR) Boot, FALSE); + if (NT_SUCCESS(Status)) { - DPRINT1("FATCount %d\n", Boot->FATCount); - *RecognizedFS = FALSE; - } + if (Boot->Signatur1 != 0xaa55) + { + *RecognizedFS = FALSE; + } + if (*RecognizedFS && + Boot->BytesPerSector != 512 && + Boot->BytesPerSector != 1024 && + Boot->BytesPerSector != 2048 && + Boot->BytesPerSector != 4096) + { + DPRINT1("BytesPerSector %d\n", Boot->BytesPerSector); + *RecognizedFS = FALSE; + } - if (*RecognizedFS && - Boot->Media != 0xf0 && - Boot->Media != 0xf8 && - Boot->Media != 0xf9 && - Boot->Media != 0xfa && - Boot->Media != 0xfb && - Boot->Media != 0xfc && - Boot->Media != 0xfd && - Boot->Media != 0xfe && - Boot->Media != 0xff) - { - DPRINT1("Media %02x\n", Boot->Media); - *RecognizedFS = FALSE; - } - - if (*RecognizedFS && - Boot->SectorsPerCluster != 1 && - Boot->SectorsPerCluster != 2 && - Boot->SectorsPerCluster != 4 && - Boot->SectorsPerCluster != 8 && - Boot->SectorsPerCluster != 16 && - Boot->SectorsPerCluster != 32 && - Boot->SectorsPerCluster != 64 && - Boot->SectorsPerCluster != 128) - { - DPRINT1("SectorsPerCluster %02x\n", Boot->SectorsPerCluster); - *RecognizedFS = FALSE; - } - - if (*RecognizedFS && - Boot->BytesPerSector * Boot->SectorsPerCluster > 32 * 1024) - { - DPRINT1("ClusterSize %dx\n", Boot->BytesPerSector * Boot->SectorsPerCluster); - *RecognizedFS = FALSE; - } - - if (*RecognizedFS) - { - FatInfo.VolumeID = Boot->VolumeID; - FatInfo.FATStart = Boot->ReservedSectors; - FatInfo.FATCount = Boot->FATCount; - FatInfo.FATSectors = Boot->FATSectors ? Boot->FATSectors : ((struct _BootSector32*) Boot)->FATSectors32; - FatInfo.BytesPerSector = Boot->BytesPerSector; - FatInfo.SectorsPerCluster = Boot->SectorsPerCluster; - FatInfo.BytesPerCluster = FatInfo.BytesPerSector * FatInfo.SectorsPerCluster; - FatInfo.rootDirectorySectors = ((Boot->RootEntries * 32) + Boot->BytesPerSector - 1) / Boot->BytesPerSector; - FatInfo.rootStart = FatInfo.FATStart + FatInfo.FATCount * FatInfo.FATSectors; - FatInfo.dataStart = FatInfo.rootStart + FatInfo.rootDirectorySectors; - FatInfo.Sectors = Sectors = Boot->Sectors ? Boot->Sectors : Boot->SectorsHuge; - Sectors -= Boot->ReservedSectors + FatInfo.FATCount * FatInfo.FATSectors + FatInfo.rootDirectorySectors; - FatInfo.NumberOfClusters = Sectors / Boot->SectorsPerCluster; - if (FatInfo.NumberOfClusters < 4085) + if (*RecognizedFS && + Boot->FATCount != 1 && + Boot->FATCount != 2) { - DPRINT("FAT12\n"); - FatInfo.FatType = FAT12; + DPRINT1("FATCount %d\n", Boot->FATCount); + *RecognizedFS = FALSE; } - else if (FatInfo.NumberOfClusters >= 65525) + + if (*RecognizedFS && + Boot->Media != 0xf0 && + Boot->Media != 0xf8 && + Boot->Media != 0xf9 && + Boot->Media != 0xfa && + Boot->Media != 0xfb && + Boot->Media != 0xfc && + Boot->Media != 0xfd && + Boot->Media != 0xfe && + Boot->Media != 0xff) { - DPRINT("FAT32\n"); - FatInfo.FatType = FAT32; - FatInfo.RootCluster = ((struct _BootSector32*) Boot)->RootCluster; - FatInfo.rootStart = FatInfo.dataStart + ((FatInfo.RootCluster - 2) * FatInfo.SectorsPerCluster); - FatInfo.VolumeID = ((struct _BootSector32*) Boot)->VolumeID; + DPRINT1("Media %02x\n", Boot->Media); + *RecognizedFS = FALSE; } - else + + if (*RecognizedFS && + Boot->SectorsPerCluster != 1 && + Boot->SectorsPerCluster != 2 && + Boot->SectorsPerCluster != 4 && + Boot->SectorsPerCluster != 8 && + Boot->SectorsPerCluster != 16 && + Boot->SectorsPerCluster != 32 && + Boot->SectorsPerCluster != 64 && + Boot->SectorsPerCluster != 128) { - DPRINT("FAT16\n"); - FatInfo.FatType = FAT16; + DPRINT1("SectorsPerCluster %02x\n", Boot->SectorsPerCluster); + *RecognizedFS = FALSE; } - if (PartitionInfoIsValid && - FatInfo.Sectors > PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector) + + if (*RecognizedFS && + Boot->BytesPerSector * Boot->SectorsPerCluster > 32 * 1024) { - CHECKPOINT1; + DPRINT1("ClusterSize %dx\n", Boot->BytesPerSector * Boot->SectorsPerCluster); *RecognizedFS = FALSE; } + + if (*RecognizedFS) + { + FatInfo.VolumeID = Boot->VolumeID; + FatInfo.FATStart = Boot->ReservedSectors; + FatInfo.FATCount = Boot->FATCount; + FatInfo.FATSectors = Boot->FATSectors ? Boot->FATSectors : ((struct _BootSector32*) Boot)->FATSectors32; + FatInfo.BytesPerSector = Boot->BytesPerSector; + FatInfo.SectorsPerCluster = Boot->SectorsPerCluster; + FatInfo.BytesPerCluster = FatInfo.BytesPerSector * FatInfo.SectorsPerCluster; + FatInfo.rootDirectorySectors = ((Boot->RootEntries * 32) + Boot->BytesPerSector - 1) / Boot->BytesPerSector; + FatInfo.rootStart = FatInfo.FATStart + FatInfo.FATCount * FatInfo.FATSectors; + FatInfo.dataStart = FatInfo.rootStart + FatInfo.rootDirectorySectors; + FatInfo.Sectors = Sectors = Boot->Sectors ? Boot->Sectors : Boot->SectorsHuge; + Sectors -= Boot->ReservedSectors + FatInfo.FATCount * FatInfo.FATSectors + FatInfo.rootDirectorySectors; + FatInfo.NumberOfClusters = Sectors / Boot->SectorsPerCluster; + if (FatInfo.NumberOfClusters < 4085) + { + DPRINT("FAT12\n"); + FatInfo.FatType = FAT12; + } + else if (FatInfo.NumberOfClusters >= 65525) + { + DPRINT("FAT32\n"); + FatInfo.FatType = FAT32; + FatInfo.RootCluster = ((struct _BootSector32*) Boot)->RootCluster; + FatInfo.rootStart = FatInfo.dataStart + ((FatInfo.RootCluster - 2) * FatInfo.SectorsPerCluster); + FatInfo.VolumeID = ((struct _BootSector32*) Boot)->VolumeID; + } + else + { + DPRINT("FAT16\n"); + FatInfo.FatType = FAT16; + } + if (PartitionInfoIsValid && + FatInfo.Sectors > PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector) + { + CHECKPOINT1; + *RecognizedFS = FALSE; + } - if (pFatInfo && *RecognizedFS) - { - *pFatInfo = FatInfo; + if (pFatInfo && *RecognizedFS) + { + *pFatInfo = FatInfo; + } } } + + ExFreePool(Boot); } - ExFreePool(Boot); - if (!*RecognizedFS && PartitionInfoIsValid) { BootFatX = ExAllocatePool(NonPagedPool, sizeof(struct _BootSectorFatX)); @@ -299,8 +298,8 @@ FatInfo.SectorsPerCluster = BootFatX->SectorsPerCluster; FatInfo.rootDirectorySectors = BootFatX->SectorsPerCluster; FatInfo.BytesPerCluster = BootFatX->SectorsPerCluster * DiskGeometry.BytesPerSector; - FatInfo.NumberOfClusters = PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerCluster; - if (FatInfo.NumberOfClusters < 65525) + FatInfo.Sectors = PartitionInfo.PartitionLength.QuadPart / DiskGeometry.BytesPerSector; + if (FatInfo.Sectors / FatInfo.SectorsPerCluster < 65525) { DPRINT("FATX16\n"); FatInfo.FatType = FATX16; @@ -313,13 +312,14 @@ FatInfo.VolumeID = BootFatX->VolumeID; FatInfo.FATStart = sizeof(struct _BootSectorFatX) / DiskGeometry.BytesPerSector; FatInfo.FATCount = BootFatX->FATCount; - FatInfo.FATSectors = - ROUND_UP(FatInfo.NumberOfClusters * (FatInfo.FatType == FATX16 ? 2 : 4), 4096) / + FatInfo.FATSectors = + ROUND_UP(FatInfo.Sectors / FatInfo.SectorsPerCluster * (FatInfo.FatType == FATX16 ? 2 : 4), 4096) / FatInfo.BytesPerSector; FatInfo.rootStart = FatInfo.FATStart + FatInfo.FATCount * FatInfo.FATSectors; FatInfo.dataStart = FatInfo.rootStart + FatInfo.rootDirectorySectors; - FatInfo.Sectors = PartitionInfo.PartitionLength.QuadPart / FatInfo.BytesPerSector; - if (pFatInfo && *RecognizedFS) + FatInfo.NumberOfClusters = (FatInfo.Sectors - FatInfo.dataStart) / FatInfo.SectorsPerCluster; + + if (pFatInfo && *RecognizedFS) { *pFatInfo = FatInfo; }

19 years, 9 months

[hbirr] 13280: - Print the file information class if debug prints are enabled in VfatGet/SetInformation.

by hbirr＠svn.reactos.com

- Print the file information class if debug prints are enabled in VfatGet/SetInformation. - Check for the open handle count instead of the reference count if file deletion is requested. Modified: trunk/reactos/drivers/fs/vfat/finfo.c _____ Modified: trunk/reactos/drivers/fs/vfat/finfo.c --- trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-25 21:09:55 UTC (rev 13279) +++ trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-25 21:10:42 UTC (rev 13280) @@ -15,6 +15,54 @@ #define NDEBUG #include "vfat.h" +/* GLOBALS ******************************************************************/ + +const char* FileInformationClassNames[] = +{ + "??????", + "FileDirectoryInformation", + "FileFullDirectoryInformation", + "FileBothDirectoryInformation", + "FileBasicInformation", + "FileStandardInformation", + "FileInternalInformation", + "FileEaInformation", + "FileAccessInformation", + "FileNameInformation", + "FileRenameInformation", + "FileLinkInformation", + "FileNamesInformation", + "FileDispositionInformation", + "FilePositionInformation", + "FileFullEaInformation", + "FileModeInformation", + "FileAlignmentInformation", + "FileAllInformation", + "FileAllocationInformation", + "FileEndOfFileInformation", + "FileAlternateNameInformation", + "FileStreamInformation", + "FilePipeInformation", + "FilePipeLocalInformation", + "FilePipeRemoteInformation", + "FileMailslotQueryInformation", + "FileMailslotSetInformation", + "FileCompressionInformation", + "FileObjectIdInformation", + "FileCompletionInformation", + "FileMoveClusterInformation", + "FileQuotaInformation", + "FileReparsePointInformation", + "FileNetworkOpenInformation", + "FileAttributeTagInformation", + "FileTrackingInformation", + "FileIdBothDirectoryInformation", + "FileIdFullDirectoryInformation", + "FileValidDataLengthInformation", + "FileShortNameInformation", + "FileMaximumInformation" +}; + /* FUNCTIONS ****************************************************************/ static NTSTATUS @@ -248,9 +296,9 @@ { if (MmFlushImageSection (FileObject->SectionObjectPointer, MmFlushForDelete)) { - if (FCB->RefCount > 1) + if (FCB->OpenHandleCount > 1) { - DPRINT1("%d %x\n", FCB->RefCount, CcGetFileObjectFromSectionPtrs(FileObject->SectionObjectPointer)); + DPRINT1("%d %x\n", FCB->OpenHandleCount, CcGetFileObjectFromSectionPtrs(FileObject->SectionObjectPointer)); Status = STATUS_ACCESS_DENIED; } else @@ -650,6 +698,10 @@ FileInformationClass = IrpContext->Stack->Parameters.QueryFile.FileInformationClass; FCB = (PVFATFCB) IrpContext->FileObject->FsContext; + DPRINT("VfatQueryInformation is called for '%s'\n", + FileInformationClass >= FileMaximumInformation - 1 ? "????" : FileInformationClassNames[FileInformationClass]); + + SystemBuffer = IrpContext->Irp->AssociatedIrp.SystemBuffer; BufferLength = IrpContext->Stack->Parameters.QueryFile.Length; @@ -754,6 +806,9 @@ IrpContext->Stack->Parameters.SetFile.FileInformationClass; FCB = (PVFATFCB) IrpContext->FileObject->FsContext; SystemBuffer = IrpContext->Irp->AssociatedIrp.SystemBuffer; + + DPRINT("VfatSetInformation is called for '%s'\n", + FileInformationClass >= FileMaximumInformation - 1 ? "????" : FileInformationClassNames[ FileInformationClass]); DPRINT("FileInformationClass %d\n", FileInformationClass); DPRINT("SystemBuffer %x\n", SystemBuffer);

19 years, 9 months

[hbirr] 13279: - Implemented dummy stubs for all fast io entry points. W2K does ignore the IsFastIoPossible variable of the fcb.

by hbirr＠svn.reactos.com

- Implemented dummy stubs for all fast io entry points. W2K does ignore the IsFastIoPossible variable of the fcb. - Fixed the directory index of a file for FATX. Modified: trunk/reactos/drivers/fs/vfat/fastio.c _____ Modified: trunk/reactos/drivers/fs/vfat/fastio.c --- trunk/reactos/drivers/fs/vfat/fastio.c 2005-01-25 21:08:54 UTC (rev 13278) +++ trunk/reactos/drivers/fs/vfat/fastio.c 2005-01-25 21:09:55 UTC (rev 13279) @@ -1,4 +1,4 @@ -/* $Id: +/* $Id$ * * * FILE: drivers/fs/vfat/fastio.c @@ -6,12 +6,13 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PROGRAMMER: Herve Poussineau (reactos(a)poussine.freesurf.fr) + * Hartmut Birr */ #define NDEBUG #include "vfat.h" -BOOLEAN NTAPI +BOOLEAN STDCALL VfatFastIoCheckIfPossible(IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, IN ULONG Lenght, @@ -26,7 +27,291 @@ return FALSE; } -BOOLEAN NTAPI +BOOLEAN STDCALL +VfatFastIoRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoRead()\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoWrite()\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoQueryBasicInfo(IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + OUT PFILE_BASIC_INFORMATION Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoQueryBasicInfo()\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoQueryStandardInfo(IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + OUT PFILE_STANDARD_INFORMATION Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoQueryStandardInfo\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoLock(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PLARGE_INTEGER Length, + PEPROCESS ProcessId, + ULONG Key, + BOOLEAN FailImmediately, + BOOLEAN ExclusiveLock, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoLock\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoUnlockSingle(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PLARGE_INTEGER Length, + PEPROCESS ProcessId, + ULONG Key, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoUnlockSingle\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoUnlockAll(IN PFILE_OBJECT FileObject, + PEPROCESS ProcessId, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoUnlockAll\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoUnlockAllByKey(IN PFILE_OBJECT FileObject, + PEPROCESS ProcessId, + ULONG Key, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoUnlockAllByKey\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoDeviceControl(IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + IN PVOID InputBuffer OPTIONAL, + IN ULONG InputBufferLength, + OUT PVOID OutputBuffer OPTIONAL, + IN ULONG OutputBufferLength, + IN ULONG IoControlCode, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoDeviceControl\n"); + return FALSE; +} + +VOID STDCALL +VfatAcquireFileForNtCreateSection(IN PFILE_OBJECT FileObject) +{ + DPRINT("VfatAcquireFileForNtCreateSection\n"); +} + +VOID STDCALL +VfatReleaseFileForNtCreateSection(IN PFILE_OBJECT FileObject) +{ + DPRINT("VfatReleaseFileForNtCreateSection\n"); +} + +VOID STDCALL +VfatFastIoDetachDevice(IN PDEVICE_OBJECT SourceDevice, + IN PDEVICE_OBJECT TargetDevice) +{ + DPRINT("VfatFastIoDetachDevice\n"); +} + +BOOLEAN STDCALL +VfatFastIoQueryNetworkOpenInfo(IN PFILE_OBJECT FileObject, + IN BOOLEAN Wait, + OUT PFILE_NETWORK_OPEN_INFORMATION Buffer, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoQueryNetworkOpenInfo\n"); + return FALSE; +} + +NTSTATUS STDCALL +VfatAcquireForModWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER EndingOffset, + OUT PERESOURCE* ResourceToRelease, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatAcquireForModWrite\n"); + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN STDCALL +VfatMdlRead(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL* MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatMdlRead\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatMdlReadComplete(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatMdlReadComplete\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatPrepareMdlWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PMDL* MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatPrepareMdlWrite\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatMdlWriteComplete(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatMdlWriteComplete\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoReadCompressed(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + OUT PVOID Buffer, + OUT PMDL* MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + OUT PCOMPRESSED_DATA_INFO CompressedDataInfo, + IN ULONG CompressedDataInfoLength, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoReadCompressed\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoWriteCompressed(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN ULONG LockKey, + IN PVOID Buffer, + OUT PMDL* MdlChain, + OUT PIO_STATUS_BLOCK IoStatus, + IN PCOMPRESSED_DATA_INFO CompressedDataInfo, + IN ULONG CompressedDataInfoLength, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoWriteCompressed\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatMdlReadCompleteCompressed(IN PFILE_OBJECT FileObject, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatMdlReadCompleteCompressed\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatMdlWriteCompleteCompressed(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN PMDL MdlChain, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatMdlWriteCompleteCompressed\n"); + return FALSE; +} + +BOOLEAN STDCALL +VfatFastIoQueryOpen(IN PIRP Irp, + OUT PFILE_NETWORK_OPEN_INFORMATION NetworkInformation, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatFastIoQueryOpen\n"); + return FALSE; +} + +NTSTATUS STDCALL +VfatReleaseForModWrite(IN PFILE_OBJECT FileObject, + IN PERESOURCE ResourceToRelease, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatReleaseForModWrite\n"); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS STDCALL +VfatAcquireForCcFlush(IN PFILE_OBJECT FileObject, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatAcquireForCcFlush\n"); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS STDCALL +VfatReleaseForCcFlush(IN PFILE_OBJECT FileObject, + IN PDEVICE_OBJECT DeviceObject) +{ + DPRINT("VfatReleaseForCcFlush\n"); + return STATUS_UNSUCCESSFUL; +} + +BOOLEAN STDCALL VfatAcquireForLazyWrite(IN PVOID Context, IN BOOLEAN Wait) { @@ -42,7 +327,7 @@ return TRUE; } -VOID NTAPI +VOID STDCALL VfatReleaseFromLazyWrite(IN PVOID Context) { PVFATFCB Fcb = (PVFATFCB)Context; @@ -52,7 +337,7 @@ ExReleaseResourceLite(&(Fcb->MainResource)); } -BOOLEAN NTAPI +BOOLEAN STDCALL VfatAcquireForReadAhead(IN PVOID Context, IN BOOLEAN Wait) { @@ -68,7 +353,7 @@ return TRUE; } -VOID NTAPI +VOID STDCALL VfatReleaseFromReadAhead(IN PVOID Context) { PVFATFCB Fcb = (PVFATFCB)Context; @@ -77,3 +362,38 @@ ExReleaseResourceLite(&(Fcb->MainResource)); } + +VOID +VfatInitFastIoRoutines(PFAST_IO_DISPATCH FastIoDispatch) +{ + FastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); + FastIoDispatch->FastIoCheckIfPossible = VfatFastIoCheckIfPossible; + FastIoDispatch->FastIoRead = VfatFastIoRead; + FastIoDispatch->FastIoWrite = VfatFastIoWrite; + FastIoDispatch->FastIoQueryBasicInfo = VfatFastIoQueryBasicInfo; + FastIoDispatch->FastIoQueryStandardInfo = VfatFastIoQueryStandardInfo; + FastIoDispatch->FastIoLock = VfatFastIoLock; + FastIoDispatch->FastIoUnlockSingle = VfatFastIoUnlockSingle; + FastIoDispatch->FastIoUnlockAll = VfatFastIoUnlockAll; + FastIoDispatch->FastIoUnlockAllByKey = VfatFastIoUnlockAllByKey; + FastIoDispatch->FastIoDeviceControl = VfatFastIoDeviceControl; + FastIoDispatch->AcquireFileForNtCreateSection = VfatAcquireFileForNtCreateSection; + FastIoDispatch->ReleaseFileForNtCreateSection = VfatReleaseFileForNtCreateSection; + FastIoDispatch->FastIoDetachDevice = VfatFastIoDetachDevice; + FastIoDispatch->FastIoQueryNetworkOpenInfo = VfatFastIoQueryNetworkOpenInfo; + FastIoDispatch->AcquireForModWrite = VfatAcquireForModWrite; + FastIoDispatch->MdlRead = VfatMdlRead; + FastIoDispatch->MdlReadComplete = VfatMdlReadComplete; + FastIoDispatch->PrepareMdlWrite = VfatPrepareMdlWrite; + FastIoDispatch->MdlWriteComplete = VfatMdlWriteComplete; + FastIoDispatch->FastIoReadCompressed = VfatFastIoReadCompressed; + FastIoDispatch->FastIoWriteCompressed = VfatFastIoWriteCompressed; + FastIoDispatch->MdlReadCompleteCompressed = VfatMdlReadCompleteCompressed; + FastIoDispatch->MdlWriteCompleteCompressed = VfatMdlWriteCompleteCompressed; + FastIoDispatch->FastIoQueryOpen = VfatFastIoQueryOpen; + FastIoDispatch->ReleaseForModWrite = VfatReleaseForModWrite; + FastIoDispatch->AcquireForCcFlush = VfatAcquireForCcFlush; + FastIoDispatch->ReleaseForCcFlush = VfatReleaseForCcFlush; +} + +

19 years, 9 months

[hbirr] 13278: - Check for some special file streams in VfatUpdateEntry.

by hbirr＠svn.reactos.com

- Check for some special file streams in VfatUpdateEntry. W2K does open the volume for changing the date and time, but the volume hasn't a parent fcb. - Fixed the directory index of a file for FATX. Modified: trunk/reactos/drivers/fs/vfat/dirwr.c _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-25 21:07:32 UTC (rev 13277) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-25 21:08:54 UTC (rev 13278) @@ -40,6 +40,13 @@ DPRINT ("updEntry dirIndex %d, PathName \'%wZ\'\n", dirIndex, &pFcb->PathNameU); + if (vfatFCBIsRoot(pFcb) || (pFcb->Flags & (FCB_IS_FAT|FCB_IS_VOLUME))) + { + return STATUS_SUCCESS; + } + + ASSERT (pFcb->parrentFcb); + Offset.u.HighPart = 0; Offset.u.LowPart = dirIndex * SizeDirEntry; if (CcPinRead (pFcb->parentFcb->FileObject, &Offset, SizeDirEntry, @@ -544,6 +551,7 @@ if (!vfatFCBIsRoot(ParentFcb)) { DirContext.DirIndex += 2; + DirContext.StartIndex += 2; } DirContext.ShortNameU.Buffer = 0;

19 years, 9 months

[hbirr] 13276: - Always try to uninitialize the file cache in VfatCleanupFile.

by hbirr＠svn.reactos.com

- Always try to uninitialize the file cache in VfatCleanupFile. - Try to purge the file cache if the last handle is closed and deleting of the file was requested. Modified: trunk/reactos/drivers/fs/vfat/cleanup.c _____ Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2005-01-25 20:53:37 UTC (rev 13275) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2005-01-25 21:05:38 UTC (rev 13276) @@ -46,16 +46,22 @@ VfatUpdateEntry (pFcb); } - /* Uninitialize file cache if initialized for this file object. */ - if (FileObject->PrivateCacheMap) + if (pFcb->Flags & FCB_DELETE_PENDING && + pFcb->OpenHandleCount == 1) { +#if 0 + /* FIXME: + * CcPurgeCacheSection is unimplemented. + */ + CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); +#endif + } + /* Uninitialize file cache if. */ #ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache (FileObject); + CcRosReleaseFileCache (FileObject); #else - CcUninitializeCacheMap (FileObject, NULL, NULL); + CcUninitializeCacheMap (FileObject, NULL, NULL); #endif - } - pFcb->OpenHandleCount--; IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); }

19 years, 9 months

[tamlin] 13275: NtGdiExtTextOut (ExtTextOut in user-mode) should now obey at least the right clipping edge with ETO_CLIPPED.

by tamlin＠svn.reactos.com

NtGdiExtTextOut (ExtTextOut in user-mode) should now obey at least the right clipping edge with ETO_CLIPPED. Modified: trunk/reactos/subsys/win32k/objects/text.c _____ Modified: trunk/reactos/subsys/win32k/objects/text.c --- trunk/reactos/subsys/win32k/objects/text.c 2005-01-25 19:11:22 UTC (rev 13274) +++ trunk/reactos/subsys/win32k/objects/text.c 2005-01-25 20:53:37 UTC (rev 13275) @@ -1493,7 +1493,7 @@ LONGLONG TextLeft, RealXStart; ULONG TextTop, pitch, previous, BackgroundLeft; FT_Bool use_kerning; - RECTL DestRect, MaskRect; + RECTL DestRect, MaskRect, SpecifiedDestRect; POINTL SourcePoint, BrushOrigin; HBRUSH hBrushFg = NULL; PGDIBRUSHOBJ BrushFg = NULL; @@ -1517,7 +1517,21 @@ NTSTATUS Status; INT *Dx = NULL; POINT Start; + BOOL DoBreak = FALSE; + // TODO: Write test-cases to exactly match real Windows in different + // bad parameters (e.g. does Windows check the DC or the RECT first?). + if (lprc && (fuOptions & (ETO_OPAQUE | ETO_CLIPPED))) + { + // At least one of the two flags were specified. Copy lprc. Once. + Status = MmCopyFromCaller(&SpecifiedDestRect, lprc, sizeof(RECT)); + if (!NT_SUCCESS(Status)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + dc = DC_LockDc(hDC); if (!dc) { @@ -1607,11 +1621,10 @@ if ((fuOptions & ETO_OPAQUE) && lprc) { - MmCopyFromCaller(&DestRect, lprc, sizeof(RECT)); - DestRect.left += dc->w.DCOrgX; - DestRect.top += dc->w.DCOrgY; - DestRect.right += dc->w.DCOrgX; - DestRect.bottom += dc->w.DCOrgY; + DestRect.left = SpecifiedDestRect.left + dc->w.DCOrgX; + DestRect.top = SpecifiedDestRect.top + dc->w.DCOrgY; + DestRect.right = SpecifiedDestRect.right + dc->w.DCOrgX; + DestRect.bottom = SpecifiedDestRect.bottom + dc->w.DCOrgY; IntEngBitBlt( BitmapObj, NULL, @@ -1880,6 +1893,17 @@ * brush. */ + if (lprc && + (fuOptions & ETO_CLIPPED) && + DestRect.right >= SpecifiedDestRect.right + dc->w.DCOrgX) + { + // We do the check '>=' instead of '>' to possibly save an iteration + // through this loop, since it's breaking after the drawing is done, + // and x is always incremented. + DestRect.right = SpecifiedDestRect.right + dc->w.DCOrgX; + DoBreak = TRUE; + } + IntEngMaskBlt( SurfObj, SourceGlyphSurf, @@ -1895,6 +1919,11 @@ EngUnlockSurface(SourceGlyphSurf); EngDeleteSurface((HSURF)HSourceGlyph); + if (DoBreak) + { + break; + } + if (NULL == Dx) { TextLeft += glyph->advance.x;

19 years, 9 months

← Newer
1
...
7
8
9
10
11
12
13
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005