Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SCR: Mac: replace all deprecated Mac APIs as of OS 10.9

This commit is contained in:
Charlie Fenton 2017-02-28 05:16:42 -08:00
parent 483f46a5f9
commit 72d15ba3b6
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientscr/Mac_Saver_Module.h
View File

@ -123,7 +123,7 @@ protected:
int launch_screensaver(RESULT* rp, int& graphics_application);
int launch_default_screensaver(char *dir_path, int& graphics_application);
void HandleRPCError(void);
OSErr KillScreenSaver(void);
int KillScreenSaver(void);
void GetDefaultDisplayPeriods(struct ss_periods &periods);
bool HasProcessExited(pid_t pid, int &exitCode);
pthread_t m_hDataManagementThread;

23
clientscr/mac_saver_module.cpp
View File

@ -264,8 +264,6 @@ CScreensaver::CScreensaver() {
int CScreensaver::Create() {
ProcessSerialNumber psn;
ProcessInfoRec pInfo;
OSStatus err;
// Ugly workaround for a problem with the System Preferences app
@ -280,12 +278,8 @@ int CScreensaver::Create() {
// fails to run and stderr shows the message:
// "The process has forked and you cannot use this CoreFoundation
// functionality safely. You MUST exec()"
GetCurrentProcess(&psn);
memset(&pInfo, 0, sizeof(pInfo));
pInfo.processInfoLength = sizeof( ProcessInfoRec );
pInfo.processName = NULL;
err = GetProcessInformation(&psn, &pInfo);
if ( (err == noErr) && (pInfo.processSignature == 'sprf') ) {
pid_t SystemPrefsPID = getPidIfRunning("com.apple.systempreferences");
if (SystemPrefsPID == getpid()) {
saverState = SaverState_ControlPanelTestMode;
}
@ -883,16 +877,13 @@ pid_t CScreensaver::FindProcessPID(char* name, pid_t thePID)
// Send a Quit AppleEvent to the process which called this module
// (i.e., tell the ScreenSaver engine to quit)
OSErr CScreensaver::KillScreenSaver() {
ProcessSerialNumber thisPSN;
int CScreensaver::KillScreenSaver() {
pid_t thisPID;
OSErr err = noErr;
int retval;
GetCurrentProcess(&thisPSN);
err = GetProcessPID(&thisPSN , &thisPID);
if (err == noErr)
err = kill(thisPID, SIGABRT); // SIGINT
return err;
thisPID = getpid();
retval = kill(thisPID, SIGABRT); // SIGINT
return retval;
}