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

Zebediah Figura z.figura12 at gmail.com
Mon Jan 14 20:29:52 CST 2019


This fixes a regression introduced by d498780294c635f67aee823bc030151a6b75bee4.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46469
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/ntoskrnl.exe/ntoskrnl.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index d8a87a6ad0..c46418e239 100644
--- 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;
-- 
2.17.1




More information about the wine-devel mailing list