[ros-diffs] [reactos] 01/01: [FASTFAT_NEW] Fix build with FASTFATDBG set

[Pierre Schweitzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3013e153b0e085de0abd2b2eeb83bdfaf6eded13

commit 3013e153b0e085de0abd2b2eeb83bdfaf6eded13
Author: Pierre Schweitzer 
AuthorDate: Fri Nov 24 12:00:10 2017 +0100

[FASTFAT_NEW] Fix build with FASTFATDBG set
---
 drivers/filesystems/fastfat_new/fatdata.h | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/filesystems/fastfat_new/fatdata.h 
b/drivers/filesystems/fastfat_new/fatdata.h
index 18fb891aab..ad4d1fb812 100644
--- a/drivers/filesystems/fastfat_new/fatdata.h
+++ b/drivers/filesystems/fastfat_new/fatdata.h
@@ -234,6 +234,7 @@ extern LONG FatDebugTraceIndent;
 }   \
 }
 
+#ifdef _MSC_VER
 #define DebugDump(STR,LEVEL,PTR) {  \
 __pragma(warning(push)) \
 __pragma(warning(disable:4210)) \
@@ -248,9 +249,22 @@ extern LONG FatDebugTraceIndent;
 }   \
 __pragma(warning(pop))  \
 }
+#else
+#define DebugDump(STR,LEVEL,PTR) {  \
+ULONG _i;   \
+VOID FatDump(IN PVOID Ptr); \
+if (((LEVEL) == 0) || (FatDebugTraceLevel & (LEVEL))) { \
+_i = (ULONG)PsGetCurrentThread();   \
+DbgPrint("%08lx:",_i);  \
+DbgPrint(STR);  \
+if (PTR != NULL) {FatDump(PTR);}\
+NT_ASSERT(FALSE);   \
+}   \
+}
+#endif
 
 #define DebugUnwind(X) {  \
-if (AbnormalTermination()) { \
+if (_SEH2_AbnormalTermination()) {\
 DebugTrace(0, DEBUG_TRACE_UNWIND, #X ", Abnormal termination.\n", 0); \
 } \
 }

[ros-diffs] [reactos] 01/01: [FASTFAT_NEW] Fix build with FASTFATDBG set

[Pierre Schweitzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f15769d95863bb17bd12188ff40fd8e04e4b3820

commit f15769d95863bb17bd12188ff40fd8e04e4b3820
Author: Pierre Schweitzer 
AuthorDate: Thu Nov 23 14:18:15 2017 +0100

[FASTFAT_NEW] Fix build with FASTFATDBG set
---
 drivers/filesystems/fastfat_new/dirsup.c  | 4 
 drivers/filesystems/fastfat_new/fatdata.h | 2 +-
 drivers/filesystems/fastfat_new/pnp.c | 4 
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/filesystems/fastfat_new/dirsup.c 
b/drivers/filesystems/fastfat_new/dirsup.c
index 71689e8d90..8ca1f6ad53 100644
--- a/drivers/filesystems/fastfat_new/dirsup.c
+++ b/drivers/filesystems/fastfat_new/dirsup.c
@@ -1991,7 +1991,11 @@ Return Value:
 ULONG ByteOffset;
 PDIRENT Dirent;
 
+#ifndef __REACTOS__
 BOOLEAN IsDirectoryEmpty;
+#else
+BOOLEAN IsDirectoryEmpty = FALSE;
+#endif
 
 NTSTATUS Status;
 
diff --git a/drivers/filesystems/fastfat_new/fatdata.h 
b/drivers/filesystems/fastfat_new/fatdata.h
index 0d0493f4e7..4d8aa2eeeb 100644
--- a/drivers/filesystems/fastfat_new/fatdata.h
+++ b/drivers/filesystems/fastfat_new/fatdata.h
@@ -243,7 +243,7 @@ extern LONG FatDebugTraceIndent;
 }
 
 #define DebugUnwind(X) {  \
-if (AbnormalTermination()) { \
+if (_SEH2_AbnormalTermination()) {\
 DebugTrace(0, DEBUG_TRACE_UNWIND, #X ", Abnormal termination.\n", 0); \
 } \
 }
diff --git a/drivers/filesystems/fastfat_new/pnp.c 
b/drivers/filesystems/fastfat_new/pnp.c
index 9604a961e8..26a9ed533f 100644
--- a/drivers/filesystems/fastfat_new/pnp.c
+++ b/drivers/filesystems/fastfat_new/pnp.c
@@ -22,6 +22,10 @@ Abstract:
 
 #define BugCheckFileId   (FAT_BUG_CHECK_PNP)
 
+#ifdef __REACTOS__
+#define Dbg  (DEBUG_TRACE_PNP)
+#endif
+
 NTSTATUS
 FatPnpQueryRemove (
 PIRP_CONTEXT IrpContext,