[PATCH 0/1] MR3285: wineboot: Always attempt setup for all machine types

[Billy Laws (＠bylaws)]

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.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3285

[PATCH 1/1] wineboot: Always attempt setup for all machine types

[Billy Laws]

From: Billy Laws <blaws05(a)gmail.com>

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.
---
 programs/wineboot/wineboot.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index c05ce580298..fe651b14e44 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1499,17 +1499,18 @@ static void update_wineprefix( BOOL force )
             for (;;)
             {
                 MSG msg;
-                DWORD res = MsgWaitForMultipleObjects( 1, &process, FALSE, INFINITE, QS_ALLINPUT );
-                if (res == WAIT_OBJECT_0)
+                DWORD res;
+                if (process) res = MsgWaitForMultipleObjects( 1, &process, FALSE, INFINITE, QS_ALLINPUT );
+                if (!process || res == WAIT_OBJECT_0)
                 {
-                    CloseHandle( process );
+                    if (process) 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;
+                    if (!process) continue;
                 }
                 else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg );
             }
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/3285