[UDFS]

Attempt to fix MSVC build

CORE-4375

svn path=/trunk/; revision=74804

diff --git a/reactos/drivers/filesystems/udfs/env_spec.cpp b/reactos/drivers/filesystems/udfs/env_spec.cpp
index aed3a06..3f86608 100644 (file)
--- a/reactos/drivers/filesystems/udfs/env_spec.cpp
+++ b/reactos/drivers/filesystems/udfs/env_spec.cpp
@@ -307,7 +307,7 @@ UDFPhWriteSynchronous(
     KeQuerySystemTime((PLARGE_INTEGER)&IoEnterTime);
 #endif //MEASURE_IO_PERFORMANCE
 
     KeQuerySystemTime((PLARGE_INTEGER)&IoEnterTime);
 #endif //MEASURE_IO_PERFORMANCE
 

-#if defined DBG || defined USE_PERF_PRINT
+#if defined UDF_DBG || defined USE_PERF_PRINT

     ULONG Lba = (ULONG)(Offset>>0xb);
 //    ASSERT(!(Lba & (32-1)));
     PerfPrint(("UDFPhWrite: Length: %x Lba: %lx\n",Length>>0xb,Lba));
     ULONG Lba = (ULONG)(Offset>>0xb);
 //    ASSERT(!(Lba & (32-1)));
     PerfPrint(("UDFPhWrite: Length: %x Lba: %lx\n",Length>>0xb,Lba));

diff --git a/reactos/drivers/filesystems/udfs/fscntrl.cpp b/reactos/drivers/filesystems/udfs/fscntrl.cpp
index 8f5d21b..02dbd94 100644 (file)
--- a/reactos/drivers/filesystems/udfs/fscntrl.cpp
+++ b/reactos/drivers/filesystems/udfs/fscntrl.cpp
@@ -835,7 +835,7 @@ try_exit: NOTHING;
             Irp->Tail.Overlay.CurrentStackLocation++;
 
             // Now call the appropriate file system driver with the request.
             Irp->Tail.Overlay.CurrentStackLocation++;
 
             // Now call the appropriate file system driver with the request.

-            return IoCallDriver( filterDevExt->lowerFSDeviceObject, Irp );
+            RC = IoCallDriver( filterDevExt->lowerFSDeviceObject, Irp );

 
         }
 
 
         }
 

diff --git a/reactos/drivers/filesystems/udfs/udf_info/mount.cpp b/reactos/drivers/filesystems/udfs/udf_info/mount.cpp
index 7ad9d6a..28583a4 100644 (file)
--- a/reactos/drivers/filesystems/udfs/udf_info/mount.cpp
+++ b/reactos/drivers/filesystems/udfs/udf_info/mount.cpp
@@ -2333,12 +2333,14 @@ UDFLoadImpUseVolDesc(
     int8*     Buf
     )
 {
     int8*     Buf
     )
 {

+#ifdef UDF_DBG

     ImpUseVolDesc* iuvd = (ImpUseVolDesc*)Buf;
     ImpUseVolDescImpUse* iuvdiu = (ImpUseVolDescImpUse*)&(iuvd->impUse);
     UDFPrint(("UDF: Imp Use Vol Desc:\n"));
     UDFPrint((" volDescSeqNum = %x\n", iuvd->volDescSeqNum));
     UDFPrint(("UDF: Imp Use Vol Desc Imp Use:\n"));
     KdDump(iuvdiu, sizeof(ImpUseVolDescImpUse));
     ImpUseVolDesc* iuvd = (ImpUseVolDesc*)Buf;
     ImpUseVolDescImpUse* iuvdiu = (ImpUseVolDescImpUse*)&(iuvd->impUse);
     UDFPrint(("UDF: Imp Use Vol Desc:\n"));
     UDFPrint((" volDescSeqNum = %x\n", iuvd->volDescSeqNum));
     UDFPrint(("UDF: Imp Use Vol Desc Imp Use:\n"));
     KdDump(iuvdiu, sizeof(ImpUseVolDescImpUse));

+#endif

     return STATUS_SUCCESS;
 } // UDFLoadImpUseVolDesc()
 
     return STATUS_SUCCESS;
 } // UDFLoadImpUseVolDesc()