Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Various fixes by Hartmut Birr.

Browse source 
svn path=/trunk/; revision=2072
This commit is contained in:
Eric Kohl 2001-07-18 12:04:52 +00:00
parent 1481663f41
commit e6063f185b
1 changed files with 61 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
reactos/drivers/fs/vfat/create.c
View file

@ -1,4 +1,4 @@
/* $Id: create.c,v 1.27 2001/07/05 01:51:52 rex Exp $ /* $Id: create.c,v 1.28 2001/07/18 12:04:52 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -110,6 +110,7 @@ GetEntryName (PVOID Block, PULONG _Offset, PWSTR Name, PULONG _jloop,
ULONG StartingSector = *_StartingSector; ULONG StartingSector = *_StartingSector;
ULONG jloop = *_jloop; ULONG jloop = *_jloop;
ULONG cpos; ULONG cpos;
PVOID OldBlock;
test = (FATDirEntry *) Block; test = (FATDirEntry *) Block;
test2 = (slot *) Block; test2 = (slot *) Block;
@ -136,8 +137,8 @@ GetEntryName (PVOID Block, PULONG _Offset, PWSTR Name, PULONG _jloop,
if (Offset == ENTRIES_PER_SECTOR) if (Offset == ENTRIES_PER_SECTOR)
{ {
Offset = 0; Offset = 0;
/* FIXME: Check status */ /* FIXME: Check status */
GetNextSector (DeviceExt, StartingSector, &StartingSector, FALSE); GetNextSector (DeviceExt, StartingSector, &StartingSector, FALSE);
jloop++; jloop++;
/* FIXME: Check status */ /* FIXME: Check status */
VfatReadSectors (DeviceExt->StorageDevice, VfatReadSectors (DeviceExt->StorageDevice,
@ -152,19 +153,51 @@ GetEntryName (PVOID Block, PULONG _Offset, PWSTR Name, PULONG _jloop,
} }
if (IsDeletedEntry (Block, Offset + 1)) // save values for returning
{
Offset++;
*_Offset = Offset;
*_jloop = jloop;
*_StartingSector = StartingSector;
return (FALSE);
}
*_Offset = Offset; *_Offset = Offset;
*_jloop = jloop; *_jloop = jloop;
*_StartingSector = StartingSector; *_StartingSector = StartingSector;
if (Offset + 1 == ENTRIES_PER_SECTOR)
{
// save the old sector
OldBlock = ExAllocatePool (NonPagedPool, BLOCKSIZE);
memcpy (OldBlock, Block, BLOCKSIZE);
// read the next sector
Offset = 0;
/* FIXME: Check status */
GetNextSector (DeviceExt, StartingSector, &StartingSector, FALSE);
jloop++;
/* FIXME: Check status */
VfatReadSectors (DeviceExt->StorageDevice, StartingSector, 1, Block);
test2 = (slot *) Block;
if (IsDeletedEntry (Block, Offset))
{
ExFreePool (OldBlock);
*_Offset = Offset;
*_jloop = jloop;
*_StartingSector = StartingSector;
return FALSE;
}
// restore the old sector
memcpy (Block, OldBlock, BLOCKSIZE);
ExFreePool (OldBlock);
}
else
{
if (IsDeletedEntry (Block, Offset + 1))
{
Offset++;
*_Offset = Offset;
*_jloop = jloop;
*_StartingSector = StartingSector;
return (FALSE);
}
}
return (TRUE); return (TRUE);
} }
@ -359,7 +392,7 @@ FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb,
i++; i++;
if (i == (ENTRIES_PER_SECTOR)) if (i == (ENTRIES_PER_SECTOR))
{ {
/* FIXME: Check status */ /* FIXME: Check status */
GetNextSector (DeviceExt, StartingSector, &StartingSector, FALSE); GetNextSector (DeviceExt, StartingSector, &StartingSector, FALSE);
/* FIXME: Check status */ /* FIXME: Check status */
@ -373,12 +406,18 @@ FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb,
CHECKPOINT; CHECKPOINT;
memcpy(Fcb->PathName, Parent->PathName, len*sizeof(WCHAR)); memcpy(Fcb->PathName, Parent->PathName, len*sizeof(WCHAR));
Fcb->ObjectName=&Fcb->PathName[len]; Fcb->ObjectName=&Fcb->PathName[len];
if (len != 1 || Fcb->PathName[0] != '\\')
{
Fcb->ObjectName[0] = '\\';
Fcb->ObjectName = &Fcb->ObjectName[1];
}
} }
else else
Fcb->ObjectName=Fcb->PathName; {
Fcb->ObjectName=Fcb->PathName;
Fcb->ObjectName[0]='\\'; Fcb->ObjectName[0]='\\';
Fcb->ObjectName=&Fcb->ObjectName[1]; Fcb->ObjectName=&Fcb->ObjectName[1];
}
memcpy (&Fcb->entry, &((FATDirEntry *) block)[i], memcpy (&Fcb->entry, &((FATDirEntry *) block)[i],
sizeof (FATDirEntry)); sizeof (FATDirEntry));
@ -388,7 +427,7 @@ FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb,
if (Entry) if (Entry)
*Entry = i; *Entry = i;
ExFreePool (block); ExFreePool (block);
DPRINT("FindFile: new Pathname %S, new Objectname %S)\n",Fcb->PathName, Fcb->ObjectName); DPRINT("FindFile: new Pathname %S, new Objectname %S)\n",Fcb->PathName, Fcb->ObjectName);
return (STATUS_SUCCESS); return (STATUS_SUCCESS);
} }
} }
@ -400,7 +439,10 @@ FindFile (PDEVICE_EXTENSION DeviceExt, PVFATFCB Fcb,
GetNextSector was originally implemented to handle the case above */ GetNextSector was originally implemented to handle the case above */
if (Entry) if (Entry)
*Entry = 0; *Entry = 0;
StartingSector++;
/* FIXME: Check status */
GetNextSector (DeviceExt, StartingSector, &StartingSector, FALSE);
if ((Parent != NULL && Parent->entry.FirstCluster != 1) if ((Parent != NULL && Parent->entry.FirstCluster != 1)
|| DeviceExt->FatType == FAT32) || DeviceExt->FatType == FAT32)
{ {