diff --git a/win_build/installerv2/redist/Windows/Win32/boinccas.dll b/win_build/installerv2/redist/Windows/Win32/boinccas.dll index 53df121e16..bc010a980a 100644 Binary files a/win_build/installerv2/redist/Windows/Win32/boinccas.dll and b/win_build/installerv2/redist/Windows/Win32/boinccas.dll differ diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CARestoreExecutionState.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CARestoreExecutionState.cpp index 337dc3e5bf..63308fa080 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CARestoreExecutionState.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CARestoreExecutionState.cpp @@ -64,16 +64,22 @@ UINT CARestoreExecutionState::OnExecution() tstring strReturnRebootRequested; tstring strReturnValidateInstall; tstring strRebootPrompt; + tstring strBOINCMasterAccountUsername; + tstring strBOINCProjectAccountUsername; GetRegistryValue( _T("LAUNCHPROGRAM"), strLaunchProgram ); - GetRegistryValue( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); GetRegistryValue( _T("REBOOTPROMPT"), strRebootPrompt ); + GetRegistryValue( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); GetRegistryValue( _T("RETURN_VALIDATEINSTALL"), strReturnValidateInstall ); + GetRegistryValue( _T("RETURN_BOINC_MASTER_USERNAME"), strBOINCMasterAccountUsername ); + GetRegistryValue( _T("RETURN_BOINC_PROJECT_USERNAME"), strBOINCProjectAccountUsername ); SetProperty( _T("LAUNCHPROGRAM"), strLaunchProgram ); - SetProperty( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); SetProperty( _T("REBOOTPROMPT"), strRebootPrompt ); + SetProperty( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); SetProperty( _T("RETURN_VALIDATEINSTALL"), strReturnValidateInstall ); + SetProperty( _T("BOINC_MASTER_USERNAME"), strBOINCMasterAccountUsername ); + SetProperty( _T("BOINC_PROJECT_USERNAME"), strBOINCProjectAccountUsername ); return ERROR_SUCCESS; } diff --git a/win_build/installerv2/redist/Windows/src/boinccas/CASaveExecutionState.cpp b/win_build/installerv2/redist/Windows/src/boinccas/CASaveExecutionState.cpp index b97c618708..5fe974e80b 100644 --- a/win_build/installerv2/redist/Windows/src/boinccas/CASaveExecutionState.cpp +++ b/win_build/installerv2/redist/Windows/src/boinccas/CASaveExecutionState.cpp @@ -64,16 +64,22 @@ UINT CASaveExecutionState::OnExecution() tstring strReturnRebootRequested; tstring strReturnValidateInstall; tstring strRebootPrompt; + tstring strBOINCMasterAccountUsername; + tstring strBOINCProjectAccountUsername; GetProperty( _T("LAUNCHPROGRAM"), strLaunchProgram ); - GetProperty( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); GetProperty( _T("REBOOTPROMPT"), strRebootPrompt ); + GetProperty( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); GetProperty( _T("RETURN_VALIDATEINSTALL"), strReturnValidateInstall ); + GetProperty( _T("BOINC_MASTER_USERNAME"), strBOINCMasterAccountUsername ); + GetProperty( _T("BOINC_PROJECT_USERNAME"), strBOINCProjectAccountUsername ); SetRegistryValue( _T("LAUNCHPROGRAM"), strLaunchProgram ); - SetRegistryValue( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); SetRegistryValue( _T("REBOOTPROMPT"), strRebootPrompt ); + SetRegistryValue( _T("RETURN_REBOOTREQUESTED"), strReturnRebootRequested ); SetRegistryValue( _T("RETURN_VALIDATEINSTALL"), strReturnValidateInstall ); + SetRegistryValue( _T("RETURN_BOINC_MASTER_USERNAME"), strBOINCMasterAccountUsername ); + SetRegistryValue( _T("RETURN_BOINC_PROJECT_USERNAME"), strBOINCProjectAccountUsername ); // Disable the ability to launch BOINC Manager if either a reboot is // requested or validation of the installation executables fails. diff --git a/win_build/installerv2/redist/Windows/x64/boinccas.dll b/win_build/installerv2/redist/Windows/x64/boinccas.dll index 82402d40e7..514e09bc5b 100644 Binary files a/win_build/installerv2/redist/Windows/x64/boinccas.dll and b/win_build/installerv2/redist/Windows/x64/boinccas.dll differ