ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This fixes a regression introduced by d498780294.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46469
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-01-14 20:29:52 -06:00 committed by Alexandre Julliard
parent 8e0139af2a
commit 48504a2cc7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/ntoskrnl.exe/ntoskrnl.c
View File

@ -3758,9 +3758,7 @@ static void handle_bus_relations( DEVICE_OBJECT *device )
strcatW( buffer, driver ); strcatW( buffer, driver );
RtlInitUnicodeString( &string, buffer ); RtlInitUnicodeString( &string, buffer );
status = ZwLoadDriver( &string ); status = ZwLoadDriver( &string );
if (status == STATUS_IMAGE_ALREADY_LOADED) if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED)
return;
else if (status != STATUS_SUCCESS)
{ {
ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) ); ERR_(plugplay)( "Failed to load driver %s\n", debugstr_w(driver) );
return; return;