diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-08-03 15:41:18 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-08-04 10:03:57 -0500 |
commit | 6d7a275edafb3ae0f3cff94d66503a82dafb71f7 (patch) | |
tree | fae8f75e2cd1d7b179b0ed93e15625d68ba7c441 /src/burn/engine/exeengine.cpp | |
parent | ed57d171f6fb6bb4e180696cc12caa568599566a (diff) | |
download | wix-6d7a275edafb3ae0f3cff94d66503a82dafb71f7.tar.gz wix-6d7a275edafb3ae0f3cff94d66503a82dafb71f7.tar.bz2 wix-6d7a275edafb3ae0f3cff94d66503a82dafb71f7.zip |
Replace static cache internals with a struct.
Initialize them explicitly to make it clearer when that happens.
Diffstat (limited to 'src/burn/engine/exeengine.cpp')
-rw-r--r-- | src/burn/engine/exeengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/burn/engine/exeengine.cpp b/src/burn/engine/exeengine.cpp index d8ffbdb0..9eea4960 100644 --- a/src/burn/engine/exeengine.cpp +++ b/src/burn/engine/exeengine.cpp | |||
@@ -342,6 +342,7 @@ LExit: | |||
342 | 342 | ||
343 | extern "C" HRESULT ExeEngineExecutePackage( | 343 | extern "C" HRESULT ExeEngineExecutePackage( |
344 | __in BURN_EXECUTE_ACTION* pExecuteAction, | 344 | __in BURN_EXECUTE_ACTION* pExecuteAction, |
345 | __in BURN_CACHE* pCache, | ||
345 | __in BURN_VARIABLES* pVariables, | 346 | __in BURN_VARIABLES* pVariables, |
346 | __in BOOL fRollback, | 347 | __in BOOL fRollback, |
347 | __in PFN_GENERICMESSAGEHANDLER pfnGenericMessageHandler, | 348 | __in PFN_GENERICMESSAGEHANDLER pfnGenericMessageHandler, |
@@ -368,7 +369,7 @@ extern "C" HRESULT ExeEngineExecutePackage( | |||
368 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgItems[0].pPayload; | 369 | BURN_PAYLOAD* pPackagePayload = pPackage->payloads.rgItems[0].pPayload; |
369 | 370 | ||
370 | // get cached executable path | 371 | // get cached executable path |
371 | hr = CacheGetCompletedPath(pPackage->fPerMachine, pPackage->sczCacheId, &sczCachedDirectory); | 372 | hr = CacheGetCompletedPath(pCache, pPackage->fPerMachine, pPackage->sczCacheId, &sczCachedDirectory); |
372 | ExitOnFailure(hr, "Failed to get cached path for package: %ls", pPackage->sczId); | 373 | ExitOnFailure(hr, "Failed to get cached path for package: %ls", pPackage->sczId); |
373 | 374 | ||
374 | // Best effort to set the execute package cache folder and action variables. | 375 | // Best effort to set the execute package cache folder and action variables. |