Author: pschweitzer Date: Thu Sep 7 21:23:19 2017 New Revision: 75782
URL: http://svn.reactos.org/svn/reactos?rev=75782&view=rev Log: [NTOSKRNL] 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
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c
Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepor... ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c [iso-8859-1] Thu Sep 7 21:23:19 2017 @@ -181,12 +181,7 @@ 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)