[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)

svn path=/trunk/; revision=46270

diff --git a/reactos/ntoskrnl/io/iomgr/drvrlist.c b/reactos/ntoskrnl/io/iomgr/drvrlist.c
index ecc9980..e15aab2 100644 (file)
--- a/reactos/ntoskrnl/io/iomgr/drvrlist.c
+++ b/reactos/ntoskrnl/io/iomgr/drvrlist.c
@@ -414,8 +414,20 @@ static INIT_FUNCTION NTSTATUS
 IopLoadDriver(PSERVICE Service)
 {
    NTSTATUS Status = STATUS_UNSUCCESSFUL;
+   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);
 
-   IopDisplayLoadingMessage(&Service->ServiceName);
    Status = ZwLoadDriver(&Service->RegistryPath);
    IopBootLog(&Service->ImagePath, NT_SUCCESS(Status) ? TRUE : FALSE);
    if (!NT_SUCCESS(Status))