From c258b72508f1b25a56e5d3ee3df08650ba1cbe36 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 4 Feb 2026 20:47:04 -0500 Subject: Support dual-purpose packages in Burn. Fixes https://github.com/wixtoolset/issues/issues/8958 --- src/burn/engine/cache.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/burn/engine/cache.cpp') diff --git a/src/burn/engine/cache.cpp b/src/burn/engine/cache.cpp index c85a1be4..b5f063c9 100644 --- a/src/burn/engine/cache.cpp +++ b/src/burn/engine/cache.cpp @@ -36,8 +36,8 @@ static HRESULT SecurePerMachineCacheRoot( static HRESULT CreateCompletedPath( __in BURN_CACHE* pCache, __in BOOL fPerMachine, - __in LPCWSTR wzCacheId, - __in LPCWSTR wzFilePath, + __in_z LPCWSTR wzId, + __in_z_opt LPCWSTR wzFilePath, __out_z LPWSTR* psczCachePath ); static HRESULT CreateUnverifiedPath( @@ -1612,7 +1612,7 @@ static HRESULT SecurePerMachineCacheRoot( if (!pCache->fPerMachineCacheRootVerified) { - // If we are doing a permachine install but have not yet verified that the root cache folder + // If we are doing a per-machine install but have not yet verified that the root cache folder // was created with the correct ACLs yet, do that now. hr = GetRootPath(pCache, TRUE, TRUE, &sczCacheDirectory); ExitOnFailure(hr, "Failed to get cache directory."); @@ -1635,7 +1635,7 @@ static HRESULT SecurePerMachineCacheRoot( if (!pCache->fOriginalPerMachineCacheRootVerified) { - // If we are doing a permachine install but have not yet verified that the original root cache folder + // If we are doing a per-machine install but have not yet verified that the original root cache folder // was created with the correct ACLs yet, do that now. hr = GetRootPath(pCache, TRUE, FALSE, &sczCacheDirectory); ExitOnFailure(hr, "Failed to get original cache directory."); @@ -1658,8 +1658,8 @@ LExit: static HRESULT CreateCompletedPath( __in BURN_CACHE* pCache, __in BOOL fPerMachine, - __in LPCWSTR wzId, - __in LPCWSTR wzFilePath, + __in_z LPCWSTR wzId, + __in_z_opt LPCWSTR wzFilePath, __out_z LPWSTR* psczCachePath ) { -- cgit v1.2.3-55-g6feb