[PATCH v3 0/3] MR2551: wineboot: Add env variable to hide wait window

[Isaac Marovitz (＠IsaacMarovitz)]

Add a new environment variable `WINEHIDEWAIT` to disable configuration wait windows. Useful for wine wrappers that want to keep the UX seamless.

--
  v3: Check if null

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

[PATCH v3 1/3] Add env variable to hide wait window

[Isaac Marovitz]

From: Isaac Marovitz

---
 programs/wineboot/wineboot.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index c05ce580298..b79e33f0e2e 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1495,7 +1495,10 @@ static void update_wineprefix( BOOL force )

if ((process = start_rundll32( inf_path, L"PreInstall", IMAGE_FILE_MACHINE_TARGET_HOST )))
         {
-            HWND hwnd = show_wait_window();
+            WCHAR *hide = _wgetenv( L"WINEHIDEWAIT" );
+            if (hide != "1") {
+                HWND hwnd = show_wait_window();
+            }
             for (;;)
             {
                 MSG msg;
@@ -1513,7 +1516,9 @@ static void update_wineprefix( BOOL force )
                 }
                 else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg );
             }
-            DestroyWindow( hwnd );
+            if (hide != "1") {
+                DestroyWindow(hwnd);
+            }
         }
         install_root_pnp_devices();
         update_user_profile();

[PATCH v3 2/3] Fix oopsie

[Isaac Marovitz]

From: Isaac Marovitz

---
 programs/wineboot/wineboot.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index b79e33f0e2e..1d831aa0ccc 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1495,9 +1495,10 @@ static void update_wineprefix( BOOL force )

if ((process = start_rundll32( inf_path, L"PreInstall", IMAGE_FILE_MACHINE_TARGET_HOST )))
         {
+            HWND hwnd;
             WCHAR *hide = _wgetenv( L"WINEHIDEWAIT" );
             if (hide != "1") {
-                HWND hwnd = show_wait_window();
+                hwnd = show_wait_window();
             }
             for (;;)
             {

[PATCH v3 3/3] Check if null

[Isaac Marovitz]

From: Isaac Marovitz

---
 programs/wineboot/wineboot.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c
index 1d831aa0ccc..0dbff34a8f4 100644
--- a/programs/wineboot/wineboot.c
+++ b/programs/wineboot/wineboot.c
@@ -1497,7 +1497,7 @@ static void update_wineprefix( BOOL force )
         {
             HWND hwnd;
             WCHAR *hide = _wgetenv( L"WINEHIDEWAIT" );
-            if (hide != "1") {
+            if (hide == NULL) {
                 hwnd = show_wait_window();
             }
             for (;;)
@@ -1517,7 +1517,7 @@ static void update_wineprefix( BOOL force )
                 }
                 else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg );
             }
-            if (hide != "1") {
+            if (hide == NULL) {
                 DestroyWindow(hwnd);
             }
         }

[Alistair Leslie-Hughes (＠alesliehughes)]

Since the second and third patch don't really add anything on their own.
Maybe you should merged them into one patch.

interactive rebase is your friend.
git rebase -i origin

[PATCH v3 0/3] MR2551: wineboot: Add env variable to hide wait window - closed

[Isaac Marovitz (＠IsaacMarovitz)]

This merge request was closed by Isaac Marovitz.