[VFATFS] Add it back to build on XBOX, with the name vfatfs.sys

Adapt some comments to new name.

CORE-16373

drivers/filesystems/CMakeLists.txt

@@ -2,7 +2,6 @@
 add_subdirectory(btrfs)
 add_subdirectory(cdfs)
 add_subdirectory(ext2)
-#add_subdirectory(fastfat)
 add_subdirectory(fastfat_new)
 add_subdirectory(fs_rec)
 add_subdirectory(msfs)
@@ -11,3 +10,4 @@ add_subdirectory(nfs)
 add_subdirectory(npfs)
 add_subdirectory(ntfs)
 add_subdirectory(udfs)
+add_subdirectory(vfatfs)

drivers/filesystems/fastfat/CMakeLists.txt

@@ -1,35 +0,0 @@
-
-list(APPEND SOURCE
-    blockdev.c
-    cleanup.c
-    close.c
-    create.c
-    dir.c
-    direntry.c
-    dirwr.c
-    ea.c
-    fat.c
-    fastio.c
-    fcb.c
-    finfo.c
-    flush.c
-    fsctl.c
-    iface.c
-    kdbg.c
-    misc.c
-    pnp.c
-    rw.c
-    shutdown.c
-    string.c
-    volume.c
-    vfat.h)
-
-if(KDBG)
-    add_definitions(-DKDBG)
-endif()
-add_library(fastfat MODULE ${SOURCE} vfatfs.rc)
-set_module_type(fastfat kernelmodedriver)
-target_link_libraries(fastfat ${PSEH_LIB})
-add_importlibs(fastfat ntoskrnl hal)
-add_pch(fastfat vfat.h SOURCE)
-add_cd_file(TARGET fastfat DESTINATION reactos/system32/drivers NO_CAB FOR all)

drivers/filesystems/vfatfs/CMakeLists.txt

@@ -0,0 +1,38 @@
+
+list(APPEND SOURCE
+    blockdev.c
+    cleanup.c
+    close.c
+    create.c
+    dir.c
+    direntry.c
+    dirwr.c
+    ea.c
+    fat.c
+    fastio.c
+    fcb.c
+    finfo.c
+    flush.c
+    fsctl.c
+    iface.c
+    kdbg.c
+    misc.c
+    pnp.c
+    rw.c
+    shutdown.c
+    string.c
+    volume.c
+    vfat.h)
+
+if(KDBG)
+    add_definitions(-DKDBG)
+endif()
+add_library(vfatfs MODULE ${SOURCE} vfatfs.rc)
+set_module_type(vfatfs kernelmodedriver)
+target_link_libraries(vfatfs ${PSEH_LIB})
+add_importlibs(vfatfs ntoskrnl hal)
+add_pch(vfatfs vfat.h SOURCE)
+if(SARCH STREQUAL "xbox")
+  add_cd_file(TARGET vfatfs DESTINATION reactos/system32/drivers NO_CAB FOR all)
+  add_registry_inf(vfatfs_reg.inf)
+endif()

drivers/filesystems/vfatfs/close.c

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
- * FILE:             drivers/filesystems/fastfat/close.c
+ * FILE:             drivers/filesystems/vfatfs/close.c
  * PURPOSE:          VFAT Filesystem
  * PROGRAMMER:       Jason Filby (jasonfilby@yahoo.com)
  *                   Pierre Schweitzer (pierre@reactos.org)

drivers/filesystems/vfatfs/create.c

@@ -18,7 +18,7 @@
  */
 /*
  * PROJECT:          ReactOS kernel
- * FILE:             drivers/filesystems/fastfat/create.c
+ * FILE:             drivers/filesystems/vfatfs/create.c
  * PURPOSE:          VFAT Filesystem
  * PROGRAMMER:       Jason Filby (jasonfilby@yahoo.com)
  *                   Pierre Schweitzer (pierre@reactos.org)

drivers/filesystems/vfatfs/dirwr.c

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
- * FILE:             drivers/filesystems/fastfat/dirwr.c
+ * FILE:             drivers/filesystems/vfatfs/dirwr.c
  * PURPOSE:          VFAT Filesystem : write in directory
  * PROGRAMMER:       Rex Jolliff (rex@lvcablemodem.com)
  *                   Herve Poussineau (reactos@poussine.freesurf.fr)

drivers/filesystems/vfatfs/fastio.c

@@ -1,5 +1,5 @@
 /*
- * FILE:             drivers/filesystems/fastfat/fastio.c
+ * FILE:             drivers/filesystems/vfatfs/fastio.c
  * PURPOSE:          Fast IO routines.
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel

drivers/filesystems/vfatfs/fat.c

@@ -1,8 +1,8 @@
 /*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
- * FILE:             drivers/filesystems/fastfat/fat.c
+ * FILE:             drivers/filesystems/vfatfs/fat.c
- * PURPOSE:          FastFAT Filesystem
+ * PURPOSE:          VFAT Filesystem
  * PROGRAMMER:       Jason Filby (jasonfilby@yahoo.com)
  *                   Pierre Schweitzer (pierre@reactos.org)
  *

drivers/filesystems/vfatfs/fcb.c

@@ -1,5 +1,5 @@
 /*
-* FILE:             drivers/filesystems/fastfat/fcb.c
+* FILE:             drivers/filesystems/vfatfs/fcb.c
 * PURPOSE:          Routines to manipulate FCBs.
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel

drivers/filesystems/vfatfs/finfo.c

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
- * FILE:             drivers/filesystems/fastfat/finfo.c
+ * FILE:             drivers/filesystems/vfatfs/finfo.c
  * PURPOSE:          VFAT Filesystem
  * PROGRAMMER:       Jason Filby (jasonfilby@yahoo.com)
  *                   Herve Poussineau (reactos@poussine.freesurf.fr)

drivers/filesystems/vfatfs/iface.c

@@ -154,7 +154,7 @@ DriverEntry(
         BOOLEAN Registered;
 
         Registered = KdRosRegisterCliCallback(vfatKdbgHandler);
-        DPRINT1("FastFAT KDBG extension registered: %s\n", (Registered ? "yes" : "no"));
+        DPRINT1("VFATFS KDBG extension registered: %s\n", (Registered ? "yes" : "no"));
     }
 #endif
 

drivers/filesystems/vfatfs/kdbg.c

@@ -1,5 +1,5 @@
 /*
-* FILE:             drivers/filesystems/fastfat/kdbg.c
+* FILE:             drivers/filesystems/vfatfs/kdbg.c
 * PURPOSE:          KDBG extension.
 * COPYRIGHT:        See COPYING in the top level directory
 * PROJECT:          ReactOS kernel

drivers/filesystems/vfatfs/misc.c

@@ -518,7 +518,7 @@ VfatCheckForDismount(
      * It seems to be related to the fact that the volume root directory as
      * well as auxiliary data stream(s) are still opened, and only these are
      * allowed to be opened at that moment. After analysis it appears that for
-     * the ReactOS' fastfat, this number is equal to "2".
+     * the ReactOS' vfatfs, this number is equal to "2".
      */
     UnCleanCount = 2;
 

drivers/filesystems/vfatfs/pnp.c

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
- * FILE:             drivers/filesystems/fastfat/pnp.c
+ * FILE:             drivers/filesystems/vfatfs/pnp.c
  * PURPOSE:          VFAT Filesystem
  * PROGRAMMER:       Pierre Schweitzer
  *

drivers/filesystems/vfatfs/rw.c

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
- * FILE:             drivers/filesystems/fastfat/rw.c
+ * FILE:             drivers/filesystems/vfatfs/rw.c
  * PURPOSE:          VFAT Filesystem
  * PROGRAMMER:       Jason Filby (jasonfilby@yahoo.com)
  *                   Pierre Schweitzer (pierre@reactos.org)

drivers/filesystems/vfatfs/vfat.h

@@ -1,5 +1,5 @@
-#ifndef _FASTFAT_PCH_
+#ifndef _VFATFS_PCH_
-#define _FASTFAT_PCH_
+#define _VFATFS_PCH_
 
 #include <ntifs.h>
 #include <ntdddisk.h>
@@ -1241,4 +1241,4 @@ NTSTATUS
 VfatSetVolumeInformation(
     PVFAT_IRP_CONTEXT IrpContext);
 
-#endif /* _FASTFAT_PCH_ */
+#endif /* _VFATFS_PCH_ */

drivers/filesystems/vfatfs/vfatfs_reg.inf

@@ -0,0 +1,7 @@
+; Virtual FATX filesystem driver
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","ErrorControl",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Group",0x00000000,"Boot File System"
+HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","ImagePath",0x00020000,"system32\drivers\vfatfs.sys"
+HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Start",0x00010001,0x00000003
+HKLM,"SYSTEM\CurrentControlSet\Services\vfatfs","Type",0x00010001,0x00000002