[FASTFAT]

* Do not include debug.h into the main header.

svn path=/trunk/; revision=61295

diff --git a/reactos/drivers/filesystems/fastfat/blockdev.c b/reactos/drivers/filesystems/fastfat/blockdev.c
index 796834c..419390f 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/blockdev.c
+++ b/reactos/drivers/filesystems/fastfat/blockdev.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ***************************************************************/
 
 static IO_COMPLETION_ROUTINE VfatReadWritePartialCompletion;
 /* FUNCTIONS ***************************************************************/
 
 static IO_COMPLETION_ROUTINE VfatReadWritePartialCompletion;

diff --git a/reactos/drivers/filesystems/fastfat/cleanup.c b/reactos/drivers/filesystems/fastfat/cleanup.c
index 97db29d..4887f9d 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/cleanup.c
+++ b/reactos/drivers/filesystems/fastfat/cleanup.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 /*
 /* FUNCTIONS ****************************************************************/
 
 /*

diff --git a/reactos/drivers/filesystems/fastfat/close.c b/reactos/drivers/filesystems/fastfat/close.c
index 5776dd0..78f016f 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/close.c
+++ b/reactos/drivers/filesystems/fastfat/close.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 /*
 /* FUNCTIONS ****************************************************************/
 
 /*

diff --git a/reactos/drivers/filesystems/fastfat/create.c b/reactos/drivers/filesystems/fastfat/create.c
index e3d026c..fbd5231 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/create.c
+++ b/reactos/drivers/filesystems/fastfat/create.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS *****************************************************************/
 
 VOID
 /* FUNCTIONS *****************************************************************/
 
 VOID

diff --git a/reactos/drivers/filesystems/fastfat/dir.c b/reactos/drivers/filesystems/fastfat/dir.c
index 0f218ec..2b5d8f1 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/dir.c
+++ b/reactos/drivers/filesystems/fastfat/dir.c
@@ -10,9 +10,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 /* Function like DosDateTimeToFileTime */
 /* FUNCTIONS ****************************************************************/
 
 /* Function like DosDateTimeToFileTime */

diff --git a/reactos/drivers/filesystems/fastfat/direntry.c b/reactos/drivers/filesystems/fastfat/direntry.c
index 5d85b0d..336f014 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/direntry.c
+++ b/reactos/drivers/filesystems/fastfat/direntry.c
@@ -10,9 +10,11 @@
 
 /*  -------------------------------------------------------  INCLUDES  */
 
 
 /*  -------------------------------------------------------  INCLUDES  */
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 ULONG
 vfatDirEntryGetFirstCluster(
     PDEVICE_EXTENSION pDeviceExt,
 ULONG
 vfatDirEntryGetFirstCluster(
     PDEVICE_EXTENSION pDeviceExt,

diff --git a/reactos/drivers/filesystems/fastfat/dirwr.c b/reactos/drivers/filesystems/fastfat/dirwr.c
index 7e5a91b..1444665 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/dirwr.c
+++ b/reactos/drivers/filesystems/fastfat/dirwr.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /*
  * update an existing FAT entry
  */
 /*
  * update an existing FAT entry
  */

diff --git a/reactos/drivers/filesystems/fastfat/ea.c b/reactos/drivers/filesystems/fastfat/ea.c
index 7a5a1b2..d2b92a4 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/ea.c
+++ b/reactos/drivers/filesystems/fastfat/ea.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS
 /* FUNCTIONS *****************************************************************/
 
 NTSTATUS

diff --git a/reactos/drivers/filesystems/fastfat/fastio.c b/reactos/drivers/filesystems/fastfat/fastio.c
index b2d3946..4a6e148 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/fastio.c
+++ b/reactos/drivers/filesystems/fastfat/fastio.c
@@ -6,9 +6,11 @@
  * PROGRAMMER:       Herve Poussineau (hpoussin@reactos.org)
  */
 
  * PROGRAMMER:       Herve Poussineau (hpoussin@reactos.org)
  */
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 static FAST_IO_CHECK_IF_POSSIBLE VfatFastIoCheckIfPossible;
 
 static
 static FAST_IO_CHECK_IF_POSSIBLE VfatFastIoCheckIfPossible;
 
 static

diff --git a/reactos/drivers/filesystems/fastfat/fat.c b/reactos/drivers/filesystems/fastfat/fat.c
index 112df04..a079f25 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/fat.c
+++ b/reactos/drivers/filesystems/fastfat/fat.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* GLOBALS ******************************************************************/
 
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
 /* GLOBALS ******************************************************************/
 
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \

diff --git a/reactos/drivers/filesystems/fastfat/fcb.c b/reactos/drivers/filesystems/fastfat/fcb.c
index 7c8e0e6..55bb609 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/fcb.c
+++ b/reactos/drivers/filesystems/fastfat/fcb.c
@@ -10,13 +10,15 @@
 
 /*  -------------------------------------------------------  INCLUDES  */
 
 
 /*  -------------------------------------------------------  INCLUDES  */
 

+#include "vfat.h"
+
+#define NDEBUG
+#include <debug.h>
+

 #ifdef __GNUC__
 #include <wctype.h> /* towlower prototype */
 #endif
 
 #ifdef __GNUC__
 #include <wctype.h> /* towlower prototype */
 #endif
 

-#define NDEBUG
-#include "vfat.h"
-

 /*  --------------------------------------------------------  DEFINES  */
 
 #define TAG_FCB 'BCFV'
 /*  --------------------------------------------------------  DEFINES  */
 
 #define TAG_FCB 'BCFV'

diff --git a/reactos/drivers/filesystems/fastfat/finfo.c b/reactos/drivers/filesystems/fastfat/finfo.c
index 1a7a53a..d0db178 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/finfo.c
+++ b/reactos/drivers/filesystems/fastfat/finfo.c
@@ -10,9 +10,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* GLOBALS ******************************************************************/
 
 const char* FileInformationClassNames[] =
 /* GLOBALS ******************************************************************/
 
 const char* FileInformationClassNames[] =

diff --git a/reactos/drivers/filesystems/fastfat/flush.c b/reactos/drivers/filesystems/fastfat/flush.c
index 97ed3b0..96d6353 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/flush.c
+++ b/reactos/drivers/filesystems/fastfat/flush.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 static
 /* FUNCTIONS ****************************************************************/
 
 static

diff --git a/reactos/drivers/filesystems/fastfat/fsctl.c b/reactos/drivers/filesystems/fastfat/fsctl.c
index efc4bec..24feadd 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/fsctl.c
+++ b/reactos/drivers/filesystems/fastfat/fsctl.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \
 /* FUNCTIONS ****************************************************************/
 
 #define  CACHEPAGESIZE(pDeviceExt) ((pDeviceExt)->FatInfo.BytesPerCluster > PAGE_SIZE ? \

diff --git a/reactos/drivers/filesystems/fastfat/iface.c b/reactos/drivers/filesystems/fastfat/iface.c
index f9ed3a6..03ddfe8 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/iface.c
+++ b/reactos/drivers/filesystems/fastfat/iface.c
@@ -25,9 +25,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* GLOBALS *****************************************************************/
 
 PVFAT_GLOBAL_DATA VfatGlobalData;
 /* GLOBALS *****************************************************************/
 
 PVFAT_GLOBAL_DATA VfatGlobalData;

diff --git a/reactos/drivers/filesystems/fastfat/misc.c b/reactos/drivers/filesystems/fastfat/misc.c
index 0d678f8..53edd8b 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/misc.c
+++ b/reactos/drivers/filesystems/fastfat/misc.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* GLOBALS ******************************************************************/
 
 const char* MajorFunctionNames[] =
 /* GLOBALS ******************************************************************/
 
 const char* MajorFunctionNames[] =

diff --git a/reactos/drivers/filesystems/fastfat/pnp.c b/reactos/drivers/filesystems/fastfat/pnp.c
index 2980238..255350d 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/pnp.c
+++ b/reactos/drivers/filesystems/fastfat/pnp.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 NTSTATUS
 /* FUNCTIONS ****************************************************************/
 
 NTSTATUS

diff --git a/reactos/drivers/filesystems/fastfat/rw.c b/reactos/drivers/filesystems/fastfat/rw.c
index 43bcadd..1477dd7 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/rw.c
+++ b/reactos/drivers/filesystems/fastfat/rw.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /*
  * Uncomment to enable strict verification of cluster/offset pair
  * caching. If this option is enabled you lose all the benefits of
 /*
  * Uncomment to enable strict verification of cluster/offset pair
  * caching. If this option is enabled you lose all the benefits of

diff --git a/reactos/drivers/filesystems/fastfat/shutdown.c b/reactos/drivers/filesystems/fastfat/shutdown.c
index 3bd5698..e2e6be5 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/shutdown.c
+++ b/reactos/drivers/filesystems/fastfat/shutdown.c
@@ -8,9 +8,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 static
 /* FUNCTIONS ****************************************************************/
 
 static

diff --git a/reactos/drivers/filesystems/fastfat/string.c b/reactos/drivers/filesystems/fastfat/string.c
index 7e05d00..6a8f65a 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/string.c
+++ b/reactos/drivers/filesystems/fastfat/string.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 const WCHAR *long_illegals = L"\"*\\<>/?:|";
 /* FUNCTIONS ****************************************************************/
 
 const WCHAR *long_illegals = L"\"*\\<>/?:|";

diff --git a/reactos/drivers/filesystems/fastfat/vfat.h b/reactos/drivers/filesystems/fastfat/vfat.h
index 33b225f..f627ff6 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/vfat.h
+++ b/reactos/drivers/filesystems/fastfat/vfat.h
@@ -1,7 +1,6 @@
 #include <ntifs.h>
 #include <bugcodes.h>
 #include <ntdddisk.h>
 #include <ntifs.h>
 #include <bugcodes.h>
 #include <ntdddisk.h>

-#include <debug.h>

 #include <dos.h>
 
 #define USE_ROS_CC_AND_FS
 #include <dos.h>
 
 #define USE_ROS_CC_AND_FS

diff --git a/reactos/drivers/filesystems/fastfat/volume.c b/reactos/drivers/filesystems/fastfat/volume.c
index c72fc3f..55f3d54 100644 (file)
--- a/reactos/drivers/filesystems/fastfat/volume.c
+++ b/reactos/drivers/filesystems/fastfat/volume.c
@@ -9,9 +9,11 @@
 
 /* INCLUDES *****************************************************************/
 
 
 /* INCLUDES *****************************************************************/
 

-#define NDEBUG

 #include "vfat.h"
 
 #include "vfat.h"
 

+#define NDEBUG
+#include <debug.h>
+

 /* FUNCTIONS ****************************************************************/
 
 static
 /* FUNCTIONS ****************************************************************/
 
 static