diff options
| author | Rob Mensching <rob@firegiant.com> | 2026-01-02 16:12:01 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2026-01-02 16:12:01 -0800 |
| commit | b1b90775c9d715ae4193e3faaa419cf163a49bd5 (patch) | |
| tree | 3afc06dc51d0452b053ea4b57312fa354323fd5a /src/burn/engine/cache.cpp | |
| parent | bd1110871eacff77d2de804c627a7851e95f1ebc (diff) | |
| download | wix-b1b90775c9d715ae4193e3faaa419cf163a49bd5.tar.gz wix-b1b90775c9d715ae4193e3faaa419cf163a49bd5.tar.bz2 wix-b1b90775c9d715ae4193e3faaa419cf163a49bd5.zip | |
Random fixes
Diffstat (limited to 'src/burn/engine/cache.cpp')
| -rw-r--r-- | src/burn/engine/cache.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/burn/engine/cache.cpp b/src/burn/engine/cache.cpp index f5df6500..c85a1be4 100644 --- a/src/burn/engine/cache.cpp +++ b/src/burn/engine/cache.cpp | |||
| @@ -363,6 +363,8 @@ extern "C" HRESULT CacheEnsureBaseWorkingFolder( | |||
| 363 | } | 363 | } |
| 364 | 364 | ||
| 365 | pWorkingFolderAcl = reinterpret_cast<LPSECURITY_ATTRIBUTES>(MemAlloc(sizeof(SECURITY_ATTRIBUTES), TRUE)); | 365 | pWorkingFolderAcl = reinterpret_cast<LPSECURITY_ATTRIBUTES>(MemAlloc(sizeof(SECURITY_ATTRIBUTES), TRUE)); |
| 366 | ExitOnNull(pWorkingFolderAcl, hr, E_OUTOFMEMORY, "Failed to allocate security attributes."); | ||
| 367 | |||
| 366 | pWorkingFolderAcl->nLength = sizeof(SECURITY_ATTRIBUTES); | 368 | pWorkingFolderAcl->nLength = sizeof(SECURITY_ATTRIBUTES); |
| 367 | pWorkingFolderAcl->lpSecurityDescriptor = psd; | 369 | pWorkingFolderAcl->lpSecurityDescriptor = psd; |
| 368 | pWorkingFolderAcl->bInheritHandle = FALSE; | 370 | pWorkingFolderAcl->bInheritHandle = FALSE; |
| @@ -857,6 +859,7 @@ extern "C" HRESULT CacheSendProgressCallback( | |||
| 857 | case PROGRESS_STOP: | 859 | case PROGRESS_STOP: |
| 858 | hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); | 860 | hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); |
| 859 | ExitOnRootFailure(hr, "UX aborted on download progress."); | 861 | ExitOnRootFailure(hr, "UX aborted on download progress."); |
| 862 | break; | ||
| 860 | 863 | ||
| 861 | case PROGRESS_QUIET: // Not actually an error, just an indication to the caller to stop requesting progress. | 864 | case PROGRESS_QUIET: // Not actually an error, just an indication to the caller to stop requesting progress. |
| 862 | pCallback->pfnProgress = NULL; | 865 | pCallback->pfnProgress = NULL; |
| @@ -866,6 +869,7 @@ extern "C" HRESULT CacheSendProgressCallback( | |||
| 866 | default: | 869 | default: |
| 867 | hr = E_UNEXPECTED; | 870 | hr = E_UNEXPECTED; |
| 868 | ExitOnRootFailure(hr, "Invalid return code from progress routine."); | 871 | ExitOnRootFailure(hr, "Invalid return code from progress routine."); |
| 872 | break; | ||
| 869 | } | 873 | } |
| 870 | } | 874 | } |
| 871 | 875 | ||
| @@ -1435,8 +1439,8 @@ extern "C" void CacheUninitialize( | |||
| 1435 | ReleaseStr(pCache->sczBaseWorkingFolder); | 1439 | ReleaseStr(pCache->sczBaseWorkingFolder); |
| 1436 | ReleaseStr(pCache->sczAcquisitionFolder); | 1440 | ReleaseStr(pCache->sczAcquisitionFolder); |
| 1437 | ReleaseStr(pCache->sczSourceProcessFolder); | 1441 | ReleaseStr(pCache->sczSourceProcessFolder); |
| 1438 | ReleaseStr(pCache->sczBundleEngineWorkingPath) | 1442 | ReleaseStr(pCache->sczBundleEngineWorkingPath); |
| 1439 | ReleaseFileHandle(pCache->hBundleEngineWorkingFile) | 1443 | ReleaseFileHandle(pCache->hBundleEngineWorkingFile); |
| 1440 | 1444 | ||
| 1441 | memset(pCache, 0, sizeof(BURN_CACHE)); | 1445 | memset(pCache, 0, sizeof(BURN_CACHE)); |
| 1442 | } | 1446 | } |
