Author: cgutman Date: Fri Mar 19 04:14:33 2010 New Revision: 46270
URL: http://svn.reactos.org/svn/reactos?rev=46270&view=rev Log: [NTOSKRNL] - Use the correct file name for services which have differing service and image names - Fixes the file name of the display miniports on the SOS screen (VGA.SYS -> VGAMP.SYS and VBE.SYS -> VBEMP.SYS)
Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c
Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist.... ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Fri Mar 19 04:14:33 2010 @@ -414,8 +414,20 @@ IopLoadDriver(PSERVICE Service) { NTSTATUS Status = STATUS_UNSUCCESSFUL; - - IopDisplayLoadingMessage(&Service->ServiceName); + PUNICODE_STRING ImagePath = &Service->ImagePath; + PWCHAR ImageName; + UNICODE_STRING ImageNameU; + + ImageName = wcsrchr(ImagePath->Buffer, L'\'); + if (!ImageName) + ImageName = ImagePath->Buffer; + else + ImageName++; + + RtlInitUnicodeString(&ImageNameU, ImageName); + + IopDisplayLoadingMessage(&ImageNameU); + Status = ZwLoadDriver(&Service->RegistryPath); IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE); if (!NT_SUCCESS(Status))