[ros-diffs] [sginsberg] 42176: - Get rid of ccros.h, deprecated by revision 42175

[sginsberg at svn.reactos.org]

Author: sginsberg
Date: Fri Jul 24 19:35:28 2009
New Revision: 42176

URL: http://svn.reactos.org/svn/reactos?rev=42176&view=rev
Log:
- Get rid of ccros.h, deprecated by revision 42175

Removed:
    trunk/reactos/include/reactos/ccros.h
Modified:
    trunk/reactos/drivers/filesystems/fastfat/fsctl.c
    trunk/reactos/drivers/filesystems/fastfat/vfat.h
    trunk/reactos/lib/fslib/vfatlib/check/vfat.h
    trunk/reactos/ntoskrnl/include/internal/cc.h
    trunk/reactos/ntoskrnl/include/precomp.h

Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat/fsctl.c?rev=42176&r1=42175&r2=42176&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Fri Jul 24 19:35:28 2009
@@ -773,30 +773,6 @@
    return STATUS_INVALID_DEVICE_REQUEST;
 }
 
-#ifdef USE_ROS_CC_AND_FS
-static NTSTATUS
-VfatRosQueryLcnMapping(PVFAT_IRP_CONTEXT IrpContext)
-{
-   PDEVICE_EXTENSION DeviceExt;
-   PROS_QUERY_LCN_MAPPING LcnQuery;
-   PIO_STACK_LOCATION Stack;
-
-   DPRINT("VfatRosQueryLcnMapping(IrpContext %p)\n", IrpContext);
-
-   DeviceExt = IrpContext->DeviceExt;
-   Stack = IrpContext->Stack;
-   if (IrpContext->Irp->AssociatedIrp.SystemBuffer == NULL ||
-       Stack->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ROS_QUERY_LCN_MAPPING))
-   {
-      return STATUS_BUFFER_TOO_SMALL;
-   }
-   LcnQuery = (PROS_QUERY_LCN_MAPPING)(IrpContext->Irp->AssociatedIrp.SystemBuffer);
-   LcnQuery->LcnDiskOffset.QuadPart = DeviceExt->FatInfo.dataStart * DeviceExt->FatInfo.BytesPerSector;
-   IrpContext->Irp->IoStatus.Information = sizeof(ROS_QUERY_LCN_MAPPING);
-   return(STATUS_SUCCESS);
-}
-#endif
-
 static NTSTATUS
 VfatIsVolumeDirty(PVFAT_IRP_CONTEXT IrpContext)
 {
@@ -877,11 +853,6 @@
             case FSCTL_MOVE_FILE:
                Status = VfatMoveFile(IrpContext);
                break;
-#ifdef USE_ROS_CC_AND_FS
-            case FSCTL_ROS_QUERY_LCN_MAPPING:
-               Status = VfatRosQueryLcnMapping(IrpContext);
-               break;
-#endif
             case FSCTL_IS_VOLUME_DIRTY:
                Status = VfatIsVolumeDirty(IrpContext);
                break;

Modified: trunk/reactos/drivers/filesystems/fastfat/vfat.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfat/vfat.h?rev=42176&r1=42175&r2=42176&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/fastfat/vfat.h [iso-8859-1] Fri Jul 24 19:35:28 2009
@@ -1,8 +1,6 @@
 #include <ntifs.h>
 #include <ntdddisk.h>
 #include <debug.h>
-
-#include <ccros.h>
 
 #define USE_ROS_CC_AND_FS
 

Removed: trunk/reactos/include/reactos/ccros.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ccros.h?rev=42175&view=auto
==============================================================================
--- trunk/reactos/include/reactos/ccros.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/ccros.h (removed)
@@ -1,29 +1,0 @@
-#ifndef __INCLUDE_DDK_NTIFS_H
-#define __INCLUDE_DDK_NTIFS_H
-
-NTSTATUS NTAPI
-CcRosInitializeFileCache(PFILE_OBJECT FileObject,
-                         ULONG CacheSegmentSize,
-                         PCACHE_MANAGER_CALLBACKS CallBacks,
-                         PVOID LazyWriterContext);
-
-NTSTATUS NTAPI
-CcRosReleaseFileCache (PFILE_OBJECT	FileObject);
-
-struct _BCB;
-
-VOID
-NTAPI
-CcRosTraceCacheMap (
-	struct _BCB* Bcb,
-	BOOLEAN Trace );
-
-#define FSCTL_ROS_QUERY_LCN_MAPPING \
-        CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 63, METHOD_BUFFERED, FILE_ANY_ACCESS)
-
-typedef struct _ROS_QUERY_LCN_MAPPING
-{
-  LARGE_INTEGER LcnDiskOffset;
-} ROS_QUERY_LCN_MAPPING, *PROS_QUERY_LCN_MAPPING;
-
-#endif /* __INCLUDE_DDK_NTIFS_H */

Modified: trunk/reactos/lib/fslib/vfatlib/check/vfat.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/check/vfat.h?rev=42176&r1=42175&r2=42176&view=diff
==============================================================================
--- trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] (original)
+++ trunk/reactos/lib/fslib/vfatlib/check/vfat.h [iso-8859-1] Fri Jul 24 19:35:28 2009
@@ -3,7 +3,6 @@
 #include <ddk/ntifs.h>
 #include <ddk/ntdddisk.h>
 #include <ndk/ntndk.h>
-#include <ccros.h>
 #include <limits.h>
 #include <debug.h>
 

Modified: trunk/reactos/ntoskrnl/include/internal/cc.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/cc.h?rev=42176&r1=42175&r2=42176&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Fri Jul 24 19:35:28 2009
@@ -299,6 +299,21 @@
 
 NTSTATUS
 NTAPI
+CcRosInitializeFileCache(
+    PFILE_OBJECT FileObject,
+    ULONG CacheSegmentSize,
+    PCACHE_MANAGER_CALLBACKS CallBacks,
+    PVOID LazyWriterContext
+);
+
+NTSTATUS
+NTAPI
+CcRosReleaseFileCache(
+    PFILE_OBJECT FileObject
+);
+
+NTSTATUS
+NTAPI
 CcTryToInitializeFileCache(PFILE_OBJECT FileObject);
 
 #endif

Modified: trunk/reactos/ntoskrnl/include/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/precomp.h?rev=42176&r1=42175&r2=42176&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/precomp.h [iso-8859-1] Fri Jul 24 19:35:28 2009
@@ -28,8 +28,7 @@
 #define TEXT(s) L##s
 #include <regstr.h>
 
-/* FIXME: Temporary until CC Ros is gone */
-#include <ccros.h>
+/* FIXME: Temporary until Winldr is used */
 #include <rosldr.h>
 
 /* Disk Dump Driver Header */