From 142370216b3444acdd83a71e4ce8d872761f4fbd Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 15 Feb 2005 06:46:42 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=5428 --- client/win/win_screensaver.cpp | 10 +++++++--- clientgui/BOINCGUIApp.cpp | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/client/win/win_screensaver.cpp b/client/win/win_screensaver.cpp index 069acea077..6cbd2fc0f7 100755 --- a/client/win/win_screensaver.cpp +++ b/client/win/win_screensaver.cpp @@ -333,10 +333,13 @@ VOID CScreensaver::StartupBOINC() // Tell the boinc client to start the screen saver BOINCTRACE(_T("CScreensaver::StartupBOINC - Calling set_screensaver_mode - WindowStation = '%s', Desktop = '%s', BlankScreen = '%d', BlankTime = '%d'.\n"), szCurrentWindowStation, szCurrentDesktop, m_dwBlankScreen, m_dwBlankTime); + DISPLAY_INFO di; + strcpy(di.window_station, szCurrentWindowStation); + strcpy(di.desktop, szCurrentDesktop); if ( 0 == m_dwBlankScreen ) - iReturnValue = rpc.set_screensaver_mode(true, szCurrentWindowStation, szCurrentDesktop, 0); + iReturnValue = rpc.set_screensaver_mode(true, 0, di); else - iReturnValue = rpc.set_screensaver_mode(true, szCurrentWindowStation, szCurrentDesktop, m_dwBlankTime); + iReturnValue = rpc.set_screensaver_mode(true, m_dwBlankTime, di); BOINCTRACE(_T("CScreensaver::StartupBOINC - set_screensaver_mode iReturnValue = '%d'\n"), iReturnValue); @@ -363,8 +366,9 @@ VOID CScreensaver::ShutdownBOINC() { if( m_bCoreNotified ) { + DISPLAY_INFO di; // Tell the boinc client to stop the screen saver - rpc.set_screensaver_mode(false, NULL, NULL, 0.0); + rpc.set_screensaver_mode(false, 0.0, di); // We have now notified the boinc client m_bCoreNotified = FALSE; diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index 97c2f0e0e9..cea707397f 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -219,6 +219,7 @@ void CBOINCGUIApp::DetectDisplayInfo() { #ifdef __WXMSW__ wxChar szWindowStation[256]; memset(szWindowStation, 0, sizeof(szWindowStation)/sizeof(wxChar)); + wxChar szDesktop[256]; memset(szDesktop, 0, sizeof(szDesktop)/sizeof(wxChar)); if ( wxWIN95 != wxGetOsVersion( NULL, NULL ) ) {