Andrew Eikum : winebus.sys: Don't return too early if SDL initialization succeeds.

Alexandre Julliard julliard at winehq.org
Fri Aug 7 10:42:30 CDT 2020


Module: wine
Branch: stable
Commit: 4246ff4b16694bab815573c6ff33103711a15bcb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=4246ff4b16694bab815573c6ff33103711a15bcb

Author: Andrew Eikum <aeikum at codeweavers.com>
Date:   Tue Jan 21 09:19:12 2020 -0600

winebus.sys: Don't return too early if SDL initialization succeeds.

Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 6cb3d0fb3778f660546e581787b1734e2b1d2955)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/winebus.sys/main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index 8bba968202..2388033ced 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -559,7 +559,10 @@ static NTSTATUS fdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp)
         if (check_bus_option(&SDL_enabled, 1))
         {
             if (sdl_driver_init() == STATUS_SUCCESS)
-                return STATUS_SUCCESS;
+            {
+                irp->IoStatus.u.Status = STATUS_SUCCESS;
+                break;
+            }
         }
         udev_driver_init();
         iohid_driver_init();




More information about the wine-cvs mailing list