diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-02-04 20:47:04 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2026-02-05 15:58:18 -0500 |
| commit | c258b72508f1b25a56e5d3ee3df08650ba1cbe36 (patch) | |
| tree | 0d5eaf7d732d4a6cb5abe663d2644447c9072220 /src/burn/engine/cache.cpp | |
| parent | a3d3963f806117ce123d95e8b77e73e1c1545b25 (diff) | |
| download | wix-c258b72508f1b25a56e5d3ee3df08650ba1cbe36.tar.gz wix-c258b72508f1b25a56e5d3ee3df08650ba1cbe36.tar.bz2 wix-c258b72508f1b25a56e5d3ee3df08650ba1cbe36.zip | |
Support dual-purpose packages in Burn.
Fixes https://github.com/wixtoolset/issues/issues/8958
Diffstat (limited to 'src/burn/engine/cache.cpp')
| -rw-r--r-- | src/burn/engine/cache.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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( | |||
| 36 | static HRESULT CreateCompletedPath( | 36 | static HRESULT CreateCompletedPath( |
| 37 | __in BURN_CACHE* pCache, | 37 | __in BURN_CACHE* pCache, |
| 38 | __in BOOL fPerMachine, | 38 | __in BOOL fPerMachine, |
| 39 | __in LPCWSTR wzCacheId, | 39 | __in_z LPCWSTR wzId, |
| 40 | __in LPCWSTR wzFilePath, | 40 | __in_z_opt LPCWSTR wzFilePath, |
| 41 | __out_z LPWSTR* psczCachePath | 41 | __out_z LPWSTR* psczCachePath |
| 42 | ); | 42 | ); |
| 43 | static HRESULT CreateUnverifiedPath( | 43 | static HRESULT CreateUnverifiedPath( |
| @@ -1612,7 +1612,7 @@ static HRESULT SecurePerMachineCacheRoot( | |||
| 1612 | 1612 | ||
| 1613 | if (!pCache->fPerMachineCacheRootVerified) | 1613 | if (!pCache->fPerMachineCacheRootVerified) |
| 1614 | { | 1614 | { |
| 1615 | // If we are doing a permachine install but have not yet verified that the root cache folder | 1615 | // If we are doing a per-machine install but have not yet verified that the root cache folder |
| 1616 | // was created with the correct ACLs yet, do that now. | 1616 | // was created with the correct ACLs yet, do that now. |
| 1617 | hr = GetRootPath(pCache, TRUE, TRUE, &sczCacheDirectory); | 1617 | hr = GetRootPath(pCache, TRUE, TRUE, &sczCacheDirectory); |
| 1618 | ExitOnFailure(hr, "Failed to get cache directory."); | 1618 | ExitOnFailure(hr, "Failed to get cache directory."); |
| @@ -1635,7 +1635,7 @@ static HRESULT SecurePerMachineCacheRoot( | |||
| 1635 | 1635 | ||
| 1636 | if (!pCache->fOriginalPerMachineCacheRootVerified) | 1636 | if (!pCache->fOriginalPerMachineCacheRootVerified) |
| 1637 | { | 1637 | { |
| 1638 | // If we are doing a permachine install but have not yet verified that the original root cache folder | 1638 | // If we are doing a per-machine install but have not yet verified that the original root cache folder |
| 1639 | // was created with the correct ACLs yet, do that now. | 1639 | // was created with the correct ACLs yet, do that now. |
| 1640 | hr = GetRootPath(pCache, TRUE, FALSE, &sczCacheDirectory); | 1640 | hr = GetRootPath(pCache, TRUE, FALSE, &sczCacheDirectory); |
| 1641 | ExitOnFailure(hr, "Failed to get original cache directory."); | 1641 | ExitOnFailure(hr, "Failed to get original cache directory."); |
| @@ -1658,8 +1658,8 @@ LExit: | |||
| 1658 | static HRESULT CreateCompletedPath( | 1658 | static HRESULT CreateCompletedPath( |
| 1659 | __in BURN_CACHE* pCache, | 1659 | __in BURN_CACHE* pCache, |
| 1660 | __in BOOL fPerMachine, | 1660 | __in BOOL fPerMachine, |
| 1661 | __in LPCWSTR wzId, | 1661 | __in_z LPCWSTR wzId, |
| 1662 | __in LPCWSTR wzFilePath, | 1662 | __in_z_opt LPCWSTR wzFilePath, |
| 1663 | __out_z LPWSTR* psczCachePath | 1663 | __out_z LPWSTR* psczCachePath |
| 1664 | ) | 1664 | ) |
| 1665 | { | 1665 | { |
