aboutsummaryrefslogtreecommitdiff
path: root/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp')
-rw-r--r--src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
index 233cabbc..c86a4a1d 100644
--- a/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
+++ b/src/ext/Bal/stdbas/WixStandardBootstrapperApplication.cpp
@@ -1,7 +1,6 @@
1// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. 1// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2 2
3#include "precomp.h" 3#include "precomp.h"
4#include "BalBaseBootstrapperApplication.h"
5 4
6static const LPCWSTR WIXBUNDLE_VARIABLE_CANRESTART = L"WixCanRestart"; 5static const LPCWSTR WIXBUNDLE_VARIABLE_CANRESTART = L"WixCanRestart";
7static const LPCWSTR WIXBUNDLE_VARIABLE_ELEVATED = L"WixBundleElevated"; 6static const LPCWSTR WIXBUNDLE_VARIABLE_ELEVATED = L"WixBundleElevated";
@@ -178,10 +177,10 @@ static LPCSTR LoggingMsiFeatureStateToString(
178 ); 177 );
179 178
180 179
181class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplication 180class CWixStandardBootstrapperApplication : public CBootstrapperApplicationBase
182{ 181{
183public: // IBootstrapperApplication 182public: // IBootstrapperApplication
184 STDMETHODIMP OnCreate( 183 virtual STDMETHODIMP OnCreate(
185 __in IBootstrapperEngine* pEngine, 184 __in IBootstrapperEngine* pEngine,
186 __in BOOTSTRAPPER_COMMAND* pCommand 185 __in BOOTSTRAPPER_COMMAND* pCommand
187 ) 186 )
@@ -189,7 +188,7 @@ public: // IBootstrapperApplication
189 HRESULT hr = S_OK; 188 HRESULT hr = S_OK;
190 189
191 hr = __super::OnCreate(pEngine, pCommand); 190 hr = __super::OnCreate(pEngine, pCommand);
192 BalExitOnFailure(hr, "CBalBaseBootstrapperApplication initialization failed."); 191 BalExitOnFailure(hr, "CBootstrapperApplicationBase initialization failed.");
193 192
194 m_commandAction = pCommand->action; 193 m_commandAction = pCommand->action;
195 m_commandDisplay = pCommand->display; 194 m_commandDisplay = pCommand->display;
@@ -388,7 +387,7 @@ public: // IBootstrapperApplication
388 } 387 }
389 388
390 LExit: 389 LExit:
391 return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel); 390 return CBootstrapperApplicationBase::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, fMissingFromCache, pfCancel);
392 } 391 }
393 392
394 393
@@ -563,7 +562,7 @@ public: // IBootstrapperApplication
563 *pRequestedType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE; 562 *pRequestedType = BOOTSTRAPPER_RELATED_BUNDLE_PLAN_TYPE_NONE;
564 } 563 }
565 564
566 return CBalBaseBootstrapperApplication::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel); 565 return CBootstrapperApplicationBase::OnPlanRelatedBundleType(wzBundleId, recommendedType, pRequestedType, pfCancel);
567 } 566 }
568 567
569 568
@@ -633,7 +632,7 @@ public: // IBootstrapperApplication
633 } 632 }
634 } 633 }
635 634
636 return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, repairCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel); 635 return CBootstrapperApplicationBase::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, repairCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel);
637 } 636 }
638 637
639 638
@@ -4778,7 +4777,7 @@ public:
4778 CWixStandardBootstrapperApplication( 4777 CWixStandardBootstrapperApplication(
4779 __in HMODULE hModule, 4778 __in HMODULE hModule,
4780 __in BOOL fRunAsPrereqBA 4779 __in BOOL fRunAsPrereqBA
4781 ) : CBalBaseBootstrapperApplication(3, 3000) 4780 ) : CBootstrapperApplicationBase(3, 3000)
4782 { 4781 {
4783 THEME_ASSIGN_CONTROL_ID* pAssignControl = NULL; 4782 THEME_ASSIGN_CONTROL_ID* pAssignControl = NULL;
4784 DWORD dwAutomaticBehaviorType = THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ENABLED | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VISIBLE | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ACTION | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VALUE; 4783 DWORD dwAutomaticBehaviorType = THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ENABLED | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VISIBLE | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_ACTION | THEME_CONTROL_AUTOMATIC_BEHAVIOR_EXCLUDE_VALUE;