*** empty log message ***

svn path=/trunk/boinc/; revision=12084

checkin_notes

@@ -1694,3 +1694,17 @@ David  14 Feb 2007
 
     test/
         testbase.py
+
+Rom    12 Feb 2007
+    - WININSTALL: Force the termination of BOINC.SCR if we could
+        not gracefully shut it down.
+        
+    win_build/installerv2/redist/Windows/src/boinccas/
+        CAShutdownBOINC.cpp
+        CAShutdownBOINCManager.cpp
+        CAShutdownBOINCScreensaver.cpp, .h
+        boinccas.def
+        boinccas.vcproj
+    win_build/installerv2/redist/Windows/x86
+        boinccas.dll
+        boinccas95.dll

win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp

@@ -144,8 +144,6 @@ UINT CAShutdownBOINC::OnExecution()
                                 (int)GetLastError(),
                                 _T("Setup was unable to shutdown the BOINC Service.")
                             );
-
-                            TerminateProcessEx( tstring(_T("boinc.exe")) );
                         }
                     }
                 }
@@ -159,6 +157,8 @@ UINT CAShutdownBOINC::OnExecution()
             CloseServiceHandle(schService);
     }
 
+    TerminateProcessEx( tstring(_T("boinc.exe")) );
+
     return ERROR_SUCCESS;
 }
 

win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINCManager.cpp

@@ -107,10 +107,10 @@ UINT CAShutdownBOINCManager::OnExecution()
             _T("One or more BOINC Manager applications could not be closed, terminating process(s).")
         );
 
-        TerminateProcessEx( tstring(_T("boincmgr.exe")) );
-        TerminateProcessEx( tstring(_T("gridrepublic.exe")) );
     }
 
+    TerminateProcessEx( tstring(_T("boincmgr.exe")) );
+    TerminateProcessEx( tstring(_T("gridrepublic.exe")) );
     return ERROR_SUCCESS;
 }
 

win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINCScreensaver.cpp

@@ -0,0 +1,89 @@
+// Berkeley Open Infrastructure for Network Computing
+// http://boinc.berkeley.edu
+// Copyright (C) 2005 University of California
+//
+// This is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation;
+// either version 2.1 of the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// To view the GNU Lesser General Public License visit
+// http://www.gnu.org/copyleft/lesser.html
+// or write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+
+#include "stdafx.h"
+#include "boinccas.h"
+#include "terminate.h"
+#include "CAShutdownBOINCScreensaver.h"
+
+#define CUSTOMACTION_NAME               _T("CAShutdownBOINCScreensaver")
+#define CUSTOMACTION_PROGRESSTITLE      _T("Shutting down running instances of BOINC Screensaver")
+
+
+/////////////////////////////////////////////////////////////////////
+// 
+// Function:    
+//
+// Description: 
+//
+/////////////////////////////////////////////////////////////////////
+CAShutdownBOINCScreensaver::CAShutdownBOINCScreensaver(MSIHANDLE hMSIHandle) :
+    BOINCCABase(hMSIHandle, CUSTOMACTION_NAME, CUSTOMACTION_PROGRESSTITLE)
+{}
+
+
+/////////////////////////////////////////////////////////////////////
+// 
+// Function:    
+//
+// Description: 
+//
+/////////////////////////////////////////////////////////////////////
+CAShutdownBOINCScreensaver::~CAShutdownBOINCScreensaver()
+{
+    BOINCCABase::~BOINCCABase();
+}
+
+
+/////////////////////////////////////////////////////////////////////
+// 
+// Function:    
+//
+// Description: 
+//
+/////////////////////////////////////////////////////////////////////
+UINT CAShutdownBOINCScreensaver::OnExecution()
+{
+    TerminateProcessEx( tstring(_T("boinc.scr")) );
+    return ERROR_SUCCESS;
+}
+
+
+/////////////////////////////////////////////////////////////////////
+// 
+// Function:    ShutdownBOINCScreensaver
+//
+// Description: 
+//
+/////////////////////////////////////////////////////////////////////
+UINT __stdcall ShutdownBOINCScreensaver(MSIHANDLE hInstall)
+{
+    UINT uiReturnValue = 0;
+
+    CAShutdownBOINCScreensaver* pCA = new CAShutdownBOINCScreensaver(hInstall);
+    uiReturnValue = pCA->Execute();
+    delete pCA;
+
+    return uiReturnValue;
+}
+
+
+
+const char *BOINC_RCSID_7bca879acb="$Id$";

win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINCScreensaver.h

@@ -0,0 +1,37 @@
+// Berkeley Open Infrastructure for Network Computing
+// http://boinc.berkeley.edu
+// Copyright (C) 2005 University of California
+//
+// This is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation;
+// either version 2.1 of the License, or (at your option) any later version.
+//
+// This software is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU Lesser General Public License for more details.
+//
+// To view the GNU Lesser General Public License visit
+// http://www.gnu.org/copyleft/lesser.html
+// or write to the Free Software Foundation, Inc.,
+// 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+
+#ifndef _CASHUTDOWNBOINCSCREENSAVER_H_
+#define _CASHUTDOWNBOINCSCREENSAVER_H_
+
+
+class CAShutdownBOINCScreensaver : public BOINCCABase
+{
+public:
+
+    CAShutdownBOINCScreensaver(MSIHANDLE hMSIHandle);
+    ~CAShutdownBOINCScreensaver();
+    virtual UINT OnExecution();
+
+};
+
+
+#endif
+

win_build/installerv2/redist/Windows/src/boinccas/boinccas.def

@@ -15,4 +15,5 @@ EXPORTS
 	VerifyServicePassword
 	ShutdownBOINC
 	ShutdownBOINCManager
+	ShutdownBOINCScreensaver
 	

win_build/installerv2/redist/Windows/src/boinccas/boinccas.vcproj

@@ -150,6 +150,9 @@
 			<File
 				RelativePath=".\CAShutdownBOINCManager.cpp">
 			</File>
+			<File
+				RelativePath=".\CAShutdownBOINCScreensaver.cpp">
+			</File>
 			<File
 				RelativePath=".\CAValidateServiceAccount.cpp">
 			</File>
@@ -211,6 +214,9 @@
 			<File
 				RelativePath=".\CAShutdownBOINCManager.h">
 			</File>
+			<File
+				RelativePath=".\CAShutdownBOINCScreensaver.h">
+			</File>
 			<File
 				RelativePath=".\CAValidateServiceAccount.h">
 			</File>