[ros-diffs] [akorotaev] 31543: Update headers patch

Author: akorotaev
Date: Wed Jan  2 01:25:57 2008
New Revision: 31543

URL: http://svn.reactos.org/svn/reactos?rev=31543&view=rev
Log:
Update headers patch

Modified:
    branches/cache_manager_rewrite/headers.patch

Modified: branches/cache_manager_rewrite/headers.patch
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/headers.p…
==============================================================================
--- branches/cache_manager_rewrite/headers.patch (original)
+++ branches/cache_manager_rewrite/headers.patch Wed Jan  2 01:25:57 2008
@@ -1,61 +1,71 @@
-Index: drivers/filesystems/cdfs/cdfs.h
-===================================================================
---- drivers/filesystems/cdfs/cdfs.h	(revision 22988)
-+++ drivers/filesystems/cdfs/cdfs.h	(working copy)
-@@ -6,7 +6,7 @@
- #include <ntddcdrm.h>
- #include <ccros.h>
+Index: ntoskrnl/include/internal/mm.h
+===================================================================
+--- ntoskrnl/include/internal/mm.h	(revision 31533)
++++ ntoskrnl/include/internal/mm.h	(working copy)
+@@ -176,6 +176,9 @@
+     ULONG Flags;
+     ULONG Characteristics;
+     BOOLEAN WriteCopy;
++    LIST_ENTRY ListEntry;
++    ULONG BytesPerSector;
++    PFILE_OBJECT FileObject;
+ } MM_SECTION_SEGMENT, *PMM_SECTION_SEGMENT;
  
--#define USE_ROS_CC_AND_FS
-+//#define USE_ROS_CC_AND_FS
+ typedef struct _MM_IMAGE_SECTION_OBJECT
+@@ -192,6 +195,10 @@
+     BOOLEAN Executable;
+     ULONG NrSegments;
+     ULONG ImageSize;
++    ULONG RefCount;
++    LIST_ENTRY ListEntry;
++    PFILE_OBJECT FileObject;
++    ULONG BytesPerSector;
+     PMM_SECTION_SEGMENT Segments;
+ } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT;
  
- #define CDFS_BASIC_SECTOR 2048
- #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16
-Index: drivers/filesystems/ntfs/ntfs.h
-===================================================================
---- drivers/filesystems/ntfs/ntfs.h	(revision 22988)
-+++ drivers/filesystems/ntfs/ntfs.h	(working copy)
-@@ -6,7 +6,7 @@
- #include <ntdddisk.h>
- #include <ccros.h>
+@@ -210,6 +217,16 @@
+     };
+ } ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT;
  
--#define USE_ROS_CC_AND_FS
-+//#define USE_ROS_CC_AND_FS
- 
- 
- #define CACHEPAGESIZE(pDeviceExt) \
-Index: drivers/filesystems/vfat/vfat.h
-===================================================================
---- drivers/filesystems/vfat/vfat.h	(revision 25241)
-+++ drivers/filesystems/vfat/vfat.h	(working copy)
-@@ -6,7 +6,7 @@
- #ifdef __GNUC__
- #include <ccros.h>
- 
--#define USE_ROS_CC_AND_FS
-+//#define USE_ROS_CC_AND_FS
- #else
- #define KEBUGCHECK KeBugCheck
- #define KEBUGCHECKEX KeBugCheckEx
-Index: include/reactos/exeformat.h
-===================================================================
---- include/reactos/exeformat.h	(revision 22988)
-+++ include/reactos/exeformat.h	(working copy)
-@@ -35,6 +35,7 @@
- typedef NTSTATUS (NTAPI * PEXEFMT_CB_READ_FILE)
- (
-  IN PVOID File,
-+ ULONG SectorSize,
-  IN PLARGE_INTEGER Offset,
-  IN ULONG Length,
-  OUT PVOID * Data,
-Index: ntoskrnl/include/internal/cc.h
-===================================================================
---- ntoskrnl/include/internal/cc.h	(revision 22988)
-+++ ntoskrnl/include/internal/cc.h	(working copy)
-@@ -1,17 +1,29 @@
- #ifndef __INCLUDE_INTERNAL_CC_H
- #define __INCLUDE_INTERNAL_CC_H
++typedef struct
++{
++   ROS_SECTION_OBJECT* Section;
++   ULONG ViewOffset;
++   LIST_ENTRY ViewListEntry;
++   PMM_SECTION_SEGMENT Segment;
++// BOOLEAN WriteCopyView;
++   LIST_ENTRY RegionListHead;
++} SECTION_DATA, *PSECTION_DATA;
++  
+ typedef struct _MEMORY_AREA
+ {
+     PVOID StartingAddress;
+@@ -224,17 +241,10 @@
+     ULONG PageOpCount;
+     union
+     {
++        SECTION_DATA SectionData;
+         struct
+         {
+-            ROS_SECTION_OBJECT* Section;
+-            ULONG ViewOffset;
+-            PMM_SECTION_SEGMENT Segment;
+-            BOOLEAN WriteCopyView;
+             LIST_ENTRY RegionListHead;
+-        } SectionData;
+-        struct
+-        {
+-            LIST_ENTRY RegionListHead;
+         } VirtualMemoryData;
+     } Data;
+ } MEMORY_AREA, *PMEMORY_AREA;
+Index: ntoskrnl/include/internal/cc.h
+===================================================================
+--- ntoskrnl/include/internal/cc.h	(revision 31533)
++++ ntoskrnl/include/internal/cc.h	(working copy)
+@@ -102,17 +102,29 @@
+     LONG ActivePrefetches;
+ } PFSN_PREFETCHER_GLOBALS, *PPFSN_PREFETCHER_GLOBALS;
  
 +#define CACHE_VIEW_SIZE	(128 * 1024) // 128kB
 +
@@ -91,7 +101,7 @@
      ULONG RefCount;
  #if defined(DBG) || defined(KDBG)
  	BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments
*/
-@@ -56,8 +68,8 @@
+@@ -157,8 +169,8 @@
  typedef struct _INTERNAL_BCB
  {
      PUBLIC_BCB PFCB;
@@ -102,72 +112,11 @@
      CSHORT RefCount; /* (At offset 0x34 on WinNT4) */
  } INTERNAL_BCB, *PINTERNAL_BCB;
  
-Index: ntoskrnl/include/internal/mm.h
-===================================================================
---- ntoskrnl/include/internal/mm.h	(revision 22988)
-+++ ntoskrnl/include/internal/mm.h	(working copy)
-@@ -176,6 +176,9 @@
-     ULONG Flags;
-     ULONG Characteristics;
-     BOOLEAN WriteCopy;
-+    LIST_ENTRY ListEntry;
-+    ULONG BytesPerSector;
-+    PFILE_OBJECT FileObject;
- } MM_SECTION_SEGMENT, *PMM_SECTION_SEGMENT;
- 
- typedef struct _MM_IMAGE_SECTION_OBJECT
-@@ -191,6 +194,10 @@
-     USHORT Machine;
-     BOOLEAN Executable;
-     ULONG NrSegments;
-+    ULONG RefCount;
-+    LIST_ENTRY ListEntry;
-+    PFILE_OBJECT FileObject;
-+    ULONG BytesPerSector;
-     PMM_SECTION_SEGMENT Segments;
- } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT;
- 
-@@ -209,6 +216,16 @@
-     };
- } ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT;
- 
-+typedef struct
-+{
-+   ROS_SECTION_OBJECT* Section;
-+   ULONG ViewOffset;
-+   LIST_ENTRY ViewListEntry;
-+   PMM_SECTION_SEGMENT Segment;
-+// BOOLEAN WriteCopyView;
-+   LIST_ENTRY RegionListHead;
-+} SECTION_DATA, *PSECTION_DATA;
-+  
- typedef struct _MEMORY_AREA
- {
-     PVOID StartingAddress;
-@@ -223,17 +240,10 @@
-     ULONG PageOpCount;
-     union
-     {
-+        SECTION_DATA SectionData;
-         struct
-         {
--            ROS_SECTION_OBJECT* Section;
--            ULONG ViewOffset;
--            PMM_SECTION_SEGMENT Segment;
--            BOOLEAN WriteCopyView;
-             LIST_ENTRY RegionListHead;
--        } SectionData;
--        struct
--        {
--            LIST_ENTRY RegionListHead;
-         } VirtualMemoryData;
-     } Data;
- } MEMORY_AREA, *PMEMORY_AREA;
-Index: ntoskrnl/ntoskrnl.def
-===================================================================
---- ntoskrnl/ntoskrnl.def	(revision 22988)
-+++ ntoskrnl/ntoskrnl.def	(working copy)
-@@ -5,9 +5,6 @@
+Index: ntoskrnl/ntoskrnl.def
+===================================================================
+--- ntoskrnl/ntoskrnl.def	(revision 31533)
++++ ntoskrnl/ntoskrnl.def	(working copy)
+@@ -5,9 +5,6 @@
  ; ReactOS Operating System
  ;
  EXPORTS
@@ -177,3 +126,29 @@
  CcCanIWrite@16
  CcCopyRead@24
  CcCopyWrite@20
+Index: drivers/filesystems/vfat/vfat.h
+===================================================================
+--- drivers/filesystems/vfat/vfat.h	(revision 31533)
++++ drivers/filesystems/vfat/vfat.h	(working copy)
+@@ -6,7 +6,7 @@
+ #ifdef __GNUC__
+ #include <ccros.h>
+ 
+-#define USE_ROS_CC_AND_FS
++//#define USE_ROS_CC_AND_FS
+ #else
+ #define KEBUGCHECK KeBugCheck
+ #define KEBUGCHECKEX KeBugCheckEx
+Index: drivers/filesystems/ntfs/ntfs.h
+===================================================================
+--- drivers/filesystems/ntfs/ntfs.h	(revision 31533)
++++ drivers/filesystems/ntfs/ntfs.h	(working copy)
+@@ -6,7 +6,7 @@
+ #include <ntdddisk.h>
+ #include <ccros.h>
+ 
+-#define USE_ROS_CC_AND_FS
++//#define USE_ROS_CC_AND_FS
+ 
+ 
+ #define CACHEPAGESIZE(pDeviceExt) \