diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp
new file mode 100644
index 0000000000..3dddb97127
--- /dev/null
+++ b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.cpp
@@ -0,0 +1,118 @@
+// 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 "CAShutdownBOINC.h"
+
+#define CUSTOMACTION_NAME _T("CAShutdownBOINC")
+#define CUSTOMACTION_PROGRESSTITLE _T("Shutting down running instances of BOINC")
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// Function:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////////
+CAShutdownBOINC::CAShutdownBOINC(MSIHANDLE hMSIHandle) :
+ BOINCCABase(hMSIHandle, CUSTOMACTION_NAME, CUSTOMACTION_PROGRESSTITLE)
+{}
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// Function:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////////
+CAShutdownBOINC::~CAShutdownBOINC()
+{
+ BOINCCABase::~BOINCCABase();
+}
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// Function:
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////////
+UINT CAShutdownBOINC::OnExecution()
+{
+ SC_HANDLE schSCManager = NULL;
+ SC_HANDLE schService = NULL;
+ SERVICE_STATUS ssStatus;
+ UINT uiReturn = ERROR_SUCCESS;
+
+ schSCManager = OpenSCManager(
+ NULL, // local machine
+ NULL, // ServicesActive database
+ GENERIC_READ); // full access rights
+
+ if (schSCManager)
+ {
+ schService = OpenService(
+ schSCManager, // SCM database
+ _T("BOINC"), // service name
+ GENERIC_READ | GENERIC_EXECUTE);
+
+ if (schService)
+ {
+ if (!ControlService(schService, SERVICE_CONTROL_STOP, &ssStatus))
+ {
+ uiReturn = ERROR_INSTALL_FAILURE;
+ }
+ }
+ }
+
+ if (schSCManager)
+ CloseServiceHandle(schSCManager);
+
+ if (schService)
+ CloseServiceHandle(schService);
+
+ return uiReturn;
+}
+
+
+/////////////////////////////////////////////////////////////////////
+//
+// Function: ShutdownBOINCManager
+//
+// Description:
+//
+/////////////////////////////////////////////////////////////////////
+UINT __stdcall ShutdownBOINC(MSIHANDLE hInstall)
+{
+ UINT uiReturnValue = 0;
+
+ CAShutdownBOINC* pCA = new CAShutdownBOINC(hInstall);
+ uiReturnValue = pCA->Execute();
+ delete pCA;
+
+ return uiReturnValue;
+}
+
+
+const char *BOINC_RCSID_7bca879acf="$Id$";
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.h b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.h
new file mode 100644
index 0000000000..4a3be3e1ac
--- /dev/null
+++ b/win_build/installerv2/redist/Windows/src/boinccas/CAShutdownBOINC.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 _CASHUTDOWNBOINC_H_
+#define _CASHUTDOWNBOINC_H_
+
+
+class CAShutdownBOINC : public BOINCCABase
+{
+public:
+
+ CAShutdownBOINC(MSIHANDLE hMSIHandle);
+ ~CAShutdownBOINC();
+ virtual UINT OnExecution();
+
+};
+
+
+#endif
+
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
index 31e4865a57..276aaf58be 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
+++ b/win_build/installerv2/redist/Windows/src/boinccas/boinccas.rc
@@ -53,8 +53,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,4
- PRODUCTVERSION 1,0,0,4
+ FILEVERSION 1,0,0,5
+ PRODUCTVERSION 1,0,0,5
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "FileDescription", "BOINC Dynamic Link Library"
- VALUE "FileVersion", "1, 0, 0, 4"
+ VALUE "FileVersion", "1, 0, 0, 5"
VALUE "InternalName", "BOINC"
VALUE "LegalCopyright", "Copyright (C) 2005"
VALUE "OriginalFilename", "BOINC.dll"
VALUE "ProductName", " BOINC Dynamic Link Library"
- VALUE "ProductVersion", "1, 0, 0, 4"
+ VALUE "ProductVersion", "1, 0, 0, 5"
END
END
BLOCK "VarFileInfo"
diff --git a/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj b/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj
index bda29d22fa..adc5f90110 100644
--- a/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj
+++ b/win_build/installerv2/redist/Windows/src/boinccas/boinccas95.vcproj
@@ -135,6 +135,9 @@
+
+
@@ -169,6 +172,9 @@
+
+