[ros-diffs] [fireball] 38403: - Update to trunk.

Author: fireball
Date: Sun Dec 28 04:13:59 2008
New Revision: 38403

URL: http://svn.reactos.org/svn/reactos?rev=38403&view=rev
Log:
- Update to trunk.

Modified:
    branches/cache_manager_rewrite/cc/cacheman.c
    branches/cache_manager_rewrite/cc/copy.c
    branches/cache_manager_rewrite/cc/fs.c
    branches/cache_manager_rewrite/cc/mdl.c
    branches/cache_manager_rewrite/cc/pin.c
    branches/cache_manager_rewrite/cc/view.c

Modified: branches/cache_manager_rewrite/cc/cacheman.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/cachem…
==============================================================================
--- branches/cache_manager_rewrite/cc/cacheman.c [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/cc/cacheman.c [iso-8859-1] Sun Dec 28 04:13:59 2008
@@ -11,7 +11,7 @@
 
 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 PFSN_PREFETCHER_GLOBALS CcPfGlobals;
 
@@ -44,7 +44,7 @@
 /*
  * @unimplemented
  */
-LARGE_INTEGER STDCALL
+LARGE_INTEGER NTAPI
 CcGetFlushedValidData (IN PSECTION_OBJECT_POINTERS SectionObjectPointer, 
                        IN BOOLEAN BcbListHeld)
 {
@@ -59,7 +59,7 @@
 /*
  * @unimplemented
  */
-PVOID STDCALL
+PVOID NTAPI
 CcRemapBcb (IN PVOID Bcb)
 {
     UNIMPLEMENTED;
@@ -70,7 +70,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcScheduleReadAhead (IN PFILE_OBJECT FileObject, 
                      IN PLARGE_INTEGER FileOffset, 
                      IN ULONG Length)
@@ -81,7 +81,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetAdditionalCacheAttributes (IN PFILE_OBJECT FileObject, 
                                 IN BOOLEAN DisableReadAhead, 
                                 IN BOOLEAN DisableWriteBehind)
@@ -92,7 +92,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetBcbOwnerPointer (IN PVOID Bcb, 
                       IN PVOID Owner)
 {
@@ -102,7 +102,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetDirtyPageThreshold (IN PFILE_OBJECT FileObject, 
                          IN ULONG DirtyPageThreshold)
 {
@@ -112,7 +112,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetReadAheadGranularity (IN PFILE_OBJECT FileObject, 
                            IN ULONG Granularity)
 {

Modified: branches/cache_manager_rewrite/cc/copy.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/copy.c…
==============================================================================
--- branches/cache_manager_rewrite/cc/copy.c [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/cc/copy.c [iso-8859-1] Sun Dec 28 04:13:59 2008
@@ -11,7 +11,7 @@
 
 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
@@ -41,7 +41,7 @@
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS STDCALL MmMapViewInSystemCache (PCACHE_VIEW);
+NTSTATUS NTAPI MmMapViewInSystemCache (PCACHE_VIEW);
 
 
 VOID NTAPI
@@ -53,20 +53,20 @@
     if (!NT_SUCCESS (Status))
     {
         DbgPrint ("Can't allocate CcZeroPage.\n");
-        KEBUGCHECKCC;
+        KeBugCheck(CACHE_MANAGER);
     }
     Status = MiZeroPage (CcZeroPage);
     if (!NT_SUCCESS (Status))
     {
         DbgPrint ("Can't zero out CcZeroPage.\n");
-        KEBUGCHECKCC;
+        KeBugCheck(CACHE_MANAGER);
     }
 }
 
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcCanIWrite (IN PFILE_OBJECT FileObject, 
              IN ULONG BytesToWrite, 
              IN BOOLEAN Wait, 
@@ -76,7 +76,7 @@
     return FALSE;
 }
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcCopyRead (IN PFILE_OBJECT FileObject,
             IN PLARGE_INTEGER FileOffset, 
             IN ULONG Length, 
@@ -102,7 +102,6 @@
     {
         IoStatus->Information = 0;
         IoStatus->Status = STATUS_UNSUCCESSFUL;
-        CHECKPOINT;
         return FALSE;
     }
 
@@ -113,13 +112,13 @@
 
     if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart)
     {
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
 
     if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) /
sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE)
     {
         /* not implemented */
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
 
     Offset = *FileOffset;
@@ -130,7 +129,6 @@
         Index = Offset.QuadPart / CACHE_VIEW_SIZE;
         if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb)
         {
-            CHECKPOINT;
             if (Bcb->CacheView[Index]->RefCount == 0)
             {
                 RemoveEntryList (&Bcb->CacheView[Index]->ListEntry);
@@ -140,11 +138,10 @@
         }
         else
         {
-            CHECKPOINT;
             if (IsListEmpty (&CcFreeCacheViewListHead))
             {
                 /* not implemented */
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
 
             entry = CcFreeCacheViewListHead.Flink;
@@ -159,7 +156,7 @@
             }
             if (entry == &CcFreeCacheViewListHead)
             {
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
 
             if (current->Bcb)
@@ -173,7 +170,7 @@
             {
                 DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb);
                 /* not implemented */
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
             Bcb->CacheView[Index]->RefCount = 1;
             Bcb->CacheView[Index]->Bcb = Bcb;
@@ -188,7 +185,7 @@
 
             if (!NT_SUCCESS (Status))
             {
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
         }
         ExReleaseFastMutex (&CcCacheViewLock);
@@ -228,15 +225,13 @@
     }
     ExReleaseFastMutex (&CcCacheViewLock);
 
-    CHECKPOINT;
-
     return TRUE;
 }
 
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcCopyWrite (IN PFILE_OBJECT FileObject, 
              IN PLARGE_INTEGER FileOffset, 
              IN ULONG Length, 
@@ -257,7 +252,6 @@
 
     if (!Wait)
     {
-        CHECKPOINT;
         return FALSE;
     }
 
@@ -265,13 +259,13 @@
 
     if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart)
     {
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
 
     if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) /
sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE)
     {
         /* not implemented */
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
 
     Offset = *FileOffset;
@@ -282,7 +276,6 @@
         Index = Offset.QuadPart / CACHE_VIEW_SIZE;
         if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb)
         {
-            CHECKPOINT;
             if (Bcb->CacheView[Index]->RefCount == 0)
             {
                 RemoveEntryList (&Bcb->CacheView[Index]->ListEntry);
@@ -292,11 +285,10 @@
         }
         else
         {
-            CHECKPOINT;
             if (IsListEmpty (&CcFreeCacheViewListHead))
             {
                 /* not implemented */
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
 
             entry = CcFreeCacheViewListHead.Flink;
@@ -311,7 +303,7 @@
             }
             if (entry == &CcFreeCacheViewListHead)
             {
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
 
             if (current->Bcb)
@@ -325,7 +317,7 @@
             {
                 DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb);
                 /* not implemented */
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
             Bcb->CacheView[Index]->RefCount = 1;
             Bcb->CacheView[Index]->Bcb = Bcb;
@@ -340,7 +332,7 @@
 
             if (!NT_SUCCESS (Status))
             {
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
         }
         ExReleaseFastMutex (&CcCacheViewLock);
@@ -380,15 +372,13 @@
     }
     ExReleaseFastMutex (&CcCacheViewLock);
 
-    CHECKPOINT;
-
     return TRUE;
 }
 
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcDeferWrite (IN PFILE_OBJECT FileObject,
               IN PCC_POST_DEFERRED_WRITE PostRoutine,
               IN PVOID Context1, 
@@ -402,7 +392,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcFastCopyRead (IN PFILE_OBJECT FileObject,
                 IN ULONG FileOffset, 
                 IN ULONG Length, 
@@ -416,7 +406,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcFastCopyWrite (IN PFILE_OBJECT FileObject, 
                  IN ULONG FileOffset, 
                  IN ULONG Length, 
@@ -428,7 +418,7 @@
 /*
  * @unimplemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 CcWaitForCurrentLazyWriterActivity (VOID)
 {
     UNIMPLEMENTED;
@@ -438,7 +428,7 @@
 /*
  * @implemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcZeroData (IN PFILE_OBJECT FileObject, 
             IN PLARGE_INTEGER StartOffset, 
             IN PLARGE_INTEGER EndOffset, 
@@ -510,19 +500,18 @@
 
         if (!Wait)
         {
-            CHECKPOINT;
             return FALSE;
         }
 
         if (EndOffset->QuadPart > Bcb->FileSizes.FileSize.QuadPart)
         {
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
 
         if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) /
sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE)
         {
             /* not implemented */
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
 
         Offset = *StartOffset;
@@ -534,7 +523,6 @@
             Index = Offset.QuadPart / CACHE_VIEW_SIZE;
             if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb ==
Bcb)
             {
-                CHECKPOINT;
                 if (Bcb->CacheView[Index]->RefCount == 0)
                 {
                     RemoveEntryList (&Bcb->CacheView[Index]->ListEntry);
@@ -544,11 +532,10 @@
             }
             else
             {
-                CHECKPOINT;
                 if (IsListEmpty (&CcFreeCacheViewListHead))
                 {
                     /* not implemented */
-                    KEBUGCHECK (0);
+                    KeBugCheck(CACHE_MANAGER);
                 }
 
                 entry = CcFreeCacheViewListHead.Flink;
@@ -563,7 +550,7 @@
                 }
                 if (entry == &CcFreeCacheViewListHead)
                 {
-                    KEBUGCHECK (0);
+                    KeBugCheck(CACHE_MANAGER);
                 }
 
                 Bcb->CacheView[Index] = current;
@@ -572,7 +559,7 @@
                 {
                     DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb);
                     /* not implemented */
-                    KEBUGCHECK (0);
+                    KeBugCheck(CACHE_MANAGER);
                 }
                 Bcb->CacheView[Index]->RefCount = 1;
                 Bcb->CacheView[Index]->Bcb = Bcb;
@@ -587,7 +574,7 @@
 
                 if (!NT_SUCCESS (Status))
                 {
-                    KEBUGCHECK (0);
+                    KeBugCheck(CACHE_MANAGER);
                 }
             }
             ExReleaseFastMutex (&CcCacheViewLock);
@@ -624,8 +611,6 @@
             }
         }
         ExReleaseFastMutex (&CcCacheViewLock);
-
-        CHECKPOINT;
     }
     return (TRUE);
 }

Modified: branches/cache_manager_rewrite/cc/fs.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/fs.c?r…
==============================================================================
--- branches/cache_manager_rewrite/cc/fs.c [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/cc/fs.c [iso-8859-1] Sun Dec 28 04:13:59 2008
@@ -11,7 +11,7 @@
 
 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 
 #ifndef ROUND_DOWN
@@ -24,16 +24,16 @@
 extern ULONG CcCacheViewArrayCount;
 extern FAST_MUTEX CcCacheViewLock;
 
-NTSTATUS STDCALL MmUnmapViewInSystemCache (PCACHE_VIEW);
+NTSTATUS NTAPI MmUnmapViewInSystemCache (PCACHE_VIEW);
 
-NTSTATUS STDCALL MmChangeSectionSize (PSECTION_OBJECT Section, PLARGE_INTEGER
NewMaxSize);
+NTSTATUS NTAPI MmChangeSectionSize (PSECTION_OBJECT Section, PLARGE_INTEGER NewMaxSize);
 
 /* FUNCTIONS *****************************************************************/
 
 /*
  * @unimplemented
  */
-LARGE_INTEGER STDCALL
+LARGE_INTEGER NTAPI
 CcGetDirtyPages (IN PVOID LogHandle, 
                  IN PDIRTY_PAGE_ROUTINE DirtyPageRoutine, 
                  IN PVOID Context1, 
@@ -48,7 +48,7 @@
 /*
  * @implemented
  */
-PFILE_OBJECT STDCALL
+PFILE_OBJECT NTAPI
 CcGetFileObjectFromBcb (IN PVOID Bcb)
 {
     PINTERNAL_BCB iBcb = (PINTERNAL_BCB) Bcb;
@@ -58,7 +58,7 @@
 /*
  * @unimplemented
  */
-LARGE_INTEGER STDCALL
+LARGE_INTEGER NTAPI
 CcGetLsnForFileObject (IN PFILE_OBJECT FileObject, 
                        OUT PLARGE_INTEGER OldestLsn OPTIONAL)
 {
@@ -71,7 +71,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcIsThereDirtyData (IN PVPB Vpb)
 {
     UNIMPLEMENTED;
@@ -81,7 +81,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcPurgeCacheSection (IN PSECTION_OBJECT_POINTERS SectionObjectPointer,
                      IN PLARGE_INTEGER FileOffset OPTIONAL, 
                      IN ULONG Length, 
@@ -95,7 +95,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetFileSizes (IN PFILE_OBJECT FileObject, 
                 IN PCC_FILE_SIZES FileSizes)
 {
@@ -128,16 +128,16 @@
         {
             if (Bcb->CacheView[i]->Bcb != Bcb)
             {
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
             if (Bcb->CacheView[i]->RefCount > 0)
             {
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
             Status = MmUnmapViewInSystemCache (Bcb->CacheView[i]);
             if (!NT_SUCCESS (Status))
             {
-                KEBUGCHECK (0);
+                KeBugCheck(CACHE_MANAGER);
             }
             Bcb->CacheView[i]->RefCount = 0;
             Bcb->CacheView[i]->Bcb = NULL;
@@ -158,12 +158,12 @@
             {
                 if (CcCacheViewArray[i].RefCount > 0)
                 {
-                    KEBUGCHECK (0);
+                    KeBugCheck(CACHE_MANAGER);
                 }
                 Status = MmUnmapViewInSystemCache (&CcCacheViewArray[i]);
                 if (!NT_SUCCESS (Status))
                 {
-                    KEBUGCHECK (0);
+                    KeBugCheck(CACHE_MANAGER);
                 }
                 CcCacheViewArray[i].RefCount = 0;
                 CcCacheViewArray[i].Bcb = NULL;
@@ -180,7 +180,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetLogHandleForFile (IN PFILE_OBJECT FileObject, 
                        IN PVOID LogHandle, 
                        IN PFLUSH_TO_LSN FlushToLsnRoutine)

Modified: branches/cache_manager_rewrite/cc/mdl.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/mdl.c?…
==============================================================================
--- branches/cache_manager_rewrite/cc/mdl.c [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/cc/mdl.c [iso-8859-1] Sun Dec 28 04:13:59 2008
@@ -11,14 +11,14 @@
 
 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* FUNCTIONS *****************************************************************/
 
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcMdlRead (IN PFILE_OBJECT FileObject,
            IN PLARGE_INTEGER FileOffset, 
            IN ULONG Length, 
@@ -45,7 +45,7 @@
  *     Used by CcMdlReadComplete@8 and FsRtl
  *
  */
-VOID STDCALL
+VOID NTAPI
 CcMdlReadCompleteDev (IN PMDL MdlChain, 
                       IN PFILE_OBJECT FileObject)
 {
@@ -76,7 +76,7 @@
  *
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcMdlReadComplete (IN PFILE_OBJECT FileObject, 
                    IN PMDL MdlChain)
 {
@@ -101,7 +101,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcMdlWriteComplete (IN PFILE_OBJECT FileObject, 
                     IN PLARGE_INTEGER FileOffset, 
                     IN PMDL MdlChain)
@@ -148,7 +148,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcMdlWriteAbort (IN PFILE_OBJECT FileObject, 
                  IN PMDL MdlChain)
 {
@@ -158,7 +158,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcPrepareMdlWrite (IN PFILE_OBJECT FileObject,
                    IN PLARGE_INTEGER FileOffset, 
                    IN ULONG Length, 

Modified: branches/cache_manager_rewrite/cc/pin.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/pin.c?…
==============================================================================
--- branches/cache_manager_rewrite/cc/pin.c [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/cc/pin.c [iso-8859-1] Sun Dec 28 04:13:59 2008
@@ -11,7 +11,7 @@
 
 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
@@ -23,13 +23,13 @@
 
 /* FUNCTIONS *****************************************************************/
 
-NTSTATUS STDCALL MmMapViewInSystemCache (PCACHE_VIEW);
-
-
-/*
- * @implemented
- */
-BOOLEAN STDCALL
+NTSTATUS NTAPI MmMapViewInSystemCache (PCACHE_VIEW);
+
+
+/*
+ * @implemented
+ */
+BOOLEAN NTAPI
 CcMapData (IN PFILE_OBJECT FileObject,
            IN PLARGE_INTEGER FileOffset, 
            IN ULONG Length, 
@@ -74,7 +74,7 @@
     if (FileOffset->QuadPart + Length - ROUND_DOWN (FileOffset->QuadPart,
CACHE_VIEW_SIZE) > CACHE_VIEW_SIZE)
     {
         /* not implemented */
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
 
 
@@ -82,7 +82,7 @@
     if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof (Bcb->CacheView) /
sizeof (Bcb->CacheView[0]) * CACHE_VIEW_SIZE)
     {
         /* not implemented */
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
 
     ExAcquireFastMutex (&CcCacheViewLock);
@@ -102,7 +102,7 @@
         if (IsListEmpty (&CcFreeCacheViewListHead))
         {
             /* not implemented */
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
 
         entry = CcFreeCacheViewListHead.Flink;
@@ -117,7 +117,7 @@
         }
         if (entry == &CcFreeCacheViewListHead)
         {
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
 
         Bcb->CacheView[Index] = current;
@@ -126,7 +126,7 @@
         {
             DPRINT1 ("%x\n", Bcb->CacheView[Index]->Bcb);
             /* not implemented */
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
         Bcb->CacheView[Index]->RefCount = 1;
         Bcb->CacheView[Index]->Bcb = Bcb;
@@ -141,7 +141,7 @@
 
         if (!NT_SUCCESS (Status))
         {
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
     }
     ExReleaseFastMutex (&CcCacheViewLock);
@@ -149,7 +149,7 @@
     iBcb = ExAllocateFromNPagedLookasideList (&iBcbLookasideList);
     if (iBcb == NULL)
     {
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
     memset (iBcb, 0, sizeof (INTERNAL_BCB));
 
@@ -168,7 +168,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcPinMappedData (IN PFILE_OBJECT FileObject, 
                  IN PLARGE_INTEGER FileOffset, 
                  IN ULONG Length, 
@@ -182,7 +182,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcPinRead (IN PFILE_OBJECT FileObject,
            IN PLARGE_INTEGER FileOffset, 
            IN ULONG Length, 
@@ -203,7 +203,7 @@
 /*
  * @unimplemented
  */
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcPreparePinWrite (IN PFILE_OBJECT FileObject,
                    IN PLARGE_INTEGER FileOffset,
                    IN ULONG Length, 
@@ -226,7 +226,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcSetDirtyPinnedData (IN PVOID Bcb, 
                       IN PLARGE_INTEGER Lsn)
 {
@@ -239,7 +239,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcUnpinData (IN PVOID _iBcb)
 {
     PINTERNAL_BCB iBcb = _iBcb;
@@ -262,7 +262,7 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcUnpinDataForThread (IN PVOID Bcb, 
                       IN ERESOURCE_THREAD ResourceThreadId)
 {
@@ -272,7 +272,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcRepinBcb (IN PVOID Bcb)
 {
 //  PINTERNAL_BCB iBcb = Bcb;
@@ -283,10 +283,10 @@
 /*
  * @unimplemented
  */
-VOID STDCALL
+VOID NTAPI
 CcUnpinRepinnedBcb (IN PVOID Bcb, 
                     IN BOOLEAN WriteThrough, 
                     IN PIO_STATUS_BLOCK IoStatus)
 {
-    KEBUGCHECK (0);
-}
+    KeBugCheck(CACHE_MANAGER);
+}

Modified: branches/cache_manager_rewrite/cc/view.c
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/cc/view.c…
==============================================================================
--- branches/cache_manager_rewrite/cc/view.c [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/cc/view.c [iso-8859-1] Sun Dec 28 04:13:59 2008
@@ -11,7 +11,7 @@
 
 #include <ntoskrnl.h>
 #define NDEBUG
-#include <internal/debug.h>
+#include <debug.h>
 
 /* GLOBALS *******************************************************************/
 
@@ -45,7 +45,7 @@
                                         PFILE_OBJECT FileObject, 
                                         BOOLEAN CacheManager);
 
-NTSTATUS STDCALL MmUnmapViewInSystemCache (PCACHE_VIEW);
+NTSTATUS NTAPI MmUnmapViewInSystemCache (PCACHE_VIEW);
 
 NTSTATUS MmFlushDataFileSection (PSECTION_OBJECT Section, PLARGE_INTEGER StartOffset,
ULONG Length);
 
@@ -54,7 +54,7 @@
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 CcFlushCache (IN PSECTION_OBJECT_POINTERS SectionObjectPointers,
               IN PLARGE_INTEGER FileOffset OPTIONAL, 
               IN ULONG Length, 
@@ -83,7 +83,7 @@
 /*
  * @implemented
  */
-PFILE_OBJECT STDCALL
+PFILE_OBJECT NTAPI
 CcGetFileObjectFromSectionPtrs (IN PSECTION_OBJECT_POINTERS SectionObjectPointers)
 {
     PBCB Bcb;
@@ -139,12 +139,12 @@
     DPRINT ("CcCacheViewBase: %x\n", CcCacheViewBase);
     if (!NT_SUCCESS (Status))
     {
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
     CcCacheViewArray = ExAllocatePool (NonPagedPool, sizeof (CACHE_VIEW) * (Size /
CACHE_VIEW_SIZE));
     if (CcCacheViewArray == NULL)
     {
-        KEBUGCHECK (0);
+        KeBugCheck(CACHE_MANAGER);
     }
 
     Base = CcCacheViewBase;
@@ -164,7 +164,7 @@
 
 }
 
-VOID STDCALL
+VOID NTAPI
 CcInitializeCacheMap (IN PFILE_OBJECT FileObject,
                       IN PCC_FILE_SIZES FileSizes,
                       IN BOOLEAN PinAccess, 
@@ -188,7 +188,7 @@
         Bcb = ExAllocateFromNPagedLookasideList (&BcbLookasideList);
         if (Bcb == NULL)
         {
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
         memset (Bcb, 0, sizeof (BCB));
 
@@ -207,7 +207,7 @@
         if (!NT_SUCCESS (Status))
         {
             DPRINT1 ("%x\n", Status);
-            KEBUGCHECK (0);
+            KeBugCheck(CACHE_MANAGER);
         }
 
         FileObject->SectionObjectPointer->SharedCacheMap = Bcb;
@@ -223,7 +223,7 @@
     DPRINT ("CcInitializeCacheMap() done\n");
 }
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 CcUninitializeCacheMap (IN PFILE_OBJECT FileObject,
                         IN PLARGE_INTEGER TruncateSize OPTIONAL, 
                         IN PCACHE_UNINITIALIZE_EVENT UninitializeCompleteEvent OPTIONAL)
@@ -255,15 +255,14 @@
                 {
                     if (Bcb->CacheView[i] && Bcb->CacheView[i]->Bcb ==
Bcb)
                     {
-                        CHECKPOINT;
                         if (Bcb->CacheView[i]->RefCount > 0)
                         {
-                            KEBUGCHECK (0);
+                            KeBugCheck(CACHE_MANAGER);
                         }
                         Status = MmUnmapViewInSystemCache (Bcb->CacheView[i]);
                         if (!NT_SUCCESS (Status))
                         {
-                            KEBUGCHECK (0);
+                            KeBugCheck(CACHE_MANAGER);
                         }
                         Bcb->CacheView[i]->RefCount = 0;
                         Bcb->CacheView[i]->Bcb = NULL;