From dbd55be5e707f07eb044c8c7f13c3dfd246148c0 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 15 Feb 2021 17:36:45 -0600 Subject: Initialize exe package ancestors during CoreInitialize instead of Plan. --- src/engine/exeengine.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/engine/exeengine.cpp') 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( ReleaseStr(pPackage->Exe.sczRepairArguments); ReleaseStr(pPackage->Exe.sczUninstallArguments); ReleaseStr(pPackage->Exe.sczIgnoreDependencies); - ReleaseStr(pPackage->Exe.sczAncestors); //ReleaseStr(pPackage->Exe.sczProgressSwitch); ReleaseMem(pPackage->Exe.rgExitCodes); @@ -334,9 +333,9 @@ extern "C" HRESULT ExeEnginePlanAddPackage( ExitOnFailure(hr, "Failed to allocate the list of dependencies to ignore."); } - if (pPackage->Exe.sczAncestors) + if (pPackage->Exe.wzAncestors) { - hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.sczAncestors, 0); + hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.wzAncestors, 0); ExitOnFailure(hr, "Failed to allocate the list of ancestors."); } @@ -359,9 +358,9 @@ extern "C" HRESULT ExeEnginePlanAddPackage( ExitOnFailure(hr, "Failed to allocate the list of dependencies to ignore."); } - if (pPackage->Exe.sczAncestors) + if (pPackage->Exe.wzAncestors) { - hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.sczAncestors, 0); + hr = StrAllocString(&pAction->exePackage.sczAncestors, pPackage->Exe.wzAncestors, 0); ExitOnFailure(hr, "Failed to allocate the list of ancestors."); } -- cgit v1.2.3-55-g6feb