ntoskrnl.exe: Handle already-loaded drivers in handle_bus_relations().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntoskrnl.exe: Handle already-loaded drivers in handle_bus_relations().
d4987802 · Zebediah Figura · Alexandre Julliard · e3ad1cff · d4987802
Commit d4987802 authored Dec 21, 2018 by Zebediah Figura Committed by Alexandre Julliard Dec 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ntoskrnl.c dlls/ntoskrnl.exe/ntoskrnl.c +4 -1

No files found.
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -3756,7 +3756,10 @@ static void handle_bus_relations( DEVICE_OBJECT *device )
    strcpyW( buffer, servicesW );
    strcatW( buffer, driver );
    RtlInitUnicodeString( &string, buffer );
-    if (ZwLoadDriver( &string ) != STATUS_SUCCESS)
+    status = ZwLoadDriver( &string );
+    if (status == STATUS_IMAGE_ALREADY_LOADED)
+        return;
+    else if (status != STATUS_SUCCESS)
    {
        ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) );
        return;