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

*** empty log message *** 

svn path=/trunk/boinc/; revision=4586
This commit is contained in:
Rom Walton 2004-11-18 02:31:40 +00:00
parent 960158bb84
commit e5c7861518
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -19739,3 +19739,11 @@ Rom 17 Nov 2004
wingui_mainwindow.cpp wingui_mainwindow.cpp
lib/ lib/
gui_rpc_client.h gui_rpc_client.h
Rom 17 Nov 2004
- Bug Fix: Use the project name in the system status message instead of the
result name.
client/win/
win_screensaver.cpp, .h

31
client/win/win_screensaver.cpp
View File

@ -122,6 +122,7 @@ CScreensaver::CScreensaver()
m_bPaintingInitialized = FALSE; m_bPaintingInitialized = FALSE;
m_bBOINCCoreNotified = FALSE; m_bBOINCCoreNotified = FALSE;
m_bResetCoreState = TRUE;
ZeroMemory( m_Monitors, sizeof(m_Monitors) ); ZeroMemory( m_Monitors, sizeof(m_Monitors) );
m_dwNumMonitors = 0; m_dwNumMonitors = 0;
@ -779,6 +780,15 @@ LRESULT CScreensaver::PrimarySaverProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPA
m_bErrorMode = FALSE; m_bErrorMode = FALSE;
m_hrError = 0; m_hrError = 0;
// Lets try and get the current state of the CC
if (m_bResetCoreState)
{
iReturnValue = rpc.get_state( state );
BOINCTRACE(_T("CScreensaver::PrimarySaverProc - get_state iReturnValue = '%d'\n"), iReturnValue);
if ( 0 == iReturnValue )
m_bResetCoreState = FALSE;
}
// Lets try and get the current status of the CC // Lets try and get the current status of the CC
iReturnValue = rpc.get_screensaver_mode( iStatus ); iReturnValue = rpc.get_screensaver_mode( iStatus );
BOINCTRACE(_T("CScreensaver::PrimarySaverProc - get_screensaver_mode iReturnValue = '%d'\n"), iReturnValue); BOINCTRACE(_T("CScreensaver::PrimarySaverProc - get_screensaver_mode iReturnValue = '%d'\n"), iReturnValue);
@ -1179,6 +1189,7 @@ VOID CScreensaver::UpdateErrorBox()
FLOAT fTimeDelta; FLOAT fTimeDelta;
RESULTS results; RESULTS results;
PROJECT* pProject;
TCHAR szBuffer[256]; TCHAR szBuffer[256];
bool bIsActive = false; bool bIsActive = false;
bool bIsExecuting = false; bool bIsExecuting = false;
@ -1209,13 +1220,21 @@ VOID CScreensaver::UpdateErrorBox()
bIsExecuting = ( CPU_SCHED_SCHEDULED == results.results.at(iIndex)->scheduler_state ); bIsExecuting = ( CPU_SCHED_SCHEDULED == results.results.at(iIndex)->scheduler_state );
if ( !( bIsActive ) || !( bIsDownloaded ) || !( bIsExecuting ) ) continue; if ( !( bIsActive ) || !( bIsDownloaded ) || !( bIsExecuting ) ) continue;
StringCbPrintf( szBuffer, sizeof(szBuffer) / sizeof(TCHAR), pProject = state.lookup_project( results.results.at( iIndex )->project_url );
_T("%s: %.2f%%\n"), if ( NULL != pProject )
results.results.at(iIndex)->name.c_str(), {
results.results.at(iIndex)->fraction_done * 100 StringCbPrintf( szBuffer, sizeof(szBuffer) / sizeof(TCHAR),
); _T("%s: %.2f%%\n"),
pProject->project_name.c_str(),
results.results.at(iIndex)->fraction_done * 100
);
StringCbCat( m_szError, sizeof(m_szError) / sizeof(TCHAR), szBuffer ); StringCbCat( m_szError, sizeof(m_szError) / sizeof(TCHAR), szBuffer );
}
else
{
m_bResetCoreState = TRUE;
}
} }
m_szError[ sizeof(m_szError) -1 ] = '\0'; m_szError[ sizeof(m_szError) -1 ] = '\0';
} }

5
client/win/win_screensaver.h
View File

@ -146,7 +146,8 @@ protected:
static INT_PTR CALLBACK ConfigureDialogProcStub( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam ); static INT_PTR CALLBACK ConfigureDialogProcStub( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
protected: protected:
RPC_CLIENT rpc; RPC_CLIENT rpc;
CC_STATE state;
SaverMode m_SaverMode; // sm_config, sm_full, sm_preview, etc. SaverMode m_SaverMode; // sm_config, sm_full, sm_preview, etc.
BOOL m_bAllScreensSame; // If TRUE, show same image on all screens BOOL m_bAllScreensSame; // If TRUE, show same image on all screens
@ -175,6 +176,8 @@ protected:
TCHAR m_strWindowTitle[200]; // Title for the app's window TCHAR m_strWindowTitle[200]; // Title for the app's window
BOOL m_bBOINCCoreNotified; BOOL m_bBOINCCoreNotified;
BOOL m_bResetCoreState;
}; };
#endif #endif