mirror of
https://github.com/reactos/reactos.git
synced 2024-10-07 01:44:21 +00:00
Allow compilation of fs_rec driver with MSVC
svn path=/trunk/; revision=17641
This commit is contained in:
parent
a650cc6d77
commit
e7ad48c2a3
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: services/fs/fs_rec/blockdev.c
|
* FILE: services/fs/fs_rec/blockdev.c
|
||||||
|
@ -27,8 +26,6 @@
|
||||||
|
|
||||||
/* INCLUDES *****************************************************************/
|
/* INCLUDES *****************************************************************/
|
||||||
|
|
||||||
#include <ddk/ntddk.h>
|
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: services/fs/fs_rec/cdfs.c
|
* FILE: services/fs/fs_rec/cdfs.c
|
||||||
|
@ -27,10 +26,6 @@
|
||||||
|
|
||||||
/* INCLUDES *****************************************************************/
|
/* INCLUDES *****************************************************************/
|
||||||
|
|
||||||
#include <ntifs.h>
|
|
||||||
#include <ntdddisk.h>
|
|
||||||
#include <ntddcdrm.h>
|
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: drivers/fs/fs_rec/vfat.c
|
* FILE: drivers/fs/fs_rec/vfat.c
|
||||||
|
@ -27,9 +26,6 @@
|
||||||
|
|
||||||
/* INCLUDES *****************************************************************/
|
/* INCLUDES *****************************************************************/
|
||||||
|
|
||||||
#include <ntifs.h>
|
|
||||||
#include <ntdddisk.h>
|
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
@ -46,7 +42,7 @@ FsRecIsFatVolume(IN PDEVICE_OBJECT DeviceObject)
|
||||||
DISK_GEOMETRY DiskGeometry;
|
DISK_GEOMETRY DiskGeometry;
|
||||||
ULONG Size;
|
ULONG Size;
|
||||||
struct _BootSector* Boot;
|
struct _BootSector* Boot;
|
||||||
BOOL RecognizedFS = FALSE;
|
BOOLEAN RecognizedFS = FALSE;
|
||||||
Size = sizeof(DISK_GEOMETRY);
|
Size = sizeof(DISK_GEOMETRY);
|
||||||
|
|
||||||
Status = FsRecDeviceIoControl(DeviceObject,
|
Status = FsRecDeviceIoControl(DeviceObject,
|
||||||
|
@ -90,8 +86,8 @@ FsRecIsFatVolume(IN PDEVICE_OBJECT DeviceObject)
|
||||||
}
|
}
|
||||||
else if (DiskGeometry.MediaType == RemovableMedia &&
|
else if (DiskGeometry.MediaType == RemovableMedia &&
|
||||||
PartitionInfo.PartitionNumber > 0 &&
|
PartitionInfo.PartitionNumber > 0 &&
|
||||||
PartitionInfo.StartingOffset.QuadPart == 0LL &&
|
PartitionInfo.StartingOffset.QuadPart == 0 &&
|
||||||
PartitionInfo.PartitionLength.QuadPart > 0LL)
|
PartitionInfo.PartitionLength.QuadPart > 0)
|
||||||
{
|
{
|
||||||
/* This is possible a removable media formated as super floppy */
|
/* This is possible a removable media formated as super floppy */
|
||||||
RecognizedFS = TRUE;
|
RecognizedFS = TRUE;
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: drivers/fs/fs_rec/fs_rec.c
|
* FILE: drivers/fs/fs_rec/fs_rec.c
|
||||||
|
@ -27,8 +26,6 @@
|
||||||
|
|
||||||
/* INCLUDES *****************************************************************/
|
/* INCLUDES *****************************************************************/
|
||||||
|
|
||||||
#include <ntifs.h>
|
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: drivers/fs/fs_rec/fs_rec.h
|
* FILE: drivers/fs/fs_rec/fs_rec.h
|
||||||
|
@ -25,6 +24,13 @@
|
||||||
* PROGRAMMER: Eric Kohl
|
* PROGRAMMER: Eric Kohl
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <ntifs.h>
|
||||||
|
#include <ntdddisk.h>
|
||||||
|
#include <ntddcdrm.h>
|
||||||
|
|
||||||
|
#ifdef _MSC_VER
|
||||||
|
#define STDCALL
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Filesystem types (add new filesystems here)*/
|
/* Filesystem types (add new filesystems here)*/
|
||||||
|
|
||||||
|
@ -40,6 +46,7 @@ typedef struct _DEVICE_EXTENSION
|
||||||
ULONG FsType;
|
ULONG FsType;
|
||||||
} DEVICE_EXTENSION, *PDEVICE_EXTENSION;
|
} DEVICE_EXTENSION, *PDEVICE_EXTENSION;
|
||||||
|
|
||||||
|
#include <pshpack1.h>
|
||||||
struct _BootSector
|
struct _BootSector
|
||||||
{
|
{
|
||||||
unsigned char magic0, res0, magic1;
|
unsigned char magic0, res0, magic1;
|
||||||
|
@ -57,7 +64,8 @@ struct _BootSector
|
||||||
unsigned char VolumeLabel[11], SysType[8];
|
unsigned char VolumeLabel[11], SysType[8];
|
||||||
unsigned char Res2[448];
|
unsigned char Res2[448];
|
||||||
unsigned short Signatur1;
|
unsigned short Signatur1;
|
||||||
} __attribute__((packed));
|
};
|
||||||
|
#include <poppack.h>
|
||||||
|
|
||||||
/* blockdev.c */
|
/* blockdev.c */
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
/* $Id$ */
|
|
||||||
|
|
||||||
#define REACTOS_VERSION_DLL
|
#define REACTOS_VERSION_DLL
|
||||||
#define REACTOS_STR_FILE_DESCRIPTION "Filesystem recognizer driver\0"
|
#define REACTOS_STR_FILE_DESCRIPTION "Filesystem recognizer driver\0"
|
||||||
#define REACTOS_STR_INTERNAL_NAME "fs_rec\0"
|
#define REACTOS_STR_INTERNAL_NAME "fs_rec\0"
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: drivers/fs/fs_rec/ntfs.c
|
* FILE: drivers/fs/fs_rec/ntfs.c
|
||||||
|
@ -27,9 +26,6 @@
|
||||||
|
|
||||||
/* INCLUDES *****************************************************************/
|
/* INCLUDES *****************************************************************/
|
||||||
|
|
||||||
#include <ntifs.h>
|
|
||||||
#include <ntdddisk.h>
|
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id$
|
/*
|
||||||
*
|
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
* FILE: drivers/fs/fs_rec/udfs.c
|
* FILE: drivers/fs/fs_rec/udfs.c
|
||||||
|
@ -27,10 +26,6 @@
|
||||||
|
|
||||||
/* INCLUDES *****************************************************************/
|
/* INCLUDES *****************************************************************/
|
||||||
|
|
||||||
#include <ntifs.h>
|
|
||||||
#include <ntdddisk.h>
|
|
||||||
#include <ntddcdrm.h>
|
|
||||||
|
|
||||||
#define NDEBUG
|
#define NDEBUG
|
||||||
#include <debug.h>
|
#include <debug.h>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue