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/engine.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/engine.cpp')
| -rw-r--r-- | src/burn/engine/engine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/burn/engine/engine.cpp b/src/burn/engine/engine.cpp index 0c2c8dc5..66eee27e 100644 --- a/src/burn/engine/engine.cpp +++ b/src/burn/engine/engine.cpp | |||
| @@ -338,7 +338,7 @@ static HRESULT InitializeEngineState( | |||
| 338 | ProcElevated(::GetCurrentProcess(), &pEngineState->internalCommand.fInitiallyElevated); | 338 | ProcElevated(::GetCurrentProcess(), &pEngineState->internalCommand.fInitiallyElevated); |
| 339 | 339 | ||
| 340 | // Parse command line. | 340 | // Parse command line. |
| 341 | hr = CoreParseCommandLine(pEngineState->argc, pEngineState->argv, &pEngineState->command, &pEngineState->companionConnection, &pEngineState->embeddedConnection, &pEngineState->mode, &pEngineState->automaticUpdates, &pEngineState->fDisableSystemRestore, &pEngineState->internalCommand.sczSourceProcessPath, &pEngineState->internalCommand.sczOriginalSource, &hSectionFile, &hSourceEngineFile, &pEngineState->fDisableUnelevate, &pEngineState->log.dwAttributes, &pEngineState->log.sczPath, &pEngineState->registration.sczActiveParent, &pEngineState->sczIgnoreDependencies, &pEngineState->registration.sczAncestors, &pEngineState->fInvalidCommandLine, &pEngineState->cUnknownArgs, &pEngineState->rgUnknownArgs); | 341 | hr = CoreParseCommandLine(pEngineState->argc, pEngineState->argv, &pEngineState->command, &pEngineState->companionConnection, &pEngineState->embeddedConnection, &pEngineState->mode, &pEngineState->automaticUpdates, &pEngineState->fDisableSystemRestore, &pEngineState->internalCommand.sczSourceProcessPath, &pEngineState->internalCommand.sczOriginalSource, &hSectionFile, &hSourceEngineFile, &pEngineState->fDisableUnelevate, &pEngineState->log.dwAttributes, &pEngineState->log.sczPath, &pEngineState->internalCommand.sczActiveParent, &pEngineState->internalCommand.sczIgnoreDependencies, &pEngineState->registration.sczAncestors, &pEngineState->fInvalidCommandLine, &pEngineState->cUnknownArgs, &pEngineState->rgUnknownArgs); |
| 342 | ExitOnFailure(hr, "Fatal error while parsing command line."); | 342 | ExitOnFailure(hr, "Fatal error while parsing command line."); |
| 343 | 343 | ||
| 344 | hr = SectionInitialize(&pEngineState->section, hSectionFile, hSourceEngineFile); | 344 | hr = SectionInitialize(&pEngineState->section, hSectionFile, hSourceEngineFile); |
| @@ -362,8 +362,6 @@ static void UninitializeEngineState( | |||
| 362 | 362 | ||
| 363 | ReleaseMem(pEngineState->rgUnknownArgs); | 363 | ReleaseMem(pEngineState->rgUnknownArgs); |
| 364 | 364 | ||
| 365 | ReleaseStr(pEngineState->sczIgnoreDependencies); | ||
| 366 | |||
| 367 | PipeConnectionUninitialize(&pEngineState->embeddedConnection); | 365 | PipeConnectionUninitialize(&pEngineState->embeddedConnection); |
| 368 | PipeConnectionUninitialize(&pEngineState->companionConnection); | 366 | PipeConnectionUninitialize(&pEngineState->companionConnection); |
| 369 | ReleaseStr(pEngineState->sczBundleEngineWorkingPath) | 367 | ReleaseStr(pEngineState->sczBundleEngineWorkingPath) |
| @@ -376,6 +374,7 @@ static void UninitializeEngineState( | |||
| 376 | UserExperienceUninitialize(&pEngineState->userExperience); | 374 | UserExperienceUninitialize(&pEngineState->userExperience); |
| 377 | 375 | ||
| 378 | ApprovedExesUninitialize(&pEngineState->approvedExes); | 376 | ApprovedExesUninitialize(&pEngineState->approvedExes); |
| 377 | DependencyUninitialize(&pEngineState->dependencies); | ||
| 379 | UpdateUninitialize(&pEngineState->update); | 378 | UpdateUninitialize(&pEngineState->update); |
| 380 | VariablesUninitialize(&pEngineState->variables); | 379 | VariablesUninitialize(&pEngineState->variables); |
| 381 | SearchesUninitialize(&pEngineState->searches); | 380 | SearchesUninitialize(&pEngineState->searches); |
| @@ -390,6 +389,8 @@ static void UninitializeEngineState( | |||
| 390 | ReleaseStr(pEngineState->command.wzLayoutDirectory); | 389 | ReleaseStr(pEngineState->command.wzLayoutDirectory); |
| 391 | ReleaseStr(pEngineState->command.wzCommandLine); | 390 | ReleaseStr(pEngineState->command.wzCommandLine); |
| 392 | 391 | ||
| 392 | ReleaseStr(pEngineState->internalCommand.sczActiveParent); | ||
| 393 | ReleaseStr(pEngineState->internalCommand.sczIgnoreDependencies); | ||
| 393 | ReleaseStr(pEngineState->internalCommand.sczOriginalSource); | 394 | ReleaseStr(pEngineState->internalCommand.sczOriginalSource); |
| 394 | ReleaseStr(pEngineState->internalCommand.sczSourceProcessPath); | 395 | ReleaseStr(pEngineState->internalCommand.sczSourceProcessPath); |
| 395 | 396 | ||
