From cb8ab26d8b072c41442e1a72fc4dc0818f0c4234 Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Thu, 7 Sep 2017 21:23:19 +0000 Subject: [PATCH] [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 svn path=/trunk/; revision=75782 --- reactos/ntoskrnl/io/pnpmgr/pnpreport.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpreport.c b/reactos/ntoskrnl/io/pnpmgr/pnpreport.c index cf13b1df105..9449e2d01a5 100644 --- a/reactos/ntoskrnl/io/pnpmgr/pnpreport.c +++ b/reactos/ntoskrnl/io/pnpmgr/pnpreport.c @@ -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)