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/mspengine.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/mspengine.cpp')
-rw-r--r-- | src/burn/engine/mspengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/burn/engine/mspengine.cpp b/src/burn/engine/mspengine.cpp index d547b130..3d7b5517 100644 --- a/src/burn/engine/mspengine.cpp +++ b/src/burn/engine/mspengine.cpp | |||
@@ -544,6 +544,7 @@ LExit: | |||
544 | extern "C" HRESULT MspEngineExecutePackage( | 544 | extern "C" HRESULT MspEngineExecutePackage( |
545 | __in_opt HWND hwndParent, | 545 | __in_opt HWND hwndParent, |
546 | __in BURN_EXECUTE_ACTION* pExecuteAction, | 546 | __in BURN_EXECUTE_ACTION* pExecuteAction, |
547 | __in BURN_CACHE* pCache, | ||
547 | __in BURN_VARIABLES* pVariables, | 548 | __in BURN_VARIABLES* pVariables, |
548 | __in BOOL fRollback, | 549 | __in BOOL fRollback, |
549 | __in PFN_MSIEXECUTEMESSAGEHANDLER pfnMessageHandler, | 550 | __in PFN_MSIEXECUTEMESSAGEHANDLER pfnMessageHandler, |
@@ -574,7 +575,7 @@ extern "C" HRESULT MspEngineExecutePackage( | |||
574 | 575 | ||
575 | if (BOOTSTRAPPER_ACTION_STATE_INSTALL == pExecuteAction->mspTarget.action) | 576 | if (BOOTSTRAPPER_ACTION_STATE_INSTALL == pExecuteAction->mspTarget.action) |
576 | { | 577 | { |
577 | hr = CacheGetCompletedPath(pMspPackage->fPerMachine, pMspPackage->sczCacheId, &sczCachedDirectory); | 578 | hr = CacheGetCompletedPath(pCache, pMspPackage->fPerMachine, pMspPackage->sczCacheId, &sczCachedDirectory); |
578 | ExitOnFailure(hr, "Failed to get cached path for MSP package: %ls", pMspPackage->sczId); | 579 | ExitOnFailure(hr, "Failed to get cached path for MSP package: %ls", pMspPackage->sczId); |
579 | 580 | ||
580 | // TODO: Figure out if this makes sense -- the variable is set to the last patch's path only | 581 | // TODO: Figure out if this makes sense -- the variable is set to the last patch's path only |