Add AnnounceUpgrade test to the module boinccas module tests.

.github/workflows/windows.yml

@@ -123,13 +123,18 @@ jobs:
 
       - name: Build
         if: success()
-        run: msbuild win_build\boinc.sln -p:Configuration=${{matrix.configuration}} -p:Platform=${{matrix.platform}} -p:VcpkgTripletConfig=ci -p:DLIB=${{ env.DLIB }} -p:DMDF=${{ env.DMDF }} -m
+        run: msbuild win_build\boinc.sln -p:Configuration=${{matrix.configuration}} -p:Platform=${{matrix.platform}} -p:VcpkgTripletConfig=ci -p:DLIB=${{ env.DLIB }} -p:DMDF=${{ env.DMDF }} -p:BOINCCAS_TEST=true -m
 
       - name: Run unit tests
         if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
         working-directory: win_build\Build\${{matrix.platform}}\${{matrix.configuration}}
         run: |
           ${{github.workspace}}\temp\OpenCppCoverage\OpenCppCoverage.exe --cover_children --optimized_build --sources ${{github.workspace}} --export_type=binary:gtest.cov -- unittests.exe --gtest_output=xml:gtest.xml
+
+      - name: Run crypt_prog tests
+        if: success() && matrix.platform == 'x64' && matrix.configuration == 'Release'
+        working-directory: win_build\Build\${{matrix.platform}}\${{matrix.configuration}}
+        run: |
           ${{github.workspace}}\temp\OpenCppCoverage\OpenCppCoverage.exe --cover_children --optimized_build --modules ${{github.workspace}} --sources ${{github.workspace}} --input_coverage=gtest.cov --export_type=cobertura:cobertura.xml -- python ${{github.workspace}}\tests\crypt_prog_tests.py ${{github.workspace}}\win_build\Build\x64\${{matrix.configuration}}\crypt_prog.exe
 
       - name: Verify MSI file

3rdParty/vcpkg_ports/configs/msbuild/vcpkg.json

@@ -21,6 +21,8 @@
     {
       "name": "libzip",
       "default-features": false
-    }
+    },
+    "wil",
+    "tinyxml2"
   ]
 }

clientsetup/win/CAAnnounceUpgrade.cpp

@@ -1,84 +1,54 @@
-// Berkeley Open Infrastructure for Network Computing
-// http://boinc.berkeley.edu
-// Copyright (C) 2005 University of California
+// This file is part of BOINC.
+// https://boinc.berkeley.edu
+// Copyright (C) 2026 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.
+// BOINC 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 3 of the License, or (at your option) any later version.
 //
-// This software is distributed in the hope that it will be useful,
+// BOINC 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.,
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
 #include "boinccas.h"
-#include "CAAnnounceUpgrade.h"
-
-#define CUSTOMACTION_NAME               _T("CAAnnounceUpgrade")
-#define CUSTOMACTION_PROGRESSTITLE      _T("Announce the new BOINC version to all components.")
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-CAAnnounceUpgrade::CAAnnounceUpgrade(MSIHANDLE hMSIHandle) :
-    BOINCCABase(hMSIHandle, CUSTOMACTION_NAME, CUSTOMACTION_PROGRESSTITLE)
-{}
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-CAAnnounceUpgrade::~CAAnnounceUpgrade()
-{
-    BOINCCABase::~BOINCCABase();
-}
 
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-UINT CAAnnounceUpgrade::OnExecution()
-{
-    return SetUpgradeParameters();
+class CAAnnounceUpgrade : public BOINCCABase {
+public:
+    virtual ~CAAnnounceUpgrade() = default;
+
+    explicit CAAnnounceUpgrade(MSIHANDLE hMSIHandle) :
+        BOINCCABase(hMSIHandle, _T("CAAnnounceUpgrade"),
+            _T("Announce the new BOINC version to all components.")) {
+    }
+
+    UINT OnExecution() override final {
+        tstring strCurrentProductVersion;
+
+        auto uiReturnValue = GetProperty(_T("ProductVersion"),
+            strCurrentProductVersion);
+        if (uiReturnValue) {
+            return uiReturnValue;
+        }
+        if (strCurrentProductVersion.empty()) {
+            return ERROR_INSTALL_FAILURE;
+        }
+
+        uiReturnValue = SetRegistryValue(_T("UpgradingTo"),
+            strCurrentProductVersion);
+        if (uiReturnValue) {
+            return uiReturnValue;
+        }
+
+        return ERROR_SUCCESS;
+    }
+};
+
+UINT __stdcall AnnounceUpgrade(MSIHANDLE hInstall) {
+    return CAAnnounceUpgrade(hInstall).Execute();
 }
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:    AnnounceUpgrade
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-UINT __stdcall AnnounceUpgrade(MSIHANDLE hInstall)
-{
-    UINT uiReturnValue = 0;
-
-    CAAnnounceUpgrade* pCA = new CAAnnounceUpgrade(hInstall);
-    uiReturnValue = pCA->Execute();
-    delete pCA;
-
-    return uiReturnValue;
-}
-

clientsetup/win/CACleanupOldBinaries.cpp

@@ -1,103 +1,69 @@
-// Berkeley Open Infrastructure for Network Computing
-// http://boinc.berkeley.edu
-// Copyright (C) 2005 University of California
+// This file is part of BOINC.
+// https://boinc.berkeley.edu
+// Copyright (C) 2026 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.
+// BOINC 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 3 of the License, or (at your option) any later version.
 //
-// This software is distributed in the hope that it will be useful,
+// BOINC 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.,
-// 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-//
+// You should have received a copy of the GNU Lesser General Public License
+// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
 #include "boinccas.h"
-#include "CACleanupOldBinaries.h"
-
-#define CUSTOMACTION_NAME               _T("CACleanupOldBinaries")
-#define CUSTOMACTION_PROGRESSTITLE      _T("Cleanup any old binaries that were left lying around from some other install.")
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-CACleanupOldBinaries::CACleanupOldBinaries(MSIHANDLE hMSIHandle) :
-    BOINCCABase(hMSIHandle, CUSTOMACTION_NAME, CUSTOMACTION_PROGRESSTITLE)
-{}
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-CACleanupOldBinaries::~CACleanupOldBinaries()
-{
-    BOINCCABase::~BOINCCABase();
-}
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-UINT CACleanupOldBinaries::OnExecution()
-{
-    tstring     strInstallDirectory;
-    UINT        uiReturnValue;
-
-
-    uiReturnValue = GetProperty( _T("INSTALLDIR"), strInstallDirectory );
-    if ( uiReturnValue ) return uiReturnValue;
-
-    DeleteFile(tstring(strInstallDirectory + _T("\\boinc.exe")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\boincmgr.exe")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\boinccmd.exe")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\boinc.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\libcurl.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\libeay32.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\ssleay32.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\zlib1.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\dbghelp.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\dbghelp95.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\srcsrv.dll")).c_str());
-    DeleteFile(tstring(strInstallDirectory + _T("\\symsrv.dll")).c_str());
-
-    return ERROR_SUCCESS;
-}
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// Function:    CleanupOldBinaries
-//
-// Description:
-//
-/////////////////////////////////////////////////////////////////////
-UINT __stdcall CleanupOldBinaries(MSIHANDLE hInstall)
-{
-    UINT uiReturnValue = 0;
-
-    CACleanupOldBinaries* pCA = new CACleanupOldBinaries(hInstall);
-    uiReturnValue = pCA->Execute();
-    delete pCA;
 
-    return uiReturnValue;
+class CACleanupOldBinaries : public BOINCCABase {
+public:
+    virtual ~CACleanupOldBinaries() = default;
+
+    explicit CACleanupOldBinaries(MSIHANDLE hMSIHandle) :
+        BOINCCABase(hMSIHandle, _T("CACleanupOldBinaries"),
+            _T("Cleanup any old binaries that were left lying around from "
+                "some other install.")) {
+    }
+
+    UINT OnExecution() override final {
+        tstring strInstallDirectory;
+
+        const auto uiReturnValue =
+            GetProperty(_T("INSTALLDIR"), strInstallDirectory);
+        if (uiReturnValue != ERROR_SUCCESS) {
+            return uiReturnValue;
+        }
+        if (strInstallDirectory.empty()) {
+            return ERROR_INSTALL_FAILURE;
+        }
+
+        constexpr std::array<std::wstring_view, 12> filesToDelete = {
+            _T("boinc.exe"),
+            _T("boincmgr.exe"),
+            _T("boinccmd.exe"),
+            _T("boinc.dll"),
+            _T("libcurl.dll"),
+            _T("libeay32.dll"),
+            _T("ssleay32.dll"),
+            _T("zlib1.dll"),
+            _T("dbghelp.dll"),
+            _T("dbghelp95.dll"),
+            _T("srcsrv.dll"),
+            _T("symsrv.dll")
+        };
+
+        for (auto file : filesToDelete) {
+            DeleteFile(
+                (strInstallDirectory + _T("\\") + file.data()).c_str());
+        }
+
+        return ERROR_SUCCESS;
+    }
+};
+
+UINT __stdcall CleanupOldBinaries(MSIHANDLE hInstall) {
+    return CACleanupOldBinaries(hInstall).Execute();
 }