[cfinck] 34080: Update the patches, so that they apply against current trunk. Also delete the "mm" directory after speaking with Aleksey about this, further work on the "branch" shall only result in updated patches.

Author: cfinck
Date: Wed Jun 25 08:49:18 2008
New Revision: 34080

URL: http://svn.reactos.org/svn/reactos?rev=34080&view=rev
Log:
Update the patches, so that they apply against current trunk.
Also delete the "mm" directory after speaking with Aleksey about this, further
work on the "branch" shall only result in updated patches.

Removed:
    branches/cache_manager_rewrite/mm/
Modified:
    branches/cache_manager_rewrite/headers.patch   (contents, props changed)
    branches/cache_manager_rewrite/mm.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 [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/headers.patch [iso-8859-1] Wed Jun 25 08:49:18 2008
@@ -1,6 +1,6 @@
 Index: include/reactos/exeformat.h
 ===================================================================
---- include/reactos/exeformat.h	(revision 31533)
+--- include/reactos/exeformat.h	(revision 34037)
 +++ include/reactos/exeformat.h	(working copy)
 @@ -35,6 +35,7 @@
  typedef NTSTATUS (NTAPI * PEXEFMT_CB_READ_FILE)
@@ -12,9 +12,9 @@
   OUT PVOID * Data,
 Index: ntoskrnl/include/internal/mm.h
 ===================================================================
---- ntoskrnl/include/internal/mm.h	(revision 31533)
+--- ntoskrnl/include/internal/mm.h	(revision 34040)
 +++ ntoskrnl/include/internal/mm.h	(working copy)
-@@ -176,6 +176,9 @@
+@@ -187,6 +187,9 @@
      ULONG Flags;
      ULONG Characteristics;
      BOOLEAN WriteCopy;
@@ -24,7 +24,7 @@
  } MM_SECTION_SEGMENT, *PMM_SECTION_SEGMENT;
  
  typedef struct _MM_IMAGE_SECTION_OBJECT
-@@ -192,6 +195,10 @@
+@@ -203,6 +206,10 @@
      BOOLEAN Executable;
      ULONG NrSegments;
      ULONG ImageSize;
@@ -35,7 +35,7 @@
      PMM_SECTION_SEGMENT Segments;
  } MM_IMAGE_SECTION_OBJECT, *PMM_IMAGE_SECTION_OBJECT;
  
-@@ -210,6 +217,16 @@
+@@ -221,6 +228,16 @@
      };
  } ROS_SECTION_OBJECT, *PROS_SECTION_OBJECT;
  
@@ -52,7 +52,7 @@
  typedef struct _MEMORY_AREA
  {
      PVOID StartingAddress;
-@@ -224,17 +241,10 @@
+@@ -235,17 +252,10 @@
      ULONG PageOpCount;
      union
      {
@@ -73,9 +73,9 @@
  } MEMORY_AREA, *PMEMORY_AREA;
 Index: ntoskrnl/include/internal/cc.h
 ===================================================================
---- ntoskrnl/include/internal/cc.h	(revision 31533)
+--- ntoskrnl/include/internal/cc.h	(revision 34040)
 +++ ntoskrnl/include/internal/cc.h	(working copy)
-@@ -102,17 +102,29 @@
+@@ -102,19 +102,29 @@
      LONG ActivePrefetches;
  } PFSN_PREFETCHER_GLOBALS, *PPFSN_PREFETCHER_GLOBALS;
  
@@ -102,6 +102,8 @@
 -    ULONG CacheSegmentSize;
 -    LARGE_INTEGER AllocationSize;
 -    LARGE_INTEGER FileSize;
+-    PCACHE_MANAGER_CALLBACKS Callbacks;
+-    PVOID LazyWriteContext;
 -    KSPIN_LOCK BcbLock;
 +    CC_FILE_SIZES FileSizes;
 +    BOOLEAN PinAccess;
@@ -113,7 +115,7 @@
      ULONG RefCount;
  #if defined(DBG) || defined(KDBG)
  	BOOLEAN Trace; /* enable extra trace output for this BCB and it's cache segments
*/
-@@ -157,8 +169,8 @@
+@@ -159,8 +169,8 @@
  typedef struct _INTERNAL_BCB
  {
      PUBLIC_BCB PFCB;
@@ -124,37 +126,10 @@
      CSHORT RefCount; /* (At offset 0x34 on WinNT4) */
  } INTERNAL_BCB, *PINTERNAL_BCB;
  
-Index: ntoskrnl/ntoskrnl.def
+Index: drivers/filesystems/fastfat/vfat.h
 ===================================================================
---- ntoskrnl/ntoskrnl.def	(revision 31533)
-+++ ntoskrnl/ntoskrnl.def	(working copy)
-@@ -5,9 +5,6 @@
- ; ReactOS Operating System
- ;
- EXPORTS
--CcRosInitializeFileCache@8
--CcRosReleaseFileCache@4
--CcRosTraceCacheMap@8
- CcCanIWrite@16
- CcCopyRead@24
- CcCopyWrite@20
-Index: drivers/filesystems/cdfs/cdfs.h
-===================================================================
---- drivers/filesystems/cdfs/cdfs.h	(revision 31533)
-+++ drivers/filesystems/cdfs/cdfs.h	(working copy)
-@@ -6,7 +6,7 @@
- #include <ntddcdrm.h>
- #include <ccros.h>
- 
--#define USE_ROS_CC_AND_FS
-+//#define USE_ROS_CC_AND_FS
- 
- #define CDFS_BASIC_SECTOR 2048
- #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16
-Index: drivers/filesystems/vfat/vfat.h
-===================================================================
---- drivers/filesystems/vfat/vfat.h	(revision 31533)
-+++ drivers/filesystems/vfat/vfat.h	(working copy)
+--- drivers/filesystems/fastfat/vfat.h	(revision 34037)
++++ drivers/filesystems/fastfat/vfat.h	(working copy)
 @@ -6,7 +6,7 @@
  #ifdef __GNUC__
  #include <ccros.h>
@@ -164,16 +139,3 @@
  #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) \

Propchange: branches/cache_manager_rewrite/headers.patch
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cache_manager_rewrite/mm.patch
URL:
http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm.patch?…
==============================================================================
--- branches/cache_manager_rewrite/mm.patch [iso-8859-1] (original)
+++ branches/cache_manager_rewrite/mm.patch [iso-8859-1] Wed Jun 25 08:49:18 2008
@@ -1,6 +1,6 @@
 Index: mm/elf.inc.h
 ===================================================================
---- mm/elf.inc.h	(revision 32677)
+--- mm/elf.inc.h	(revision 34040)
 +++ mm/elf.inc.h	(working copy)
 @@ -1,3 +1,5 @@
 +#include <ntoskrnl.h>
@@ -18,7 +18,7 @@
     &pData,
 Index: mm/elf32.c
 ===================================================================
---- mm/elf32.c	(revision 32677)
+--- mm/elf32.c	(revision 34040)
 +++ mm/elf32.c	(working copy)
 @@ -6,7 +6,7 @@
   *
@@ -31,7 +31,7 @@
  
 Index: mm/elf64.c
 ===================================================================
---- mm/elf64.c	(revision 32677)
+--- mm/elf64.c	(revision 34040)
 +++ mm/elf64.c	(working copy)
 @@ -6,6 +6,6 @@
   *
@@ -43,7 +43,7 @@
  #include "elf.inc.h"
 Index: mm/freelist.c
 ===================================================================
---- mm/freelist.c	(revision 32677)
+--- mm/freelist.c	(revision 34040)
 +++ mm/freelist.c	(working copy)
 @@ -634,6 +634,12 @@
  }
@@ -60,7 +60,7 @@
  {
 Index: mm/mm.c
 ===================================================================
---- mm/mm.c	(revision 32677)
+--- mm/mm.c	(revision 34040)
 +++ mm/mm.c	(working copy)
 @@ -246,6 +246,7 @@
              break;
@@ -72,7 +72,7 @@
                                                    (PVOID)Address,
 Index: mm/mminit.c
 ===================================================================
---- mm/mminit.c	(revision 32677)
+--- mm/mminit.c	(revision 34040)
 +++ mm/mminit.c	(working copy)
 @@ -67,6 +67,9 @@
  FALSE;
@@ -94,7 +94,7 @@
      return TRUE;
 Index: mm/mpw.c
 ===================================================================
---- mm/mpw.c	(revision 32677)
+--- mm/mpw.c	(revision 34040)
 +++ mm/mpw.c	(working copy)
 @@ -88,7 +88,7 @@
        MmWriteDirtyPages(128, &PagesWritten);
@@ -107,7 +107,7 @@
  
 Index: mm/pagefile.c
 ===================================================================
---- mm/pagefile.c	(revision 32677)
+--- mm/pagefile.c	(revision 34040)
 +++ mm/pagefile.c	(working copy)
 @@ -1,5 +1,4 @@
 -/*
@@ -118,7 +118,7 @@
   *  This program is free software; you can redistribute it and/or modify
 Index: mm/pageop.c
 ===================================================================
---- mm/pageop.c	(revision 32677)
+--- mm/pageop.c	(revision 34040)
 +++ mm/pageop.c	(working copy)
 @@ -81,14 +81,23 @@
     /*
@@ -213,11 +213,10 @@
     }
     PageOp->ReferenceCount = 1;
     PageOp->Next = MmPageOpHashTable[Hash];
-@@ -257,12 +277,3 @@
-                                     TAG_MM_PAGEOP,
+@@ -258,11 +278,3 @@
                                      50);
  }
--
+ 
 -
 -
 -
@@ -228,7 +227,7 @@
 -
 Index: mm/pe.c
 ===================================================================
---- mm/pe.c	(revision 32677)
+--- mm/pe.c	(revision 34040)
 +++ mm/pe.c	(working copy)
 @@ -240,7 +240,7 @@
  	lnOffset.QuadPart = pidhDosHeader->e_lfanew;
@@ -250,7 +249,7 @@
  	    DIE(("ReadFile failed with status %08X\n", nStatus));
 Index: mm/rmap.c
 ===================================================================
---- mm/rmap.c	(revision 32677)
+--- mm/rmap.c	(revision 34040)
 +++ mm/rmap.c	(working copy)
 @@ -299,6 +299,17 @@
        Status = MmPageOutVirtualMemory(AddressSpace, MemoryArea,
@@ -272,7 +271,7 @@
        KEBUGCHECK(0);
 Index: mm/section.c
 ===================================================================
---- mm/section.c	(revision 32677)
+--- mm/section.c	(revision 34040)
 +++ mm/section.c	(working copy)
 @@ -31,7 +31,7 @@
   *                  Ge van Geldorp
@@ -4361,14 +4360,14 @@
                              IN OUT PULONG NumberOfPages,
 Index: mm/virtual.c
 ===================================================================
---- mm/virtual.c	(revision 32677)
+--- mm/virtual.c	(revision 34040)
 +++ mm/virtual.c	(working copy)
-@@ -396,7 +396,7 @@
+@@ -594,7 +594,7 @@
      NTSTATUS Status;
- 
+     
      *NumberOfBytesToProtect =
--        PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) -
-+        PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (ULONG_PTR)(*NumberOfBytesToProtect))
-
-         PAGE_ROUND_DOWN(*BaseAddress);
+-    PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (*NumberOfBytesToProtect)) -
++    PAGE_ROUND_UP((ULONG_PTR)(*BaseAddress) + (ULONG_PTR)(*NumberOfBytesToProtect)) -
+     PAGE_ROUND_DOWN(*BaseAddress);
      *BaseAddress = (PVOID)PAGE_ROUND_DOWN(*BaseAddress);
- 
+