Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [ISAPNP] Fix some warnings
by Hervé Poussineau 21 Mar '20

21 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7b1e28e7243ab6f76f3c0… commit 7b1e28e7243ab6f76f3c032a2b6a95f373b36348 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Mar 21 08:29:15 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sat Mar 21 08:29:15 2020 +0100 [ISAPNP] Fix some warnings --- drivers/bus/isapnp/isapnp.c | 6 +++--- drivers/bus/isapnp/pdo.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 7f2731b7ce4..69fbcbb9f3a 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -84,7 +84,7 @@ IsaFdoCreateDeviceIDs( LogDev->ProdId); if (!NT_SUCCESS(Status)) return Status; - TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); Status = IsaPnpDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &TempString, @@ -105,7 +105,7 @@ IsaFdoCreateDeviceIDs( LogDev->ProdId); if (!NT_SUCCESS(Status)) return Status; - TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); Status = IsaPnpDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &TempString, @@ -125,7 +125,7 @@ IsaFdoCreateDeviceIDs( LogDev->SerialNumber); if (!NT_SUCCESS(Status)) return Status; - TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + TempString.Length = (USHORT)((End - TempString.Buffer) * sizeof(WCHAR)); Status = IsaPnpDuplicateUnicodeString( RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &TempString, diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 82dc98cf1a9..917ab4d626d 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -252,7 +252,7 @@ IsaPdoStartReadPort( PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; if (PartialDescriptor->Type == CmResourceTypePort) { - PUCHAR ReadDataPort = (PUCHAR)PartialDescriptor->u.Port.Start.u.LowPart + 3; + PUCHAR ReadDataPort = ULongToPtr(PartialDescriptor->u.Port.Start.u.LowPart + 3); if (PartialDescriptor->u.Port.Length > 1 && !FdoExt->ReadDataPort && NT_SUCCESS(IsaHwTryReadDataPort(ReadDataPort))) { FdoExt->ReadDataPort = ReadDataPort;

1 0

[reactos] 01/01: [INF] Do not require a device for the ISAPNP read data port
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b915dce420005b146a909… commit b915dce420005b146a909121451af35a4d1dcb6c Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Fri Mar 20 22:42:36 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:42:57 2020 +0100 [INF] Do not require a device for the ISAPNP read data port --- media/inf/machine.inf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media/inf/machine.inf b/media/inf/machine.inf index bed48883dee..69ac0b92b25 100644 --- a/media/inf/machine.inf +++ b/media/inf/machine.inf @@ -50,6 +50,7 @@ HKR, , Icon, 0, "-27" %SWENUM.DeviceDesc% = SWENUM_Inst, ROOT\SWENUM %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton +%ISAPNP\ReadDataPort.DeviceDesc% = NO_DRV,ISAPNP\ReadDataPort %PCI\CC_0500.DeviceDesc% = NO_DRV,PCI\CC_0500 %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 %PCI\CC_0601.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0601 @@ -172,6 +173,7 @@ GenericMfg = "(Generic system devices)" *PNP0C0F.DeviceDesc = "PCI interrupt link device" *PNP0C15.DeviceDesc = "Docking Station" ACPI\FixedButton.DeviceDesc = "ACPI fixed feature button" +ISAPNP\ReadDataPort.DeviceDesc = "ISAPNP read data port" PCI\CC_0500.DeviceDesc = "Standard PCI RAM controller" PCI\CC_0600.DeviceDesc = "Standard CPU to PCI bridge" PCI\CC_0601.DeviceDesc = "Standard PCI to ISA bridge"

1 0

[reactos] 10/10: [ISAPNP] Implement some more IRP_MJ_PNP/IRP_MN_* requests
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2abd853b37d15801effd8… commit 2abd853b37d15801effd898fe898aa822e751a23 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Mar 17 23:51:53 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Implement some more IRP_MJ_PNP/IRP_MN_* requests We either succeed them, or we pass them down to the ISAPNP FDO. --- drivers/bus/isapnp/pdo.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index a75b4d32ed7..82dc98cf1a9 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -270,6 +270,64 @@ IsaPdoStartReadPort( return Status; } +static +NTSTATUS +NTAPI +IsaPdoOnRepeaterComplete( + IN PDEVICE_OBJECT Tdo, + IN PIRP SubIrp, + PVOID NeedsVote) +{ + PIO_STACK_LOCATION SubStack = IoGetCurrentIrpStackLocation(SubIrp); + PIRP Irp = (PIRP)SubStack->Parameters.Others.Argument1; + ObDereferenceObject(Tdo); + + if (SubIrp->IoStatus.Status == STATUS_NOT_SUPPORTED) + { + if (NeedsVote) + { + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + } + } + else + { + Irp->IoStatus = SubIrp->IoStatus; + } + + IoFreeIrp(SubIrp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +IsaPdoRepeatRequest( + IN PISAPNP_PDO_EXTENSION PdoExt, + IN PIRP Irp, + IN BOOLEAN NeedsVote) +{ + PDEVICE_OBJECT Fdo = PdoExt->FdoExt->Common.Self; + PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + + PDEVICE_OBJECT Tdo = IoGetAttachedDeviceReference(Fdo); + PIRP SubIrp = IoAllocateIrp(Tdo->StackSize + 1, FALSE); + PIO_STACK_LOCATION SubStack = IoGetNextIrpStackLocation(SubIrp); + + SubStack->DeviceObject = Tdo; + SubStack->Parameters.Others.Argument1 = (PVOID)Irp; + + IoSetNextIrpStackLocation(SubIrp); + SubStack = IoGetNextIrpStackLocation(SubIrp); + RtlCopyMemory(SubStack, Stack, FIELD_OFFSET(IO_STACK_LOCATION, CompletionRoutine)); + SubStack->Control = 0; + IoSetCompletionRoutine(SubIrp, IsaPdoOnRepeaterComplete, (PVOID)(ULONG_PTR)NeedsVote, TRUE, TRUE, TRUE); + + SubIrp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoMarkIrpPending(Irp); + IoCallDriver(Tdo, SubIrp); + return STATUS_PENDING; +} + NTSTATUS NTAPI IsaPdoPnp( @@ -332,6 +390,25 @@ IsaPdoPnp( Status = IsaPdoQueryId(PdoExt, Irp, IrpSp); break; + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: + case IRP_MN_QUERY_DEVICE_TEXT: + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + case IRP_MN_SURPRISE_REMOVAL: + Status = STATUS_SUCCESS; + break; + + case IRP_MN_READ_CONFIG: + case IRP_MN_WRITE_CONFIG: + case IRP_MN_EJECT: + case IRP_MN_SET_LOCK: + case IRP_MN_QUERY_BUS_INFORMATION: + case IRP_MN_DEVICE_USAGE_NOTIFICATION: + return IsaPdoRepeatRequest(PdoExt, Irp, TRUE); + default: DPRINT1("Unknown PnP code: %x\n", IrpSp->MinorFunction); break;

1 0

[reactos] 09/10: [ISAPNP] Implement IRP_MN_QUERY_PNP_DEVICE_STATE for ReadDataPort
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8b53ed1d9b45649469d66… commit 8b53ed1d9b45649469d6662c27520088091910ca Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Tue Mar 17 23:50:39 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Implement IRP_MN_QUERY_PNP_DEVICE_STATE for ReadDataPort --- drivers/bus/isapnp/pdo.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index f0481119758..a75b4d32ed7 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -75,6 +75,17 @@ IsaPdoQueryCapabilities( return STATUS_SUCCESS; } +NTSTATUS +NTAPI +IsaPdoQueryPnpDeviceState( + IN PISAPNP_PDO_EXTENSION PdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; + return STATUS_SUCCESS; +} + NTSTATUS NTAPI IsaPdoQueryId( @@ -298,6 +309,11 @@ IsaPdoPnp( Status = IsaPdoQueryCapabilities(PdoExt, Irp, IrpSp); break; + case IRP_MN_QUERY_PNP_DEVICE_STATE: + if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) + Status = IsaPdoQueryPnpDeviceState(PdoExt, Irp, IrpSp); + break; + case IRP_MN_QUERY_RESOURCES: if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) Status = IsaPdoQueryResources(PdoExt, Irp, IrpSp);

1 0

[reactos] 08/10: [ISAPNP] Detect devices only once ReadDataPort is started
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b9929a07687d202ec3f8… commit 5b9929a07687d202ec3f8240af8579f7fc51538a Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Mar 16 20:58:53 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Detect devices only once ReadDataPort is started Also let kernel choose the read data port address, by using the resources given in IRP_MN_START_DEVICE. --- drivers/bus/isapnp/fdo.c | 24 ---------------------- drivers/bus/isapnp/hardware.c | 37 +++------------------------------ drivers/bus/isapnp/isapnp.h | 4 ++-- drivers/bus/isapnp/pdo.c | 48 ++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 52 insertions(+), 61 deletions(-) diff --git a/drivers/bus/isapnp/fdo.c b/drivers/bus/isapnp/fdo.c index f232766b180..caa4b69c7e2 100644 --- a/drivers/bus/isapnp/fdo.c +++ b/drivers/bus/isapnp/fdo.c @@ -17,21 +17,9 @@ IsaFdoStartDevice( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - NTSTATUS Status; - KIRQL OldIrql; - UNREFERENCED_PARAMETER(Irp); UNREFERENCED_PARAMETER(IrpSp); - KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); - Status = IsaHwDetectReadDataPort(FdoExt); - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - FdoExt->Common.State = dsStarted; return STATUS_SUCCESS; @@ -44,21 +32,9 @@ IsaFdoQueryDeviceRelations( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - NTSTATUS Status; - KIRQL OldIrql; - if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) return Irp->IoStatus.Status; - KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); - Status = IsaHwFillDeviceList(FdoExt); - KeReleaseSpinLock(&FdoExt->Lock, OldIrql); - - if (!NT_SUCCESS(Status)) - { - return Status; - } - return IsaPnpFillDeviceRelations(FdoExt, Irp, TRUE); } diff --git a/drivers/bus/isapnp/hardware.c b/drivers/bus/isapnp/hardware.c index 77ca6c40b4b..4a3d49bb1e7 100644 --- a/drivers/bus/isapnp/hardware.c +++ b/drivers/bus/isapnp/hardware.c @@ -451,28 +451,6 @@ TryIsolate( return Csn; } -static -PUCHAR -Isolate(VOID) -{ - PUCHAR ReadPort; - - for (ReadPort = (PUCHAR)ISAPNP_READ_PORT_START; - (ULONG_PTR)ReadPort <= ISAPNP_READ_PORT_MAX; - ReadPort += ISAPNP_READ_PORT_STEP) - { - /* Avoid the NE2000 probe space */ - if ((ULONG_PTR)ReadPort >= 0x280 && - (ULONG_PTR)ReadPort <= 0x380) - continue; - - if (TryIsolate(ReadPort) > 0) - return ReadPort; - } - - return 0; -} - VOID DeviceActivation( IN PISAPNP_LOGICAL_DEVICE IsaDevice, @@ -557,19 +535,10 @@ ProbeIsaPnpBus( NTSTATUS NTAPI -IsaHwDetectReadDataPort( - IN PISAPNP_FDO_EXTENSION FdoExt) +IsaHwTryReadDataPort( + IN PUCHAR ReadDataPort) { - FdoExt->ReadDataPort = Isolate(); - if (!FdoExt->ReadDataPort) - { - DPRINT1("No read data port found\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - DPRINT1("Detected read data port at 0x%p\n", FdoExt->ReadDataPort); - - return STATUS_SUCCESS; + return TryIsolate(ReadDataPort) > 0 ? STATUS_SUCCESS : STATUS_INSUFFICIENT_RESOURCES; } NTSTATUS diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index e62381b6760..4a68b5ee11d 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -106,8 +106,8 @@ IsaPdoPnp( /* hardware.c */ NTSTATUS NTAPI -IsaHwDetectReadDataPort( - IN PISAPNP_FDO_EXTENSION FdoExt); +IsaHwTryReadDataPort( + IN PUCHAR ReadDataPort); NTSTATUS NTAPI diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 55ab0da804a..f0481119758 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -213,6 +213,52 @@ IsaPdoQueryResourceRequirements( return STATUS_SUCCESS; } +static +NTSTATUS +NTAPI +IsaPdoStartReadPort( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIO_STACK_LOCATION IrpSp) +{ + PCM_RESOURCE_LIST ResourceList = IrpSp->Parameters.StartDevice.AllocatedResources; + NTSTATUS Status; + KIRQL OldIrql; + ULONG i; + + if (!ResourceList || ResourceList->Count != 1) + { + DPRINT1("No resource list (%p) or bad count (%d)\n", ResourceList, ResourceList ? ResourceList->Count : 0); + return STATUS_INSUFFICIENT_RESOURCES; + } + if (ResourceList->List[0].PartialResourceList.Version != 1 + || ResourceList->List[0].PartialResourceList.Revision != 1) + { + DPRINT1("Bad resource list version (%d.%d)\n", ResourceList->List[0].PartialResourceList.Version, ResourceList->List[0].PartialResourceList.Revision); + return STATUS_REVISION_MISMATCH; + } + for (i = 0; i < ResourceList->List[0].PartialResourceList.Count; i++) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + if (PartialDescriptor->Type == CmResourceTypePort) + { + PUCHAR ReadDataPort = (PUCHAR)PartialDescriptor->u.Port.Start.u.LowPart + 3; + if (PartialDescriptor->u.Port.Length > 1 && !FdoExt->ReadDataPort && NT_SUCCESS(IsaHwTryReadDataPort(ReadDataPort))) + { + FdoExt->ReadDataPort = ReadDataPort; + KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); + Status = IsaHwFillDeviceList(FdoExt); + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + if (FdoExt->DeviceCount > 0) + { + IoInvalidateDeviceRelations(FdoExt->Pdo, BusRelations); + IoInvalidateDeviceRelations(FdoExt->DataPortPdo, RemovalRelations); + } + } + } + } + return Status; +} + NTSTATUS NTAPI IsaPdoPnp( @@ -228,7 +274,7 @@ IsaPdoPnp( if (PdoExt->IsaPnpDevice) Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice); else - Status = STATUS_SUCCESS; + Status = IsaPdoStartReadPort(PdoExt->FdoExt, IrpSp); if (NT_SUCCESS(Status)) PdoExt->Common.State = dsStarted;

1 0

[reactos] 07/10: [ISAPNP] Implement IRP_MN_QUERY_RESOURCES/IRP_MN_QUERY_RESOURCE_REQUIREMENTS for ReadDataPort
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5a404e6c5048a29a4e6c3… commit 5a404e6c5048a29a4e6c3dc2d1bf2df776cf0d44 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Mar 16 20:50:29 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Implement IRP_MN_QUERY_RESOURCES/IRP_MN_QUERY_RESOURCE_REQUIREMENTS for ReadDataPort --- drivers/bus/isapnp/pdo.c | 183 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 140 insertions(+), 43 deletions(-) diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 639f07d5aa1..55ab0da804a 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -6,6 +6,7 @@ */ #include <isapnp.h> +#include <isapnphw.h> #define NDEBUG #include <debug.h> @@ -122,6 +123,96 @@ IsaPdoQueryId( return STATUS_SUCCESS; } +NTSTATUS +NTAPI +IsaPdoQueryResources( + IN PISAPNP_PDO_EXTENSION PdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS }; + ULONG ListSize, i; + PCM_RESOURCE_LIST ResourceList; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + + ListSize = sizeof(CM_RESOURCE_LIST) + + (ARRAYSIZE(Ports) - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + ResourceList = ExAllocatePool(NonPagedPool, ListSize); + if (!ResourceList) + return STATUS_NO_MEMORY; + + RtlZeroMemory(ResourceList, ListSize); + ResourceList->Count = 1; + ResourceList->List[0].InterfaceType = Internal; + ResourceList->List[0].PartialResourceList.Version = 1; + ResourceList->List[0].PartialResourceList.Revision = 1; + ResourceList->List[0].PartialResourceList.Count = 2; + + for (i = 0; i < ARRAYSIZE(Ports); i++) + { + Descriptor = &ResourceList->List[0].PartialResourceList.PartialDescriptors[i]; + Descriptor->Type = CmResourceTypePort; + Descriptor->ShareDisposition = CmResourceShareDeviceExclusive; + Descriptor->Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + Descriptor->u.Port.Length = 0x01; + Descriptor->u.Port.Start.LowPart = Ports[i]; + } + + Irp->IoStatus.Information = (ULONG_PTR)ResourceList; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaPdoQueryResourceRequirements( + IN PISAPNP_PDO_EXTENSION PdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + USHORT Ports[] = { ISAPNP_WRITE_DATA, ISAPNP_ADDRESS, 0x274, 0x3e4, 0x204, 0x2e4, 0x354, 0x2f4 }; + ULONG ListSize, i; + PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; + PIO_RESOURCE_DESCRIPTOR Descriptor; + + ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + + 2 * ARRAYSIZE(Ports) * sizeof(IO_RESOURCE_DESCRIPTOR); + RequirementsList = ExAllocatePool(NonPagedPool, ListSize); + if (!RequirementsList) + return STATUS_NO_MEMORY; + + RtlZeroMemory(RequirementsList, ListSize); + RequirementsList->ListSize = ListSize; + RequirementsList->AlternativeLists = 1; + + RequirementsList->List[0].Version = 1; + RequirementsList->List[0].Revision = 1; + RequirementsList->List[0].Count = 2 * ARRAYSIZE(Ports); + + for (i = 0; i < 2 * ARRAYSIZE(Ports); i += 2) + { + Descriptor = &RequirementsList->List[0].Descriptors[i]; + + /* Expected port */ + Descriptor[0].Type = CmResourceTypePort; + Descriptor[0].ShareDisposition = CmResourceShareDeviceExclusive; + Descriptor[0].Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + Descriptor[0].u.Port.Length = Ports[i / 2] & 1 ? 0x01 : 0x04; + Descriptor[0].u.Port.Alignment = 0x01; + Descriptor[0].u.Port.MinimumAddress.LowPart = Ports[i / 2]; + Descriptor[0].u.Port.MaximumAddress.LowPart = Ports[i / 2] + Descriptor[0].u.Port.Length - 1; + + /* ... but mark it as optional */ + Descriptor[1].Option = IO_RESOURCE_ALTERNATIVE; + Descriptor[1].Type = CmResourceTypePort; + Descriptor[1].ShareDisposition = CmResourceShareDeviceExclusive; + Descriptor[1].Flags = CM_RESOURCE_PORT_16_BIT_DECODE; + Descriptor[1].u.Port.Alignment = 0x01; + } + + Irp->IoStatus.Information = (ULONG_PTR)RequirementsList; + return STATUS_SUCCESS; +} + NTSTATUS NTAPI IsaPdoPnp( @@ -133,49 +224,55 @@ IsaPdoPnp( switch (IrpSp->MinorFunction) { - case IRP_MN_START_DEVICE: - if (PdoExt->IsaPnpDevice) - Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice); - else - Status = STATUS_SUCCESS; - - if (NT_SUCCESS(Status)) - PdoExt->Common.State = dsStarted; - break; - - case IRP_MN_STOP_DEVICE: - if (PdoExt->IsaPnpDevice) - Status = IsaHwDeactivateDevice(PdoExt->IsaPnpDevice); - else - Status = STATUS_SUCCESS; - - if (NT_SUCCESS(Status)) - PdoExt->Common.State = dsStopped; - break; - - case IRP_MN_QUERY_DEVICE_RELATIONS: - Status = IsaPdoQueryDeviceRelations(PdoExt, Irp, IrpSp); - break; - - case IRP_MN_QUERY_CAPABILITIES: - Status = IsaPdoQueryCapabilities(PdoExt, Irp, IrpSp); - break; - - case IRP_MN_QUERY_RESOURCES: - DPRINT1("IRP_MN_QUERY_RESOURCES is UNIMPLEMENTED!\n"); - break; - - case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: - DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS is UNIMPLEMENTED!\n"); - break; - - case IRP_MN_QUERY_ID: - Status = IsaPdoQueryId(PdoExt, Irp, IrpSp); - break; - - default: - DPRINT1("Unknown PnP code: %x\n", IrpSp->MinorFunction); - break; + case IRP_MN_START_DEVICE: + if (PdoExt->IsaPnpDevice) + Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice); + else + Status = STATUS_SUCCESS; + + if (NT_SUCCESS(Status)) + PdoExt->Common.State = dsStarted; + break; + + case IRP_MN_STOP_DEVICE: + if (PdoExt->IsaPnpDevice) + Status = IsaHwDeactivateDevice(PdoExt->IsaPnpDevice); + else + Status = STATUS_SUCCESS; + + if (NT_SUCCESS(Status)) + PdoExt->Common.State = dsStopped; + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + Status = IsaPdoQueryDeviceRelations(PdoExt, Irp, IrpSp); + break; + + case IRP_MN_QUERY_CAPABILITIES: + Status = IsaPdoQueryCapabilities(PdoExt, Irp, IrpSp); + break; + + case IRP_MN_QUERY_RESOURCES: + if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) + Status = IsaPdoQueryResources(PdoExt, Irp, IrpSp); + else + DPRINT1("IRP_MN_QUERY_RESOURCES is UNIMPLEMENTED!\n"); + break; + + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + if (PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) + Status = IsaPdoQueryResourceRequirements(PdoExt, Irp, IrpSp); + else + DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS is UNIMPLEMENTED!\n"); + break; + + case IRP_MN_QUERY_ID: + Status = IsaPdoQueryId(PdoExt, Irp, IrpSp); + break; + + default: + DPRINT1("Unknown PnP code: %x\n", IrpSp->MinorFunction); + break; } Irp->IoStatus.Status = Status;

1 0

[reactos] 06/10: [ISAPNP] Report removal relations on ReadDataPort
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2fe644dc860767ec38035… commit 2fe644dc860767ec38035f730b11fadf902a8646 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Mar 16 19:43:37 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Report removal relations on ReadDataPort --- drivers/bus/isapnp/isapnp.c | 2 ++ drivers/bus/isapnp/isapnp.h | 1 + drivers/bus/isapnp/pdo.c | 6 ++++++ 3 files changed, 9 insertions(+) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 41488efc5a7..7f2731b7ce4 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -194,6 +194,7 @@ IsaPnpFillDeviceRelations( PdoExt->Common.Self = IsaDevice->Pdo; PdoExt->Common.State = dsStopped; PdoExt->IsaPnpDevice = IsaDevice; + PdoExt->FdoExt = FdoExt; Status = IsaFdoCreateDeviceIDs(PdoExt); if (!NT_SUCCESS(Status)) @@ -352,6 +353,7 @@ IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt) PdoExt->Common.IsFdo = FALSE; PdoExt->Common.Self = FdoExt->DataPortPdo; PdoExt->Common.State = dsStopped; + PdoExt->FdoExt = FdoExt; Status = IsaPnpDuplicateUnicodeString(0, &DeviceID, diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 724ccfea79d..e62381b6760 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -48,6 +48,7 @@ typedef struct _ISAPNP_FDO_EXTENSION { typedef struct _ISAPNP_PDO_EXTENSION { ISAPNP_COMMON_EXTENSION Common; PISAPNP_LOGICAL_DEVICE IsaPnpDevice; + PISAPNP_FDO_EXTENSION FdoExt; UNICODE_STRING DeviceID; UNICODE_STRING HardwareIDs; UNICODE_STRING InstanceID; diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 1f3f7e18f7b..639f07d5aa1 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -19,6 +19,12 @@ IsaPdoQueryDeviceRelations( { PDEVICE_RELATIONS DeviceRelations; + if (IrpSp->Parameters.QueryDeviceRelations.Type == RemovalRelations && + PdoExt->Common.Self == PdoExt->FdoExt->DataPortPdo) + { + return IsaPnpFillDeviceRelations(PdoExt->FdoExt, Irp, FALSE); + } + if (IrpSp->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) return Irp->IoStatus.Status;

1 0

[reactos] 05/10: [ISAPNP] Report a ReadDataPort PDO
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c4813f73f56d21ccc9926… commit c4813f73f56d21ccc9926ff2f93980aea040b141 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Mar 16 19:24:07 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Report a ReadDataPort PDO This PDO will later request resources required for ISAPNP bus. --- drivers/bus/isapnp/fdo.c | 2 +- drivers/bus/isapnp/isapnp.c | 61 ++++++++++++++++++++++++++++++++++++++++++++- drivers/bus/isapnp/isapnp.h | 4 ++- drivers/bus/isapnp/pdo.c | 27 +++++++++++++++++--- 4 files changed, 87 insertions(+), 7 deletions(-) diff --git a/drivers/bus/isapnp/fdo.c b/drivers/bus/isapnp/fdo.c index 6417d6e68bc..f232766b180 100644 --- a/drivers/bus/isapnp/fdo.c +++ b/drivers/bus/isapnp/fdo.c @@ -59,7 +59,7 @@ IsaFdoQueryDeviceRelations( return Status; } - return IsaPnpFillDeviceRelations(FdoExt, Irp); + return IsaPnpFillDeviceRelations(FdoExt, Irp, TRUE); } NTSTATUS diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 0382f8c843d..41488efc5a7 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -140,7 +140,8 @@ NTSTATUS NTAPI IsaPnpFillDeviceRelations( IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp) + IN PIRP Irp, + IN BOOLEAN IncludeDataPort) { PISAPNP_PDO_EXTENSION PdoExt; NTSTATUS Status = STATUS_SUCCESS; @@ -156,6 +157,12 @@ IsaPnpFillDeviceRelations( return STATUS_NO_MEMORY; } + if (IncludeDataPort) + { + DeviceRelations->Objects[i++] = FdoExt->DataPortPdo; + ObReferenceObject(FdoExt->DataPortPdo); + } + CurrentEntry = FdoExt->DeviceListHead.Flink; while (CurrentEntry != &FdoExt->DeviceListHead) { @@ -320,6 +327,53 @@ IsaReadWrite( return STATUS_NOT_SUPPORTED; } +static +NTSTATUS +NTAPI +IsaPnpCreateReadPortDO(PISAPNP_FDO_EXTENSION FdoExt) +{ + UNICODE_STRING DeviceID = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0"); + UNICODE_STRING HardwareIDs = RTL_CONSTANT_STRING(L"ISAPNP\\ReadDataPort\0\0"); + UNICODE_STRING InstanceID = RTL_CONSTANT_STRING(L"0\0"); + PISAPNP_PDO_EXTENSION PdoExt; + + NTSTATUS Status; + Status = IoCreateDevice(FdoExt->DriverObject, + sizeof(ISAPNP_PDO_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &FdoExt->DataPortPdo); + if (!NT_SUCCESS(Status)) + return Status; + PdoExt = (PISAPNP_PDO_EXTENSION)FdoExt->DataPortPdo->DeviceExtension; + RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); + PdoExt->Common.IsFdo = FALSE; + PdoExt->Common.Self = FdoExt->DataPortPdo; + PdoExt->Common.State = dsStopped; + + Status = IsaPnpDuplicateUnicodeString(0, + &DeviceID, + &PdoExt->DeviceID); + if (!NT_SUCCESS(Status)) + return Status; + + Status = IsaPnpDuplicateUnicodeString(0, + &HardwareIDs, + &PdoExt->HardwareIDs); + if (!NT_SUCCESS(Status)) + return Status; + + Status = IsaPnpDuplicateUnicodeString(0, + &InstanceID, + &PdoExt->InstanceID); + if (!NT_SUCCESS(Status)) + return Status; + + return Status; +} + static NTSTATUS NTAPI @@ -360,7 +414,12 @@ IsaAddDevice( InitializeListHead(&FdoExt->DeviceListHead); KeInitializeSpinLock(&FdoExt->Lock); + Status = IsaPnpCreateReadPortDO(FdoExt); + if (!NT_SUCCESS(Status)) + return Status; + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + FdoExt->DataPortPdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 3321ff8b9ec..724ccfea79d 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -37,6 +37,7 @@ typedef struct _ISAPNP_FDO_EXTENSION { ISAPNP_COMMON_EXTENSION Common; PDEVICE_OBJECT Ldo; PDEVICE_OBJECT Pdo; + PDEVICE_OBJECT DataPortPdo; LIST_ENTRY DeviceListHead; ULONG DeviceCount; PDRIVER_OBJECT DriverObject; @@ -68,7 +69,8 @@ NTSTATUS NTAPI IsaPnpFillDeviceRelations( IN PISAPNP_FDO_EXTENSION FdoExt, - IN PIRP Irp); + IN PIRP Irp, + IN BOOLEAN IncludeDataPort); DRIVER_INITIALIZE DriverEntry; diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 78026a3b40a..1f3f7e18f7b 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -44,13 +44,26 @@ IsaPdoQueryCapabilities( { PDEVICE_CAPABILITIES DeviceCapabilities; PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; + ULONG i; DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities; if (DeviceCapabilities->Version != 1) return STATUS_REVISION_MISMATCH; - DeviceCapabilities->UniqueID = LogDev->SerialNumber != 0xffffffff; - DeviceCapabilities->Address = LogDev->CSN; + if (LogDev) + { + DeviceCapabilities->UniqueID = LogDev->SerialNumber != 0xffffffff; + DeviceCapabilities->Address = LogDev->CSN; + } + else + { + DeviceCapabilities->UniqueID = TRUE; + DeviceCapabilities->SilentInstall = TRUE; + DeviceCapabilities->RawDeviceOK = TRUE; + for (i = 0; i < POWER_SYSTEM_MAXIMUM; i++) + DeviceCapabilities->DeviceState[i] = PowerDeviceD3; + DeviceCapabilities->DeviceState[PowerSystemWorking] = PowerDeviceD0; + } return STATUS_SUCCESS; } @@ -115,14 +128,20 @@ IsaPdoPnp( switch (IrpSp->MinorFunction) { case IRP_MN_START_DEVICE: - Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice); + if (PdoExt->IsaPnpDevice) + Status = IsaHwActivateDevice(PdoExt->IsaPnpDevice); + else + Status = STATUS_SUCCESS; if (NT_SUCCESS(Status)) PdoExt->Common.State = dsStarted; break; case IRP_MN_STOP_DEVICE: - Status = IsaHwDeactivateDevice(PdoExt->IsaPnpDevice); + if (PdoExt->IsaPnpDevice) + Status = IsaHwDeactivateDevice(PdoExt->IsaPnpDevice); + else + Status = STATUS_SUCCESS; if (NT_SUCCESS(Status)) PdoExt->Common.State = dsStopped;

1 0

[reactos] 04/10: [ISAPNP] Create PDO identifiers ahead of IRP_MN_QUERY_ID
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e0607fcebf0f93ed2b5be… commit e0607fcebf0f93ed2b5be062771ca2300cc73196 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Mar 16 19:00:00 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Create PDO identifiers ahead of IRP_MN_QUERY_ID --- drivers/bus/isapnp/isapnp.c | 134 ++++++++++++++++++++++++++++++++++++++++++++ drivers/bus/isapnp/isapnp.h | 13 +++++ drivers/bus/isapnp/pdo.c | 68 ++++++---------------- 3 files changed, 163 insertions(+), 52 deletions(-) diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index 6fc29e9e70c..0382f8c843d 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -10,6 +10,132 @@ #define NDEBUG #include <debug.h> +NTSTATUS +NTAPI +IsaPnpDuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || + DestinationString == NULL || + SourceString->Length > SourceString->MaximumLength || + (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || + Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || + Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + if ((SourceString->Length == 0) && + (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} + +static +NTSTATUS +NTAPI +IsaFdoCreateDeviceIDs( + IN PISAPNP_PDO_EXTENSION PdoExt) +{ + PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; + UNICODE_STRING TempString; + WCHAR TempBuffer[256]; + PWCHAR End; + NTSTATUS Status; + USHORT i; + + TempString.Buffer = TempBuffer; + TempString.MaximumLength = sizeof(TempBuffer); + TempString.Length = 0; + + /* Device ID */ + Status = RtlStringCbPrintfExW(TempString.Buffer, + TempString.MaximumLength / sizeof(WCHAR), + &End, + NULL, 0, + L"ISAPNP\\%3S%04X", + LogDev->VendorId, + LogDev->ProdId); + if (!NT_SUCCESS(Status)) + return Status; + TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + Status = IsaPnpDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &TempString, + &PdoExt->DeviceID); + if (!NT_SUCCESS(Status)) + return Status; + + /* HardwareIDs */ + Status = RtlStringCbPrintfExW(TempString.Buffer, + TempString.MaximumLength / sizeof(WCHAR), + &End, + NULL, 0, + L"ISAPNP\\%3S%04X@" + L"*%3S%04X@", + LogDev->VendorId, + LogDev->ProdId, + LogDev->VendorId, + LogDev->ProdId); + if (!NT_SUCCESS(Status)) + return Status; + TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + Status = IsaPnpDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &TempString, + &PdoExt->HardwareIDs); + if (!NT_SUCCESS(Status)) + return Status; + for (i = 0; i < PdoExt->HardwareIDs.Length / sizeof(WCHAR); i++) + if (PdoExt->HardwareIDs.Buffer[i] == '@') + PdoExt->HardwareIDs.Buffer[i] = UNICODE_NULL; + + /* InstanceID */ + Status = RtlStringCbPrintfExW(TempString.Buffer, + TempString.MaximumLength / sizeof(WCHAR), + &End, + NULL, 0, + L"%X", + LogDev->SerialNumber); + if (!NT_SUCCESS(Status)) + return Status; + TempString.Length = (End - TempString.Buffer) * sizeof(WCHAR); + Status = IsaPnpDuplicateUnicodeString( + RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &TempString, + &PdoExt->InstanceID); + if (!NT_SUCCESS(Status)) + return Status; + + return STATUS_SUCCESS; +} + NTSTATUS NTAPI IsaPnpFillDeviceRelations( @@ -61,6 +187,14 @@ IsaPnpFillDeviceRelations( PdoExt->Common.Self = IsaDevice->Pdo; PdoExt->Common.State = dsStopped; PdoExt->IsaPnpDevice = IsaDevice; + + Status = IsaFdoCreateDeviceIDs(PdoExt); + if (!NT_SUCCESS(Status)) + { + IoDeleteDevice(IsaDevice->Pdo); + IsaDevice->Pdo = NULL; + break; + } } DeviceRelations->Objects[i++] = IsaDevice->Pdo; diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index e247643112c..3321ff8b9ec 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -47,10 +47,23 @@ typedef struct _ISAPNP_FDO_EXTENSION { typedef struct _ISAPNP_PDO_EXTENSION { ISAPNP_COMMON_EXTENSION Common; PISAPNP_LOGICAL_DEVICE IsaPnpDevice; + UNICODE_STRING DeviceID; + UNICODE_STRING HardwareIDs; + UNICODE_STRING InstanceID; } ISAPNP_PDO_EXTENSION, *PISAPNP_PDO_EXTENSION; /* isapnp.c */ +#define RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE 1 +#define RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING 2 + +NTSTATUS +NTAPI +IsaPnpDuplicateUnicodeString( + IN ULONG Flags, + IN PCUNICODE_STRING SourceString, + OUT PUNICODE_STRING DestinationString); + NTSTATUS NTAPI IsaPnpFillDeviceRelations( diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c index 4a674a05e0f..78026a3b40a 100644 --- a/drivers/bus/isapnp/pdo.c +++ b/drivers/bus/isapnp/pdo.c @@ -62,79 +62,43 @@ IsaPdoQueryId( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice; - WCHAR Temp[256]; - PWCHAR Buffer, End; - ULONG Length; - NTSTATUS Status; + UNICODE_STRING EmptyString = RTL_CONSTANT_STRING(L""); + PUNICODE_STRING Source; + PWCHAR Buffer; switch (IrpSp->Parameters.QueryId.IdType) { case BusQueryDeviceID: - { DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); - Status = RtlStringCbPrintfExW(Temp, sizeof(Temp), - &End, - NULL, 0, - L"ISAPNP\\%3S%04X", - LogDev->VendorId, - LogDev->ProdId); - if (!NT_SUCCESS(Status)) - return Status; - Length = End - Temp; - Temp[Length++] = UNICODE_NULL; + Source = &PdoExt->DeviceID; break; - } case BusQueryHardwareIDs: DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); - Status = RtlStringCbPrintfExW(Temp, sizeof(Temp), - &End, - NULL, 0, - L"ISAPNP\\%3S%04X", - LogDev->VendorId, - LogDev->ProdId); - if (!NT_SUCCESS(Status)) - return Status; - Length = End - Temp; - Temp[Length++] = UNICODE_NULL; - Status = RtlStringCbPrintfExW(Temp + Length, sizeof(Temp) - Length, - &End, - NULL, 0, - L"*%3S%04X", - LogDev->VendorId, - LogDev->ProdId); - if (!NT_SUCCESS(Status)) - return Status; - Length = End - Temp; - Temp[Length++] = UNICODE_NULL; - Temp[Length++] = UNICODE_NULL; + Source = &PdoExt->HardwareIDs; + break; + + case BusQueryCompatibleIDs: + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + Source = &EmptyString; break; case BusQueryInstanceID: DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); - Status = RtlStringCbPrintfExW(Temp, sizeof(Temp), - &End, - NULL, 0, - L"%X", - LogDev->SerialNumber); - if (!NT_SUCCESS(Status)) - return Status; - Length = End - Temp; - Temp[Length++] = UNICODE_NULL; + Source = &PdoExt->InstanceID; break; default: - DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", - IrpSp->Parameters.QueryId.IdType); - return Irp->IoStatus.Status; + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", + IrpSp->Parameters.QueryId.IdType); + return Irp->IoStatus.Status; } - Buffer = ExAllocatePool(PagedPool, Length * sizeof(WCHAR)); + Buffer = ExAllocatePool(PagedPool, Source->MaximumLength); if (!Buffer) return STATUS_NO_MEMORY; - RtlCopyMemory(Buffer, Temp, Length * sizeof(WCHAR)); + RtlCopyMemory(Buffer, Source->Buffer, Source->MaximumLength); Irp->IoStatus.Information = (ULONG_PTR)Buffer; return STATUS_SUCCESS; }

1 0

[reactos] 03/10: [ISAPNP] Extract function to create DOs
by Hervé Poussineau 20 Mar '20

20 Mar '20

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89aff07a671332065c408… commit 89aff07a671332065c408c23806ee1fd05683e4b Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Mar 16 18:07:24 2020 +0100 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Fri Mar 20 22:40:11 2020 +0100 [ISAPNP] Extract function to create DOs --- drivers/bus/isapnp/fdo.c | 57 +------------------------------------- drivers/bus/isapnp/isapnp.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ drivers/bus/isapnp/isapnp.h | 6 ++++ 3 files changed, 74 insertions(+), 56 deletions(-) diff --git a/drivers/bus/isapnp/fdo.c b/drivers/bus/isapnp/fdo.c index 5e6931d07f0..6417d6e68bc 100644 --- a/drivers/bus/isapnp/fdo.c +++ b/drivers/bus/isapnp/fdo.c @@ -44,13 +44,8 @@ IsaFdoQueryDeviceRelations( IN PIRP Irp, IN PIO_STACK_LOCATION IrpSp) { - PISAPNP_PDO_EXTENSION PdoExt; NTSTATUS Status; - PLIST_ENTRY CurrentEntry; - PISAPNP_LOGICAL_DEVICE IsaDevice; - PDEVICE_RELATIONS DeviceRelations; KIRQL OldIrql; - ULONG i = 0; if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) return Irp->IoStatus.Status; @@ -64,57 +59,7 @@ IsaFdoQueryDeviceRelations( return Status; } - DeviceRelations = ExAllocatePool(NonPagedPool, - sizeof(DEVICE_RELATIONS) + sizeof(DEVICE_OBJECT) * (FdoExt->DeviceCount - 1)); - if (!DeviceRelations) - { - return STATUS_NO_MEMORY; - } - - CurrentEntry = FdoExt->DeviceListHead.Flink; - while (CurrentEntry != &FdoExt->DeviceListHead) - { - IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, ListEntry); - - if (!IsaDevice->Pdo) - { - Status = IoCreateDevice(FdoExt->DriverObject, - sizeof(ISAPNP_PDO_EXTENSION), - NULL, - FILE_DEVICE_CONTROLLER, - FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, - FALSE, - &IsaDevice->Pdo); - if (!NT_SUCCESS(Status)) - { - break; - } - - IsaDevice->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; - - //Device->Pdo->Flags |= DO_POWER_PAGABLE; - - PdoExt = (PISAPNP_PDO_EXTENSION)IsaDevice->Pdo->DeviceExtension; - - RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); - - PdoExt->Common.IsFdo = FALSE; - PdoExt->Common.Self = IsaDevice->Pdo; - PdoExt->Common.State = dsStopped; - PdoExt->IsaPnpDevice = IsaDevice; - } - DeviceRelations->Objects[i++] = IsaDevice->Pdo; - - ObReferenceObject(IsaDevice->Pdo); - - CurrentEntry = CurrentEntry->Flink; - } - - DeviceRelations->Count = FdoExt->DeviceCount; - - Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; - - return STATUS_SUCCESS; + return IsaPnpFillDeviceRelations(FdoExt, Irp); } NTSTATUS diff --git a/drivers/bus/isapnp/isapnp.c b/drivers/bus/isapnp/isapnp.c index d3d600a75d3..6fc29e9e70c 100644 --- a/drivers/bus/isapnp/isapnp.c +++ b/drivers/bus/isapnp/isapnp.c @@ -10,6 +10,73 @@ #define NDEBUG #include <debug.h> +NTSTATUS +NTAPI +IsaPnpFillDeviceRelations( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp) +{ + PISAPNP_PDO_EXTENSION PdoExt; + NTSTATUS Status = STATUS_SUCCESS; + PLIST_ENTRY CurrentEntry; + PISAPNP_LOGICAL_DEVICE IsaDevice; + PDEVICE_RELATIONS DeviceRelations; + ULONG i = 0; + + DeviceRelations = ExAllocatePool(NonPagedPool, + sizeof(DEVICE_RELATIONS) + sizeof(DEVICE_OBJECT) * FdoExt->DeviceCount); + if (!DeviceRelations) + { + return STATUS_NO_MEMORY; + } + + CurrentEntry = FdoExt->DeviceListHead.Flink; + while (CurrentEntry != &FdoExt->DeviceListHead) + { + IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, ListEntry); + + if (!IsaDevice->Pdo) + { + Status = IoCreateDevice(FdoExt->DriverObject, + sizeof(ISAPNP_PDO_EXTENSION), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN | FILE_AUTOGENERATED_DEVICE_NAME, + FALSE, + &IsaDevice->Pdo); + if (!NT_SUCCESS(Status)) + { + break; + } + + IsaDevice->Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + //Device->Pdo->Flags |= DO_POWER_PAGABLE; + + PdoExt = (PISAPNP_PDO_EXTENSION)IsaDevice->Pdo->DeviceExtension; + + RtlZeroMemory(PdoExt, sizeof(ISAPNP_PDO_EXTENSION)); + + PdoExt->Common.IsFdo = FALSE; + PdoExt->Common.Self = IsaDevice->Pdo; + PdoExt->Common.State = dsStopped; + PdoExt->IsaPnpDevice = IsaDevice; + } + DeviceRelations->Objects[i++] = IsaDevice->Pdo; + + ObReferenceObject(IsaDevice->Pdo); + + CurrentEntry = CurrentEntry->Flink; + } + + DeviceRelations->Count = i; + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + return Status; +} + + static IO_COMPLETION_ROUTINE ForwardIrpCompletion; static diff --git a/drivers/bus/isapnp/isapnp.h b/drivers/bus/isapnp/isapnp.h index 633341d5f99..e247643112c 100644 --- a/drivers/bus/isapnp/isapnp.h +++ b/drivers/bus/isapnp/isapnp.h @@ -51,6 +51,12 @@ typedef struct _ISAPNP_PDO_EXTENSION { /* isapnp.c */ +NTSTATUS +NTAPI +IsaPnpFillDeviceRelations( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp); + DRIVER_INITIALIZE DriverEntry; NTSTATUS

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs