From 0f74d012d412ca1e8b8647fe97b4572d4262f4aa Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sun, 19 Jan 2014 15:05:23 +0000
Subject: [PATCH] [DDK][NDK] - Fix some members of SHARED_CACHE_MAP - Move MBCB
 to NDK where it belongs

svn path=/trunk/; revision=61708
---
 reactos/include/ddk/ntifs.h          | 13 -------------
 reactos/include/ndk/cctypes.h        | 21 +++++++++++++++++----
 reactos/include/xdk/ntifs.template.h | 13 -------------
 3 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index ae939673b73..fa7d3fe7984 100644
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -11416,19 +11416,6 @@ typedef struct _GET_RETRIEVAL_DESCRIPTOR {
     MAPPING_PAIR    Pair[1];
 } GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR;
 
-typedef struct _MBCB {
-    CSHORT          NodeTypeCode;
-    CSHORT          NodeIsInZone;
-    ULONG           PagesToWrite;
-    ULONG           DirtyPages;
-    ULONG           Reserved;
-    LIST_ENTRY      BitmapRanges;
-    LONGLONG        ResumeWritePage;
-    BITMAP_RANGE    BitmapRange1;
-    BITMAP_RANGE    BitmapRange2;
-    BITMAP_RANGE    BitmapRange3;
-} MBCB, *PMBCB;
-
 typedef struct _MOVEFILE_DESCRIPTOR {
      HANDLE         FileHandle;
      ULONG          Reserved;
diff --git a/reactos/include/ndk/cctypes.h b/reactos/include/ndk/cctypes.h
index a5e43d1790a..b94738fdccc 100644
--- a/reactos/include/ndk/cctypes.h
+++ b/reactos/include/ndk/cctypes.h
@@ -81,6 +81,19 @@ typedef struct _PRIVATE_CACHE_MAP
     LIST_ENTRY PrivateLinks;
 } PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP;
 
+typedef struct _MBCB {
+    CSHORT NodeTypeCode;
+    CSHORT NodeIsInZone;
+    ULONG PagesToWrite;
+    ULONG DirtyPages;
+    ULONG Reserved;
+    LIST_ENTRY BitmapRanges;
+    LONGLONG ResumeWritePage;
+    BITMAP_RANGE BitmapRange1;
+    BITMAP_RANGE BitmapRange2;
+    BITMAP_RANGE BitmapRange3;
+} MBCB, *PMBCB;
+
 #ifdef _NTIFS_INCLUDED_
 
 //
@@ -103,12 +116,12 @@ typedef struct _SHARED_CACHE_MAP
     PVOID NeedToZero;
     ULONG ActivePage;
     ULONG NeedToZeroPage;
-    ULONG ActiveVacbSpinLock;
+    KSPIN_LOCK ActiveVacbSpinLock;
     ULONG VacbActiveCount;
     ULONG DirtyPages;
     LIST_ENTRY SharedCacheMapLinks;
     ULONG Flags;
-    ULONG Status;
+    LONG Status;
     PMBCB Mbcb;
     PVOID Section;
     PKEVENT CreateEvent;
@@ -119,12 +132,12 @@ typedef struct _SHARED_CACHE_MAP
     PVOID LazyWriteContext;
     LIST_ENTRY PrivateList;
     PVOID LogHandle;
-    PVOID FlushToLsnRoutine;
+    PFLUSH_TO_LSN FlushToLsnRoutine;
     ULONG DirtyPageThreshold;
     ULONG LazyWritePassCount;
     PCACHE_UNINITIALIZE_EVENT UninitializeEvent;
     PVACB NeedToZeroVacb;
-    ULONG BcbSpinLock;
+    KSPIN_LOCK BcbSpinLock;
     PVOID Reserved;
     KEVENT Event;
     EX_PUSH_LOCK VacbPushLock;
diff --git a/reactos/include/xdk/ntifs.template.h b/reactos/include/xdk/ntifs.template.h
index 98d2c6d3c85..a7908988416 100644
--- a/reactos/include/xdk/ntifs.template.h
+++ b/reactos/include/xdk/ntifs.template.h
@@ -1535,19 +1535,6 @@ typedef struct _GET_RETRIEVAL_DESCRIPTOR {
     MAPPING_PAIR    Pair[1];
 } GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR;
 
-typedef struct _MBCB {
-    CSHORT          NodeTypeCode;
-    CSHORT          NodeIsInZone;
-    ULONG           PagesToWrite;
-    ULONG           DirtyPages;
-    ULONG           Reserved;
-    LIST_ENTRY      BitmapRanges;
-    LONGLONG        ResumeWritePage;
-    BITMAP_RANGE    BitmapRange1;
-    BITMAP_RANGE    BitmapRange2;
-    BITMAP_RANGE    BitmapRange3;
-} MBCB, *PMBCB;
-
 typedef struct _MOVEFILE_DESCRIPTOR {
      HANDLE         FileHandle;
      ULONG          Reserved;