Author: arty Date: Tue Nov 17 04:28:54 2009 New Revision: 44210
URL: http://svn.reactos.org/svn/reactos?rev=44210&view=rev Log: Revert some extra printing i introduced. No longer needed.
Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild branches/arty-newcc/drivers/filesystems/cdfs/create.c branches/arty-newcc/drivers/filesystems/cdfs/fcb.c branches/arty-newcc/drivers/filesystems/cdfs/rw.c
Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/c... ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -4,6 +4,7 @@ #include <ntifs.h> #include <ntddk.h> #include <ntddcdrm.h> +#include <pseh/pseh.h>
#define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 @@ -227,8 +228,12 @@ ULONG LastOffset; } CCB, *PCCB;
-#define TAG_CCB 'BCCI' -#define TAG_FCB 'BCFI' +#ifndef TAG +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#endif + +#define TAG_CCB TAG('I', 'C', 'C', 'B') +#define TAG_FCB TAG('I', 'F', 'C', 'B')
typedef struct { @@ -400,6 +405,7 @@ PUNICODE_STRING LongName, PUNICODE_STRING ShortName);
+ /* rw.c */
NTSTATUS NTAPI
Modified: branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/c... ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/cdfs.rbuild [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -5,6 +5,7 @@ <include base="cdfs">.</include> <library>ntoskrnl</library> <library>hal</library> + <library>pseh</library> <file>cdfs.c</file> <file>cleanup.c</file> <file>close.c</file>
Modified: branches/arty-newcc/drivers/filesystems/cdfs/create.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/c... ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/create.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/create.c [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -1,5 +1,3 @@ - - /* * ReactOS kernel * Copyright (C) 2002, 2003, 2004 ReactOS Team
Modified: branches/arty-newcc/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/c... ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -313,7 +313,6 @@ return(Fcb); }
-#define ch(x) (((x) < 127 && (x) > 31) ? (x) : '.')
static VOID CdfsGetDirEntryName(PDEVICE_EXTENSION DeviceExt, @@ -333,34 +332,12 @@ } else { - int i; - for (i = 0; i < 32; i += 8) - { - DPRINT("%08x: %02x %02x %02x %02x-%02x %02x %02x %02x %c%c%c%c%c%c%c%c\n", ((char *)Record->FileId) + i, - ((char *)Record->FileId)[i+0] & 0xff, - ((char *)Record->FileId)[i+1] & 0xff, - ((char *)Record->FileId)[i+2] & 0xff, - ((char *)Record->FileId)[i+3] & 0xff, - ((char *)Record->FileId)[i+4] & 0xff, - ((char *)Record->FileId)[i+5] & 0xff, - ((char *)Record->FileId)[i+6] & 0xff, - ((char *)Record->FileId)[i+7] & 0xff, - ch(((char *)Record->FileId)[i+0] & 0xff), - ch(((char *)Record->FileId)[i+1] & 0xff), - ch(((char *)Record->FileId)[i+2] & 0xff), - ch(((char *)Record->FileId)[i+3] & 0xff), - ch(((char *)Record->FileId)[i+4] & 0xff), - ch(((char *)Record->FileId)[i+5] & 0xff), - ch(((char *)Record->FileId)[i+6] & 0xff), - ch(((char *)Record->FileId)[i+7] & 0xff)); - } if (DeviceExt->CdInfo.JolietLevel == 0) { ULONG i; + for (i = 0; i < Record->FileIdLength && Record->FileId[i] != ';'; i++) - { Name[i] = (WCHAR)Record->FileId[i]; - } Name[i] = 0; } else @@ -437,7 +414,7 @@ CdfsAddFCBToTable(Vcb, rcFCB); *fileFCB = rcFCB;
- DPRINT("%S %d %I64d %x %x\n", LongName, Size, rcFCB->RFCB.AllocationSize.QuadPart, rcFCB->IndexNumber.u.HighPart, rcFCB->IndexNumber.u.LowPart); + DPRINT("%S %d %I64d\n", LongName, Size, rcFCB->RFCB.AllocationSize.QuadPart);
return(STATUS_SUCCESS); } @@ -522,7 +499,6 @@ DirSize = DirectoryFcb->Entry.DataLengthL; StreamOffset.QuadPart = (LONGLONG)DirectoryFcb->Entry.ExtentLocationL * (LONGLONG)BLOCKSIZE;
- DPRINT("Directory is at block %x, Offset %I64x\n", DirectoryFcb->Entry.ExtentLocationL, StreamOffset.QuadPart); if (!CcMapData(DeviceExt->StreamFileObject, &StreamOffset, BLOCKSIZE, @@ -547,7 +523,6 @@
while(TRUE) { - DPRINT("Record %x\n", Record); if (Record->RecordLength == 0) { DPRINT("RecordLength == 0 Stopped!\n");
Modified: branches/arty-newcc/drivers/filesystems/cdfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/drivers/filesystems/c... ============================================================================== --- branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] (original) +++ branches/arty-newcc/drivers/filesystems/cdfs/rw.c [iso-8859-1] Tue Nov 17 04:28:54 2009 @@ -208,18 +208,6 @@ ReadOffset.u.LowPart, Irp->Flags, &ReturnedReadLength); - - DPRINT("Status %x Returned read length %x\n", Status, ReturnedReadLength); - - int *buffer; - int carry, crc = 0; - for (buffer = (int *)Buffer; buffer < ((int *)Buffer) + ReadLength / sizeof(int); buffer++) - { - carry = !!(*buffer < 0 && crc < 0); - crc += carry + *buffer; - } - DPRINT("Sector: %08x crc %08x length %x\n", ReadOffset.u.LowPart, crc, ReadLength); - if (NT_SUCCESS(Status)) { if (FileObject->Flags & FO_SYNCHRONOUS_IO) @@ -249,7 +237,6 @@
Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp,IO_NO_INCREMENT); return(STATUS_NOT_SUPPORTED); }
-
arty＠svn.reactos.org