[ros-diffs] [reactos] 06/20: [ISAPNP] Fix device capabilities

[Dmitry Borisov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2d367001bd17f56837501…

commit 2d367001bd17f5683750182d7030d8c7bafce02b
Author:     Dmitry Borisov <di.sean(a)protonmail.com>
AuthorDate: Thu Mar 4 18:46:50 2021 +0600
Commit:     Dmitry Borisov <di.sean(a)protonmail.com>
CommitDate: Sun Jun 20 19:24:19 2021 +0600

    [ISAPNP] Fix device capabilities
    
    - The bus does not supply an address.
    - Read Port ID is always unique.
    
    This reverts commit fc0a0b9f84e1f284914b4576305cbf11c9015ad6.
    See also commit 21514e473f5.
    
    CORE-17034
---
 drivers/bus/isapnp/pdo.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/bus/isapnp/pdo.c b/drivers/bus/isapnp/pdo.c
index 3e2256b4b68..1227f7cf22b 100644
--- a/drivers/bus/isapnp/pdo.c
+++ b/drivers/bus/isapnp/pdo.c
@@ -53,23 +53,26 @@ IsaPdoQueryCapabilities(
     _In_ PIO_STACK_LOCATION IrpSp)
 {
     PDEVICE_CAPABILITIES DeviceCapabilities;
-    PISAPNP_LOGICAL_DEVICE LogDev = PdoExt->IsaPnpDevice;
     ULONG i;
 
+    UNREFERENCED_PARAMETER(Irp);
+
     PAGED_CODE();
 
     DeviceCapabilities = IrpSp->Parameters.DeviceCapabilities.Capabilities;
     if (DeviceCapabilities->Version != 1)
         return STATUS_REVISION_MISMATCH;
 
-    if (LogDev)
-    {
-        DeviceCapabilities->UniqueID = TRUE;
-        DeviceCapabilities->Address = LogDev->CSN;
-    }
-    else
+    DeviceCapabilities->LockSupported =
+    DeviceCapabilities->EjectSupported =
+    DeviceCapabilities->Removable =
+    DeviceCapabilities->DockDevice = FALSE;
+
+    DeviceCapabilities->UniqueID = TRUE;
+
+    if (PdoExt->FdoExt->ReadPortPdo &&
+        PdoExt->Common.Self == PdoExt->FdoExt->ReadPortPdo)
     {
-        DeviceCapabilities->UniqueID = FALSE;
         DeviceCapabilities->RawDeviceOK = TRUE;
         DeviceCapabilities->SilentInstall = TRUE;
     }