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

This fixes a regression introduced by d4987802. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46469Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntoskrnl.exe: Properly handle already-loaded drivers in handle_bus_relations().
48504a2c · Zebediah Figura · Alexandre Julliard · 8e0139af · 48504a2c
Commit 48504a2c authored Jan 14, 2019 by Zebediah Figura Committed by Alexandre Julliard Jan 15, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

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

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