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

WINBUILD: Properly move the BOINC Master and BOINC Project account information back into the UI installer process.

This commit is contained in:
Rom Walton 2014-05-07 15:20:08 -04:00
parent d1b5abd0b4
commit 55e0d2c711
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
win_build/installerv2/redist/Windows/Win32/boinccas.dll
View File

Binary file not shown.

10
win_build/installerv2/redist/Windows/src/boinccas/CARestoreExecutionState.cpp
View File

@ -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;
}

10
win_build/installerv2/redist/Windows/src/boinccas/CASaveExecutionState.cpp
View File

@ -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.

BIN
win_build/installerv2/redist/Windows/x64/boinccas.dll
View File

Binary file not shown.