[ros-diffs] [spetreolle] 44610: -Add missing NTAPI in prototypes. -Fix PLONG casts. -Remove duplicate Ext2FastIoQueryNetworkOpenInfo declaration.

Author: spetreolle
Date: Tue Dec 15 22:50:33 2009
New Revision: 44610

URL: http://svn.reactos.org/svn/reactos?rev=44610&view=rev
Log:
-Add missing NTAPI in prototypes.
-Fix PLONG casts.
-Remove duplicate Ext2FastIoQueryNetworkOpenInfo declaration.


Modified:
    branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c
    branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c
    branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h

Modified: branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/…
==============================================================================
--- branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c [iso-8859-1] (original)
+++ branches/arty-newcc/drivers/filesystems/Ext3Fsd/cmcb.c [iso-8859-1] Tue Dec 15
22:50:33 2009
@@ -142,7 +142,7 @@
     ExReleaseResourceLite(&Fcb->MainResource);
 }
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2NoOpAcquire (
     IN PVOID Fcb,
     IN BOOLEAN Wait
@@ -153,7 +153,7 @@
     return TRUE;
 }
 
-VOID
+VOID NTAPI
 Ext2NoOpRelease (
     IN PVOID Fcb
     )
@@ -196,7 +196,7 @@
 }
 
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2AcquireFileForModWrite (
     IN PFILE_OBJECT FileObject,
     IN PLARGE_INTEGER EndingOffset,
@@ -226,7 +226,7 @@
     return (ResourceAcquired ? STATUS_SUCCESS : STATUS_CANT_WAIT);
 }
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2ReleaseFileForModWrite (
     IN PFILE_OBJECT FileObject,
     IN PERESOURCE ResourceToRelease,
@@ -248,7 +248,7 @@
     return STATUS_SUCCESS;
 }
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2AcquireFileForCcFlush (
     IN PFILE_OBJECT FileObject,
     IN PDEVICE_OBJECT DeviceObject
@@ -265,7 +265,7 @@
     return STATUS_SUCCESS;
 }
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2ReleaseFileForCcFlush (
     IN PFILE_OBJECT FileObject,
     IN PDEVICE_OBJECT DeviceObject

Modified: branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/…
==============================================================================
--- branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c [iso-8859-1] (original)
+++ branches/arty-newcc/drivers/filesystems/Ext3Fsd/fastio.c [iso-8859-1] Tue Dec 15
22:50:33 2009
@@ -54,7 +54,7 @@
 }
 
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoCheckIfPossible (
               IN PFILE_OBJECT         FileObject,
               IN PLARGE_INTEGER       FileOffset,
@@ -156,6 +156,7 @@
 
 #if EXT2_DEBUG
 BOOLEAN
+NTAPI
 Ext2FastIoRead (IN PFILE_OBJECT         FileObject,
            IN PLARGE_INTEGER       FileOffset,
            IN ULONG                Length,
@@ -195,6 +196,7 @@
 }
 
 BOOLEAN
+NTAPI
 Ext2FastIoWrite (
            IN PFILE_OBJECT         FileObject,
            IN PLARGE_INTEGER       FileOffset,
@@ -243,7 +245,7 @@
 #endif /* EXT2_DEBUG */
 
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoQueryBasicInfo (
               IN PFILE_OBJECT             FileObject,
               IN BOOLEAN                  Wait,
@@ -358,7 +360,7 @@
     return Status;
 }
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoQueryStandardInfo (
                 IN PFILE_OBJECT                 FileObject,
                 IN BOOLEAN                      Wait,
@@ -480,7 +482,7 @@
     return Status;
 }
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoLock (
            IN PFILE_OBJECT         FileObject,
            IN PLARGE_INTEGER       FileOffset,
@@ -588,7 +590,7 @@
     return Status;
 }
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoUnlockSingle (
                IN PFILE_OBJECT         FileObject,
                IN PLARGE_INTEGER       FileOffset,
@@ -691,7 +693,7 @@
     return Status;
 }
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoUnlockAll (
             IN PFILE_OBJECT         FileObject,
             IN PEPROCESS            Process,
@@ -782,7 +784,7 @@
     return Status;
 }
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoUnlockAllByKey (
              IN PFILE_OBJECT         FileObject,
              IN PEPROCESS            Process,
@@ -885,7 +887,7 @@
 }
 
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoQueryNetworkOpenInfo (
     IN PFILE_OBJECT         FileObject,
     IN BOOLEAN              Wait,

Modified: branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h
URL:
http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/…
==============================================================================
--- branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h [iso-8859-1]
(original)
+++ branches/arty-newcc/drivers/filesystems/Ext3Fsd/include/ext2fs.h [iso-8859-1] Tue Dec
15 22:50:33 2009
@@ -870,7 +870,7 @@
 static 
 __inline ULONG DEC_OBJ_CNT(PULONG _C) {
     if (*_C > 0) {
-        return InterlockedDecrement(_C);
+        return InterlockedDecrement((PLONG)_C);
     } else {
         DbgBreak(); 
     }
@@ -1030,12 +1030,12 @@
 Ext2TraceMemory(BOOLEAN _n, int _i, PVOID _p, LONG _s)
 {
     if (_n) {
-        InterlockedIncrement(&Ext2Global->PerfStat.Current.Slot[_i]);
-        InterlockedIncrement(&Ext2Global->PerfStat.Total.Slot[_i]);
-        InterlockedExchangeAdd(&Ext2Global->PerfStat.Size.Slot[_i], _s);
+        InterlockedIncrement((PLONG)&Ext2Global->PerfStat.Current.Slot[_i]);
+        InterlockedIncrement((PLONG)&Ext2Global->PerfStat.Total.Slot[_i]);
+        InterlockedExchangeAdd((PLONG)&Ext2Global->PerfStat.Size.Slot[_i], _s);
     } else {
-        InterlockedDecrement(&Ext2Global->PerfStat.Current.Slot[_i]);
-        InterlockedExchangeAdd(&Ext2Global->PerfStat.Size.Slot[_i], -1 * _s);
+        InterlockedDecrement((PLONG)&Ext2Global->PerfStat.Current.Slot[_i]);
+        InterlockedExchangeAdd((PLONG)&Ext2Global->PerfStat.Size.Slot[_i], -1 *
_s);
     }
 }
 
@@ -1046,11 +1046,11 @@
 {
     if (_n) {
         INC_MEM_COUNT(PS_IRP_CONTEXT, IrpContext, sizeof(EXT2_IRP_CONTEXT));
-       
InterlockedIncrement(&(Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current));
+       
InterlockedIncrement((PLONG)&(Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current));
     } else {
         DEC_MEM_COUNT(PS_IRP_CONTEXT, IrpContext, sizeof(EXT2_IRP_CONTEXT));
-       
InterlockedIncrement(&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Processed);
-       
InterlockedDecrement(&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current);
+       
InterlockedIncrement((PLONG)&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Processed);
+       
InterlockedDecrement((PLONG)&Ext2Global->PerfStat.Irps[IrpContext->MajorFunction].Current);
     }
 }
 
@@ -1160,12 +1160,12 @@
 VOID
 Ext2ReleaseFromReadAhead (IN PVOID Context);
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2NoOpAcquire (
         IN PVOID Fcb,
         IN BOOLEAN Wait );
 
-VOID
+VOID NTAPI
 Ext2NoOpRelease (IN PVOID Fcb);
 
 VOID
@@ -1178,7 +1178,7 @@
     IN PFILE_OBJECT FileObject
     );
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2AcquireFileForModWrite (
     IN PFILE_OBJECT FileObject,
     IN PLARGE_INTEGER EndingOffset,
@@ -1186,20 +1186,20 @@
     IN PDEVICE_OBJECT DeviceObject
     );
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2ReleaseFileForModWrite (
     IN PFILE_OBJECT FileObject,
     IN PERESOURCE ResourceToRelease,
     IN PDEVICE_OBJECT DeviceObject
     );
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2AcquireFileForCcFlush (
     IN PFILE_OBJECT FileObject,
     IN PDEVICE_OBJECT DeviceObject
     );
 
-NTSTATUS
+NTSTATUS NTAPI
 Ext2ReleaseFileForCcFlush (
     IN PFILE_OBJECT FileObject,
     IN PDEVICE_OBJECT DeviceObject
@@ -1745,7 +1745,7 @@
     IN PEXT2_FCB Fcb
     );
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoCheckIfPossible (
     IN PFILE_OBJECT         FileObject,
     IN PLARGE_INTEGER       FileOffset,
@@ -1759,6 +1759,7 @@
 
 
 BOOLEAN
+NTAPI
 Ext2FastIoRead (IN PFILE_OBJECT FileObject,
         IN PLARGE_INTEGER       FileOffset,
         IN ULONG                Length,
@@ -1769,6 +1770,7 @@
         IN PDEVICE_OBJECT       DeviceObject);
 
 BOOLEAN
+NTAPI
 Ext2FastIoWrite (
         IN PFILE_OBJECT         FileObject,
         IN PLARGE_INTEGER       FileOffset,
@@ -1779,7 +1781,7 @@
         OUT PIO_STATUS_BLOCK    IoStatus,
         IN PDEVICE_OBJECT       DeviceObject);
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoQueryBasicInfo (
               IN PFILE_OBJECT             FileObject,
               IN BOOLEAN                  Wait,
@@ -1787,7 +1789,7 @@
               OUT PIO_STATUS_BLOCK        IoStatus,
               IN PDEVICE_OBJECT           DeviceObject);
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoQueryStandardInfo (
                  IN PFILE_OBJECT                 FileObject,
                  IN BOOLEAN                      Wait,
@@ -1795,7 +1797,7 @@
                  OUT PIO_STATUS_BLOCK            IoStatus,
                  IN PDEVICE_OBJECT               DeviceObject);
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoLock (
            IN PFILE_OBJECT         FileObject,
            IN PLARGE_INTEGER       FileOffset,
@@ -1808,7 +1810,7 @@
            IN PDEVICE_OBJECT       DeviceObject
            );
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoUnlockSingle (
                IN PFILE_OBJECT         FileObject,
                IN PLARGE_INTEGER       FileOffset,
@@ -1819,7 +1821,7 @@
                IN PDEVICE_OBJECT       DeviceObject
                );
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoUnlockAll (
             IN PFILE_OBJECT         FileObject,
             IN PEPROCESS            Process,
@@ -1827,7 +1829,7 @@
             IN PDEVICE_OBJECT       DeviceObject
             );
 
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoUnlockAllByKey (
              IN PFILE_OBJECT         FileObject,
              IN PEPROCESS            Process,
@@ -1836,23 +1838,13 @@
              IN PDEVICE_OBJECT       DeviceObject
              );
 
-
-BOOLEAN
+BOOLEAN NTAPI
 Ext2FastIoQueryNetworkOpenInfo (
      IN PFILE_OBJECT                     FileObject,
      IN BOOLEAN                          Wait,
      OUT PFILE_NETWORK_OPEN_INFORMATION  Buffer,
      OUT PIO_STATUS_BLOCK                IoStatus,
      IN PDEVICE_OBJECT                   DeviceObject );
-
-BOOLEAN
-Ext2FastIoQueryNetworkOpenInfo (
-    IN PFILE_OBJECT                     FileObject,
-    IN BOOLEAN                          Wait,
-    OUT PFILE_NETWORK_OPEN_INFORMATION  Buffer,
-    OUT PIO_STATUS_BLOCK                IoStatus,
-    IN PDEVICE_OBJECT                   DeviceObject);
-
 
 //
 // FileInfo.c