diff options
Diffstat (limited to 'Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp')
-rw-r--r-- | Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp index e88981fc3ab..2e468b7e57b 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -281,10 +281,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { case ID_INSTALL_BUTTON: SavePageSettings(); - if (!WillElevate() && !QueryElevateForCrtInstall()) { - break; - } - hr = BalGetNumericVariable(L"InstallAllUsers", &installAllUsers); ExitOnFailure(hr, L"Failed to get install scope"); @@ -332,10 +328,6 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication { ReleaseStr(targetDir); } - if (!WillElevate() && !QueryElevateForCrtInstall()) { - break; - } - OnPlan(_command.action); break; @@ -2642,30 +2634,6 @@ private: return result; } - BOOL QueryElevateForCrtInstall() { - // Called to prompt the user that even though they think they won't need - // to elevate, they actually will because of the CRT install. - if (IsCrtInstalled()) { - // CRT is already installed - no need to prompt - return TRUE; - } - - LONGLONG elevated; - HRESULT hr = BalGetNumericVariable(L"WixBundleElevated", &elevated); - if (SUCCEEDED(hr) && elevated) { - // Already elevated - no need to prompt - return TRUE; - } - - LOC_STRING *locStr; - hr = LocGetString(_wixLoc, L"#(loc.ElevateForCRTInstall)", &locStr); - if (FAILED(hr)) { - BalLogError(hr, "Failed to get ElevateForCRTInstall string"); - return FALSE; - } - return ::MessageBoxW(_hWnd, locStr->wzText, _theme->sczCaption, MB_YESNO) != IDNO; - } - HRESULT EvaluateConditions() { HRESULT hr = S_OK; BOOL result = FALSE; |