Allow compilation of fs_rec driver with MSVC

svn path=/trunk/; revision=17641

diff --git a/reactos/drivers/fs/fs_rec/blockdev.c b/reactos/drivers/fs/fs_rec/blockdev.c
index 980046a..17a9769 100644 (file)
--- a/reactos/drivers/fs/fs_rec/blockdev.c
+++ b/reactos/drivers/fs/fs_rec/blockdev.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:             services/fs/fs_rec/blockdev.c
@@ -27,8 +26,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/fs/fs_rec/cdfs.c b/reactos/drivers/fs/fs_rec/cdfs.c
index e2a0553..e7db97b 100644 (file)
--- a/reactos/drivers/fs/fs_rec/cdfs.c
+++ b/reactos/drivers/fs/fs_rec/cdfs.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:             services/fs/fs_rec/cdfs.c
@@ -27,10 +26,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntifs.h>
-#include <ntdddisk.h>
-#include <ntddcdrm.h>
-
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/fs/fs_rec/fat.c b/reactos/drivers/fs/fs_rec/fat.c
index ae51139..7eef61b 100644 (file)
--- a/reactos/drivers/fs/fs_rec/fat.c
+++ b/reactos/drivers/fs/fs_rec/fat.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/fs_rec/vfat.c
@@ -27,9 +26,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntifs.h>
-#include <ntdddisk.h>
-
 #define NDEBUG
 #include <debug.h>
 
@@ -46,7 +42,7 @@ FsRecIsFatVolume(IN PDEVICE_OBJECT DeviceObject)
    DISK_GEOMETRY DiskGeometry;
    ULONG Size;
    struct _BootSector* Boot;
-   BOOL RecognizedFS = FALSE;
+   BOOLEAN RecognizedFS = FALSE;
    Size = sizeof(DISK_GEOMETRY);
 
    Status = FsRecDeviceIoControl(DeviceObject,
@@ -90,8 +86,8 @@ FsRecIsFatVolume(IN PDEVICE_OBJECT DeviceObject)
       }
       else if (DiskGeometry.MediaType == RemovableMedia &&
                PartitionInfo.PartitionNumber > 0 &&
-               PartitionInfo.StartingOffset.QuadPart == 0LL &&
-               PartitionInfo.PartitionLength.QuadPart > 0LL)
+               PartitionInfo.StartingOffset.QuadPart == 0 &&
+               PartitionInfo.PartitionLength.QuadPart > 0)
       {
          /* This is possible a removable media formated as super floppy */
          RecognizedFS = TRUE;

diff --git a/reactos/drivers/fs/fs_rec/fs_rec.c b/reactos/drivers/fs/fs_rec/fs_rec.c
index f866300..9808c07 100644 (file)
--- a/reactos/drivers/fs/fs_rec/fs_rec.c
+++ b/reactos/drivers/fs/fs_rec/fs_rec.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/fs_rec/fs_rec.c
@@ -27,8 +26,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntifs.h>
-
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/fs/fs_rec/fs_rec.h b/reactos/drivers/fs/fs_rec/fs_rec.h
index 31e750b..1c00f34 100644 (file)
--- a/reactos/drivers/fs/fs_rec/fs_rec.h
+++ b/reactos/drivers/fs/fs_rec/fs_rec.h
@@ -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/fs_rec/fs_rec.h
@@ -25,6 +24,13 @@
  * PROGRAMMER:       Eric Kohl
  */
 
+#include <ntifs.h>
+#include <ntdddisk.h>
+#include <ntddcdrm.h>
+
+#ifdef _MSC_VER
+#define STDCALL
+#endif
 
 /* Filesystem types (add new filesystems here)*/
 
@@ -40,6 +46,7 @@ typedef struct _DEVICE_EXTENSION
   ULONG FsType;
 } DEVICE_EXTENSION, *PDEVICE_EXTENSION;
 
+#include <pshpack1.h>
 struct _BootSector
 {
   unsigned char  magic0, res0, magic1;
@@ -57,7 +64,8 @@ struct _BootSector
   unsigned char  VolumeLabel[11], SysType[8];
   unsigned char  Res2[448];
   unsigned short Signatur1;
-} __attribute__((packed));
+};
+#include <poppack.h>
 
 /* blockdev.c */
 

diff --git a/reactos/drivers/fs/fs_rec/fs_rec.rc b/reactos/drivers/fs/fs_rec/fs_rec.rc
index f8da7dc..f73adff 100644 (file)
--- a/reactos/drivers/fs/fs_rec/fs_rec.rc
+++ b/reactos/drivers/fs/fs_rec/fs_rec.rc
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 #define REACTOS_VERSION_DLL
 #define REACTOS_STR_FILE_DESCRIPTION   "Filesystem recognizer driver\0"
 #define REACTOS_STR_INTERNAL_NAME      "fs_rec\0"

diff --git a/reactos/drivers/fs/fs_rec/fs_rec.xml b/reactos/drivers/fs/fs_rec/fs_rec.xml
index 8d62383..30f2a1b 100644 (file)
--- a/reactos/drivers/fs/fs_rec/fs_rec.xml
+++ b/reactos/drivers/fs/fs_rec/fs_rec.xml
@@ -1,6 +1,6 @@
 <module name="fs_rec" type="kernelmodedriver" installbase="system32/drivers" installname="fs_rec.sys">
        <include base="fs_rec">.</include>
-        <define name="__USE_W32API" />
+       <define name="__USE_W32API" />
        <library>ntoskrnl</library>
        <library>hal</library>
        <file>blockdev.c</file>

diff --git a/reactos/drivers/fs/fs_rec/ntfs.c b/reactos/drivers/fs/fs_rec/ntfs.c
index 4cb3cd9..ccfdf07 100644 (file)
--- a/reactos/drivers/fs/fs_rec/ntfs.c
+++ b/reactos/drivers/fs/fs_rec/ntfs.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/fs_rec/ntfs.c
@@ -27,9 +26,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntifs.h>
-#include <ntdddisk.h>
-
 #define NDEBUG
 #include <debug.h>
 

diff --git a/reactos/drivers/fs/fs_rec/udfs.c b/reactos/drivers/fs/fs_rec/udfs.c
index 371b1bc..368801c 100644 (file)
--- a/reactos/drivers/fs/fs_rec/udfs.c
+++ b/reactos/drivers/fs/fs_rec/udfs.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/fs_rec/udfs.c
@@ -27,10 +26,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ntifs.h>
-#include <ntdddisk.h>
-#include <ntddcdrm.h>
-
 #define NDEBUG
 #include <debug.h>