Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[navaraf] 12964: Add definiton of RPC_E_INVALID_OBJREF.

by navaraf＠svn.reactos.com

Add definiton of RPC_E_INVALID_OBJREF. Modified: trunk/reactos/w32api/include/winerror.h _____ Modified: trunk/reactos/w32api/include/winerror.h --- trunk/reactos/w32api/include/winerror.h 2005-01-12 13:15:24 UTC (rev 12963) +++ trunk/reactos/w32api/include/winerror.h 2005-01-12 13:35:43 UTC (rev 12964) @@ -2198,6 +2198,7 @@ #define RPC_E_CANTCALLOUT_ININPUTSYNCCALL ((HRESULT)0x8001010DL) #define RPC_E_WRONG_THREAD ((HRESULT)0x8001010EL) #define RPC_E_THREAD_NOT_INIT ((HRESULT)0x8001010FL) +#define RPC_E_INVALID_OBJREF ((HRESULT)0x8001011DL) #define RPC_E_UNEXPECTED ((HRESULT)0x8001FFFFL) #define NTE_BAD_UID ((HRESULT)0x80090001L)

19 years, 10 months

[navaraf] 12963: Herve Poussineau <poussine@freesurf.fr>

by navaraf＠svn.reactos.com

Herve Poussineau <poussine(a)freesurf.fr> Simpily the VFAT/FATX detection. 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-12 13:07:17 UTC (rev 12962) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 13:15:24 UTC (rev 12963) @@ -86,59 +86,21 @@ return Status; } PartitionInfoIsValid = TRUE; - DPRINT("Partition Information:\n"); - DPRINT("StartingOffset %u\n", PartitionInfo.StartingOffset.QuadPart / 512); - DPRINT("PartitionLength %u\n", PartitionInfo.PartitionLength.QuadPart / 512); - DPRINT("HiddenSectors %u\n", PartitionInfo.HiddenSectors); - DPRINT("PartitionNumber %u\n", PartitionInfo.PartitionNumber); - DPRINT("PartitionType %u\n", PartitionInfo.PartitionType); - DPRINT("BootIndicator %u\n", PartitionInfo.BootIndicator); - DPRINT("RecognizedPartition %u\n", PartitionInfo.RecognizedPartition); - DPRINT("RewritePartition %u\n", PartitionInfo.RewritePartition); - if (PartitionInfo.PartitionType) - { - if (PartitionInfo.PartitionType == PARTITION_FAT_12 || - PartitionInfo.PartitionType == PARTITION_FAT_16 || - PartitionInfo.PartitionType == PARTITION_HUGE || - PartitionInfo.PartitionType == PARTITION_FAT32 || - PartitionInfo.PartitionType == PARTITION_FAT32_XINT13 || - PartitionInfo.PartitionType == PARTITION_XINT13) - { - *RecognizedFS = TRUE; - } - } - else if (DiskGeometry.MediaType == RemovableMedia && - PartitionInfo.PartitionNumber > 0 && - PartitionInfo.StartingOffset.QuadPart == 0LL && - PartitionInfo.PartitionLength.QuadPart > 0LL) - { - /* This is possible a removable media formated as super floppy */ - *RecognizedFS = TRUE; - } } - /* - * Floppy disk driver can return Unknown as media type if it - * doesn't know yet what floppy in the drive really is. This is - * perfectly correct to do under Windows. - */ - if (DiskGeometry.MediaType == Unknown) + else if (DiskGeometry.MediaType == Unknown) { + /* + * Floppy disk driver can return Unknown as media type if it + * doesn't know yet what floppy in the drive really is. This is + * perfectly correct to do under Windows. + */ *RecognizedFS = TRUE; DiskGeometry.BytesPerSector = 512; } - if (DiskGeometry.MediaType > Unknown && DiskGeometry.MediaType < RemovableMedia ) - { - *RecognizedFS = TRUE; - } - if (*RecognizedFS == FALSE) - { - return STATUS_SUCCESS; - } Boot = ExAllocatePool(NonPagedPool, DiskGeometry.BytesPerSector); if (Boot == NULL) { - *RecognizedFS=FALSE; return STATUS_INSUFFICIENT_RESOURCES; } @@ -148,17 +110,11 @@ Status = VfatReadDisk(DeviceToMount, &Offset, DiskGeometry.BytesPerSector, (PUCHAR) Boot, FALSE); if (NT_SUCCESS(Status)) { + *RecognizedFS = TRUE; + if (Boot->Signatur1 != 0xaa55) { - BootFatX = (struct _BootSectorFatX *) Boot; - if (BootFatX->SysType[0] != 'F' || - BootFatX->SysType[1] != 'A' || - BootFatX->SysType[2] != 'T' || - BootFatX->SysType[3] != 'X') - { - DPRINT1("Signature %04x\n", Boot->Signatur1); - } - *RecognizedFS=FALSE; + *RecognizedFS = FALSE; } if (*RecognizedFS && Boot->BytesPerSector != 512 && @@ -167,7 +123,7 @@ Boot->BytesPerSector != 4096) { DPRINT1("BytesPerSector %d\n", Boot->BytesPerSector); - *RecognizedFS=FALSE; + *RecognizedFS = FALSE; } if (*RecognizedFS && @@ -175,7 +131,7 @@ Boot->FATCount != 2) { DPRINT1("FATCount %d\n", Boot->FATCount); - *RecognizedFS=FALSE; + *RecognizedFS = FALSE; } if (*RecognizedFS && @@ -190,7 +146,7 @@ Boot->Media != 0xff) { DPRINT1("Media %02x\n", Boot->Media); - *RecognizedFS=FALSE; + *RecognizedFS = FALSE; } if (*RecognizedFS && @@ -204,14 +160,14 @@ Boot->SectorsPerCluster != 128) { DPRINT1("SectorsPerCluster %02x\n", Boot->SectorsPerCluster); - *RecognizedFS=FALSE; + *RecognizedFS = FALSE; } if (*RecognizedFS && Boot->BytesPerSector * Boot->SectorsPerCluster > 32 * 1024) { DPRINT1("ClusterSize %dx\n", Boot->BytesPerSector * Boot->SectorsPerCluster); - *RecognizedFS=FALSE; + *RecognizedFS = FALSE; } if (*RecognizedFS)

19 years, 10 months

[navaraf] 12962: Herve Poussineau <poussine@freesurf.fr>

by navaraf＠svn.reactos.com

Herve Poussineau <poussine(a)freesurf.fr> Use MmGetSystemAddressForMdlSafe instead of MmGetSystemAddressForMdl. 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-12 13:00:43 UTC (rev 12961) +++ trunk/reactos/drivers/fs/vfat/misc.c 2005-01-12 13:07:17 UTC (rev 12962) @@ -218,7 +218,9 @@ if (Irp->MdlAddress) { - return MmGetSystemAddressForMdl(Irp->MdlAddress); + /* This call may be in the paging path, so use maximum priority */ + /* FIXME: call with normal priority in the non-paging path */ + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, HighPagePriority); } else {

19 years, 10 months

[navaraf] 12961: Based on a patch by Herve Poussineau <poussine@freesurf.fr>:

by navaraf＠svn.reactos.com

Based on a patch by Herve Poussineau <poussine(a)freesurf.fr>: Add basic cache manager and Fast I/O callbacks and don't use ReactOS specific cache manager / filesystem features if USE_ROS_CC_AND_FS is not defined. Modified: trunk/reactos/drivers/fs/vfat/cleanup.c Added: trunk/reactos/drivers/fs/vfat/fastio.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/iface.c Modified: trunk/reactos/drivers/fs/vfat/makefile Modified: trunk/reactos/drivers/fs/vfat/rw.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2005-01-12 13:00:43 UTC (rev 12961) @@ -49,7 +49,11 @@ /* Uninitialize file cache if initialized for this file object. */ if (FileObject->PrivateCacheMap) { +#ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache (FileObject); +#else + CcUninitializeCacheMap (FileObject, NULL, NULL); +#endif } pFcb->OpenHandleCount--; _____ Added: trunk/reactos/drivers/fs/vfat/fastio.c --- trunk/reactos/drivers/fs/vfat/fastio.c 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/fastio.c 2005-01-12 13:00:43 UTC (rev 12961) @@ -0,0 +1,79 @@ +/* $Id: + * + * + * FILE: drivers/fs/vfat/fastio.c + * PURPOSE: Fast IO routines. + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * PROGRAMMER: Herve Poussineau (reactos(a)poussine.freesurf.fr) + */ + +#define NDEBUG +#include "vfat.h" + +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) +{ + /* Prevent all Fast I/O requests */ + DPRINT("VfatFastIoCheckIfPossible(): returning FALSE.\n"); + return FALSE; +} + +BOOLEAN NTAPI +VfatAcquireForLazyWrite(IN PVOID Context, + IN BOOLEAN Wait) +{ + PVFATFCB Fcb = (PVFATFCB)Context; + ASSERT(Fcb); + DPRINT("VfatAcquireForLazyWrite(): Fcb %p\n", Fcb); + + if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) + { + DPRINT("VfatAcquireForLazyWrite(): ExReleaseResourceLite failed.\n"); + return FALSE; + } + return TRUE; +} + +VOID NTAPI +VfatReleaseFromLazyWrite(IN PVOID Context) +{ + PVFATFCB Fcb = (PVFATFCB)Context; + ASSERT(Fcb); + DPRINT("VfatReleaseFromLazyWrite(): Fcb %p\n", Fcb); + + ExReleaseResourceLite(&(Fcb->MainResource)); +} + +BOOLEAN NTAPI +VfatAcquireForReadAhead(IN PVOID Context, + IN BOOLEAN Wait) +{ + PVFATFCB Fcb = (PVFATFCB)Context; + ASSERT(Fcb); + DPRINT("VfatAcquireForReadAhead(): Fcb %p\n", Fcb); + + if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) + { + DPRINT("VfatAcquireForReadAhead(): ExReleaseResourceLite failed.\n"); + return FALSE; + } + return TRUE; +} + +VOID NTAPI +VfatReleaseFromReadAhead(IN PVOID Context) +{ + PVFATFCB Fcb = (PVFATFCB)Context; + ASSERT(Fcb); + DPRINT("VfatReleaseFromReadAhead(): Fcb %p\n", Fcb); + + ExReleaseResourceLite(&(Fcb->MainResource)); +} _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 13:00:43 UTC (rev 12961) @@ -228,7 +228,11 @@ /* Uninitialize file cache if initialized for this file object. */ if (pFCB->FileObject->SectionObjectPointer->SharedCacheMap) { +#ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache(pFCB->FileObject); +#else + CcUninitializeCacheMap(pFCB->FileObject, NULL, NULL); +#endif } vfatDestroyCCB(pFCB->FileObject->FsContext2); pFCB->FileObject->FsContext2 = NULL; @@ -325,9 +329,11 @@ NTSTATUS vfatFCBInitializeCacheFromVolume (PVCB vcb, PVFATFCB fcb) { +#ifdef USE_ROS_CC_AND_FS NTSTATUS status; + ULONG fileCacheQuantum; +#endif PFILE_OBJECT fileObject; - ULONG fileCacheQuantum; PVFATCCB newCCB; fileObject = IoCreateStreamFileObject (NULL, vcb->StorageDevice); @@ -344,7 +350,7 @@ fileObject->FsContext2 = newCCB; fcb->FileObject = fileObject; - +#ifdef USE_ROS_CC_AND_FS fileCacheQuantum = (vcb->FatInfo.BytesPerCluster >= PAGE_SIZE) ? vcb->FatInfo.BytesPerCluster : PAGE_SIZE; @@ -355,10 +361,22 @@ DbgPrint ("CcRosInitializeFileCache failed\n"); KEBUGCHECK (0); } +#else + /* FIXME: Guard by SEH. */ + CcInitializeCacheMap(fileObject, + (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), + FALSE, + &VfatGlobalData->CacheMgrCallbacks, + fcb); +#endif fcb->Flags |= FCB_CACHE_INITIALIZED; +#ifdef USE_ROS_CC_AND_FS return status; +#else + return STATUS_SUCCESS; +#endif } PVFATFCB _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 13:00:43 UTC (rev 12961) @@ -517,6 +517,7 @@ Fcb->RFCB.ValidDataLength = Fcb->RFCB.FileSize; Fcb->RFCB.AllocationSize = Fcb->RFCB.FileSize; +#ifdef USE_ROS_CC_AND_FS if (DeviceExt->FatInfo.FatType != FAT12) { Status = CcRosInitializeFileCache(DeviceExt->FATFileObject, CACHEPAGESIZE(DeviceExt)); @@ -530,6 +531,14 @@ DPRINT1 ("CcRosInitializeFileCache failed\n"); goto ByeBye; } +#else + /* FIXME: Guard by SEH. */ + CcInitializeCacheMap(DeviceExt->FATFileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &VfatGlobalData->CacheMgrCallbacks, + Fcb); +#endif DeviceExt->LastAvailableCluster = 2; ExInitializeResourceLite(&DeviceExt->DirResource); ExInitializeResourceLite(&DeviceExt->FatResource); @@ -744,6 +753,7 @@ return STATUS_INVALID_DEVICE_REQUEST; } +#ifdef USE_ROS_CC_AND_FS static NTSTATUS VfatRosQueryLcnMapping(PVFAT_IRP_CONTEXT IrpContext) { @@ -765,6 +775,7 @@ IrpContext->Irp->IoStatus.Information = sizeof(ROS_QUERY_LCN_MAPPING); return(STATUS_SUCCESS); } +#endif NTSTATUS VfatFileSystemControl(PVFAT_IRP_CONTEXT IrpContext) /* @@ -796,9 +807,11 @@ case FSCTL_MOVE_FILE: Status = VfatMoveFile(IrpContext); break; +#ifdef USE_ROS_CC_AND_FS case FSCTL_ROS_QUERY_LCN_MAPPING: Status = VfatRosQueryLcnMapping(IrpContext); break; +#endif default: Status = STATUS_INVALID_DEVICE_REQUEST; } _____ Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/iface.c 2005-01-12 13:00:43 UTC (rev 12961) @@ -49,6 +49,7 @@ { PDEVICE_OBJECT DeviceObject; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); + PFAST_IO_DISPATCH pFastIoDispatch; NTSTATUS Status; Status = IoCreateDevice(DriverObject, @@ -86,7 +87,19 @@ DriverObject->MajorFunction[IRP_MJ_FLUSH_BUFFERS] = VfatBuildRequest; DriverObject->DriverUnload = NULL; + + /* Cache manager */ + VfatGlobalData->CacheMgrCallbacks.AcquireForLazyWrite = VfatAcquireForLazyWrite; + VfatGlobalData->CacheMgrCallbacks.ReleaseFromLazyWrite = VfatReleaseFromLazyWrite; + VfatGlobalData->CacheMgrCallbacks.AcquireForReadAhead = VfatAcquireForReadAhead; + VfatGlobalData->CacheMgrCallbacks.ReleaseFromReadAhead = VfatReleaseFromReadAhead; + + /* Fast I/O */ + DriverObject->FastIoDispatch = pFastIoDispatch = &VfatGlobalData->FastIoDispatch; + pFastIoDispatch->SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); + pFastIoDispatch->FastIoCheckIfPossible = VfatFastIoCheckIfPossible; + /* Private lists */ ExInitializeNPagedLookasideList(&VfatGlobalData->FcbLookasideList, NULL, NULL, 0, sizeof(VFATFCB), TAG_FCB, 0); ExInitializeNPagedLookasideList(&VfatGlobalData->CcbLookasideList, _____ Modified: trunk/reactos/drivers/fs/vfat/makefile --- trunk/reactos/drivers/fs/vfat/makefile 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/makefile 2005-01-12 13:00:43 UTC (rev 12961) @@ -19,6 +19,7 @@ direntry.o \ dirwr.o \ fat.o \ + fastio.o \ fcb.o \ finfo.o \ iface.o \ _____ Modified: trunk/reactos/drivers/fs/vfat/rw.c --- trunk/reactos/drivers/fs/vfat/rw.c 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/rw.c 2005-01-12 13:00:43 UTC (rev 12961) @@ -680,10 +680,19 @@ CHECKPOINT; if (IrpContext->FileObject->PrivateCacheMap == NULL) { - ULONG CacheSize; - CacheSize = max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, - 8 * PAGE_SIZE); - CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); +#ifdef USE_ROS_CC_AND_FS + ULONG CacheSize; + CacheSize = max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, + 8 * PAGE_SIZE); + CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); +#else + /* FIXME: Guard by SEH. */ + CcInitializeCacheMap(IrpContext->FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &(VfatGlobalData->CacheMgrCallbacks), + Fcb); +#endif } if (!CcCopyRead(IrpContext->FileObject, &ByteOffset, Length, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT), Buffer, @@ -972,14 +981,23 @@ if (IrpContext->FileObject->PrivateCacheMap == NULL) { - ULONG CacheSize; - CacheSize = max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, - 8 * PAGE_SIZE); - CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); +#ifdef USE_ROS_CC_AND_FS + ULONG CacheSize; + CacheSize = max(IrpContext->DeviceExt->FatInfo.BytesPerCluster, + 8 * PAGE_SIZE); + CcRosInitializeFileCache(IrpContext->FileObject, CacheSize); +#else + /* FIXME: Guard by SEH. */ + CcInitializeCacheMap(IrpContext->FileObject, + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + FALSE, + &VfatGlobalData->CacheMgrCallbacks, + Fcb); +#endif } if (ByteOffset.QuadPart > OldFileSize.QuadPart) { - CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE); + CcZeroData(IrpContext->FileObject, &OldFileSize, &ByteOffset, TRUE); } if (CcCopyWrite(IrpContext->FileObject, &ByteOffset, Length, 1 /*IrpContext->Flags & IRPCONTEXT_CANWAIT*/, Buffer)) _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 12:33:57 UTC (rev 12960) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 13:00:43 UTC (rev 12961) @@ -269,6 +269,8 @@ NPAGED_LOOKASIDE_LIST FcbLookasideList; NPAGED_LOOKASIDE_LIST CcbLookasideList; NPAGED_LOOKASIDE_LIST IrpContextLookasideList; + FAST_IO_DISPATCH FastIoDispatch; + CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; } VFAT_GLOBAL_DATA, *PVFAT_GLOBAL_DATA; extern PVFAT_GLOBAL_DATA VfatGlobalData; @@ -507,6 +509,32 @@ NTSTATUS VfatCleanup (PVFAT_IRP_CONTEXT IrpContext); +/* --------------------------------------------------------- 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); + +BOOLEAN NTAPI +VfatAcquireForLazyWrite(IN PVOID Context, + IN BOOLEAN Wait); + +VOID NTAPI +VfatReleaseFromLazyWrite(IN PVOID Context); + +BOOLEAN NTAPI +VfatAcquireForReadAhead(IN PVOID Context, + IN BOOLEAN Wait); + +VOID NTAPI +VfatReleaseFromReadAhead(IN PVOID Context); + /* --------------------------------------------------------- fsctl.c */ NTSTATUS VfatFileSystemControl (PVFAT_IRP_CONTEXT IrpContext);

19 years, 10 months

[navaraf] 12960: Based on a patch by Herve Poussineau <poussine@freesurf.fr>:

by navaraf＠svn.reactos.com

Based on a patch by Herve Poussineau <poussine(a)freesurf.fr>: - Clean up #includes. - Get rid of ROSRTL dependancy. Modified: trunk/reactos/drivers/fs/vfat/blockdev.c Modified: trunk/reactos/drivers/fs/vfat/cleanup.c Modified: trunk/reactos/drivers/fs/vfat/close.c Modified: trunk/reactos/drivers/fs/vfat/create.c Modified: trunk/reactos/drivers/fs/vfat/dir.c Modified: trunk/reactos/drivers/fs/vfat/direntry.c Modified: trunk/reactos/drivers/fs/vfat/dirwr.c Modified: trunk/reactos/drivers/fs/vfat/ea.c Modified: trunk/reactos/drivers/fs/vfat/fat.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/finfo.c Modified: trunk/reactos/drivers/fs/vfat/flush.c Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/iface.c Modified: trunk/reactos/drivers/fs/vfat/misc.c Modified: trunk/reactos/drivers/fs/vfat/shutdown.c Modified: trunk/reactos/drivers/fs/vfat/string.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h Modified: trunk/reactos/drivers/fs/vfat/volume.c _____ Modified: trunk/reactos/drivers/fs/vfat/blockdev.c --- trunk/reactos/drivers/fs/vfat/blockdev.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/blockdev.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -10,11 +10,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ***************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -10,11 +10,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/close.c --- trunk/reactos/drivers/fs/vfat/close.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/close.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -10,11 +10,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -27,13 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <wchar.h> -#include <limits.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/dir.c --- trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -10,21 +10,16 @@ */ -#include <ddk/ntddk.h> -#include <wchar.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" // function like DosDateTimeToFileTime BOOLEAN -FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, USHORT wDosDate, WORD wDosTime, PLARGE_INTEGER SystemTime) +FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, USHORT DosDate, USHORT DosTime, PLARGE_INTEGER SystemTime) { - PDOSTIME pdtime = (PDOSTIME) & wDosTime; - PDOSDATE pddate = (PDOSDATE) & wDosDate; + PDOSTIME pdtime = (PDOSTIME) &DosTime; + PDOSDATE pddate = (PDOSDATE) &DosDate; TIME_FIELDS TimeFields; LARGE_INTEGER LocalTime; _____ Modified: trunk/reactos/drivers/fs/vfat/direntry.c --- trunk/reactos/drivers/fs/vfat/direntry.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/direntry.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -13,13 +13,7 @@ /* ------------------------------------------------------- INCLUDES */ -#include <ddk/ntddk.h> -#include <wchar.h> -#include <limits.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" ULONG _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -9,14 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ctype.h> -#include <wchar.h> -#include <string.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" NTSTATUS _____ Modified: trunk/reactos/drivers/fs/vfat/ea.c --- trunk/reactos/drivers/fs/vfat/ea.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/ea.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -27,13 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <wchar.h> -#include <limits.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/fat.c --- trunk/reactos/drivers/fs/vfat/fat.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/fat.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -12,13 +12,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <wchar.h> -#include <ntos/minmax.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* GLOBALS ******************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -13,14 +13,9 @@ /* ------------------------------------------------------- INCLUDES */ -#include <ddk/ntddk.h> -#include <wchar.h> -#include <limits.h> -#include <rosrtl/string.h> +#include <wctype.h> /* towlower prototype */ #define NDEBUG -#include <debug.h> - #include "vfat.h" /* -------------------------------------------------------- DEFINES */ @@ -372,10 +367,8 @@ PVFATFCB FCB; ULONG FirstCluster, CurrentCluster, Size = 0; NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING NameU; + UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\"); - RtlRosInitUnicodeStringFromLiteral(&NameU, L"\\"); - FCB = vfatNewFCB(pVCB, &NameU); if (FCB->Flags & FCB_IS_FATX_ENTRY) { @@ -425,10 +418,8 @@ vfatOpenRootFCB(PDEVICE_EXTENSION pVCB) { PVFATFCB FCB; - UNICODE_STRING NameU; + UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\"); - RtlRosInitUnicodeStringFromLiteral(&NameU, L"\\"); - FCB = vfatGrabFCBFromTable (pVCB, &NameU); if (FCB == NULL) { @@ -654,7 +645,7 @@ PVFATFCB FCB = NULL; PVFATFCB parentFCB; UNICODE_STRING NameU; - UNICODE_STRING RootNameU; + UNICODE_STRING RootNameU = RTL_CONSTANT_STRING(L"\\"); PWCHAR curr, prev, last; ULONG Length; @@ -668,8 +659,6 @@ if (parentFCB == NULL) { - RtlRosInitUnicodeStringFromLiteral(&RootNameU, L"\\"); - // Trivial case, open of the root directory on volume if (RtlEqualUnicodeString(pFileNameU, &RootNameU, FALSE)) { _____ Modified: trunk/reactos/drivers/fs/vfat/finfo.c --- trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -12,12 +12,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <wchar.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/flush.c --- trunk/reactos/drivers/fs/vfat/flush.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/flush.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -9,12 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include "vfat.h" -#define NDEBUG -#include <debug.h> - /* FUNCTIONS ****************************************************************/ NTSTATUS VfatFlushFile(PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb) _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -26,13 +26,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <rosrtl/string.h> -#include <wchar.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/ @@ -385,7 +379,8 @@ PVFATFCB VolumeFcb = NULL; PVFATCCB Ccb = NULL; PDEVICE_OBJECT DeviceToMount; - UNICODE_STRING NameU; + UNICODE_STRING NameU = RTL_CONSTANT_STRING(L"\\$$Fat$$"); + UNICODE_STRING VolumeNameU = RTL_CONSTANT_STRING(L"\\$$Volume$$"); DPRINT("VfatMount(IrpContext %x)\n", IrpContext); @@ -495,7 +490,6 @@ DPRINT("FsDeviceObject %lx\n", DeviceObject); DeviceExt->FATFileObject = IoCreateStreamFileObject(NULL, DeviceExt->StorageDevice); - RtlRosInitUnicodeStringFromLiteral(&NameU, L"\\$$Fat$$"); Fcb = vfatNewFCB(DeviceExt, &NameU); if (Fcb == NULL) { @@ -541,9 +535,8 @@ ExInitializeResourceLite(&DeviceExt->FatResource); InitializeListHead(&DeviceExt->FcbListHead); - RtlRosInitUnicodeStringFromLiteral(&NameU, L"\\$$Volume$$"); - VolumeFcb = vfatNewFCB(DeviceExt, &NameU); + VolumeFcb = vfatNewFCB(DeviceExt, &VolumeNameU); if (VolumeFcb == NULL) { Status = STATUS_INSUFFICIENT_RESOURCES; _____ Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/iface.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -27,12 +27,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <rosrtl/string.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* GLOBALS *****************************************************************/ @@ -53,7 +48,7 @@ */ { PDEVICE_OBJECT DeviceObject; - UNICODE_STRING DeviceName = ROS_STRING_INITIALIZER(L"\\Fat"); + UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Fat"); NTSTATUS Status; Status = IoCreateDevice(DriverObject, _____ Modified: trunk/reactos/drivers/fs/vfat/misc.c --- trunk/reactos/drivers/fs/vfat/misc.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/misc.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -10,12 +10,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <wchar.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/shutdown.c --- trunk/reactos/drivers/fs/vfat/shutdown.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/shutdown.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -9,11 +9,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/string.c --- trunk/reactos/drivers/fs/vfat/string.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/string.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -11,12 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <wchar.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 12:33:57 UTC (rev 12960) @@ -2,7 +2,8 @@ #include <ddk/ntifs.h> #include <ddk/ntdddisk.h> -#undef DeleteFile /* FIXME */ +#include <limits.h> +#include <debug.h> #define USE_ROS_CC_AND_FS @@ -11,6 +12,7 @@ NTSTATUS NTAPI RtlOemStringToUnicodeString(PUNICODE_STRING, CONST STRING *, BOOLEAN); NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN); NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN); +#undef DeleteFile /* FIXME */ #endif #ifdef USE_ROS_CC_AND_FS _____ Modified: trunk/reactos/drivers/fs/vfat/volume.c --- trunk/reactos/drivers/fs/vfat/volume.c 2005-01-12 12:32:06 UTC (rev 12959) +++ trunk/reactos/drivers/fs/vfat/volume.c 2005-01-12 12:33:57 UTC (rev 12960) @@ -11,12 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <wchar.h> - #define NDEBUG -#include <debug.h> - #include "vfat.h" /* FUNCTIONS ****************************************************************/

19 years, 10 months

[navaraf] 12959: Add definition of RTL_CONSTANT_STRING.

by navaraf＠svn.reactos.com

Add definition of RTL_CONSTANT_STRING. Modified: trunk/reactos/w32api/include/ntdef.h _____ Modified: trunk/reactos/w32api/include/ntdef.h --- trunk/reactos/w32api/include/ntdef.h 2005-01-12 12:31:10 UTC (rev 12958) +++ trunk/reactos/w32api/include/ntdef.h 2005-01-12 12:32:06 UTC (rev 12959) @@ -60,4 +60,5 @@ } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif #define NOTHING +#define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #endif /* _NTDEF_H */

19 years, 10 months

[gdalsnes] 12958: remove leftovers

by gdalsnes＠svn.reactos.com

remove leftovers Modified: trunk/reactos/ntoskrnl/ps/thread.c _____ Modified: trunk/reactos/ntoskrnl/ps/thread.c --- trunk/reactos/ntoskrnl/ps/thread.c 2005-01-12 12:06:15 UTC (rev 12957) +++ trunk/reactos/ntoskrnl/ps/thread.c 2005-01-12 12:31:10 UTC (rev 12958) @@ -477,8 +477,6 @@ VOID PsUnblockThread(PETHREAD Thread, PNTSTATUS WaitStatus) { - ASSERT(Thread->WaitBlockList == NULL); - if (THREAD_STATE_TERMINATED_1 == Thread->Tcb.State || THREAD_STATE_TERMINATED_2 == Thread->Tcb.State) {

19 years, 10 months

[navaraf] 12957: Based on a patch by Herve Poussineau <poussine@freesurf.fr>:

by navaraf＠svn.reactos.com

Based on a patch by Herve Poussineau <poussine(a)freesurf.fr>: - Compile using W32API. - Use documented structures names instead of ReactOS equivalent. - Get rid of MAX_PATH constant (only valid in user mode). Modified: trunk/reactos/drivers/fs/vfat/create.c Modified: trunk/reactos/drivers/fs/vfat/dir.c Modified: trunk/reactos/drivers/fs/vfat/dirwr.c Modified: trunk/reactos/drivers/fs/vfat/fcb.c Modified: trunk/reactos/drivers/fs/vfat/finfo.c Modified: trunk/reactos/drivers/fs/vfat/fsctl.c Modified: trunk/reactos/drivers/fs/vfat/makefile Modified: trunk/reactos/drivers/fs/vfat/rw.c Modified: trunk/reactos/drivers/fs/vfat/vfat.h _____ Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-01-12 12:06:15 UTC (rev 12957) @@ -41,7 +41,7 @@ void vfat8Dot3ToString (PFAT_DIR_ENTRY pEntry, PUNICODE_STRING NameU) { OEM_STRING StringA; - ULONG Length; + USHORT Length; CHAR cString[12]; RtlCopyMemory(cString, pEntry->Filename, 11); @@ -191,22 +191,39 @@ * FUNCTION: Find a file */ { - WCHAR PathNameBuffer[MAX_PATH]; + PWCHAR PathNameBuffer; + ULONG PathNameBufferLength; NTSTATUS Status; PVOID Context = NULL; PVOID Page; PVFATFCB rcFcb; BOOLEAN Found; UNICODE_STRING PathNameU; + UNICODE_STRING FileToFindUpcase; BOOLEAN WildCard; DPRINT ("FindFile(Parent %x, FileToFind '%wZ', DirIndex: %d)\n", Parent, FileToFindU, DirContext->DirIndex); DPRINT ("FindFile: Path %wZ)\n",&Parent->PathNameU); + + PathNameBufferLength = Parent->PathNameU.Length + LONGNAME_MAX_LENGTH + 2 * sizeof(WCHAR); + if (PathNameBufferLength > (USHRT_MAX - 2) * sizeof(WCHAR)) + { + /* A valid filename can't be so long. Do as if the file doesn't exist. */ + CHECKPOINT; + return STATUS_NO_SUCH_FILE; + } + + PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameBufferLength); + if (!PathNameBuffer) + { + CHECKPOINT1; + return STATUS_INSUFFICIENT_RESOURCES; + } PathNameU.Buffer = PathNameBuffer; PathNameU.Length = 0; - PathNameU.MaximumLength = sizeof(PathNameBuffer); + PathNameU.MaximumLength = PathNameBufferLength; DirContext->LongNameU.Length = 0; DirContext->ShortNameU.Length = 0; @@ -244,10 +261,21 @@ Status = STATUS_UNSUCCESSFUL; } vfatReleaseFCB(DeviceExt, rcFcb); + ExFreePool(PathNameBuffer); return Status; } } + /* FsRtlIsNameInExpression need the searched string to be upcase, + * even if IgnoreCase is specified */ + Status = RtlUpcaseUnicodeString(&FileToFindUpcase, FileToFindU, TRUE); + if (!NT_SUCCESS(Status)) + { + CHECKPOINT; + ExFreePool(PathNameBuffer); + return Status; + } + while(TRUE) { Status = DeviceExt->GetNextDirEntry(&Context, &Page, Parent, DirContext, First); @@ -263,14 +291,13 @@ } if (WildCard) { - Found = FsRtlIsNameInExpression(FileToFindU, &DirContext->LongNameU, TRUE, NULL) || - FsRtlIsNameInExpression(FileToFindU, &DirContext->ShortNameU, TRUE, NULL); + Found = FsRtlIsNameInExpression(&FileToFindUpcase, &DirContext->LongNameU, TRUE, NULL) || + FsRtlIsNameInExpression(&FileToFindUpcase, &DirContext->ShortNameU, TRUE, NULL); } else { - /* FIXME: Use FsRtlAreNamesEqual */ - Found = RtlEqualUnicodeString(&DirContext->LongNameU, FileToFindU, TRUE) || - RtlEqualUnicodeString(&DirContext->ShortNameU, FileToFindU, TRUE); + Found = FsRtlAreNamesEqual(&DirContext->LongNameU, FileToFindU, TRUE, NULL) || + FsRtlAreNamesEqual(&DirContext->ShortNameU, FileToFindU, TRUE, NULL); } if (Found) @@ -300,6 +327,8 @@ { CcUnpinData(Context); } + RtlFreeUnicodeString(&FileToFindUpcase); + ExFreePool(PathNameBuffer); return STATUS_SUCCESS; } DirContext->DirIndex++; @@ -310,6 +339,8 @@ CcUnpinData(Context); } + RtlFreeUnicodeString(&FileToFindUpcase); + ExFreePool(PathNameBuffer); return Status; } _____ Modified: trunk/reactos/drivers/fs/vfat/dir.c --- trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 12:06:15 UTC (rev 12957) @@ -311,7 +311,7 @@ BOOLEAN First = FALSE; BOOLEAN FirstCall; VFAT_DIRENTRY_CONTEXT DirContext; - WCHAR LongNameBuffer[MAX_PATH]; + WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH]; WCHAR ShortNameBuffer[13]; PIO_STACK_LOCATION Stack = IrpContext->Stack; @@ -344,7 +344,13 @@ } /* Obtain the callers parameters */ +#ifdef _MSC_VER + /* HACKHACK: Bug in the MS ntifs.h header: + * FileName is really a PUNICODE_STRING, not a PSTRING */ + pSearchPattern = (PUNICODE_STRING)Stack->Parameters.QueryDirectory.FileName; +#else pSearchPattern = Stack->Parameters.QueryDirectory.FileName; +#endif FileInformationClass = Stack->Parameters.QueryDirectory.FileInformationClass; FileIndex = Stack->Parameters.QueryDirectory.FileIndex; _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 12:06:15 UTC (rev 12957) @@ -211,7 +211,7 @@ BOOLEAN SpacesFound; VFAT_DIRENTRY_CONTEXT DirContext; - WCHAR LongNameBuffer[MAX_PATH]; + WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH]; WCHAR ShortNameBuffer[13]; DPRINT ("addEntry: Name='%wZ', Dir='%wZ'\n", NameU, &ParentFcb->PathNameU); @@ -370,16 +370,6 @@ } /* set dates and times */ KeQuerySystemTime (&SystemTime); -#if 0 - { - TIME_FIELDS tf; - RtlTimeToTimeFields (&SystemTime, &tf); - DPRINT1("%d.%d.%d %02d:%02d:%02d.%03d '%wZ'\n", - tf.Day, tf.Month, tf.Year, tf.Hour, - tf.Minute, tf.Second, tf.Milliseconds, - NameU); - } -#endif FsdSystemTimeToDosDateTime (DeviceExt, &SystemTime, &DirContext.DirEntry.Fat.CreationDate, &DirContext.DirEntry.Fat.CreationTime); DirContext.DirEntry.Fat.UpdateDate = DirContext.DirEntry.Fat.CreationDate; @@ -566,7 +556,7 @@ NameA.Length = 0; NameA.MaximumLength = 42; RtlUnicodeStringToOemString(&NameA, &DirContext.LongNameU, FALSE); - DirContext.DirEntry.FatX.FilenameLength = NameA.Length; + DirContext.DirEntry.FatX.FilenameLength = (unsigned char)NameA.Length; /* set attributes */ DirContext.DirEntry.FatX.Attrib = ReqAttr; _____ Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-01-12 12:06:15 UTC (rev 12957) @@ -14,7 +14,6 @@ /* ------------------------------------------------------- INCLUDES */ #include <ddk/ntddk.h> -#include <ntos/kefuncs.h> #include <wchar.h> #include <limits.h> #include <rosrtl/string.h> @@ -26,7 +25,6 @@ /* -------------------------------------------------------- DEFINES */ -#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) #define TAG_FCB TAG('V', 'F', 'C', 'B') #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) @@ -55,7 +53,7 @@ vfatSplitPathName(PUNICODE_STRING PathNameU, PUNICODE_STRING DirNameU, PUNICODE_STRING FileNameU) { PWCHAR pName; - ULONG Length = 0; + USHORT Length = 0; pName = PathNameU->Buffer + PathNameU->Length / sizeof(WCHAR) - 1; while (*pName != L'\\' && pName >= PathNameU->Buffer) { @@ -79,9 +77,24 @@ VOID vfatInitFcb(PVFATFCB Fcb, PUNICODE_STRING NameU) { + ULONG PathNameBufferLength; + + if (NameU) + PathNameBufferLength = NameU->Length + sizeof(WCHAR); + else + PathNameBufferLength = 0; + + Fcb->PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameBufferLength); + if (!Fcb->PathNameBuffer) + { + /* FIXME: what to do if no more memory? */ + DPRINT1("Unable to initialize FCB for filename '%wZ'\n", NameU); + KEBUGCHECKEX(0, (ULONG_PTR)Fcb, (ULONG_PTR)NameU, 0, 0); + } + Fcb->PathNameU.Length = 0; Fcb->PathNameU.Buffer = Fcb->PathNameBuffer; - Fcb->PathNameU.MaximumLength = sizeof(Fcb->PathNameBuffer); + Fcb->PathNameU.MaximumLength = PathNameBufferLength; Fcb->ShortNameU.Length = 0; Fcb->ShortNameU.Buffer = Fcb->ShortNameBuffer; Fcb->ShortNameU.MaximumLength = sizeof(Fcb->ShortNameBuffer); @@ -146,6 +159,7 @@ vfatDestroyFCB(PVFATFCB pFCB) { FsRtlUninitializeFileLock(&pFCB->FileLock); + ExFreePool(pFCB->PathNameBuffer); ExDeleteResourceLite(&pFCB->PagingIoResource); ExDeleteResourceLite(&pFCB->MainResource); ExFreeToNPagedLookasideList(&VfatGlobalData->FcbLookasideList, pFCB); @@ -431,20 +445,28 @@ PVFATFCB* fileFCB) { PVFATFCB rcFCB; - WCHAR pathName [MAX_PATH]; + PWCHAR PathNameBuffer; + ULONG PathNameLength; ULONG Size; ULONG hash; UNICODE_STRING NameU; - if (directoryFCB->PathNameU.Length + 2 * sizeof(WCHAR) + - + DirContext->LongNameU.Length > MAX_PATH * sizeof(WCHAR)) + PathNameLength = (directoryFCB->PathNameU.Length + 2 * sizeof(WCHAR) + + DirContext->LongNameU.Length) * sizeof(WCHAR); + + if (PathNameLength > (USHRT_MAX - 2) * sizeof(WCHAR)) { return STATUS_OBJECT_NAME_INVALID; } - NameU.Buffer = pathName; + PathNameBuffer = ExAllocatePool(NonPagedPool, PathNameLength); + if (!PathNameBuffer) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + NameU.Buffer = PathNameBuffer; NameU.Length = 0; - NameU.MaximumLength = sizeof(pathName); + NameU.MaximumLength = PathNameLength; RtlCopyUnicodeString(&NameU, &directoryFCB->PathNameU); if (!vfatFCBIsRoot (directoryFCB)) @@ -516,6 +538,7 @@ vfatAddFCBToTable (vcb, rcFCB); *fileFCB = rcFCB; + ExFreePool(PathNameBuffer); return STATUS_SUCCESS; } @@ -553,7 +576,7 @@ PVOID Page = NULL; BOOLEAN First = TRUE; VFAT_DIRENTRY_CONTEXT DirContext; - WCHAR LongNameBuffer[MAX_PATH]; + WCHAR LongNameBuffer[LONGNAME_MAX_LENGTH]; WCHAR ShortNameBuffer[13]; BOOLEAN FoundLong = FALSE; BOOLEAN FoundShort = FALSE; @@ -690,9 +713,9 @@ vfatReleaseFCB (pVCB, FCB); return STATUS_OBJECT_NAME_INVALID; } - memmove(pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR), + RtlMoveMemory(pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR), curr, pFileNameU->Length - Length); - pFileNameU->Length += FCB->PathNameU.Length - Length; + pFileNameU->Length += (USHORT)(FCB->PathNameU.Length - Length); curr = pFileNameU->Buffer + FCB->PathNameU.Length / sizeof(WCHAR); last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; } @@ -751,9 +774,9 @@ vfatReleaseFCB (pVCB, parentFCB); return STATUS_OBJECT_NAME_INVALID; } - memmove(prev + parentFCB->LongNameU.Length / sizeof(WCHAR), curr, + RtlMoveMemory(prev + parentFCB->LongNameU.Length / sizeof(WCHAR), curr, pFileNameU->Length - (curr - pFileNameU->Buffer) * sizeof(WCHAR)); - pFileNameU->Length += parentFCB->LongNameU.Length - Length; + pFileNameU->Length += (USHORT)(parentFCB->LongNameU.Length - Length); curr = prev + parentFCB->LongNameU.Length / sizeof(WCHAR); last = pFileNameU->Buffer + pFileNameU->Length / sizeof(WCHAR) - 1; } _____ Modified: trunk/reactos/drivers/fs/vfat/finfo.c --- trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/finfo.c 2005-01-12 12:06:15 UTC (rev 12957) @@ -226,8 +226,9 @@ PFILE_DISPOSITION_INFORMATION DispositionInfo) { NTSTATUS Status = STATUS_SUCCESS; - +#ifdef DBG PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; +#endif DPRINT ("FsdSetDispositionInformation()\n"); @@ -248,7 +249,7 @@ return STATUS_ACCESS_DENIED; } - if (DispositionInfo->DoDeleteFile) + if (DispositionInfo->DeleteFile) { if (MmFlushImageSection (FileObject->SectionObjectPointer, MmFlushForDelete)) { _____ Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-01-12 12:06:15 UTC (rev 12957) @@ -27,7 +27,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/kefuncs.h> #include <rosrtl/string.h> #include <wchar.h> @@ -654,9 +653,9 @@ static NTSTATUS VfatGetRetrievalPointers(PVFAT_IRP_CONTEXT IrpContext) { - PIO_STACK_LOCATION Stack; + PIO_STACK_LOCATION Stack; LARGE_INTEGER Vcn; - PGET_RETRIEVAL_DESCRIPTOR RetrievalPointers; + PRETRIEVAL_POINTERS_BUFFER RetrievalPointers; PFILE_OBJECT FileObject; ULONG MaxExtentCount; PVFATFCB Fcb; @@ -677,7 +676,7 @@ return STATUS_INVALID_PARAMETER; } if (IrpContext->Irp->UserBuffer == NULL || - Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(GET_RETRIEVAL_DESCRIPTOR) + sizeof(MAPPING_PAIR)) + Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(RETRIEVAL_POINTERS_BUFFER)) { return STATUS_BUFFER_TOO_SMALL; } @@ -689,7 +688,7 @@ Vcn = *(PLARGE_INTEGER)Stack->Parameters.DeviceIoControl.Type3InputBuffer; RetrievalPointers = IrpContext->Irp->UserBuffer; - MaxExtentCount = ((Stack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(GET_RETRIEVAL_DESCRIPTOR)) / sizeof(MAPPING_PAIR)); + MaxExtentCount = ((Stack->Parameters.DeviceIoControl.OutputBufferLength - sizeof(RetrievalPointers->ExtentCount) - sizeof(RetrievalPointers->StartingVcn)) / sizeof(RetrievalPointers->Extents[0])); if (Vcn.QuadPart >= Fcb->RFCB.AllocationSize.QuadPart / DeviceExt->FatInfo.BytesPerCluster) @@ -707,11 +706,12 @@ goto ByeBye; } - RetrievalPointers->StartVcn = Vcn.QuadPart; - RetrievalPointers->NumberOfPairs = 0; - RetrievalPointers->Pair[0].Lcn = CurrentCluster - 2; + RetrievalPointers->StartingVcn = Vcn; + RetrievalPointers->ExtentCount = 0; + RetrievalPointers->Extents[0].Lcn.u.HighPart = 0; + RetrievalPointers->Extents[0].Lcn.u.LowPart = CurrentCluster - 2; LastCluster = 0; - while (CurrentCluster != 0xffffffff && RetrievalPointers->NumberOfPairs < MaxExtentCount) + while (CurrentCluster != 0xffffffff && RetrievalPointers->ExtentCount < MaxExtentCount) { LastCluster = CurrentCluster; @@ -724,16 +724,17 @@ if (LastCluster + 1 != CurrentCluster) { - RetrievalPointers->Pair[RetrievalPointers->NumberOfPairs].Vcn = Vcn.QuadPart; - RetrievalPointers->NumberOfPairs++; - if (RetrievalPointers->NumberOfPairs < MaxExtentCount) + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].NextVcn = Vcn; + RetrievalPointers->ExtentCount++; + if (RetrievalPointers->ExtentCount < MaxExtentCount) { - RetrievalPointers->Pair[RetrievalPointers->NumberOfPairs].Lcn = CurrentCluster - 2; + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.HighPar t = 0; + RetrievalPointers->Extents[RetrievalPointers->ExtentCount].Lcn.u.LowPart = CurrentCluster - 2; } } } - IrpContext->Irp->IoStatus.Information = sizeof(GET_RETRIEVAL_DESCRIPTOR) + sizeof(MAPPING_PAIR) * RetrievalPointers->NumberOfPairs; + IrpContext->Irp->IoStatus.Information = sizeof(RETRIEVAL_POINTERS_BUFFER) + (sizeof(RetrievalPointers->Extents[0]) * (RetrievalPointers->ExtentCount - 1)); Status = STATUS_SUCCESS; ByeBye: @@ -757,7 +758,7 @@ PROS_QUERY_LCN_MAPPING LcnQuery; PIO_STACK_LOCATION Stack; - DPRINT("VfatGetRetrievalPointers(IrpContext %x)\n", IrpContext); + DPRINT("VfatRosQueryLcnMapping(IrpContext %x)\n", IrpContext); DeviceExt = IrpContext->DeviceExt; Stack = IrpContext->Stack; _____ Modified: trunk/reactos/drivers/fs/vfat/makefile --- trunk/reactos/drivers/fs/vfat/makefile 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/makefile 2005-01-12 12:06:15 UTC (rev 12957) @@ -38,9 +38,9 @@ include $(PATH_TO_TOP)/config ifeq ($(DBG), 1) -TARGET_CFLAGS = -Wall -Werror -g +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -g else -TARGET_CFLAGS = -Wall -Werror -O3 -fno-strict-aliasing +TARGET_CFLAGS = -D__USE_W32API -Wall -Werror -O3 -fno-strict-aliasing endif include $(PATH_TO_TOP)/rules.mak _____ Modified: trunk/reactos/drivers/fs/vfat/rw.c --- trunk/reactos/drivers/fs/vfat/rw.c 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/rw.c 2005-01-12 12:06:15 UTC (rev 12957) @@ -13,7 +13,6 @@ /* INCLUDES *****************************************************************/ #include <ddk/ntddk.h> -#include <ntos/kefuncs.h> #include <wchar.h> #include <ntos/minmax.h> _____ Modified: trunk/reactos/drivers/fs/vfat/vfat.h --- trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 11:07:31 UTC (rev 12956) +++ trunk/reactos/drivers/fs/vfat/vfat.h 2005-01-12 12:06:15 UTC (rev 12957) @@ -1,7 +1,28 @@ /* $Id$ */ #include <ddk/ntifs.h> +#include <ddk/ntdddisk.h> +#undef DeleteFile /* FIXME */ +#define USE_ROS_CC_AND_FS + +/* FIXME */ +#ifdef __USE_W32API +NTSTATUS NTAPI RtlOemStringToUnicodeString(PUNICODE_STRING, CONST STRING *, BOOLEAN); +NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN); +NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN); +#endif + +#ifdef USE_ROS_CC_AND_FS +NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT, ULONG); +NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT); +#define FSCTL_ROS_QUERY_LCN_MAPPING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS) +typedef struct _ROS_QUERY_LCN_MAPPING { LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING; +#endif + +#define KEBUGCHECK(a) DbgPrint("KeBugCheck at %s:%i\n",__FILE__,__LINE__), KeBugCheck(a) +#define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx at %s:%i\n",__FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) + #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) #define ROUND_DOWN(N, S) ((N) - ((N) % (S))) @@ -75,9 +96,11 @@ typedef struct _BootSector BootSector; -#define VFAT_CASE_LOWER_BASE 8 // base is lower case -#define VFAT_CASE_LOWER_EXT 16 // extension is lower case +#define VFAT_CASE_LOWER_BASE 8 // base is lower case +#define VFAT_CASE_LOWER_EXT 16 // extension is lower case +#define LONGNAME_MAX_LENGTH 256 // max length for a long filename + #define ENTRY_DELETED(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_DELETED(&((DirEntry)->FatX)) : FAT_ENTRY_DELETED(&((DirEntry)->Fat))) #define ENTRY_VOLUME(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_VOLUME(&((DirEntry)->FatX)) : FAT_ENTRY_VOLUME(&((DirEntry)->Fat))) #define ENTRY_END(DeviceExt, DirEntry) ((DeviceExt)->Flags & VCB_IS_FATX ? FATX_ENTRY_END(&((DirEntry)->FatX)) : FAT_ENTRY_END(&((DirEntry)->Fat))) @@ -284,7 +307,7 @@ UNICODE_STRING PathNameU; /* buffer for PathNameU */ - WCHAR PathNameBuffer[MAX_PATH]; + PWCHAR PathNameBuffer; /* buffer for ShortNameU */ WCHAR ShortNameBuffer[13];

19 years, 10 months

[navaraf] 12956: Herve Poussineau <poussine@freesurf.fr>

by navaraf＠svn.reactos.com

Herve Poussineau <poussine(a)freesurf.fr> - Use documented structures names instead of ReactOS equivalents. - Replace CcMapData with CcPinRead on places where we're modifying the data. Modified: trunk/reactos/drivers/fs/vfat/dir.c Modified: trunk/reactos/drivers/fs/vfat/dirwr.c Modified: trunk/reactos/drivers/fs/vfat/fat.c Modified: trunk/reactos/drivers/fs/vfat/volume.c _____ Modified: trunk/reactos/drivers/fs/vfat/dir.c --- trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 10:49:47 UTC (rev 12955) +++ trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 11:07:31 UTC (rev 12956) @@ -166,14 +166,14 @@ NTSTATUS VfatGetFileFullDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext, PDEVICE_EXTENSION DeviceExt, - PFILE_FULL_DIRECTORY_INFORMATION pInfo, + PFILE_FULL_DIR_INFORMATION pInfo, ULONG BufferLength) { - if ((sizeof (FILE_FULL_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + if ((sizeof (FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) return STATUS_BUFFER_OVERFLOW; pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_FULL_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_FULL_DIR_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); // pInfo->FileIndex=; if (DeviceExt->Flags & VCB_IS_FATX) @@ -220,10 +220,10 @@ NTSTATUS VfatGetFileBothInformation (PVFAT_DIRENTRY_CONTEXT DirContext, PDEVICE_EXTENSION DeviceExt, - PFILE_BOTH_DIRECTORY_INFORMATION pInfo, + PFILE_BOTH_DIR_INFORMATION pInfo, ULONG BufferLength) { - if ((sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) + if ((sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length) > BufferLength) return STATUS_BUFFER_OVERFLOW; if (DeviceExt->Flags & VCB_IS_FATX) @@ -231,7 +231,7 @@ pInfo->FileNameLength = DirContext->LongNameU.Length; RtlCopyMemory(pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length); pInfo->ShortName[0] = 0; pInfo->ShortNameLength = 0; // pInfo->FileIndex=; @@ -264,7 +264,7 @@ { pInfo->FileNameLength = DirContext->LongNameU.Length; pInfo->NextEntryOffset = - ULONG_ROUND_UP (sizeof (FILE_BOTH_DIRECTORY_INFORMATION) + DirContext->LongNameU.Length); + ULONG_ROUND_UP (sizeof (FILE_BOTH_DIR_INFORMATION) + DirContext->LongNameU.Length); RtlCopyMemory(pInfo->ShortName, DirContext->ShortNameU.Buffer, DirContext->ShortNameU.Length); pInfo->ShortNameLength = DirContext->ShortNameU.Length; RtlCopyMemory (pInfo->FileName, DirContext->LongNameU.Buffer, DirContext->LongNameU.Length); @@ -427,13 +427,13 @@ case FileFullDirectoryInformation: RC = VfatGetFileFullDirectoryInformation (&DirContext, IrpContext->DeviceExt, - (PFILE_FULL_DIRECTORY_INFORMATION) Buffer, + (PFILE_FULL_DIR_INFORMATION) Buffer, BufferLength); break; case FileBothDirectoryInformation: RC = VfatGetFileBothInformation (&DirContext, IrpContext->DeviceExt, - (PFILE_BOTH_DIRECTORY_INFORMATION) Buffer, + (PFILE_BOTH_DIR_INFORMATION) Buffer, BufferLength); break; default: _____ Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 10:49:47 UTC (rev 12955) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-01-12 11:07:31 UTC (rev 12956) @@ -49,7 +49,7 @@ Offset.u.HighPart = 0; Offset.u.LowPart = dirIndex * SizeDirEntry; - if (CcMapData (pFcb->parentFcb->FileObject, &Offset, SizeDirEntry, + if (CcPinRead (pFcb->parentFcb->FileObject, &Offset, SizeDirEntry, TRUE, &Context, (PVOID*)&PinEntry)) { pFcb->Flags &= ~FCB_IS_DIRTY; @@ -99,7 +99,7 @@ CcUnpinData(Context); } // FIXME: check return value - CcMapData (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, + CcPinRead (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); FileOffset.u.LowPart += DeviceExt->FatInfo.BytesPerCluster; } @@ -153,7 +153,7 @@ // clear the new dir cluster FileOffset.u.LowPart = (ULONG)(pDirFcb->RFCB.FileSize.QuadPart - DeviceExt->FatInfo.BytesPerCluster); - CcMapData (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, + CcPinRead (pDirFcb->FileObject, &FileOffset, DeviceExt->FatInfo.BytesPerCluster, TRUE, &Context, (PVOID*)&pFatEntry); if (DeviceExt->Flags & VCB_IS_FATX) memset(pFatEntry, 0xff, DeviceExt->FatInfo.BytesPerCluster); @@ -164,7 +164,7 @@ { // clear the entry after the last new entry FileOffset.u.LowPart = (*start + nbSlots) * SizeDirEntry; - CcMapData (pDirFcb->FileObject, &FileOffset, SizeDirEntry, + CcPinRead (pDirFcb->FileObject, &FileOffset, SizeDirEntry, TRUE, &Context, (PVOID*)&pFatEntry); if (DeviceExt->Flags & VCB_IS_FATX) memset(pFatEntry, 0xff, SizeDirEntry); @@ -448,7 +448,7 @@ { /* one cluster */ CHECKPOINT; - CcMapData (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), + CcPinRead (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY), TRUE, &Context, (PVOID*)&pFatEntry); if (nbSlots > 1) { @@ -463,13 +463,13 @@ size = DeviceExt->FatInfo.BytesPerCluster - (DirContext.StartIndex * sizeof(FAT_DIR_ENTRY)) % DeviceExt->FatInfo.BytesPerCluster; i = size / sizeof(FAT_DIR_ENTRY); - CcMapData (ParentFcb->FileObject, &FileOffset, size, TRUE, + CcPinRead (ParentFcb->FileObject, &FileOffset, size, TRUE, &Context, (PVOID*)&pFatEntry); RtlCopyMemory(pFatEntry, Buffer, size); CcSetDirtyPinnedData(Context, NULL); CcUnpinData(Context); FileOffset.u.LowPart += size; - CcMapData (ParentFcb->FileObject, &FileOffset, + CcPinRead (ParentFcb->FileObject, &FileOffset, nbSlots * sizeof(FAT_DIR_ENTRY) - size, TRUE, &Context, (PVOID*)&pFatEntry); if (nbSlots - 1 > i) @@ -587,7 +587,7 @@ /* add entry into parent directory */ FileOffset.u.HighPart = 0; FileOffset.u.LowPart = DirContext.StartIndex * sizeof(FATX_DIR_ENTRY); - CcMapData(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), + CcPinRead(ParentFcb->FileObject, &FileOffset, sizeof(FATX_DIR_ENTRY), TRUE, &Context, (PVOID*)&pFatXDirEntry); RtlCopyMemory(pFatXDirEntry, &DirContext.DirEntry.FatX, sizeof(FATX_DIR_ENTRY)); CcSetDirtyPinnedData(Context, NULL); @@ -641,7 +641,7 @@ CcUnpinData(Context); } Offset.u.LowPart = (i * sizeof(FAT_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; - CcMapData (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, + CcPinRead (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, &Context, (PVOID*)&pDirEntry); } pDirEntry[i % (PAGE_SIZE / sizeof(FAT_DIR_ENTRY))].Filename[0] = 0xe5; @@ -690,10 +690,10 @@ DPRINT ("delete entry: %d\n", StartIndex); Offset.u.HighPart = 0; Offset.u.LowPart = (StartIndex * sizeof(FATX_DIR_ENTRY) / PAGE_SIZE) * PAGE_SIZE; - if (!CcMapData (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, + if (!CcPinRead (pFcb->parentFcb->FileObject, &Offset, PAGE_SIZE, TRUE, &Context, (PVOID*)&pDirEntry)) { - DPRINT1("CcMapData(Offset %x:%x, Length %d) failed\n", Offset.u.HighPart, Offset.u.LowPart, PAGE_SIZE); + DPRINT1("CcPinRead(Offset %x:%x, Length %d) failed\n", Offset.u.HighPart, Offset.u.LowPart, PAGE_SIZE); return STATUS_UNSUCCESSFUL; } pDirEntry = &pDirEntry[StartIndex % (PAGE_SIZE / sizeof(FATX_DIR_ENTRY))]; _____ Modified: trunk/reactos/drivers/fs/vfat/fat.c --- trunk/reactos/drivers/fs/vfat/fat.c 2005-01-12 10:49:47 UTC (rev 12955) +++ trunk/reactos/drivers/fs/vfat/fat.c 2005-01-12 11:07:31 UTC (rev 12956) @@ -157,7 +157,7 @@ for (i = StartCluster; i < FatLength; ) { Offset.QuadPart = ROUND_DOWN(i * 2, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { DPRINT1("CcMapData(Offset %x, Length %d) failed\n", (ULONG)Offset.QuadPart, ChunkSize); return STATUS_UNSUCCESSFUL; @@ -209,7 +209,7 @@ *Cluster = 0; StartCluster = DeviceExt->LastAvailableCluster; Offset.QuadPart = 0; - if(!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) { DPRINT1("CcMapData(Offset %x, Length %d) failed\n", (ULONG)Offset.QuadPart, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector); return STATUS_UNSUCCESSFUL; @@ -274,7 +274,7 @@ for (i = StartCluster; i < FatLength;) { Offset.QuadPart = ROUND_DOWN(i * 4, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { DPRINT1("CcMapData(Offset %x, Length %d) failed\n", (ULONG)Offset.QuadPart, ChunkSize); return STATUS_UNSUCCESSFUL; @@ -491,7 +491,7 @@ LARGE_INTEGER Offset; Offset.QuadPart = 0; - if(!CcMapData(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, DeviceExt->FatInfo.FATSectors * DeviceExt->FatInfo.BytesPerSector, 1, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -540,7 +540,7 @@ ChunkSize = CACHEPAGESIZE(DeviceExt); FATOffset = ClusterToWrite * 2; Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } @@ -574,7 +574,7 @@ FATOffset = (ClusterToWrite * 4); Offset.QuadPart = ROUND_DOWN(FATOffset, ChunkSize); - if(!CcMapData(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) + if(!CcPinRead(DeviceExt->FATFileObject, &Offset, ChunkSize, 1, &Context, &BaseAddress)) { return STATUS_UNSUCCESSFUL; } _____ Modified: trunk/reactos/drivers/fs/vfat/volume.c --- trunk/reactos/drivers/fs/vfat/volume.c 2005-01-12 10:49:47 UTC (rev 12955) +++ trunk/reactos/drivers/fs/vfat/volume.c 2005-01-12 11:07:31 UTC (rev 12956) @@ -233,7 +233,7 @@ /* Search existing volume entry on disk */ FileOffset.QuadPart = 0; - if (CcMapData(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) + if (CcPinRead(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) { while (TRUE) { @@ -256,7 +256,7 @@ { CcUnpinData(Context); FileOffset.u.LowPart += PAGE_SIZE; - if (!CcMapData(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) + if (!CcPinRead(pRootFcb->FileObject, &FileOffset, PAGE_SIZE, TRUE, &Context, (PVOID*)&Entry)) { Context = NULL; break; @@ -277,7 +277,7 @@ { FileOffset.u.HighPart = 0; FileOffset.u.LowPart = VolumeLabelDirIndex * SizeDirEntry; - CcMapData(pRootFcb->FileObject, &FileOffset, SizeDirEntry, + CcPinRead(pRootFcb->FileObject, &FileOffset, SizeDirEntry, TRUE, &Context, (PVOID*)&Entry); RtlCopyMemory(Entry, &VolumeLabelDirEntry, SizeDirEntry); CcSetDirtyPinnedData(Context, NULL);

19 years, 10 months

[navaraf] 12955: Oops, forgot to patch one place.

by navaraf＠svn.reactos.com

Oops, forgot to patch one place. Modified: trunk/reactos/drivers/fs/vfat/dir.c _____ Modified: trunk/reactos/drivers/fs/vfat/dir.c --- trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 10:46:13 UTC (rev 12954) +++ trunk/reactos/drivers/fs/vfat/dir.c 2005-01-12 10:49:47 UTC (rev 12955) @@ -21,7 +21,7 @@ // function like DosDateTimeToFileTime BOOLEAN -FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, WORD wDosDate, WORD wDosTime, PLARGE_INTEGER SystemTime) +FsdDosDateTimeToSystemTime (PDEVICE_EXTENSION DeviceExt, USHORT wDosDate, WORD wDosTime, PLARGE_INTEGER SystemTime) { PDOSTIME pdtime = (PDOSTIME) & wDosTime; PDOSDATE pddate = (PDOSDATE) & wDosDate;

19 years, 10 months

← Newer
1
...
39
40
41
42
43
44
45
...
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