[NTOSKRNL]
authorPierre Schweitzer <pierre@reactos.org>
Thu, 7 Sep 2017 21:23:19 +0000 (21:23 +0000)
committerPierre Schweitzer <pierre@reactos.org>
Thu, 7 Sep 2017 21:23:19 +0000 (21:23 +0000)
In IoReportDetectedDevice(), don't attempt to guess service name, use the one provided in DriverObject.
This fixes BtrFS file system driver initialization.
Patch by Thomas Faber.

CORE-13763

svn path=/trunk/; revision=75782

reactos/ntoskrnl/io/pnpmgr/pnpreport.c

index cf13b1d..9449e2d 100644 (file)
@@ -181,12 +181,7 @@ IoReportDetectedDevice(IN PDRIVER_OBJECT DriverObject,
     DPRINT("IoReportDetectedDevice (DeviceObject %p, *DeviceObject %p)\n",
       DeviceObject, DeviceObject ? *DeviceObject : NULL);
 
-    /* Create the service name (eg. ACPI_HAL) */
-    ServiceName.Buffer = DriverObject->DriverName.Buffer +
-       sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1;
-    ServiceName.Length = DriverObject->DriverName.Length -
-       sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR);
-    ServiceName.MaximumLength = ServiceName.Length;
+    ServiceName = DriverObject->DriverExtension->ServiceKeyName;
 
     /* If the interface type is unknown, treat it as internal */
     if (LegacyBusType == InterfaceTypeUndefined)