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

Quick Updates 

svn path=/trunk/boinc/; revision=23304
This commit is contained in:
Rom Walton 2011-03-31 19:56:47 +00:00
parent de7e97cc32
commit d049739cd8
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clientscr/screensaver_win.cpp
View File

@ -77,25 +77,24 @@ INT WINAPI WinMain(
return retval; return retval;
} }
// Initialize Screensaver
if (FAILED(hr = BOINCSS.Create(hInstance))) { if (FAILED(hr = BOINCSS.Create(hInstance))) {
BOINCSS.DisplayErrorMsg(hr); BOINCSS.DisplayErrorMsg(hr);
WSACleanup(); WSACleanup();
return 0; return 0;
} }
// Run Screensaver
retval = BOINCSS.Run(); retval = BOINCSS.Run();
// Cleanup any existing screensaver objects and handles // Cleanup any existing screensaver objects and handles
BOINCTRACE("WinMain - Cleanup Screensaver Resources\n");
BOINCSS.Cleanup(); BOINCSS.Cleanup();
// Cleanup the Windows sockets interface. // Cleanup the Windows sockets interface.
BOINCTRACE("WinMain - Cleanup Winsock Resources\n");
WSACleanup(); WSACleanup();
// Instruct the OS to terminate the screensaver by any
// means nessassary.
fflush(NULL);
TerminateProcess(GetCurrentProcess(), retval);
return retval; return retval;
} }
@ -361,10 +360,12 @@ HRESULT CScreensaver::Run() {
// Cleanup anything that needs cleaning. // Cleanup anything that needs cleaning.
// //
HRESULT CScreensaver::Cleanup() { HRESULT CScreensaver::Cleanup() {
BOINCTRACE("CScreensaver::Cleanup - Cleanup graphics application if running\n");
if (m_hGraphicsApplication) { if (m_hGraphicsApplication) {
TerminateProcess(m_hGraphicsApplication, 0); TerminateProcess(m_hGraphicsApplication, 0);
m_hGraphicsApplication = NULL; m_hGraphicsApplication = NULL;
} }
BOINCTRACE("CScreensaver::Cleanup - Cleanup RPC client if running\n");
if (rpc) { if (rpc) {
rpc->close(); rpc->close();
delete rpc; delete rpc;
@ -380,11 +381,8 @@ HRESULT CScreensaver::Cleanup() {
// //
HRESULT CScreensaver::DisplayErrorMsg(HRESULT hr) { HRESULT CScreensaver::DisplayErrorMsg(HRESULT hr) {
TCHAR strMsg[512]; TCHAR strMsg[512];
GetTextForError(hr, strMsg, 512); GetTextForError(hr, strMsg, 512);
MessageBox(m_hWnd, strMsg, m_strWindowTitle, MB_ICONERROR | MB_OK); MessageBox(m_hWnd, strMsg, m_strWindowTitle, MB_ICONERROR | MB_OK);
return hr; return hr;
} }