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, ...)

svn path=/trunk/; revision=17516

diff --git a/reactos/drivers/fs/vfat/cleanup.c b/reactos/drivers/fs/vfat/cleanup.c
index ab88f36..db2cccc 100644 (file)
--- a/reactos/drivers/fs/vfat/cleanup.c
+++ b/reactos/drivers/fs/vfat/cleanup.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/cleanup.c

diff --git a/reactos/drivers/fs/vfat/close.c b/reactos/drivers/fs/vfat/close.c
index dd6c385..7955d29 100644 (file)
--- a/reactos/drivers/fs/vfat/close.c
+++ b/reactos/drivers/fs/vfat/close.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/close.c

diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/fs/vfat/create.c
index 41ef6f2..18e473a 100644 (file)
--- a/reactos/drivers/fs/vfat/create.c
+++ b/reactos/drivers/fs/vfat/create.c
@@ -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 @@ void  vfat8Dot3ToString (PFAT_DIR_ENTRY pEntry, PUNICODE_STRING NameU)
   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 @@ VfatCreateFile (PDEVICE_OBJECT DeviceObject, PIRP Irp)
       /* 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;
        }

diff --git a/reactos/drivers/fs/vfat/dir.c b/reactos/drivers/fs/vfat/dir.c
index 8a87c39..b59260e 100644 (file)
--- a/reactos/drivers/fs/vfat/dir.c
+++ b/reactos/drivers/fs/vfat/dir.c
@@ -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 @@ VfatGetFileDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext,
     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 @@ VfatGetFileDirectoryInformation (PVFAT_DIRENTRY_CONTEXT DirContext,
     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 @@ VfatGetFileBothInformation (PVFAT_DIRENTRY_CONTEXT DirContext,
     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 @@ VfatGetFileBothInformation (PVFAT_DIRENTRY_CONTEXT DirContext,
     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
       {

diff --git a/reactos/drivers/fs/vfat/direntry.c b/reactos/drivers/fs/vfat/direntry.c
index 2dbcd71..b214a13 100644 (file)
--- a/reactos/drivers/fs/vfat/direntry.c
+++ b/reactos/drivers/fs/vfat/direntry.c
@@ -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 @@ BOOLEAN FATIsDirectoryEmpty(PVFATFCB Fcb)
        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 @@ BOOLEAN FATXIsDirectoryEmpty(PVFATFCB Fcb)
 
    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 @@ NTSTATUS FATGetNextDirEntry(PVOID * pContext,
                   {
                     shortCheckSum = (((shortCheckSum & 1) << 7)
                                   | ((shortCheckSum & 0xfe) >> 1))
-                                  + fatDirEntry->Filename[i];
+                                  + fatDirEntry->ShortName[i];
                  }
                if (shortCheckSum != CheckSum && DirContext->LongNameU.Buffer[0])
                  {

diff --git a/reactos/drivers/fs/vfat/dirwr.c b/reactos/drivers/fs/vfat/dirwr.c
index 6e3e0d8..42691a4 100644 (file)
--- a/reactos/drivers/fs/vfat/dirwr.c
+++ b/reactos/drivers/fs/vfat/dirwr.c
@@ -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 @@ FATAddEntry (PDEVICE_EXTENSION DeviceExt,
     }
   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 @@ FATAddEntry (PDEVICE_EXTENSION DeviceExt,
       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))

diff --git a/reactos/drivers/fs/vfat/ea.c b/reactos/drivers/fs/vfat/ea.c
index 316e275..5bf25f3 100644 (file)
--- a/reactos/drivers/fs/vfat/ea.c
+++ b/reactos/drivers/fs/vfat/ea.c
@@ -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

diff --git a/reactos/drivers/fs/vfat/fastio.c b/reactos/drivers/fs/vfat/fastio.c
index 0262502..906d23f 100644 (file)
--- a/reactos/drivers/fs/vfat/fastio.c
+++ b/reactos/drivers/fs/vfat/fastio.c
@@ -1,6 +1,4 @@
-/* $Id$ 
- *
- *
+/*
  * FILE:             drivers/fs/vfat/fastio.c
  * PURPOSE:          Fast IO routines.
  * COPYRIGHT:        See COPYING in the top level directory

diff --git a/reactos/drivers/fs/vfat/fat.c b/reactos/drivers/fs/vfat/fat.c
index 5503d5a..427eb63 100644 (file)
--- a/reactos/drivers/fs/vfat/fat.c
+++ b/reactos/drivers/fs/vfat/fat.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/fat.c

diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/fs/vfat/fcb.c
index 10a8c6f..a9bc901 100644 (file)
--- a/reactos/drivers/fs/vfat/fcb.c
+++ b/reactos/drivers/fs/vfat/fcb.c
@@ -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 @@ vfatMakeRootFCB(PDEVICE_EXTENSION  pVCB)
   }
   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)

diff --git a/reactos/drivers/fs/vfat/finfo.c b/reactos/drivers/fs/vfat/finfo.c
index 69a8cfe..4d4c65a 100644 (file)
--- a/reactos/drivers/fs/vfat/finfo.c
+++ b/reactos/drivers/fs/vfat/finfo.c
@@ -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 @@ VfatGetStandardInformation(PVFATFCB FCB,
 
   if (vfatFCBIsDirectory(FCB))
     {
-      StandardInfo->AllocationSize.QuadPart = 0LL;
-      StandardInfo->EndOfFile.QuadPart = 0LL;
+      StandardInfo->AllocationSize.QuadPart = 0;
+      StandardInfo->EndOfFile.QuadPart = 0;
       StandardInfo->Directory = TRUE;
     }
   else

diff --git a/reactos/drivers/fs/vfat/flush.c b/reactos/drivers/fs/vfat/flush.c
index e9e999a..4945365 100644 (file)
--- a/reactos/drivers/fs/vfat/flush.c
+++ b/reactos/drivers/fs/vfat/flush.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/flush.c

diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/fs/vfat/fsctl.c
index adc33b5..b43f2e6 100644 (file)
--- a/reactos/drivers/fs/vfat/fsctl.c
+++ b/reactos/drivers/fs/vfat/fsctl.c
@@ -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 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
    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 @@ VfatMount (PVFAT_IRP_CONTEXT IrpContext)
 
    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 */

diff --git a/reactos/drivers/fs/vfat/iface.c b/reactos/drivers/fs/vfat/iface.c
index dd0cead..abdedbd 100644 (file)
--- a/reactos/drivers/fs/vfat/iface.c
+++ b/reactos/drivers/fs/vfat/iface.c
@@ -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 @@ DriverEntry(PDRIVER_OBJECT DriverObject,
    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;

diff --git a/reactos/drivers/fs/vfat/misc.c b/reactos/drivers/fs/vfat/misc.c
index 9b4ab00..5758301 100644 (file)
--- a/reactos/drivers/fs/vfat/misc.c
+++ b/reactos/drivers/fs/vfat/misc.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/misc.c

diff --git a/reactos/drivers/fs/vfat/rw.c b/reactos/drivers/fs/vfat/rw.c
index 751664f..407bd5a 100644 (file)
--- a/reactos/drivers/fs/vfat/rw.c
+++ b/reactos/drivers/fs/vfat/rw.c
@@ -1,6 +1,4 @@
-
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/rw.c

diff --git a/reactos/drivers/fs/vfat/shutdown.c b/reactos/drivers/fs/vfat/shutdown.c
index 3740523..d947236 100644 (file)
--- a/reactos/drivers/fs/vfat/shutdown.c
+++ b/reactos/drivers/fs/vfat/shutdown.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/shutdown.c

diff --git a/reactos/drivers/fs/vfat/string.c b/reactos/drivers/fs/vfat/string.c
index 3e6ea20..8a5b57f 100644 (file)
--- a/reactos/drivers/fs/vfat/string.c
+++ b/reactos/drivers/fs/vfat/string.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/string.c

diff --git a/reactos/drivers/fs/vfat/vfatfs.rc b/reactos/drivers/fs/vfat/vfatfs.rc
index ec37b77..0559ee6 100644 (file)
--- a/reactos/drivers/fs/vfat/vfatfs.rc
+++ b/reactos/drivers/fs/vfat/vfatfs.rc
@@ -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"

diff --git a/reactos/drivers/fs/vfat/volume.c b/reactos/drivers/fs/vfat/volume.c
index 9c4f78e..3a38e0a 100644 (file)
--- a/reactos/drivers/fs/vfat/volume.c
+++ b/reactos/drivers/fs/vfat/volume.c
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
  * FILE:             drivers/fs/vfat/volume.c