- Build cdfs, ntfs, vfatfs with PCH

- Remove core.h and disable diskdump driver (never worked, was told it's an abandonned, obsolete driver and I tend to agree.)
 - Rename ROS ntifs.h to ccros.h and moved to root include directory (where all the "temporary" includes are for now).
 - Moved ROS class2.h to drivers/storage/include, per my own and other's recommendation, to make it clear that it's a ros-intenral file only useful for low-level storage drivers (no 3rd party driver needs this, which is why MS doesn't export it).

svn path=/trunk/; revision=16656
This commit is contained in:
Alex Ionescu 2005-07-20 02:52:52 +00:00
parent 832b1aa035
commit f7270f23c4
42 changed files with 100 additions and 176 deletions

View file

@ -28,15 +28,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/
PCDFS_GLOBAL_DATA CdfsGlobalData;

View file

@ -1,7 +1,10 @@
#ifndef CDFS_H
#define CDFS_H
#include <ddk/ntddk.h>
#include <ddk/ntifs.h>
#include <ntddcdrm.h>
#include <ccros.h>
#define USE_ROS_CC_AND_FS

View file

@ -17,4 +17,5 @@
<file>rw.c</file>
<file>volinfo.c</file>
<file>cdfs.rc</file>
<pch>cdfs.h</pch>
</module>

View file

@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
static NTSTATUS

View file

@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
NTSTATUS

View file

@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
NTSTATUS

View file

@ -28,15 +28,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include <ntddcdrm.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
static NTSTATUS

View file

@ -29,14 +29,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* DEFINES ******************************************************************/
/* FUNCTIONS ****************************************************************/
#define ROUND_DOWN(N, S) (((N) / (S)) * (S))
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))

View file

@ -28,15 +28,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* MACROS *******************************************************************/
/* FUNCTIONS ****************************************************************/
#define TAG_FCB TAG('I', 'F', 'C', 'B')

View file

@ -29,14 +29,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
/*

View file

@ -28,15 +28,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include <ntddcdrm.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
static inline

View file

@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
VOID

View file

@ -28,15 +28,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* GLOBALS *******************************************************************/
/* FUNCTIONS ****************************************************************/
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))

View file

@ -28,14 +28,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "cdfs.h"
#define NDEBUG
#include <debug.h>
#include "cdfs.h"
/* FUNCTIONS ****************************************************************/
static NTSTATUS

View file

@ -28,13 +28,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/

View file

@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/

View file

@ -28,12 +28,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/

View file

@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/

View file

@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/

View file

@ -32,6 +32,8 @@
#define NDEBUG
#include <debug.h>
/* GLOBALS *****************************************************************/
/* MACROS *******************************************************************/

View file

@ -27,12 +27,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/

View file

@ -29,11 +29,12 @@
/* INCLUDES *****************************************************************/
#include "ntfs.h"
#include <ntdddisk.h>
//#define NDEBUG
#define NDEBUG
#include <debug.h>
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/
static NTSTATUS

View file

@ -28,15 +28,12 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
//#define __min(a,b) (((a) < (b)) ? (a) : (b))
/* GLOBALS *****************************************************************/
/* FUNCTIONS ****************************************************************/

View file

@ -27,14 +27,11 @@
/* INCLUDES *****************************************************************/
#include <ddk/ntddk.h>
#include "ntfs.h"
#define NDEBUG
#include <debug.h>
#include "ntfs.h"
/* GLOBALS *****************************************************************/
PNTFS_GLOBAL_DATA NtfsGlobalData;

View file

@ -1,7 +1,10 @@
#ifndef NTFS_H
#define NTFS_H
#include <ddk/ntddk.h>
#include <ddk/ntifs.h>
#include <ddk/ntdddisk.h>
#include <ccros.h>
#define USE_ROS_CC_AND_FS

View file

@ -17,4 +17,5 @@
<file>rw.c</file>
<file>volinfo.c</file>
<file>ntfs.rc</file>
<pch>ntfs.h</pch>
</module>

View file

@ -17,8 +17,6 @@
/* GLOBALS ******************************************************************/
#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
#define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
(pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE)

View file

@ -22,8 +22,6 @@
#define TAG_FCB TAG('V', 'F', 'C', 'B')
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
/* -------------------------------------------------------- PUBLICS */
ULONG vfatNameHash(ULONG hash, PUNICODE_STRING NameU)

View file

@ -34,6 +34,7 @@
#define CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
(pDeviceExt)->FatInfo.BytesPerCluster : PAGE_SIZE)
#define VOLUME_IS_DIRTY 0x00000001
static NTSTATUS
VfatHasFileSystem(PDEVICE_OBJECT DeviceToMount,

View file

@ -2,32 +2,14 @@
#include <ddk/ntifs.h>
#include <ddk/ntdddisk.h>
#include <ndk/ntndk.h>
#include <reactos/helper.h>
#include <ccros.h>
#include <limits.h>
#include <debug.h>
#define USE_ROS_CC_AND_FS
/* FIXME */
#ifdef __USE_W32API
NTSTATUS NTAPI RtlOemStringToUnicodeString(PUNICODE_STRING, CONST STRING *, BOOLEAN);
NTSTATUS NTAPI RtlDowncaseUnicodeString(PUNICODE_STRING, PCUNICODE_STRING, BOOLEAN);
NTSTATUS NTAPI RtlUnicodeStringToOemString(POEM_STRING, PCUNICODE_STRING, BOOLEAN);
#undef DeleteFile /* FIXME */
#define VOLUME_IS_DIRTY 0x00000001 /* FIXME */
#endif
#ifdef USE_ROS_CC_AND_FS
#ifndef __INCLUDE_DDK_NTIFS_H
NTSTATUS STDCALL CcRosInitializeFileCache(PFILE_OBJECT, ULONG);
NTSTATUS STDCALL CcRosReleaseFileCache(PFILE_OBJECT);
#define FSCTL_ROS_QUERY_LCN_MAPPING CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
typedef struct _ROS_QUERY_LCN_MAPPING { LARGE_INTEGER LcnDiskOffset; } ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
#endif
#endif
#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S))
#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
#include <pshpack1.h>
struct _BootSector
{

View file

@ -26,4 +26,5 @@
<file>string.c</file>
<file>volume.c</file>
<file>vfatfs.rc</file>
<pch>vfat.h</pch>
</module>

View file

@ -38,7 +38,7 @@
#include <ddk/ntddscsi.h>
#include <ddk/ntdddisk.h>
#include <ddk/ntddcdrm.h>
#include <ddk/class2.h>
#include <include/class2.h>
#include <stdio.h>
#define NDEBUG

View file

@ -4,6 +4,7 @@
<library>ntoskrnl</library>
<library>hal</library>
<library>class2</library>
<include base="cdrom">..</include>
<file>cdrom.c</file>
<file>cdrom.rc</file>
</module>

View file

@ -35,7 +35,7 @@
#include <ddk/ntddk.h>
#include <ddk/ntdddisk.h>
#include <ddk/scsi.h>
#include <ddk/class2.h>
#include <include/class2.h>
#include <stdio.h>
#define NDEBUG

View file

@ -4,6 +4,7 @@
<importlibrary definition="class2.def" />
<library>ntoskrnl</library>
<library>hal</library>
<include base="class2">..</include>
<file>class2.c</file>
<file>class2.rc</file>
</module>

View file

@ -10,9 +10,6 @@
<directory name="disk">
<xi:include href="disk/disk.xml" />
</directory>
<directory name="diskdump">
<xi:include href="diskdump/diskdump.xml" />
</directory>
<directory name="floppy">
<xi:include href="floppy/floppy.xml" />
</directory>

View file

@ -30,8 +30,8 @@
#include <ddk/ntddk.h>
#include <ddk/ntdddisk.h>
#include <ddk/scsi.h>
#include <ddk/class2.h>
#include <ddk/ntddscsi.h>
#include <include/class2.h>
#include <stdio.h>
#define NDEBUG

View file

@ -5,6 +5,7 @@
<library>ntoskrnl</library>
<library>hal</library>
<library>class2</library>
<include base="disk">..</include>
<file>disk.c</file>
<file>disk.rc</file>
</module>

View file

@ -1,20 +1,18 @@
#ifndef __INCLUDE_DDK_NTIFS_H
#define __INCLUDE_DDK_NTIFS_H
#include_next <ddk/ntifs.h>
NTSTATUS STDCALL
CcRosInitializeFileCache (PFILE_OBJECT FileObject,
ULONG CacheSegmentSize);
NTSTATUS STDCALL
CcRosReleaseFileCache (PFILE_OBJECT FileObject);
#define FSCTL_ROS_QUERY_LCN_MAPPING \
CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
typedef struct _ROS_QUERY_LCN_MAPPING
{
LARGE_INTEGER LcnDiskOffset;
} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
#endif /* __INCLUDE_DDK_NTIFS_H */
#ifndef __INCLUDE_DDK_NTIFS_H
#define __INCLUDE_DDK_NTIFS_H
NTSTATUS STDCALL
CcRosInitializeFileCache (PFILE_OBJECT FileObject,
ULONG CacheSegmentSize);
NTSTATUS STDCALL
CcRosReleaseFileCache (PFILE_OBJECT FileObject);
#define FSCTL_ROS_QUERY_LCN_MAPPING \
CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
typedef struct _ROS_QUERY_LCN_MAPPING
{
LARGE_INTEGER LcnDiskOffset;
} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
#endif /* __INCLUDE_DDK_NTIFS_H */

View file

@ -1,30 +0,0 @@
#ifndef __INCLUDE_NAPI_CORE_H
#define __INCLUDE_NAPI_CORE_H
#define MM_CORE_DUMP_HEADER_MAGIC (0xdeafbead)
#define MM_CORE_DUMP_HEADER_VERSION (0x1)
#include <ddk/ntddscsi.h>
#include <ndk/ketypes.h>
typedef struct _MM_CORE_DUMP_HEADER
{
ULONG Magic;
ULONG Version;
ULONG Type;
KTRAP_FRAME TrapFrame;
ULONG BugCheckCode;
ULONG BugCheckParameters[4];
PVOID FaultingStackBase;
ULONG FaultingStackSize;
ULONG PhysicalMemorySize;
} MM_CORE_DUMP_HEADER, *PMM_CORE_DUMP_HEADER;
typedef struct MM_CORE_DUMP_FUNCTIONS
{
NTSTATUS (STDCALL *DumpPrepare)(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);
NTSTATUS (STDCALL *DumpInit)(VOID);
NTSTATUS (STDCALL *DumpWrite)(LARGE_INTEGER Address, PMDL Mdl);
NTSTATUS (STDCALL *DumpFinish)(VOID);
} MM_CORE_DUMP_FUNCTIONS, *PMM_CORE_DUMP_FUNCTIONS;
#endif /* __INCLUDE_NAPI_CORE_H */

View file

@ -697,14 +697,6 @@ RtlUpcaseUnicodeStringToCountedOemString(
IN BOOLEAN AllocateDestinationString
);
NTSTATUS
STDCALL
RtlUpcaseUnicodeString(
PUNICODE_STRING DestinationString,
PCUNICODE_STRING SourceString,
BOOLEAN AllocateDestinationString
);
NTSTATUS
STDCALL
RtlUnicodeStringToOemString(
@ -856,6 +848,14 @@ RtlCreateUnicodeString(
PCWSTR SourceString
);
NTSTATUS
STDCALL
RtlDowncaseUnicodeString(
IN OUT PUNICODE_STRING UniDest,
IN PUNICODE_STRING UniSource,
IN BOOLEAN AllocateDestinationString
);
BOOLEAN
STDCALL
RtlEqualUnicodeString(
@ -868,11 +868,20 @@ VOID
STDCALL
RtlFreeUnicodeString(IN PUNICODE_STRING UnicodeString);
NTSTATUS
STDCALL
RtlHashUnicodeString(
IN CONST UNICODE_STRING *String,
IN BOOLEAN CaseInSensitive,
IN ULONG HashAlgorithm,
OUT PULONG HashValue
);
VOID
STDCALL
RtlInitUnicodeString(
IN OUT PUNICODE_STRING DestinationString,
IN PCWSTR SourceString);
IN OUT PUNICODE_STRING DestinationString,
IN PCWSTR SourceString);
ULONG
STDCALL
@ -890,6 +899,14 @@ RtlPrefixUnicodeString(
BOOLEAN CaseInsensitive
);
NTSTATUS
STDCALL
RtlUpcaseUnicodeString(
PUNICODE_STRING DestinationString,
PCUNICODE_STRING SourceString,
BOOLEAN AllocateDestinationString
);
NTSTATUS
STDCALL
RtlUnicodeStringToInteger(
@ -898,14 +915,6 @@ RtlUnicodeStringToInteger(
PULONG Value
);
NTSTATUS
STDCALL
RtlHashUnicodeString(
IN CONST UNICODE_STRING *String,
IN BOOLEAN CaseInSensitive,
IN ULONG HashAlgorithm,
OUT PULONG HashValue);
/*
* Ansi String Functions
*/