aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/approvedexe.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-08-03 15:41:18 -0500
committerSean Hall <r.sean.hall@gmail.com>2021-08-04 10:03:57 -0500
commit6d7a275edafb3ae0f3cff94d66503a82dafb71f7 (patch)
treefae8f75e2cd1d7b179b0ed93e15625d68ba7c441 /src/burn/engine/approvedexe.cpp
parented57d171f6fb6bb4e180696cc12caa568599566a (diff)
downloadwix-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/approvedexe.cpp')
-rw-r--r--src/burn/engine/approvedexe.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/burn/engine/approvedexe.cpp b/src/burn/engine/approvedexe.cpp
index e3d51a47..b9efd624 100644
--- a/src/burn/engine/approvedexe.cpp
+++ b/src/burn/engine/approvedexe.cpp
@@ -211,6 +211,7 @@ LExit:
211} 211}
212 212
213extern "C" HRESULT ApprovedExesVerifySecureLocation( 213extern "C" HRESULT ApprovedExesVerifySecureLocation(
214 __in BURN_CACHE* pCache,
214 __in BURN_VARIABLES* pVariables, 215 __in BURN_VARIABLES* pVariables,
215 __in BURN_LAUNCH_APPROVED_EXE* pLaunchApprovedExe 216 __in BURN_LAUNCH_APPROVED_EXE* pLaunchApprovedExe
216 ) 217 )
@@ -245,7 +246,7 @@ extern "C" HRESULT ApprovedExesVerifySecureLocation(
245 246
246 // The problem with using a Variable for the root package cache folder is that it might not have been secured yet. 247 // The problem with using a Variable for the root package cache folder is that it might not have been secured yet.
247 // Getting it through CacheGetPerMachineRootCompletedPath makes sure it has been secured. 248 // Getting it through CacheGetPerMachineRootCompletedPath makes sure it has been secured.
248 hr = CacheGetPerMachineRootCompletedPath(&scz, &sczSecondary); 249 hr = CacheGetPerMachineRootCompletedPath(pCache, &scz, &sczSecondary);
249 ExitOnFailure(hr, "Failed to get the root package cache folder."); 250 ExitOnFailure(hr, "Failed to get the root package cache folder.");
250 251
251 // If the package cache is redirected, hr is S_FALSE. 252 // If the package cache is redirected, hr is S_FALSE.