diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-15 17:36:45 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 20:25:06 -0600 |
| commit | dbd55be5e707f07eb044c8c7f13c3dfd246148c0 (patch) | |
| tree | 3c1628524caf1e64f4a8aafc917988424977ba02 /src/engine/exeengine.cpp | |
| parent | b6862716cd27cefa541b85c63dd30dc3f0749d87 (diff) | |
| download | wix-dbd55be5e707f07eb044c8c7f13c3dfd246148c0.tar.gz wix-dbd55be5e707f07eb044c8c7f13c3dfd246148c0.tar.bz2 wix-dbd55be5e707f07eb044c8c7f13c3dfd246148c0.zip | |
Initialize exe package ancestors during CoreInitialize instead of Plan.
Diffstat (limited to 'src/engine/exeengine.cpp')
| -rw-r--r-- | src/engine/exeengine.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/engine/exeengine.cpp b/src/engine/exeengine.cpp index 1ca28473..f734edca 100644 --- a/src/engine/exeengine.cpp +++ b/src/engine/exeengine.cpp | |||
| @@ -105,7 +105,6 @@ extern "C" void ExeEnginePackageUninitialize( | |||
| 105 | ReleaseStr(pPackage->Exe.sczRepairArguments); | 105 | ReleaseStr(pPackage->Exe.sczRepairArguments); |
| 106 | ReleaseStr(pPackage->Exe.sczUninstallArguments); | 106 | ReleaseStr(pPackage->Exe.sczUninstallArguments); |
| 107 | ReleaseStr(pPackage->Exe.sczIgnoreDependencies); | 107 | ReleaseStr(pPackage->Exe.sczIgnoreDependencies); |
| 108 | ReleaseStr(pPackage->Exe.sczAncestors); | ||
| 109 | //ReleaseStr(pPackage->Exe.sczProgressSwitch); | 108 | //ReleaseStr(pPackage->Exe.sczProgressSwitch); |
| 110 | ReleaseMem(pPackage->Exe.rgExitCodes); | 109 | ReleaseMem(pPackage->Exe.rgExitCodes); |
| 111 | 110 | ||
| @@ -334,9 +333,9 @@ extern "C" HRESULT ExeEnginePlanAddPackage( | |||
| 334 | ExitOnFailure(hr, "Failed to allocate the list of dependencies to ignore."); | 333 | ExitOnFailure(hr, "Failed to allocate the list of dependencies to ignore."); |
| 335 | } | 334 | } |
| 336 | 335 | ||
| 337 | if (pPackage->Exe.sczAncestors) | 336 | if (pPackage->Exe.wzAncestors) |
| 338 | { | 337 | { |
| 339 | hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.sczAncestors, 0); | 338 | hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.wzAncestors, 0); |
| 340 | ExitOnFailure(hr, "Failed to allocate the list of ancestors."); | 339 | ExitOnFailure(hr, "Failed to allocate the list of ancestors."); |
| 341 | } | 340 | } |
| 342 | 341 | ||
| @@ -359,9 +358,9 @@ extern "C" HRESULT ExeEnginePlanAddPackage( | |||
| 359 | ExitOnFailure(hr, "Failed to allocate the list of dependencies to ignore."); | 358 | ExitOnFailure(hr, "Failed to allocate the list of dependencies to ignore."); |
| 360 | } | 359 | } |
| 361 | 360 | ||
| 362 | if (pPackage->Exe.sczAncestors) | 361 | if (pPackage->Exe.wzAncestors) |
| 363 | { | 362 | { |
| 364 | hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.sczAncestors, 0); | 363 | hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.wzAncestors, 0); |
| 365 | ExitOnFailure(hr, "Failed to allocate the list of ancestors."); | 364 | ExitOnFailure(hr, "Failed to allocate the list of ancestors."); |
| 366 | } | 365 | } |
| 367 | 366 | ||
