Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 09:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DISK]

Browse source 
Revert accidential changes.

svn path=/trunk/; revision=68062
This commit is contained in:
Eric Kohl 2015-06-07 13:44:49 +00:00
parent f1e3085aa8
commit 071eb9ad40
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
reactos/drivers/storage/class/disk/disk.c
View file

@ -4809,7 +4809,6 @@ Return Value:
ULONG numberListElements; ULONG numberListElements;
BOOLEAN found; BOOLEAN found;
DPRINT1("UpdateDeviceObjects()\n");
partitionCount = ((partitionList->PartitionCount + 3) / 4) * 4; partitionCount = ((partitionList->PartitionCount + 3) / 4) * 4;
// //
@ -4910,11 +4909,10 @@ Return Value:
if (partitionEntry->PartitionLength.QuadPart == if (partitionEntry->PartitionLength.QuadPart ==
deviceExtension->PartitionLength.QuadPart) { deviceExtension->PartitionLength.QuadPart) {
// DebugPrint((3, DebugPrint((3,
DPRINT1(
"UpdateDeviceObjects: Found match for \\Harddisk%d\\Partition%d\n", "UpdateDeviceObjects: Found match for \\Harddisk%d\\Partition%d\n",
physicalExtension->DeviceNumber, physicalExtension->DeviceNumber,
diskData->PartitionNumber); diskData->PartitionNumber));
// //
// Indicate match is found and set partition number // Indicate match is found and set partition number
@ -4950,12 +4948,11 @@ Return Value:
diskData->PartitionOrdinal = partitionOrdinal; diskData->PartitionOrdinal = partitionOrdinal;
// DebugPrint((1, DebugPrint((1,
DPRINT1(
"UpdateDeviceObjects: Disk %d ordinal %d is partition %d\n", "UpdateDeviceObjects: Disk %d ordinal %d is partition %d\n",
physicalExtension->DeviceNumber, physicalExtension->DeviceNumber,
diskData->PartitionOrdinal, diskData->PartitionOrdinal,
diskData->PartitionNumber); diskData->PartitionNumber));
} else { } else {
@ -4963,11 +4960,10 @@ Return Value:
// no match was found, indicate this partition is gone. // no match was found, indicate this partition is gone.
// //
// DebugPrint((1, DebugPrint((1,
DPRINT1(
"UpdateDeviceObjects: Deleting \\Device\\Harddisk%x\\Partition%x\n", "UpdateDeviceObjects: Deleting \\Device\\Harddisk%x\\Partition%x\n",
physicalExtension->DeviceNumber, physicalExtension->DeviceNumber,
diskData->PartitionNumber); diskData->PartitionNumber));
deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0; deviceExtension->PartitionLength.QuadPart = (LONGLONG) 0;
} }
@ -5089,10 +5085,9 @@ Return Value:
continue; continue;
} }
// DebugPrint((3, DebugPrint((3,
DPRINT1(
"UpdateDeviceObjects: Create device object %s\n", "UpdateDeviceObjects: Create device object %s\n",
ntNameBuffer); ntNameBuffer));
// //
// This is a new name. Create the device object to represent it. // This is a new name. Create the device object to represent it.
@ -5107,10 +5102,9 @@ Return Value:
&deviceObject); &deviceObject);
if (!NT_SUCCESS(status)) { if (!NT_SUCCESS(status)) {
// DebugPrint((1, DebugPrint((1,
DPRINT1(
"UpdateDeviceObjects: Can't create device %s\n", "UpdateDeviceObjects: Can't create device %s\n",
ntNameBuffer); ntNameBuffer));
RtlFreeUnicodeString(&ntUnicodeString); RtlFreeUnicodeString(&ntUnicodeString);
continue; continue;
} }
@ -5201,11 +5195,10 @@ Return Value:
diskData = (PDISK_DATA)(deviceExtension + 1); diskData = (PDISK_DATA)(deviceExtension + 1);
// DebugPrint((1, DebugPrint((1,
DPRINT1(
"UpdateDeviceObjects: Used existing device object \\Device\\Harddisk%x\\Partition%x\n", "UpdateDeviceObjects: Used existing device object \\Device\\Harddisk%x\\Partition%x\n",
physicalExtension->DeviceNumber, physicalExtension->DeviceNumber,
partitionNumber); partitionNumber));
} }
// //
@ -5220,11 +5213,10 @@ Return Value:
diskData->HiddenSectors = partitionEntry->HiddenSectors; diskData->HiddenSectors = partitionEntry->HiddenSectors;
diskData->PartitionOrdinal = partitionOrdinal; diskData->PartitionOrdinal = partitionOrdinal;
// DebugPrint((1, DebugPrint((1,
DPRINT1(
"UpdateDeviceObjects: Ordinal %d is partition %d\n", "UpdateDeviceObjects: Ordinal %d is partition %d\n",
diskData->PartitionOrdinal, diskData->PartitionOrdinal,
diskData->PartitionNumber); diskData->PartitionNumber));
// //
// Update partition number passed in to indicate the // Update partition number passed in to indicate the