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

[Andrew Eikum]

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>
---

CCing Zeb as this was moved here in
a60a014dc4f76f36031fa560531192ac9a335bf4.

 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 8bba9682023..2388033ceda 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();
-- 
2.25.0

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>

Thanks for catching this.

On 1/21/20 9:19 AM, Andrew Eikum wrote:
> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>
> ---
>
> CCing Zeb as this was moved here in
> a60a014dc4f76f36031fa560531192ac9a335bf4.
>
> 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 8bba9682023..2388033ceda 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();