Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 06:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed volume label reading.

Browse source 
svn path=/trunk/; revision=464
This commit is contained in:
Eric Kohl 1999-05-13 18:02:24 +00:00
parent 60f4a025ef
commit 4251bd8513
1 changed files with 79 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

115
reactos/drivers/fs/vfat/iface.c
View file

@ -687,6 +687,78 @@ BOOLEAN wstrcmpjoki(PWSTR s1, PWSTR s2)
return(FALSE); return(FALSE);
} }
NTSTATUS ReadVolumeLabel(PDEVICE_EXTENSION DeviceExt, PVPB Vpb)
/*
* FUNCTION: Read the volume label
*/
{
ULONG i, j;
ULONG Size;
char* block;
ULONG StartingSector;
ULONG NextCluster;
Size = DeviceExt->rootDirectorySectors;//FIXME : in fat32, no limit
StartingSector = DeviceExt->rootStart;
NextCluster=0;
block = ExAllocatePool(NonPagedPool,BLOCKSIZE);
DPRINT("FindFile : start at sector %lx, entry %ld\n",StartingSector,i);
for (j=0; j<Size; j++)
{
VFATReadSectors(DeviceExt->StorageDevice,StartingSector,1,block);
for (i=0; i<ENTRIES_PER_SECTOR; i++)
{
if (IsVolEntry((PVOID)block,i))
{
FATDirEntry *test = (FATDirEntry *)block;
/* copy volume label */
RtlAnsiToUnicode(Vpb->VolumeLabel,test[i].Filename,8);
RtlCatAnsiToUnicode(Vpb->VolumeLabel,test[i].Ext,3);
Vpb->VolumeLabelLength = wcslen(Vpb->VolumeLabel);
ExFreePool(block);
return(STATUS_SUCCESS);
}
if (IsLastEntry((PVOID)block,i))
{
*(Vpb->VolumeLabel) = 0;
Vpb->VolumeLabelLength = 0;
ExFreePool(block);
return(STATUS_UNSUCCESSFUL);
}
}
// not found in this sector, try next :
/* directory can be fragmented although it is best to keep them
unfragmented */
StartingSector++;
if (DeviceExt->FatType ==FAT32)
{
if(StartingSector==ClusterToSector(DeviceExt,NextCluster+1))
{
NextCluster = GetNextCluster(DeviceExt,NextCluster);
if (NextCluster == 0||NextCluster==0xffffffff)
{
*(Vpb->VolumeLabel) = 0;
Vpb->VolumeLabelLength = 0;
ExFreePool(block);
return(STATUS_UNSUCCESSFUL);
}
StartingSector = ClusterToSector(DeviceExt,NextCluster);
}
}
}
*(Vpb->VolumeLabel) = 0;
Vpb->VolumeLabelLength = 0;
ExFreePool(block);
return(STATUS_UNSUCCESSFUL);
}
NTSTATUS FindFile(PDEVICE_EXTENSION DeviceExt, PVfatFCB Fcb, NTSTATUS FindFile(PDEVICE_EXTENSION DeviceExt, PVfatFCB Fcb,
PVfatFCB Parent, PWSTR FileToFind,ULONG *StartSector,ULONG *Entry) PVfatFCB Parent, PWSTR FileToFind,ULONG *StartSector,ULONG *Entry)
/* /*
@ -1583,45 +1655,16 @@ NTSTATUS FsdMount(PDEVICE_OBJECT DeviceToMount)
DeviceExt->StorageDevice = IoAttachDeviceToDeviceStack(DeviceObject, DeviceExt->StorageDevice = IoAttachDeviceToDeviceStack(DeviceObject,
DeviceToMount); DeviceToMount);
// fill in missing information in vpb /* read serial number */
if (DeviceExt->FatType == FAT12 || DeviceExt->FatType == FAT16) if (DeviceExt->FatType == FAT12 || DeviceExt->FatType == FAT16)
{ DeviceObject->Vpb->SerialNumber =
struct _BootSector *BootSect = (PVOID)DeviceExt->Boot; ((struct _BootSector *)(DeviceExt->Boot))->VolumeID;
PSTR s = BootSect->VolumeLabel;
PWSTR w = DeviceObject->Vpb->VolumeLabel;
int n=0;
// get serial number
DeviceObject->Vpb->SerialNumber = BootSect->VolumeID;
// copy drive label
while (*s != ' ' && n < 11)
{
*w++ = *s++;
n++;
}
*w = 0;
DeviceObject->Vpb->VolumeLabelLength = n;
}
else if (DeviceExt->FatType == FAT32) else if (DeviceExt->FatType == FAT32)
{ DeviceObject->Vpb->SerialNumber =
struct _BootSector32 *BootSect = (PVOID)DeviceExt->Boot; ((struct _BootSector32 *)(DeviceExt->Boot))->VolumeID;
PSTR s = BootSect->VolumeLabel;
PWSTR w = DeviceObject->Vpb->VolumeLabel;
int n=0;
// get serial number /* read volume label */
DeviceObject->Vpb->SerialNumber = BootSect->VolumeID; ReadVolumeLabel (DeviceExt, DeviceObject->Vpb);
// copy drive label
while (*s != ' ' && n < 11)
{
*w++ = *s++;
n++;
}
*w = 0;
DeviceObject->Vpb->VolumeLabelLength = n;
}
return(STATUS_SUCCESS); return(STATUS_SUCCESS);
} }