diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-26 17:34:48 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-31 13:20:44 -0500 |
| commit | 90982fbf1c887a3ed3454f9ab3ab8dfbd57a1383 (patch) | |
| tree | 7d87b21f0879de446f5db7053d349f32b4882cbe /src/ext | |
| parent | a070d8c7b57d6c9a54106abeb359a6c868b6d7ae (diff) | |
| download | wix-90982fbf1c887a3ed3454f9ab3ab8dfbd57a1383.tar.gz wix-90982fbf1c887a3ed3454f9ab3ab8dfbd57a1383.tar.bz2 wix-90982fbf1c887a3ed3454f9ab3ab8dfbd57a1383.zip | |
Add PathConcatRelativeToBase and use it in Burn.
Fixes 6707
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/Bal/dnchost/dnchost.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ext/Bal/dnchost/dnchost.cpp b/src/ext/Bal/dnchost/dnchost.cpp index 36970f83..cdf204fb 100644 --- a/src/ext/Bal/dnchost/dnchost.cpp +++ b/src/ext/Bal/dnchost/dnchost.cpp | |||
| @@ -199,7 +199,7 @@ static HRESULT LoadDncConfiguration( | |||
| 199 | hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName); | 199 | hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName); |
| 200 | BalExitOnRequiredXmlQueryFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath."); | 200 | BalExitOnRequiredXmlQueryFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath."); |
| 201 | 201 | ||
| 202 | hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); | 202 | hr = PathConcatRelativeToBase(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); |
| 203 | BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); | 203 | BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); |
| 204 | 204 | ||
| 205 | LPCWSTR wzFileName = PathFile(pState->sczBaFactoryAssemblyPath); | 205 | LPCWSTR wzFileName = PathFile(pState->sczBaFactoryAssemblyPath); |