diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-08-03 15:41:34 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-08-04 10:03:57 -0500 |
commit | ce8acddf52bde840571535c3dfd56a2371d80684 (patch) | |
tree | 8c462caa2642bfddcb644f1353f321ecceeb2aca /src/burn/engine/registration.cpp | |
parent | 6d7a275edafb3ae0f3cff94d66503a82dafb71f7 (diff) | |
download | wix-ce8acddf52bde840571535c3dfd56a2371d80684.tar.gz wix-ce8acddf52bde840571535c3dfd56a2371d80684.tar.bz2 wix-ce8acddf52bde840571535c3dfd56a2371d80684.zip |
Add BURN_DEPENDENCIES struct to store Dependency state.
Diffstat (limited to 'src/burn/engine/registration.cpp')
-rw-r--r-- | src/burn/engine/registration.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp index d1c32b3e..51e75b78 100644 --- a/src/burn/engine/registration.cpp +++ b/src/burn/engine/registration.cpp | |||
@@ -385,7 +385,6 @@ extern "C" void RegistrationUninitialize( | |||
385 | ReleaseMem(pRegistration->rgsczPatchCodes); | 385 | ReleaseMem(pRegistration->rgsczPatchCodes); |
386 | 386 | ||
387 | ReleaseStr(pRegistration->sczProviderKey); | 387 | ReleaseStr(pRegistration->sczProviderKey); |
388 | ReleaseStr(pRegistration->sczActiveParent); | ||
389 | ReleaseStr(pRegistration->sczExecutableName); | 388 | ReleaseStr(pRegistration->sczExecutableName); |
390 | 389 | ||
391 | ReleaseStr(pRegistration->sczRegistrationKey); | 390 | ReleaseStr(pRegistration->sczRegistrationKey); |
@@ -462,12 +461,6 @@ extern "C" HRESULT RegistrationSetVariables( | |||
462 | hr = GetBundleManufacturer(pRegistration, pVariables, &scz); | 461 | hr = GetBundleManufacturer(pRegistration, pVariables, &scz); |
463 | ExitOnFailure(hr, "Failed to initialize bundle manufacturer."); | 462 | ExitOnFailure(hr, "Failed to initialize bundle manufacturer."); |
464 | 463 | ||
465 | if (pRegistration->sczActiveParent && *pRegistration->sczActiveParent) | ||
466 | { | ||
467 | hr = VariableSetString(pVariables, BURN_BUNDLE_ACTIVE_PARENT, pRegistration->sczActiveParent, TRUE, FALSE); | ||
468 | ExitOnFailure(hr, "Failed to overwrite the bundle active parent built-in variable."); | ||
469 | } | ||
470 | |||
471 | hr = VariableSetString(pVariables, BURN_BUNDLE_PROVIDER_KEY, pRegistration->sczProviderKey, TRUE, FALSE); | 464 | hr = VariableSetString(pVariables, BURN_BUNDLE_PROVIDER_KEY, pRegistration->sczProviderKey, TRUE, FALSE); |
472 | ExitOnFailure(hr, "Failed to overwrite the bundle provider key built-in variable."); | 465 | ExitOnFailure(hr, "Failed to overwrite the bundle provider key built-in variable."); |
473 | 466 | ||