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/msiengine.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/msiengine.cpp')
-rw-r--r-- | src/burn/engine/msiengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/msiengine.cpp b/src/burn/engine/msiengine.cpp index bfd5710f..edbf4d45 100644 --- a/src/burn/engine/msiengine.cpp +++ b/src/burn/engine/msiengine.cpp | |||
@@ -1236,7 +1236,7 @@ extern "C" HRESULT MsiEngineExecutePackage( | |||
1236 | // Best effort to set the execute package cache folder variable. | 1236 | // Best effort to set the execute package cache folder variable. |
1237 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, sczCachedDirectory, TRUE, FALSE); | 1237 | VariableSetString(pVariables, BURN_BUNDLE_EXECUTE_PACKAGE_CACHE_FOLDER, sczCachedDirectory, TRUE, FALSE); |
1238 | 1238 | ||
1239 | hr = PathConcatRelativeToBase(sczCachedDirectory, pPackagePayload->sczFilePath, &sczMsiPath); | 1239 | hr = PathConcatRelativeToFullyQualifiedBase(sczCachedDirectory, pPackagePayload->sczFilePath, &sczMsiPath); |
1240 | ExitOnFailure(hr, "Failed to build MSI path."); | 1240 | ExitOnFailure(hr, "Failed to build MSI path."); |
1241 | } | 1241 | } |
1242 | 1242 | ||
@@ -2195,7 +2195,7 @@ static HRESULT ConcatPatchProperty( | |||
2195 | hr = CacheGetCompletedPath(pCache, pMspPackage->fPerMachine, pMspPackage->sczCacheId, &sczCachedDirectory); | 2195 | hr = CacheGetCompletedPath(pCache, pMspPackage->fPerMachine, pMspPackage->sczCacheId, &sczCachedDirectory); |
2196 | ExitOnFailure(hr, "Failed to get cached path for MSP package: %ls", pMspPackage->sczId); | 2196 | ExitOnFailure(hr, "Failed to get cached path for MSP package: %ls", pMspPackage->sczId); |
2197 | 2197 | ||
2198 | hr = PathConcatRelativeToBase(sczCachedDirectory, pMspPackagePayload->sczFilePath, &sczMspPath); | 2198 | hr = PathConcatRelativeToFullyQualifiedBase(sczCachedDirectory, pMspPackagePayload->sczFilePath, &sczMspPath); |
2199 | ExitOnFailure(hr, "Failed to build MSP path."); | 2199 | ExitOnFailure(hr, "Failed to build MSP path."); |
2200 | 2200 | ||
2201 | if (!sczPatches) | 2201 | if (!sczPatches) |