diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-16 16:35:36 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-01-16 22:59:50 -0600 |
commit | 5ed5a24fae06b35351235d708b6ab410d8310d33 (patch) | |
tree | 1b3e15d3d1fdb5b81c2bb8095f64c8f40a44c464 /src/burn/engine/pseudobundle.cpp | |
parent | eee408f4f52823038ca6da83693efd135c8511c8 (diff) | |
download | wix-5ed5a24fae06b35351235d708b6ab410d8310d33.tar.gz wix-5ed5a24fae06b35351235d708b6ab410d8310d33.tar.bz2 wix-5ed5a24fae06b35351235d708b6ab410d8310d33.zip |
Add BOOTSTRAPPER_REQUEST_STATE_FORCE_PRESENT.
Make BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT uninstall even if detected absent.
Remove fPseudoBundle.
Diffstat (limited to 'src/burn/engine/pseudobundle.cpp')
-rw-r--r-- | src/burn/engine/pseudobundle.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/burn/engine/pseudobundle.cpp b/src/burn/engine/pseudobundle.cpp index 153d76e6..94b095c5 100644 --- a/src/burn/engine/pseudobundle.cpp +++ b/src/burn/engine/pseudobundle.cpp | |||
@@ -51,7 +51,6 @@ extern "C" HRESULT PseudoBundleInitializeRelated( | |||
51 | pPackage->fVital = FALSE; | 51 | pPackage->fVital = FALSE; |
52 | 52 | ||
53 | pPackage->fPermanent = FALSE; | 53 | pPackage->fPermanent = FALSE; |
54 | pPackage->Bundle.fPseudoBundle = TRUE; | ||
55 | pPackage->Bundle.fRepairable = TRUE; | 54 | pPackage->Bundle.fRepairable = TRUE; |
56 | pPackage->Bundle.fSupportsBurnProtocol = fSupportsBurnProtocol; | 55 | pPackage->Bundle.fSupportsBurnProtocol = fSupportsBurnProtocol; |
57 | 56 | ||
@@ -114,7 +113,7 @@ extern "C" HRESULT PseudoBundleInitializePassthrough( | |||
114 | pPassthroughPackage->fVital = pPackage->fVital; | 113 | pPassthroughPackage->fVital = pPackage->fVital; |
115 | pPassthroughPackage->fPermanent = TRUE; | 114 | pPassthroughPackage->fPermanent = TRUE; |
116 | 115 | ||
117 | pPassthroughPackage->Exe.fPseudoBundle = TRUE; | 116 | pPassthroughPackage->Exe.fPseudoPackage = TRUE; |
118 | pPassthroughPackage->Exe.fUninstallable = FALSE; | 117 | pPassthroughPackage->Exe.fUninstallable = FALSE; |
119 | pPassthroughPackage->Exe.protocol = pPackage->Bundle.fSupportsBurnProtocol ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE; | 118 | pPassthroughPackage->Exe.protocol = pPackage->Bundle.fSupportsBurnProtocol ? BURN_EXE_PROTOCOL_TYPE_BURN : BURN_EXE_PROTOCOL_TYPE_NONE; |
120 | 119 | ||
@@ -195,7 +194,7 @@ extern "C" HRESULT PseudoBundleInitializeUpdateBundle( | |||
195 | 194 | ||
196 | // Trust the BA to only use UPDATE_REPLACE_EMBEDDED when appropriate. | 195 | // Trust the BA to only use UPDATE_REPLACE_EMBEDDED when appropriate. |
197 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_BURN; | 196 | pPackage->Exe.protocol = BURN_EXE_PROTOCOL_TYPE_BURN; |
198 | pPackage->Exe.fPseudoBundle = TRUE; | 197 | pPackage->Exe.fPseudoPackage = TRUE; |
199 | 198 | ||
200 | hr = StrAllocString(&pPackage->sczId, wzId, 0); | 199 | hr = StrAllocString(&pPackage->sczId, wzId, 0); |
201 | ExitOnFailure(hr, "Failed to copy id for update bundle."); | 200 | ExitOnFailure(hr, "Failed to copy id for update bundle."); |