Mac: Fix bugs in Mac installer

Author: Charlie Fenton

client/check_security.cpp

@@ -163,8 +163,11 @@ int use_sandbox, int isManager, char* path_to_error, int len
 
 #ifdef __APPLE__
     char DataDirPath[MAXPATHLEN];
+#ifdef _MAC_INSTALLER
+    strlcpy(DataDirPath, dataPath, sizeof(dir_path));  // Installer
+#else
     getcwd(DataDirPath, sizeof(DataDirPath));
-
+#endif
     snprintf(full_path, sizeof(full_path),
         "%s/%s", DataDirPath, FIX_BOINC_USERS_FILENAME
     );

clientgui/AdvancedFrame.cpp

@@ -50,7 +50,6 @@
 #include "ViewProjects.h"
 #include "ViewWork.h"
 #include "ViewTransfers.h"
-#include "ViewMessages.h"
 #include "ViewStatistics.h"
 #include "ViewResources.h"
 #include "DlgAbout.h"
@@ -1567,6 +1566,7 @@ void CAdvancedFrame::OnRefreshView(CFrameEvent& WXUNUSED(event)) {
     if (IsShown()) {
         CMainDocument*  pDoc = wxGetApp().GetDocument();
         CBOINCBaseView* pView = NULL;
+        wxTimerEvent    timerEvent;
         wxString        strTabTitle = wxEmptyString;
         int             iCount = 0;
         static int      iLastCount = 0;
@@ -1996,6 +1996,7 @@ void CAdvancedFrame::OnDarkModeChanged( wxSysColourChangedEvent& WXUNUSED(event)
     CBOINCBaseView* theView = NULL;;
     CBOINCListCtrl* theListCtrl = NULL;
     long bottomItem;
+    wxTimerEvent    timerEvent;
     int currentPage = _GetCurrentViewPage();
 
     StopTimers();

clientgui/BOINCGUIApp.cpp

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2024 University of California
+// Copyright (C) 2025 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -69,33 +69,7 @@ BEGIN_EVENT_TABLE (CBOINCGUIApp, wxApp)
 #endif
 END_EVENT_TABLE ()
 
-#if defined(__WXGTK__) && defined(BUILD_WITH_VCPKG)
-extern "C" {
-    void _gdk_pixbuf__svg_fill_info (void*);
-    void _gdk_pixbuf__svg_fill_vtable (void*);
-    unsigned int rsvg_error_quark (void);
-    void rsvg_handle_get_pixbuf (void*);
-}
-
-typedef void (*GdkPixbufFillInfo) (void*);
-typedef void (*GdkPixbufFillVtable) (void*);
-typedef unsigned int (*RsvgErrorQuark) (void);
-typedef void (*RsvgHandleGetPixbuf) (void*);
-#endif
-
 bool CBOINCGUIApp::OnInit() {
-#if defined(__WXGTK__) && defined(BUILD_WITH_VCPKG)
-    try {
-        GdkPixbufFillInfo fi = _gdk_pixbuf__svg_fill_info;
-        GdkPixbufFillVtable fv = _gdk_pixbuf__svg_fill_vtable;
-        RsvgErrorQuark eq = rsvg_error_quark;
-        RsvgHandleGetPixbuf hp = rsvg_handle_get_pixbuf;
-        fi(NULL);
-        fv(NULL);
-        eq();
-        hp(NULL);
-    } catch (...) {}
-#endif
     // Initialize globals
 #ifdef SANDBOX
     g_use_sandbox = true;
@@ -149,6 +123,7 @@ bool CBOINCGUIApp::OnInit() {
     m_iDisplayAnotherInstanceRunningDialog = 1;
 #ifdef __WXMAC__
     m_iHideMenuBarIcon = 0;
+    m_iWasShutDownBySystem = 0;
 #endif
     m_iGUISelected = BOINC_SIMPLEGUI;
     m_bSafeMessageBoxDisplayed = 0;
@@ -232,6 +207,18 @@ bool CBOINCGUIApp::OnInit() {
     m_pConfig->Read(wxT("DisplayAnotherInstanceRunningDialog"), &m_iDisplayAnotherInstanceRunningDialog, 1L);
 #ifdef __WXMAC__
     m_pConfig->Read(wxT("HideMenuBarIcon"), &m_iHideMenuBarIcon, 0L);
+    m_pConfig->Read(wxT("WasShutDownBySystem"), &m_iWasShutDownBySystem, 0L);
+    // If Manager was hidden and was shut down by system when user last logged
+    // out, MacOS's "Reopen windows when logging in" functionality may relaunch
+    // us visible before our LaunchAgent launches us with the "autostart" arg.
+    // QuitAppleEventHandler() set m_iWasShutDownBySystem to 1, causing
+    // CBOINCGUIApp::SaveState to set WasShutDownBySystem in our configuraiton
+    // file to tell us to treat this as an autostart and launch hidden.
+    if (m_iWasShutDownBySystem) {
+        m_iWasShutDownBySystem = 0;
+        m_bBOINCMGRAutoStarted = true;
+        m_bGUIVisible = false;
+    }
 #endif
     m_pConfig->Read(wxT("DisableAutoStart"), &m_iBOINCMGRDisableAutoStart, 0L);
     m_pConfig->Read(wxT("LanguageISO"), &m_strISOLanguageCode, wxT(""));
@@ -490,6 +477,10 @@ bool CBOINCGUIApp::OnInit() {
     // Detect if BOINC Manager is already running, if so, bring it into the
     // foreground and then exit.
     if (DetectDuplicateInstance()) {
+#ifdef __WXMAC__
+        // Hack to work around an issue with the Mac Installer
+        if (m_bBOINCMGRAutoStarted) return false;
+#endif
         if (GetBOINCMGRDisplayAnotherInstanceRunningMessage()) {
             wxString appName = m_pSkinManager->GetAdvanced()->GetApplicationName();
             wxString message;
@@ -686,6 +677,7 @@ void CBOINCGUIApp::SaveState() {
     m_pConfig->Write(wxT("DisplayAnotherInstanceRunningDialog"), m_iDisplayAnotherInstanceRunningDialog);
 #ifdef __WXMAC__
     m_pConfig->Write(wxT("HideMenuBarIcon"), m_iHideMenuBarIcon);
+    m_pConfig->Write(wxT("WasShutDownBySystem"), m_iWasShutDownBySystem);
 #endif
     m_pConfig->Write(wxT("DisableAutoStart"), m_iBOINCMGRDisableAutoStart);
     m_pConfig->Write(wxT("RunDaemon"), m_bRunDaemon);
@@ -1105,19 +1097,17 @@ int CBOINCGUIApp::IdleTrackerDetach() {
 void CBOINCGUIApp::OnActivateApp(wxActivateEvent& event) {
     m_bProcessingActivateAppEvent = true;
 
-
-#ifndef __WXMSW__  // On Win, the following raises the wrong window
-    if (event.GetActive())
-#endif
-    {
+    if (event.GetActive()) {
 #ifdef __WXMAC__
         ShowInterface();
-#elif defined(__WXGTK__)
+#else
+#ifdef __WXGTK__
         // Linux allows the Event Log to be brought forward and made active
         // even if we have a modal dialog displayed (associated with our
         // main frame.) This test is needed to allow bringing the modal
         // dialog forward again by clicking on its title bar.
         if (!IsModalDialogDisplayed())
+#endif
         {
             bool keepEventLogInFront = m_bEventLogWasActive;
 

clientgui/BOINCGUIApp.h

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2024 University of California
+// Copyright (C) 2025 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -123,6 +123,7 @@ class CBOINCGUIApp : public wxApp {
     int                 m_iDisplayAnotherInstanceRunningDialog;
 #ifdef __WXMAC__
     int                 m_iHideMenuBarIcon;
+    int                 m_iWasShutDownBySystem;
 #endif
 
     bool                m_bGUIVisible;
@@ -202,6 +203,8 @@ class CBOINCGUIApp : public wxApp {
                                                     { return m_iHideMenuBarIcon; }
     void                SetBOINCMGRHideMenuBarIcon(int iHideMenuBarIcon)
                                                     { m_iHideMenuBarIcon = iHideMenuBarIcon; }
+    void                 SetBOINCMGRWasShutDownBySystem(int val)
+                                                    { m_iWasShutDownBySystem = val; }
 #endif
 
     bool                GetRunDaemon()

clientgui/mac/BOINCGUIApp.mm

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2016 University of California
+// Copyright (C) 2025 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -218,6 +218,14 @@ OSErr QuitAppleEventHandler( const AppleEvent *appleEvt, AppleEvent* reply, UInt
             if (([bundleID compare:@"com.apple.dock"] != NSOrderedSame)
                     && ([bundleID compare:@"edu.berkeley.boinc"] != NSOrderedSame)) {
                 s_bSkipExitConfirmation = true; // Not from our app, our dock icon or our taskbar icon
+                if ([ NSApp isHidden ]) {
+                // If Manager was hidden and was shut down by system when user last logged
+                // out, MacOS's "Reopen windows when logging in" functionality may relaunch
+                // us visible before our LaunchAgent launches us with the "autostart" arg.
+                // Set the WasShutDownBySystem in our configuraiton file to tell us to
+                // treat this as an autostart and launch hidden.
+                    wxGetApp().SetBOINCMGRWasShutDownBySystem(1);
+                }
                 // The following may no longer be needed under wxCocoa-3.0.0
                 wxGetApp().ExitMainLoop();  // Prevents wxMac from issuing events to closed frames
             }

mac_installer/PostInstall.cpp

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2024 University of California
+// Copyright (C) 2025 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -61,7 +61,7 @@
 #if VERBOSE_TEST
 #define CREATE_LOG 1    /* for debugging */
 #else
-#define CREATE_LOG 0    /* for debugging */
+#define CREATE_LOG 1    /* for debugging */
 #endif
 
 #define USE_OSASCRIPT_FOR_ALL_LOGGED_IN_USERS false
@@ -693,12 +693,14 @@ int DeleteReceipt()
                 // Launch Manager hidden (in background, without opening windows)
                 sprintf(s, "su -l \"%s\" -c 'open -jg \"%s\" --args -s'", pw->pw_name, appPath[brandID]);
                 err = callPosixSpawn(s);
-                printf("command: %s returned error %d\n", s, err);
-                fflush(stdout);
+                if (err) {
+                    REPORT_ERROR(true);
+                    printf("command: %s returned error %d\n", s, err);
+                    fflush(stdout);
+                }
            }
         }
     }
-
     return 0;
 }
 
@@ -1833,7 +1835,11 @@ OSErr UpdateAllVisibleUsers(long brandID, long oldBrandID)
 
             if (compareOSVersionTo(13, 0) >= 0) {
                 deleteLoginItem =  true;    // Use LaunchAgent to autostart BOINC Manager
-                snprintf(s, sizeof(s), "open \"/Library/Application Support/BOINC Data/%s_Finish_Install.app\"", brandName[brandID]);
+                // The -i argument tells BOINC_Finish_Install not to "Launchctl load" our
+                // LaunchAgent, because doing that launches the Mamager immediately (before
+                // we can finish setting things up) and the Mamager starts incorrectly,
+                // especially causing problems if starting in SimpleView.
+               snprintf(s, sizeof(s), "open \"/Library/Application Support/BOINC Data/%s_Finish_Install.app\" --args -i", brandName[brandID]);
                 err = callPosixSpawn(s);
                 REPORT_ERROR(err);
                 if (err) {

mac_installer/finish_install.cpp

@@ -1,6 +1,6 @@
 // This file is part of BOINC.
 // http://boinc.berkeley.edu
-// Copyright (C) 2023 University of California
+// Copyright (C) 2025 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -31,12 +31,10 @@
 
 #define VERBOSE_TEST 0  /* for debugging callPosixSpawn */
 #if VERBOSE_TEST
-#define CREATE_LOG 0    /* for debugging */
+#define CREATE_LOG 1    /* for debugging */
 #else
 #define CREATE_LOG 0    /* for debugging */
 #endif
-#define USE_SPECIAL_LOG_FILE 1
-
 
 #include <Carbon/Carbon.h>
 
@@ -72,6 +70,7 @@ int main(int argc, const char * argv[]) {
     passwd                  *pw;
     bool                    isUninstall = false;
     int                     iBrandId = 0;
+    bool                    calledFromInstaller = false;
 
     // Wait until we are the active login (in case of fast user switching)
     userName = getenv("USER");
@@ -92,10 +91,13 @@ int main(int argc, const char * argv[]) {
     }
 
     for (i=1; i<argc; i++) {
+        print_to_log_file("argv[%d] = '%s'", i, argv[i]);
         if (strcmp(argv[i], "-d") == 0) {
             isUninstall = true;
-        } else if (strcmp(argv[i], "-a") != 0) {
+        } else if (strcmp(argv[i], "-a") == 0) {
             iBrandId = atoi(argv[i]);
+        } else if (strcmp(argv[i], "-i") == 0) {
+            calledFromInstaller = true;
         }
     }   // end for (i=i; i<argc; i+=2)
 
@@ -150,12 +152,15 @@ int main(int argc, const char * argv[]) {
                 print_to_log_file("returned error %d\n", err);
             }
 
-            snprintf(cmd, sizeof(cmd), "launchctl load \"/Users/%s/Library/LaunchAgents/edu.berkeley.launchboincmanager.plist\"", pw->pw_name);
-            err = callPosixSpawn(cmd);
-            if (err) {
-                print_to_log_file("Command: %s\n", cmd);
-                print_to_log_file("returned error %d\n", err);
+            if (! calledFromInstaller) {
+                snprintf(cmd, sizeof(cmd), "launchctl load \"/Users/%s/Library/LaunchAgents/edu.berkeley.launchboincmanager.plist\"", pw->pw_name);
+                err = callPosixSpawn(cmd);
+                if (err) {
+                    print_to_log_file("Command: %s\n", cmd);
+                    print_to_log_file("returned error %d\n", err);
+                }
             }
+
         } else {
             snprintf(cmd, sizeof(cmd), "open -jg \"%s\"", appPath[iBrandId]);
             err = callPosixSpawn(cmd);
@@ -527,18 +532,14 @@ static void print_to_log_file(const char *format, ...) {
     va_list args;
     char buf[256];
     time_t t;
-#if USE_SPECIAL_LOG_FILE
-    strlcpy(buf, getenv("HOME"), sizeof(buf));
-    strlcat(buf, "/Documents/test_log.txt", sizeof(buf));
+    sprintf(buf, "/Users/Shared/test_log_finish_install.txt");
     FILE *f;
     f = fopen(buf, "a");
     if (!f) return;
 
-//  freopen(buf, "a", stdout);
-//  freopen(buf, "a", stderr);
-#else
-    #define f stderr
-#endif
+    // File may be owned by various users, so make it world readable & writable
+    chmod(buf, 0666);
+
     time(&t);
     strlcpy(buf, asctime(localtime(&t)), sizeof(buf));
 
@@ -552,9 +553,7 @@ static void print_to_log_file(const char *format, ...) {
     va_end(args);
 
     fputs("\n", f);
-#if USE_SPECIAL_LOG_FILE
     fflush(f);
     fclose(f);
 #endif
-#endif
 }