Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 01:15:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Um, yeah, the "DiskType" is CLEARLY not an NT FILE_DEVICE_ constant... this makes no sense at all.

Browse source 
- Defined some proper constants (somewhat based on guesses, but should be mostly correct) for the DiskType.
- Now the code actually makes sense, instead of talking about CD-ROM File Systems and CD-ROMs everywhere (and Controllers and...floppies?!)


svn path=/trunk/; revision=34657
This commit is contained in:
ReactOS Portable Systems Group 2008-07-22 05:49:52 +00:00
parent afdc43c7b2
commit 2b398fba13
3 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
reactos/drivers/storage/class/ramdisk/ramdisk.c
View file

@ -311,15 +311,15 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
LARGE_INTEGER CurrentOffset;
//
// Check if we're a CDROM-type RAM disk
// Check if we're a boot RAM disk
//
DiskType = Input->DiskType;
if (DiskType > FILE_DEVICE_CD_ROM)
if (DiskType >= RAMDISK_BOOT_DISK)
{
//
// Check if we're an ISO
//
if (DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM)
if (DiskType == RAMDISK_BOOT_DISK)
{
//
// NTLDR mounted us somewhere
@ -340,10 +340,15 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
else
{
//
// The only other possibility is a controller
// The only other possibility is a WIM disk
//
if (DiskType != FILE_DEVICE_CONTROLLER)
if (DiskType != RAMDISK_WIM_DISK)
{
//
// Fail
//
return STATUS_INVALID_PARAMETER;
}
//
// Read the view count instead
@ -471,7 +476,7 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
//
// It this an ISO boot ramdisk?
//
if (Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM)
if (Input->DiskType == RAMDISK_BOOT_DISK)
{
//
// Does it need a drive letter?
@ -536,10 +541,10 @@ RamdiskCreateDiskDevice(IN PRAMDISK_BUS_EXTENSION DeviceExtension,
GuidString.Buffer = NULL;
//
// Check if this is an ISO boot, or a registry ram drive
// Check if this is an boot disk, or a registry ram drive
//
if (!(Input->Options.ExportAsCd) &&
(Input->DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM))
(Input->DiskType == RAMDISK_BOOT_DISK))
{
//
// Not an ISO boot, but it's a boot FS -- map it to figure out the
@ -684,12 +689,12 @@ RamdiskCreateRamdisk(IN PDEVICE_OBJECT DeviceObject,
// Validate the disk type
//
DiskType = Input->DiskType;
if (DiskType == FILE_DEVICE_CONTROLLER) return STATUS_INVALID_PARAMETER;
if (DiskType == RAMDISK_WIM_DISK) return STATUS_INVALID_PARAMETER;
//
// Look at the disk type
//
if (DiskType == FILE_DEVICE_CD_ROM_FILE_SYSTEM)
if (DiskType == RAMDISK_BOOT_DISK)
{
//
// We only allow this as an early-init boot
@ -706,19 +711,18 @@ RamdiskCreateRamdisk(IN PDEVICE_OBJECT DeviceObject,
//
// Validate the disk type
//
if ((Input->Options.ExportAsCd) &&
(DiskType != FILE_DEVICE_CD_ROM_FILE_SYSTEM))
if ((Input->Options.ExportAsCd) && (DiskType != RAMDISK_BOOT_DISK))
{
//
// If the type isn't CDFS, it has to at least be raw CD
//
if (DiskType != FILE_DEVICE_CD_ROM) return STATUS_INVALID_PARAMETER;
if (DiskType != RAMDISK_MEMORY_MAPPED_DISK) return STATUS_INVALID_PARAMETER;
}
//
// Check if this is an actual file
//
if (DiskType <= FILE_DEVICE_CD_ROM)
if (DiskType <= RAMDISK_MEMORY_MAPPED_DISK)
{
//
// Validate the file name
@ -1134,7 +1138,7 @@ RamdiskReadWrite(IN PDEVICE_OBJECT DeviceObject,
//
// See if we want to do this sync or async
//
if (DeviceExtension->DiskType > FILE_DEVICE_CD_ROM)
if (DeviceExtension->DiskType > RAMDISK_MEMORY_MAPPED_DISK)
{
//
// Do it sync

8
reactos/include/reactos/drivers/ntddrdsk.h
View file

@ -36,6 +36,14 @@ DEFINE_GUID(RAMDISK_BOOTDISK_GUID, 0xd9b257fc, 0x684e, 0x4dcb, 0x79, 0xab, 0xf6,
#define IOCTL_RAMDISK_BASE FILE_DEVICE_VIRTUAL_DISK
#define FSCTL_CREATE_RAM_DISK CTL_CODE(FILE_DEVICE_VIRTUAL_DISK, 0x0000, METHOD_BUFFERED, FILE_ANY_ACCESS)
//
// Disk Types
//
#define RAMDISK_REGISTRY_DISK 1 // Loaded from the registry
#define RAMDISK_MEMORY_MAPPED_DISK 2 // Loaded from the registry
#define RAMDISK_BOOT_DISK 3 // Used as a boot device
#define RAMDISK_WIM_DISK 4 // Used as an installation device
//
// Options when creating a ramdisk
//

2
reactos/ntoskrnl/io/iomgr/ramdisk.c
View file

@ -83,7 +83,7 @@ IopStartRamdisk(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
//
RtlZeroMemory(&RamdiskCreate, sizeof(RamdiskCreate));
RamdiskCreate.Version = sizeof(RamdiskCreate);
RamdiskCreate.DiskType = FILE_DEVICE_CD_ROM_FILE_SYSTEM;
RamdiskCreate.DiskType = RAMDISK_BOOT_DISK;
RamdiskCreate.BasePage = MemoryDescriptor->BasePage;
RamdiskCreate.DiskOffset = 0;
RamdiskCreate.DiskLength = MemoryDescriptor->PageCount << PAGE_SHIFT;