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

[PARTMGR] Remove hacks as PnP manager should not send bogus IRPs anymore

Browse source
This commit is contained in:
Victor Perevertkin 2021-01-10 04:43:44 +03:00
parent d14d7e5b8c
commit b0c931ac91
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
3 changed files with 0 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

23
drivers/storage/partmgr/partition.c
View file

@ -94,13 +94,6 @@ PartitionHandleStartDevice(
{ {
PAGED_CODE(); PAGED_CODE();
// fix the damn kernel!
if (PartExt->DeviceRemoved)
{
DPRINT1("IRP_MN_START_DEVICE after IRP_MN_REMOVE_DEVICE!\n");
return STATUS_SUCCESS;
}
// first, create a symbolic link for our device // first, create a symbolic link for our device
WCHAR nameBuf[64]; WCHAR nameBuf[64];
UNICODE_STRING partitionSymlink, interfaceName; UNICODE_STRING partitionSymlink, interfaceName;
@ -235,15 +228,6 @@ PartitionHandleRemove(
if (FinalRemove) if (FinalRemove)
{ {
// fix the damn kernel!
if (PartExt->DeviceRemoved)
{
DPRINT1("Double IRP_MN_REMOVE_DEVICE!\n");
return STATUS_SUCCESS;
}
PartExt->DeviceRemoved = TRUE;
ASSERT(PartExt->DeviceName.Buffer); ASSERT(PartExt->DeviceName.Buffer);
if (PartExt->DeviceName.Buffer) if (PartExt->DeviceName.Buffer)
{ {
@ -266,13 +250,6 @@ PartitionHandleDeviceRelations(
{ {
PAGED_CODE(); PAGED_CODE();
// fix the damn kernel!
if (PartExt->DeviceRemoved)
{
DPRINT1("QDR after device removal!\n");
return STATUS_DEVICE_DOES_NOT_EXIST;
}
PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp); PIO_STACK_LOCATION ioStack = IoGetCurrentIrpStackLocation(Irp);
DEVICE_RELATION_TYPE type = ioStack->Parameters.QueryDeviceRelations.Type; DEVICE_RELATION_TYPE type = ioStack->Parameters.QueryDeviceRelations.Type;

11
drivers/storage/partmgr/partmgr.c
View file

@ -1017,17 +1017,6 @@ FdoHandleRemoveDevice(
{ {
PAGED_CODE(); PAGED_CODE();
for (PSINGLE_LIST_ENTRY curEntry = FdoExtension->PartitionList.Next;
curEntry != NULL;
curEntry = curEntry->Next)
{
PPARTITION_EXTENSION partExt = CONTAINING_RECORD(curEntry,
PARTITION_EXTENSION,
ListEntry);
ASSERT(partExt->DeviceRemoved);
}
if (FdoExtension->DiskInterfaceName.Buffer) if (FdoExtension->DiskInterfaceName.Buffer)
{ {
IoSetDeviceInterfaceState(&FdoExtension->DiskInterfaceName, FALSE); IoSetDeviceInterfaceState(&FdoExtension->DiskInterfaceName, FALSE);

1
drivers/storage/partmgr/partmgr.h
View file

@ -77,7 +77,6 @@ typedef struct _PARTITION_EXTENSION
UINT32 OnDiskNumber; // partition number for issuing Io requests to the kernel UINT32 OnDiskNumber; // partition number for issuing Io requests to the kernel
BOOLEAN IsEnumerated; // reported via IRP_MN_QUERY_DEVICE_RELATIONS BOOLEAN IsEnumerated; // reported via IRP_MN_QUERY_DEVICE_RELATIONS
BOOLEAN SymlinkCreated; BOOLEAN SymlinkCreated;
BOOLEAN DeviceRemoved; // !!!
BOOLEAN Attached; // attached to PartitionList of the FDO BOOLEAN Attached; // attached to PartitionList of the FDO
union union
{ {