[ros-diffs] [akorotaev] 31546: One more try to fix branch build

Author: akorotaev
Date: Wed Jan  2 02:32:34 2008
New Revision: 31546

URL: http://svn.reactos.org/svn/reactos?rev=31546&view=rev
Log:
One more try to fix branch build

Modified:
    branches/cache_manager_rewrite/cc/mdl.c
    branches/cache_manager_rewrite/headers.patch

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 (original)
+++ branches/cache_manager_rewrite/cc/mdl.c Wed Jan  2 02:32:34 2008
@@ -96,7 +96,7 @@
     }
 
     /* Use slow path */
-    CcMdlReadCompleteDev (MdlChain, FileObject);
+    CcMdlReadComplete2 (MdlChain, FileObject);
 }
 
 /*
@@ -122,7 +122,7 @@
     }
 
     /* Use slow path */
-    CcMdlWriteCompleteDev (FileObject, FileOffset, MdlChain);
+    CcMdlWriteComplete2 (FileObject, FileOffset, MdlChain);
 }
 
 /*

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 02:32:34 2008
@@ -1,3 +1,15 @@
+Index: include/reactos/exeformat.h
+===================================================================
+--- include/reactos/exeformat.h	(revision 31533)
++++ 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/mm.h
 ===================================================================
 --- ntoskrnl/include/internal/mm.h	(revision 31533)
@@ -126,6 +138,19 @@
  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)