Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 20:15:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Return unique IndexNumber.

Browse source 
Minor cleanup.

svn path=/trunk/; revision=8586
This commit is contained in:
Eric Kohl 2004-03-08 08:51:26 +00:00
parent 17ad90f8d0
commit 11cc5733d3
5 changed files with 113 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

28
reactos/drivers/fs/cdfs/cdfs.h
View file

@ -41,7 +41,11 @@ struct _DIR_RECORD
typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD; typedef struct _DIR_RECORD DIR_RECORD, *PDIR_RECORD;
/* DIR_RECORD.FileFlags */
#define FILE_FLAG_HIDDEN 0x01
#define FILE_FLAG_DIRECTORY 0x02
#define FILE_FLAG_SYSTEM 0x04
#define FILE_FLAG_READONLY 0x10
/* Volume Descriptor header*/ /* Volume Descriptor header*/
@ -182,12 +186,13 @@ typedef struct _FCB
ULONG DirIndex; ULONG DirIndex;
LARGE_INTEGER IndexNumber; /* HighPart: Parent directory start sector */
/* LowPart: Directory record offset in the parent directory file */
LONG RefCount; LONG RefCount;
ULONG Flags; ULONG Flags;
DIR_RECORD Entry; DIR_RECORD Entry;
} FCB, *PFCB; } FCB, *PFCB;
@ -312,15 +317,26 @@ CdfsMakeRootFCB(PDEVICE_EXTENSION Vcb);
PFCB PFCB
CdfsOpenRootFCB(PDEVICE_EXTENSION Vcb); CdfsOpenRootFCB(PDEVICE_EXTENSION Vcb);
NTSTATUS
CdfsMakeFCBFromDirEntry(PVCB Vcb,
PFCB DirectoryFCB,
PWSTR LongName,
PWSTR ShortName,
PDIR_RECORD Record,
ULONG DirectorySector,
ULONG DirectoryOffset,
PFCB * fileFCB);
NTSTATUS NTSTATUS
CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb, CdfsAttachFCBToFileObject(PDEVICE_EXTENSION Vcb,
PFCB Fcb, PFCB Fcb,
PFILE_OBJECT FileObject); PFILE_OBJECT FileObject);
NTSTATUS
CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt,
PFCB DirectoryFcb,
PWSTR FileToFind,
PFCB *FoundFCB);
NTSTATUS NTSTATUS
CdfsGetFCBForFile(PDEVICE_EXTENSION Vcb, CdfsGetFCBForFile(PDEVICE_EXTENSION Vcb,

20
reactos/drivers/fs/cdfs/fcb.c
View file

@ -1,6 +1,6 @@
/* /*
* ReactOS kernel * ReactOS kernel
* Copyright (C) 2002 ReactOS Team * Copyright (C) 2002, 2004 ReactOS Team
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: fcb.c,v 1.17 2004/01/28 20:52:21 ekohl Exp $ /* $Id: fcb.c,v 1.18 2004/03/08 08:51:26 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -111,8 +111,7 @@ CdfsDestroyFCB(PFCB Fcb)
BOOLEAN BOOLEAN
CdfsFCBIsDirectory(PFCB Fcb) CdfsFCBIsDirectory(PFCB Fcb)
{ {
// return(Fcb->entry.Attrib & FILE_ATTRIBUTE_DIRECTORY); return(Fcb->Entry.FileFlags & FILE_FLAG_DIRECTORY);
return(Fcb->Entry.FileFlags & 0x02);
} }
@ -268,7 +267,8 @@ CdfsMakeRootFCB(PDEVICE_EXTENSION Vcb)
Fcb->Entry.DataLengthL = Vcb->CdInfo.RootSize; Fcb->Entry.DataLengthL = Vcb->CdInfo.RootSize;
Fcb->Entry.ExtentLocationL = Vcb->CdInfo.RootStart; Fcb->Entry.ExtentLocationL = Vcb->CdInfo.RootStart;
Fcb->Entry.FileFlags = 0x02; // FILE_ATTRIBUTE_DIRECTORY; Fcb->Entry.FileFlags = FILE_FLAG_DIRECTORY;
Fcb->IndexNumber.QuadPart = 0LL;
Fcb->RefCount = 1; Fcb->RefCount = 1;
Fcb->DirIndex = 0; Fcb->DirIndex = 0;
Fcb->RFCB.FileSize.QuadPart = Vcb->CdInfo.RootSize; Fcb->RFCB.FileSize.QuadPart = Vcb->CdInfo.RootSize;
@ -342,6 +342,8 @@ CdfsMakeFCBFromDirEntry(PVCB Vcb,
PWSTR LongName, PWSTR LongName,
PWSTR ShortName, PWSTR ShortName,
PDIR_RECORD Record, PDIR_RECORD Record,
ULONG DirectorySector,
ULONG DirectoryOffset,
PFCB * fileFCB) PFCB * fileFCB)
{ {
WCHAR pathName[MAX_PATH]; WCHAR pathName[MAX_PATH];
@ -388,6 +390,8 @@ CdfsMakeFCBFromDirEntry(PVCB Vcb,
{ {
CdfsFCBInitializeCache(Vcb, rcFCB); CdfsFCBInitializeCache(Vcb, rcFCB);
} }
rcFCB->IndexNumber.u.HighPart = DirectorySector;
rcFCB->IndexNumber.u.LowPart = DirectoryOffset;
rcFCB->RefCount++; rcFCB->RefCount++;
CdfsAddFCBToTable(Vcb, rcFCB); CdfsAddFCBToTable(Vcb, rcFCB);
*fileFCB = rcFCB; *fileFCB = rcFCB;
@ -507,7 +511,9 @@ CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt,
Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength); Record->RecordLength, Record->ExtAttrRecordLength, Record->FileIdLength);
CdfsGetDirEntryName(DeviceExt, Record, Name); CdfsGetDirEntryName(DeviceExt, Record, Name);
DPRINT("Name '%S'\n", Name); DPRINT ("Name '%S'\n", Name);
DPRINT ("Sector %lu\n", DirectoryFcb->Entry.ExtentLocationL);
DPRINT ("Offset %lu\n", Offset);
RtlInitUnicodeString(&LongName, Name); RtlInitUnicodeString(&LongName, Name);
ShortName.Length = 0; ShortName.Length = 0;
@ -542,6 +548,8 @@ CdfsDirFindFile(PDEVICE_EXTENSION DeviceExt,
Name, Name,
ShortNameBuffer, ShortNameBuffer,
Record, Record,
DirectoryFcb->Entry.ExtentLocationL,
Offset,
FoundFCB); FoundFCB);
CcUnpinData(Context); CcUnpinData(Context);

116
reactos/drivers/fs/cdfs/finfo.c
View file

@ -1,6 +1,6 @@
/* /*
* ReactOS kernel * ReactOS kernel
* Copyright (C) 2002 ReactOS Team * Copyright (C) 2002, 2004 ReactOS Team
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: finfo.c,v 1.8 2003/09/20 20:31:57 weiden Exp $ /* $Id: finfo.c,v 1.9 2004/03/08 08:51:26 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -39,14 +39,14 @@
/* FUNCTIONS ****************************************************************/ /* FUNCTIONS ****************************************************************/
/*
* FUNCTION: Retrieve the standard file information
*/
static NTSTATUS static NTSTATUS
CdfsGetStandardInformation(PFCB Fcb, CdfsGetStandardInformation(PFCB Fcb,
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PFILE_STANDARD_INFORMATION StandardInfo, PFILE_STANDARD_INFORMATION StandardInfo,
PULONG BufferLength) PULONG BufferLength)
/*
* FUNCTION: Retrieve the standard file information
*/
{ {
DPRINT("CdfsGetStandardInformation() called\n"); DPRINT("CdfsGetStandardInformation() called\n");
@ -71,6 +71,9 @@ CdfsGetStandardInformation(PFCB Fcb,
} }
/*
* FUNCTION: Retrieve the file position information
*/
static NTSTATUS static NTSTATUS
CdfsGetPositionInformation(PFILE_OBJECT FileObject, CdfsGetPositionInformation(PFILE_OBJECT FileObject,
PFILE_POSITION_INFORMATION PositionInfo, PFILE_POSITION_INFORMATION PositionInfo,
@ -92,6 +95,9 @@ CdfsGetPositionInformation(PFILE_OBJECT FileObject,
} }
/*
* FUNCTION: Retrieve the basic file information
*/
static NTSTATUS static NTSTATUS
CdfsGetBasicInformation(PFILE_OBJECT FileObject, CdfsGetBasicInformation(PFILE_OBJECT FileObject,
PFCB Fcb, PFCB Fcb,
@ -122,15 +128,15 @@ CdfsGetBasicInformation(PFILE_OBJECT FileObject,
} }
/*
* FUNCTION: Retrieve the file name information
*/
static NTSTATUS static NTSTATUS
CdfsGetNameInformation(PFILE_OBJECT FileObject, CdfsGetNameInformation(PFILE_OBJECT FileObject,
PFCB Fcb, PFCB Fcb,
PDEVICE_OBJECT DeviceObject, PDEVICE_OBJECT DeviceObject,
PFILE_NAME_INFORMATION NameInfo, PFILE_NAME_INFORMATION NameInfo,
PULONG BufferLength) PULONG BufferLength)
/*
* FUNCTION: Retrieve the file name information
*/
{ {
ULONG NameLength; ULONG NameLength;
@ -155,6 +161,9 @@ CdfsGetNameInformation(PFILE_OBJECT FileObject,
} }
/*
* FUNCTION: Retrieve the internal file information
*/
static NTSTATUS static NTSTATUS
CdfsGetInternalInformation(PFCB Fcb, CdfsGetInternalInformation(PFCB Fcb,
PFILE_INTERNAL_INFORMATION InternalInfo, PFILE_INTERNAL_INFORMATION InternalInfo,
@ -168,8 +177,7 @@ CdfsGetInternalInformation(PFCB Fcb,
if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION)) if (*BufferLength < sizeof(FILE_INTERNAL_INFORMATION))
return(STATUS_BUFFER_OVERFLOW); return(STATUS_BUFFER_OVERFLOW);
/* FIXME: get a real index, that can be used in a create operation */ InternalInfo->IndexNumber.QuadPart = Fcb->IndexNumber.QuadPart;
InternalInfo->IndexNumber.QuadPart = 0;
*BufferLength -= sizeof(FILE_INTERNAL_INFORMATION); *BufferLength -= sizeof(FILE_INTERNAL_INFORMATION);
@ -177,13 +185,13 @@ CdfsGetInternalInformation(PFCB Fcb,
} }
/*
* FUNCTION: Retrieve the file network open information
*/
static NTSTATUS static NTSTATUS
CdfsGetNetworkOpenInformation(PFCB Fcb, CdfsGetNetworkOpenInformation(PFCB Fcb,
PFILE_NETWORK_OPEN_INFORMATION NetworkInfo, PFILE_NETWORK_OPEN_INFORMATION NetworkInfo,
PULONG BufferLength) PULONG BufferLength)
/*
* FUNCTION: Retrieve the file network open information
*/
{ {
assert(NetworkInfo); assert(NetworkInfo);
assert(Fcb); assert(Fcb);
@ -210,14 +218,14 @@ CdfsGetNetworkOpenInformation(PFCB Fcb,
} }
/*
* FUNCTION: Retrieve all file information
*/
static NTSTATUS static NTSTATUS
CdfsGetAllInformation(PFILE_OBJECT FileObject, CdfsGetAllInformation(PFILE_OBJECT FileObject,
PFCB Fcb, PFCB Fcb,
PFILE_ALL_INFORMATION Info, PFILE_ALL_INFORMATION Info,
PULONG BufferLength) PULONG BufferLength)
/*
* FUNCTION: Retrieve the all file information
*/
{ {
ULONG NameLength; ULONG NameLength;
@ -245,11 +253,10 @@ CdfsGetAllInformation(PFILE_OBJECT FileObject,
Info->StandardInformation.EndOfFile = Fcb->RFCB.FileSize; Info->StandardInformation.EndOfFile = Fcb->RFCB.FileSize;
Info->StandardInformation.NumberOfLinks = 0; Info->StandardInformation.NumberOfLinks = 0;
Info->StandardInformation.DeletePending = FALSE; Info->StandardInformation.DeletePending = FALSE;
Info->StandardInformation.Directory = Fcb->Entry.FileFlags & 0x02 ? TRUE : FALSE; Info->StandardInformation.Directory = Fcb->Entry.FileFlags & FILE_FLAG_DIRECTORY ? TRUE : FALSE;
/* Internal Information */ /* Internal Information */
/* FIXME: get a real index, that can be used in a create operation */ Info->InternalInformation.IndexNumber.QuadPart = Fcb->IndexNumber.QuadPart;
Info->InternalInformation.IndexNumber.QuadPart = 0;
/* EA Information */ /* EA Information */
Info->EaInformation.EaSize = 0; Info->EaInformation.EaSize = 0;
@ -277,26 +284,13 @@ CdfsGetAllInformation(PFILE_OBJECT FileObject,
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static NTSTATUS
CdfsSetPositionInformation(PFILE_OBJECT FileObject,
PFILE_POSITION_INFORMATION PositionInfo)
{
DPRINT ("CdfsSetPositionInformation()\n");
DPRINT ("PositionInfo %x\n", PositionInfo);
DPRINT ("Setting position %d\n", PositionInfo->CurrentByteOffset.u.LowPart);
memcpy (&FileObject->CurrentByteOffset, &PositionInfo->CurrentByteOffset,
sizeof (LARGE_INTEGER));
return (STATUS_SUCCESS);
}
NTSTATUS STDCALL
CdfsQueryInformation(PDEVICE_OBJECT DeviceObject,
PIRP Irp)
/* /*
* FUNCTION: Retrieve the specified file information * FUNCTION: Retrieve the specified file information
*/ */
NTSTATUS STDCALL
CdfsQueryInformation(PDEVICE_OBJECT DeviceObject,
PIRP Irp)
{ {
FILE_INFORMATION_CLASS FileInformationClass; FILE_INFORMATION_CLASS FileInformationClass;
PIO_STACK_LOCATION Stack; PIO_STACK_LOCATION Stack;
@ -374,6 +368,7 @@ CdfsQueryInformation(PDEVICE_OBJECT DeviceObject,
default: default:
DPRINT("Unimplemented information class %u\n", FileInformationClass); DPRINT("Unimplemented information class %u\n", FileInformationClass);
Status = STATUS_NOT_SUPPORTED; Status = STATUS_NOT_SUPPORTED;
break;
} }
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;
@ -388,12 +383,32 @@ CdfsQueryInformation(PDEVICE_OBJECT DeviceObject,
return(Status); return(Status);
} }
/*
* FUNCTION: Set the file position information
*/
static NTSTATUS
CdfsSetPositionInformation(PFILE_OBJECT FileObject,
PFILE_POSITION_INFORMATION PositionInfo)
{
DPRINT ("CdfsSetPositionInformation()\n");
DPRINT ("PositionInfo %x\n", PositionInfo);
DPRINT ("Setting position %I64u\n", PositionInfo->CurrentByteOffset.QuadPart);
FileObject->CurrentByteOffset.QuadPart =
PositionInfo->CurrentByteOffset.QuadPart;
return STATUS_SUCCESS;
}
/*
* FUNCTION: Set the specified file information
*/
NTSTATUS STDCALL NTSTATUS STDCALL
CdfsSetInformation(PDEVICE_OBJECT DeviceObject, CdfsSetInformation(PDEVICE_OBJECT DeviceObject,
PIRP Irp) PIRP Irp)
/*
* FUNCTION: Retrieve the specified file information
*/
{ {
FILE_INFORMATION_CLASS FileInformationClass; FILE_INFORMATION_CLASS FileInformationClass;
PIO_STACK_LOCATION Stack; PIO_STACK_LOCATION Stack;
@ -414,16 +429,19 @@ CdfsSetInformation(PDEVICE_OBJECT DeviceObject,
switch (FileInformationClass) switch (FileInformationClass)
{ {
case FilePositionInformation: case FilePositionInformation:
Status = CdfsSetPositionInformation(FileObject, Status = CdfsSetPositionInformation(FileObject,
SystemBuffer); SystemBuffer);
break; break;
case FileBasicInformation:
case FileRenameInformation: case FileBasicInformation:
Status = STATUS_NOT_IMPLEMENTED; case FileRenameInformation:
break; Status = STATUS_NOT_IMPLEMENTED;
default: break;
Status = STATUS_NOT_SUPPORTED;
default:
Status = STATUS_NOT_SUPPORTED;
break;
} }
Irp->IoStatus.Status = Status; Irp->IoStatus.Status = Status;
@ -431,7 +449,7 @@ CdfsSetInformation(PDEVICE_OBJECT DeviceObject,
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoCompleteRequest(Irp, IO_NO_INCREMENT);
return(Status); return Status;
} }
/* EOF */ /* EOF */

5
reactos/drivers/fs/cdfs/fsctl.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: fsctl.c,v 1.17 2003/11/13 15:25:08 ekohl Exp $ /* $Id: fsctl.c,v 1.18 2004/03/08 08:51:26 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -95,6 +95,9 @@ CdfsGetPVDData(PUCHAR Buffer,
DPRINT("VolumeSize: %lu\n", Pvd->VolumeSpaceSizeL); DPRINT("VolumeSize: %lu\n", Pvd->VolumeSpaceSizeL);
DPRINT("RootStart: %lu\n", Pvd->RootDirRecord.ExtentLocationL); DPRINT("RootStart: %lu\n", Pvd->RootDirRecord.ExtentLocationL);
DPRINT("RootSize: %lu\n", Pvd->RootDirRecord.DataLengthL); DPRINT("RootSize: %lu\n", Pvd->RootDirRecord.DataLengthL);
DPRINT("PathTableSize: %lu\n", Pvd->PathTableSizeL);
DPRINT("PathTablePos: %lu\n", Pvd->LPathTablePos);
DPRINT("OptPathTablePos: %lu\n", Pvd->LOptPathTablePos);
#if 0 #if 0
DbgPrint("******** PVD **********\n"); DbgPrint("******** PVD **********\n");

12
reactos/drivers/fs/cdfs/misc.c
View file

@ -1,6 +1,6 @@
/* /*
* ReactOS kernel * ReactOS kernel
* Copyright (C) 2002 ReactOS Team * Copyright (C) 2002, 2004 ReactOS Team
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: misc.c,v 1.5 2002/10/03 18:28:22 sedwards Exp $ /* $Id: misc.c,v 1.6 2004/03/08 08:51:26 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -128,10 +128,10 @@ CdfsFileFlagsToAttributes(PFCB Fcb,
/* FIXME: Fix attributes */ /* FIXME: Fix attributes */
*FileAttributes = // FILE_ATTRIBUTE_READONLY | *FileAttributes = // FILE_ATTRIBUTE_READONLY |
(Fcb->Entry.FileFlags & 0x01) ? FILE_ATTRIBUTE_HIDDEN : 0 | (Fcb->Entry.FileFlags & FILE_FLAG_HIDDEN) ? FILE_ATTRIBUTE_HIDDEN : 0 |
(Fcb->Entry.FileFlags & 0x02) ? FILE_ATTRIBUTE_DIRECTORY : 0 | (Fcb->Entry.FileFlags & FILE_FLAG_DIRECTORY) ? FILE_ATTRIBUTE_DIRECTORY : 0 |
(Fcb->Entry.FileFlags & 0x04) ? FILE_ATTRIBUTE_SYSTEM : 0 | (Fcb->Entry.FileFlags & FILE_FLAG_SYSTEM) ? FILE_ATTRIBUTE_SYSTEM : 0 |
(Fcb->Entry.FileFlags & 0x10) ? FILE_ATTRIBUTE_READONLY : 0; (Fcb->Entry.FileFlags & FILE_FLAG_READONLY) ? FILE_ATTRIBUTE_READONLY : 0;
} }
/* EOF */ /* EOF */