wineboot: Always attempt setup for all machine types.

Without this, wineboot would bail out on ARM64 in the case where x86_64 WOW is not available but i386 is. Leaving an incomplete prefix without any clear error.

wineboot: Always attempt setup for all machine types.
b233cfb3 · Billy Laws · Alexandre Julliard · 4021dde4 · b233cfb3
Commit b233cfb3 authored Jul 03, 2023 by Billy Laws Committed by Alexandre Julliard Jul 11, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 11 deletions

wineboot.c programs/wineboot/wineboot.c +14 -11

No files found.
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1498,20 +1498,23 @@ static void update_wineprefix( BOOL force )
            HWND hwnd = show_wait_window();
            for (;;)
            {
-                MSG msg;
-                DWORD res = MsgWaitForMultipleObjects( 1, &process, FALSE, INFINITE, QS_ALLINPUT );
-                if (res == WAIT_OBJECT_0)
+                if (process)
                {
+                    MSG msg;
+                    DWORD res = MsgWaitForMultipleObjects( 1, &process, FALSE, INFINITE, QS_ALLINPUT );
+                    if (res != WAIT_OBJECT_0)
+                    {
+                        while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg );
+                        continue;
+                    }
                    CloseHandle( process );
-                    if (!machines[count]) break;
-                    if (HIWORD(machines[count]) & 4 /* native machine */)
-                        process = start_rundll32( inf_path, L"DefaultInstall", IMAGE_FILE_MACHINE_TARGET_HOST );
-                    else
-                        process = start_rundll32( inf_path, L"Wow64Install", LOWORD(machines[count]) );
-                    count++;
-                    if (!process) break;
                }
-                else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg );
+                if (!machines[count]) break;
+                if (HIWORD(machines[count]) & 4 /* native machine */)
+                    process = start_rundll32( inf_path, L"DefaultInstall", IMAGE_FILE_MACHINE_TARGET_HOST );
+                else
+                    process = start_rundll32( inf_path, L"Wow64Install", LOWORD(machines[count]) );
+                count++;
            }
            DestroyWindow( hwnd );
        }