Remove $Id$ tags Use FATEntry.ShortName field instead of FATEntry.FileName when dealing with full name Remove LL suffix on long long constants Replace Win32 types by their kernel counterparts (DWORD -> ULONG, ...) 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/fastio.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/rw.c Modified: trunk/reactos/drivers/fs/vfat/shutdown.c Modified: trunk/reactos/drivers/fs/vfat/string.c Modified: trunk/reactos/drivers/fs/vfat/vfatfs.rc Modified: trunk/reactos/drivers/fs/vfat/volume.c Property changes on: trunk/reactos/drivers/fs/vfat/blockdev.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/cleanup.c --- trunk/reactos/drivers/fs/vfat/cleanup.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/cleanup.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/cleanup.c Property changes on: trunk/reactos/drivers/fs/vfat/cleanup.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/close.c --- trunk/reactos/drivers/fs/vfat/close.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/close.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/close.c Property changes on: trunk/reactos/drivers/fs/vfat/close.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/create.c --- trunk/reactos/drivers/fs/vfat/create.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/create.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -16,8 +16,7 @@
* along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/create.c * PURPOSE: VFAT Filesystem @@ -38,7 +37,7 @@ USHORT Length; CHAR cString[12];
- RtlCopyMemory(cString, pEntry->Filename, 11); + RtlCopyMemory(cString, pEntry->ShortName, 11); cString[11] = 0; if (cString[0] == 0x05) { @@ -695,8 +694,7 @@ /* Supersede the file */ if (RequestedDisposition == FILE_SUPERSEDE) { - LARGE_INTEGER AllocationSize; - AllocationSize.QuadPart = 0LL; + AllocationSize.QuadPart = 0; VfatSetAllocationSizeInformation(FileObject, pFcb, DeviceExt, &AllocationSize); Irp->IoStatus.Information = FILE_SUPERSEDED; } Property changes on: trunk/reactos/drivers/fs/vfat/create.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/dir.c --- trunk/reactos/drivers/fs/vfat/dir.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/dir.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,6 +1,4 @@
/* - * $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/dir.c @@ -115,8 +113,8 @@ pInfo->ChangeTime = pInfo->LastWriteTime; if (DirContext->DirEntry.FatX.Attrib & FILE_ATTRIBUTE_DIRECTORY) { - pInfo->EndOfFile.QuadPart = 0LL; - pInfo->AllocationSize.QuadPart = 0LL; + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; } else { @@ -141,8 +139,8 @@ pInfo->ChangeTime = pInfo->LastWriteTime; if (DirContext->DirEntry.Fat.Attrib & FILE_ATTRIBUTE_DIRECTORY) { - pInfo->EndOfFile.QuadPart = 0LL; - pInfo->AllocationSize.QuadPart = 0LL; + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; } else { @@ -242,8 +240,8 @@ pInfo->ChangeTime = pInfo->LastWriteTime; if (DirContext->DirEntry.FatX.Attrib & FILE_ATTRIBUTE_DIRECTORY) { - pInfo->EndOfFile.QuadPart = 0LL; - pInfo->AllocationSize.QuadPart = 0LL; + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; } else { @@ -275,8 +273,8 @@ pInfo->ChangeTime = pInfo->LastWriteTime; if (DirContext->DirEntry.Fat.Attrib & FILE_ATTRIBUTE_DIRECTORY) { - pInfo->EndOfFile.QuadPart = 0LL; - pInfo->AllocationSize.QuadPart = 0LL; + pInfo->EndOfFile.QuadPart = 0; + pInfo->AllocationSize.QuadPart = 0; } else { Property changes on: trunk/reactos/drivers/fs/vfat/dir.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/direntry.c --- trunk/reactos/drivers/fs/vfat/direntry.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/direntry.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,6 +1,4 @@
-/* $Id$ - * - * +/* * FILE: DirEntry.c * PURPOSE: Routines to manipulate directory entries. * COPYRIGHT: See COPYING in the top level directory @@ -55,7 +53,7 @@ Index = 2; }
- FileOffset.QuadPart = 0LL; + FileOffset.QuadPart = 0; MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FAT_DIR_ENTRY);
while (Index < MaxIndex) @@ -101,7 +99,7 @@
Index = 0;
- FileOffset.QuadPart = 0LL; + FileOffset.QuadPart = 0; MaxIndex = Fcb->RFCB.FileSize.u.LowPart / sizeof(FATX_DIR_ENTRY);
while (Index < MaxIndex) @@ -306,7 +304,7 @@ { shortCheckSum = (((shortCheckSum & 1) << 7) | ((shortCheckSum & 0xfe) >> 1)) - + fatDirEntry->Filename[i]; + + fatDirEntry->ShortName[i]; } if (shortCheckSum != CheckSum && DirContext->LongNameU.Buffer[0]) { Property changes on: trunk/reactos/drivers/fs/vfat/direntry.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/dirwr.c --- trunk/reactos/drivers/fs/vfat/dirwr.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/dirwr.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/dirwr.c @@ -320,7 +319,7 @@ } DPRINT ("'%s', '%wZ', needTilde=%d, needLong=%d\n", aName, &DirContext.LongNameU, needTilde, needLong); - memset(DirContext.DirEntry.Fat.Filename, ' ', 11); + memset(DirContext.DirEntry.Fat.ShortName, ' ', 11); for (i = 0; i < 8 && aName[i] && aName[i] != '.'; i++) { DirContext.DirEntry.Fat.Filename[i] = aName[i]; @@ -496,9 +495,9 @@ RtlZeroMemory (pFatEntry, DeviceExt->FatInfo.BytesPerCluster); /* create '.' and '..' */ RtlCopyMemory (&pFatEntry[0].Attrib, &DirContext.DirEntry.Fat.Attrib, sizeof(FAT_DIR_ENTRY) - 11); - RtlCopyMemory (pFatEntry[0].Filename, ". ", 11); + RtlCopyMemory (pFatEntry[0].ShortName, ". ", 11); RtlCopyMemory (&pFatEntry[1].Attrib, &DirContext.DirEntry.Fat.Attrib, sizeof(FAT_DIR_ENTRY) - 11); - RtlCopyMemory (pFatEntry[1].Filename, ".. ", 11); + RtlCopyMemory (pFatEntry[1].ShortName, ".. ", 11); pFatEntry[1].FirstCluster = ParentFcb->entry.Fat.FirstCluster; pFatEntry[1].FirstClusterHigh = ParentFcb->entry.Fat.FirstClusterHigh; if (vfatFCBIsRoot(ParentFcb)) Property changes on: trunk/reactos/drivers/fs/vfat/dirwr.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/ea.c --- trunk/reactos/drivers/fs/vfat/ea.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/ea.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -16,8 +16,7 @@
* along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/ea.c * PURPOSE: VFAT Filesystem Property changes on: trunk/reactos/drivers/fs/vfat/ea.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/fastio.c --- trunk/reactos/drivers/fs/vfat/fastio.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/fastio.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,6 +1,4 @@
-/* $Id$ - * - * +/* * FILE: drivers/fs/vfat/fastio.c * PURPOSE: Fast IO routines. * COPYRIGHT: See COPYING in the top level directory Property changes on: trunk/reactos/drivers/fs/vfat/fastio.c ___________________________________________________________________ Name: svn:keywords + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/fat.c --- trunk/reactos/drivers/fs/vfat/fat.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/fat.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,6 +1,4 @@
/* - * $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/fat.c Property changes on: trunk/reactos/drivers/fs/vfat/fat.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/fcb.c --- trunk/reactos/drivers/fs/vfat/fcb.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/fcb.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,6 +1,4 @@
-/* $Id$ - * - * +/* * FILE: drivers/fs/vfat/fcb.c * PURPOSE: Routines to manipulate FCBs. * COPYRIGHT: See COPYING in the top level directory @@ -380,7 +378,7 @@ } else { - memset(FCB->entry.Fat.Filename, ' ', 11); + memset(FCB->entry.Fat.ShortName, ' ', 11); FCB->entry.Fat.FileSize = pVCB->FatInfo.rootDirectorySectors * pVCB->FatInfo.BytesPerSector; FCB->entry.Fat.Attrib = FILE_ATTRIBUTE_DIRECTORY; if (pVCB->FatInfo.FatType == FAT32) Property changes on: trunk/reactos/drivers/fs/vfat/fcb.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/finfo.c --- trunk/reactos/drivers/fs/vfat/finfo.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/finfo.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/finfo.c @@ -83,8 +82,8 @@
if (vfatFCBIsDirectory(FCB)) { - StandardInfo->AllocationSize.QuadPart = 0LL; - StandardInfo->EndOfFile.QuadPart = 0LL; + StandardInfo->AllocationSize.QuadPart = 0; + StandardInfo->EndOfFile.QuadPart = 0; StandardInfo->Directory = TRUE; } else Property changes on: trunk/reactos/drivers/fs/vfat/finfo.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/flush.c --- trunk/reactos/drivers/fs/vfat/flush.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/flush.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/flush.c Property changes on: trunk/reactos/drivers/fs/vfat/flush.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/fsctl.c --- trunk/reactos/drivers/fs/vfat/fsctl.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/fsctl.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -16,8 +16,7 @@
* along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/fsctl.c @@ -422,7 +421,7 @@ HashTableSize = FCB_HASH_TABLE_SIZE; DPRINT("VFAT: Recognized volume\n"); Status = IoCreateDevice(VfatGlobalData->DriverObject, - ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(DWORD)) + sizeof(HASHENTRY*) * HashTableSize, + ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, NULL, FILE_DEVICE_FILE_SYSTEM, 0, @@ -435,8 +434,8 @@
DeviceObject->Flags = DeviceObject->Flags | DO_DIRECT_IO; DeviceExt = (PVOID) DeviceObject->DeviceExtension; - RtlZeroMemory(DeviceExt, ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(DWORD)) + sizeof(HASHENTRY*) * HashTableSize); - DeviceExt->FcbHashTable = (HASHENTRY**)((ULONG_PTR)DeviceExt + ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(DWORD))); + RtlZeroMemory(DeviceExt, ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize); + DeviceExt->FcbHashTable = (HASHENTRY**)((ULONG_PTR)DeviceExt + ROUND_UP(sizeof(DEVICE_EXTENSION), sizeof(ULONG))); DeviceExt->HashTableSize = HashTableSize;
/* use same vpb as device disk */ Property changes on: trunk/reactos/drivers/fs/vfat/fsctl.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/iface.c --- trunk/reactos/drivers/fs/vfat/iface.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/iface.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -16,8 +16,7 @@
* along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/iface.c * PURPOSE: VFAT Filesystem @@ -83,7 +82,7 @@ VfatGlobalData->DriverObject = DriverObject; VfatGlobalData->DeviceObject = DeviceObject;
- DeviceObject->Flags = DO_DIRECT_IO; + DeviceObject->Flags |= DO_DIRECT_IO; DriverObject->MajorFunction[IRP_MJ_CLOSE] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_CREATE] = VfatBuildRequest; DriverObject->MajorFunction[IRP_MJ_READ] = VfatBuildRequest; Property changes on: trunk/reactos/drivers/fs/vfat/iface.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/misc.c --- trunk/reactos/drivers/fs/vfat/misc.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/misc.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/misc.c Property changes on: trunk/reactos/drivers/fs/vfat/misc.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/rw.c --- trunk/reactos/drivers/fs/vfat/rw.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/rw.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,6 +1,4 @@
- -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/rw.c Property changes on: trunk/reactos/drivers/fs/vfat/rw.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/shutdown.c --- trunk/reactos/drivers/fs/vfat/shutdown.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/shutdown.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/shutdown.c Property changes on: trunk/reactos/drivers/fs/vfat/shutdown.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/string.c --- trunk/reactos/drivers/fs/vfat/string.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/string.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/string.c Property changes on: trunk/reactos/drivers/fs/vfat/string.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision Property changes on: trunk/reactos/drivers/fs/vfat/vfat005.1st ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision Property changes on: trunk/reactos/drivers/fs/vfat/vfat_fr.txt ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision Property changes on: trunk/reactos/drivers/fs/vfat/vfatfs.def ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/vfatfs.rc --- trunk/reactos/drivers/fs/vfat/vfatfs.rc 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/vfatfs.rc 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,3 @@
-/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "VFAT IFS Driver\0" #define REACTOS_STR_INTERNAL_NAME "vfatfs\0" Property changes on: trunk/reactos/drivers/fs/vfat/vfatfs.rc ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision _____
Modified: trunk/reactos/drivers/fs/vfat/volume.c --- trunk/reactos/drivers/fs/vfat/volume.c 2005-08-24 18:13:00 UTC (rev 17515) +++ trunk/reactos/drivers/fs/vfat/volume.c 2005-08-24 18:29:45 UTC (rev 17516) @@ -1,5 +1,4 @@
-/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/vfat/volume.c Property changes on: trunk/reactos/drivers/fs/vfat/volume.c ___________________________________________________________________ Name: svn:keywords - author date id revision + author date revision