MacOS 26 Screensaver fixes

client/check_security.cpp

@@ -242,7 +242,15 @@ int use_sandbox, int isManager, char* path_to_error, int len
         // Require absolute owner and group boinc_master:boinc_master
         // Get the full path to BOINC Client inside this application's bundle
         //
-        retval = stat("/Applications/BOINCManager.app/Contents/Resources/boinc", &sbuf);
+    long brandId = 0;
+    FILE *f = fopen("/Library/Application Support/BOINC Data/Branding", "r");
+    if (f) {
+        fscanf(f, "BrandId=%ld\n", &brandId);
+        fclose(f);
+    }
+
+    snprintf(full_path, sizeof(full_path),"/%s/Contents/Resources/boinc", appPath[brandId]);
+        retval = stat(full_path, &sbuf);
         if (retval)
             return -1016;          // Should never happen
 

client/switcher.cpp

@@ -278,7 +278,7 @@ static void print_to_log_file(const char *format, ...) {
     char buf[256];
     time_t t;
 
-    f = fopen("/Users/Shared/test_log_gfx_switcher.txt", "a");
+    f = fopen("/Users/Shared/test_log_switcher.txt", "a");
     if (!f) return;
 
 //  freopen(buf, "a", stdout);
@@ -298,7 +298,7 @@ static void print_to_log_file(const char *format, ...) {
     fputs("\n", f);
     fflush(f);
     fclose(f);
-    chmod("/Users/Shared/test_log_gfx_switcher.txt", 0666);
+    chmod("/Users/Shared/test_log_switcher.txt", 0666);
 }
 
 static void strip_cr(char *buf)

clientgui/mac/templates/Finish_Install-Info.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -8,6 +8,8 @@
 	<string>BOINC_Finish_Install</string>
 	<key>CFBundleIdentifier</key>
 	<string>edu.berkeley.boinc.finish-install</string>
+	<key>CFBundleIconFile</key>
+	<string>MacInstaller.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>

clientgui/mac/templates/PostInstall-Info.plist

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>PostInstall</string>
+	<key>CFBundleIconFile</key>
+	<string>MacInstaller.icns</string>
 	<key>CFBundleIdentifier</key>
 	<string>edu.berkeley.boinc.PostInstall</string>
 	<key>CFBundleInfoDictionaryVersion</key>

clientgui/mac/templates/ScreenSaver-Info.plist

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -10,8 +10,6 @@
 	<string>edu.berkeley.boincsaver</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>BOINCSaver</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleSignature</key>

clientscr/Mac_Saver_Module.h

@@ -90,6 +90,7 @@ class CScreensaver
 {
 public:
     CScreensaver();
+    ~CScreensaver();
 
     int             Create();
     int             Run();
@@ -137,7 +138,6 @@ class CScreensaver
     int             launch_screensaver(RESULT* rp, int& graphics_application);
     int             launch_default_screensaver(char *dir_path, int& graphics_application);
     void            HandleRPCError(void);
-    int             KillScreenSaver(void);
     void            GetDefaultDisplayPeriods(struct ss_periods &periods);
     pthread_t       m_hDataManagementThread;
 
@@ -155,7 +155,6 @@ class CScreensaver
     bool            m_bResetCoreState;
     bool            m_bQuitDataManagementProc;
     bool            m_bDataManagementProcStopped;
-    bool            m_bV5_GFX_app_is_running;
 
 
     //

clientscr/Mac_Saver_ModuleView.h

@@ -44,6 +44,7 @@
 
 - (bool) setUpToUseCGWindowList;
 - (void) doPeriodicTasks;
+- (void) advancePosition:(NSTimer*)timer;
 
 @end
 
@@ -53,6 +54,7 @@
 - (void)init:(NSView*)saverView;
 - (void)testConnection;
 - (void)portDied:(NSNotification *)notification;
+- (void)closeServerPort;
 - (void)cleanUpOpenGL;
 
 @end