diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-03 17:50:50 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-07 19:44:36 -0500 |
| commit | 68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5 (patch) | |
| tree | b40803c4ba8d5312ed3d95c66778c2bc87cf0de9 /src/burn/engine/registration.cpp | |
| parent | 8810aa8908ed7887616d86dd5fb821fcfa92f444 (diff) | |
| download | wix-68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5.tar.gz wix-68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5.tar.bz2 wix-68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5.zip | |
Make sure base paths are fully qualified in Burn.
Diffstat (limited to 'src/burn/engine/registration.cpp')
| -rw-r--r-- | src/burn/engine/registration.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp index 2b3dc4d4..d0e5c677 100644 --- a/src/burn/engine/registration.cpp +++ b/src/burn/engine/registration.cpp | |||
| @@ -1149,7 +1149,7 @@ static HRESULT SetPaths( | |||
| 1149 | ExitOnFailure(hr, "Failed to build cache directory."); | 1149 | ExitOnFailure(hr, "Failed to build cache directory."); |
| 1150 | 1150 | ||
| 1151 | // build cached executable path | 1151 | // build cached executable path |
| 1152 | hr = PathConcatRelativeToBase(sczCacheDirectory, pRegistration->sczExecutableName, &pRegistration->sczCacheExecutablePath); | 1152 | hr = PathConcatRelativeToFullyQualifiedBase(sczCacheDirectory, pRegistration->sczExecutableName, &pRegistration->sczCacheExecutablePath); |
| 1153 | ExitOnFailure(hr, "Failed to build cached executable path."); | 1153 | ExitOnFailure(hr, "Failed to build cached executable path."); |
| 1154 | 1154 | ||
| 1155 | // build state file path | 1155 | // build state file path |
| @@ -1367,7 +1367,7 @@ static HRESULT WriteSoftwareTags( | |||
| 1367 | hr = PathConcat(sczRootFolder, SWIDTAG_FOLDER, &sczTagFolder); | 1367 | hr = PathConcat(sczRootFolder, SWIDTAG_FOLDER, &sczTagFolder); |
| 1368 | ExitOnFailure(hr, "Failed to allocate regid folder path."); | 1368 | ExitOnFailure(hr, "Failed to allocate regid folder path."); |
| 1369 | 1369 | ||
| 1370 | hr = PathConcatRelativeToBase(sczTagFolder, pSoftwareTag->sczFilename, &sczPath); | 1370 | hr = PathConcatRelativeToFullyQualifiedBase(sczTagFolder, pSoftwareTag->sczFilename, &sczPath); |
| 1371 | ExitOnFailure(hr, "Failed to allocate regid file path."); | 1371 | ExitOnFailure(hr, "Failed to allocate regid file path."); |
| 1372 | 1372 | ||
| 1373 | hr = DirEnsureExists(sczTagFolder, NULL); | 1373 | hr = DirEnsureExists(sczTagFolder, NULL); |
| @@ -1405,7 +1405,7 @@ static HRESULT RemoveSoftwareTags( | |||
| 1405 | hr = PathConcat(sczRootFolder, SWIDTAG_FOLDER, &sczTagFolder); | 1405 | hr = PathConcat(sczRootFolder, SWIDTAG_FOLDER, &sczTagFolder); |
| 1406 | ExitOnFailure(hr, "Failed to allocate regid folder path."); | 1406 | ExitOnFailure(hr, "Failed to allocate regid folder path."); |
| 1407 | 1407 | ||
| 1408 | hr = PathConcatRelativeToBase(sczTagFolder, pSoftwareTag->sczFilename, &sczPath); | 1408 | hr = PathConcatRelativeToFullyQualifiedBase(sczTagFolder, pSoftwareTag->sczFilename, &sczPath); |
| 1409 | ExitOnFailure(hr, "Failed to allocate regid file path."); | 1409 | ExitOnFailure(hr, "Failed to allocate regid file path."); |
| 1410 | 1410 | ||
| 1411 | // Best effort to delete the software tag file and the regid folder. | 1411 | // Best effort to delete the software tag file and the regid folder. |