diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-08-03 18:09:36 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-08-04 10:03:57 -0500 |
commit | 4d0798ec6311b48bfe6ee3cb4dd41379b4653528 (patch) | |
tree | 87e3a02f540a206403c5e61b242dabbe87c8363a /src/burn/engine/core.cpp | |
parent | cdba28de1ee229369b254c62bc58cf2f001899a3 (diff) | |
download | wix-4d0798ec6311b48bfe6ee3cb4dd41379b4653528.tar.gz wix-4d0798ec6311b48bfe6ee3cb4dd41379b4653528.tar.bz2 wix-4d0798ec6311b48bfe6ee3cb4dd41379b4653528.zip |
Always use user's temp directory as basis for acquisition folder.
Fixes #5830
Diffstat (limited to 'src/burn/engine/core.cpp')
-rw-r--r-- | src/burn/engine/core.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/burn/engine/core.cpp b/src/burn/engine/core.cpp index e8c51187..87d748cc 100644 --- a/src/burn/engine/core.cpp +++ b/src/burn/engine/core.cpp | |||
@@ -229,7 +229,7 @@ extern "C" HRESULT CoreInitializeConstants( | |||
229 | { | 229 | { |
230 | // Pass along any ancestors and ourself to prevent infinite loops. | 230 | // Pass along any ancestors and ourself to prevent infinite loops. |
231 | pPackage->Exe.wzAncestors = pRegistration->sczBundlePackageAncestors; | 231 | pPackage->Exe.wzAncestors = pRegistration->sczBundlePackageAncestors; |
232 | pPackage->Exe.wzEngineWorkingDirectory = pInternalCommand->sczWorkingDirectory; | 232 | pPackage->Exe.wzEngineWorkingDirectory = pInternalCommand->sczEngineWorkingDirectory; |
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||
@@ -1019,7 +1019,7 @@ static HRESULT CoreRecreateCommandLine( | |||
1019 | ExitOnFailure(hr, "Failed to append ancestors to command-line."); | 1019 | ExitOnFailure(hr, "Failed to append ancestors to command-line."); |
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | hr = CoreAppendEngineWorkingDirectoryToCommandLine(pInternalCommand->sczWorkingDirectory, psczCommandLine, NULL); | 1022 | hr = CoreAppendEngineWorkingDirectoryToCommandLine(pInternalCommand->sczEngineWorkingDirectory, psczCommandLine, NULL); |
1023 | ExitOnFailure(hr, "Failed to append the custom working directory to command-line."); | 1023 | ExitOnFailure(hr, "Failed to append the custom working directory to command-line."); |
1024 | 1024 | ||
1025 | if (wzRelationTypeCommandLine) | 1025 | if (wzRelationTypeCommandLine) |
@@ -1733,12 +1733,12 @@ extern "C" HRESULT CoreParseCommandLine( | |||
1733 | else if (L'\0' == wzParam[1]) | 1733 | else if (L'\0' == wzParam[1]) |
1734 | { | 1734 | { |
1735 | // Need to grab the current directory here since this is passed on to other processes. | 1735 | // Need to grab the current directory here since this is passed on to other processes. |
1736 | hr = DirGetCurrent(&pInternalCommand->sczWorkingDirectory); | 1736 | hr = DirGetCurrent(&pInternalCommand->sczEngineWorkingDirectory); |
1737 | ExitOnFailure(hr, "Failed to get current directory for custom working directory."); | 1737 | ExitOnFailure(hr, "Failed to get current directory for custom working directory."); |
1738 | } | 1738 | } |
1739 | else | 1739 | else |
1740 | { | 1740 | { |
1741 | hr = StrAllocString(&pInternalCommand->sczWorkingDirectory, wzParam + 1, 0); | 1741 | hr = StrAllocString(&pInternalCommand->sczEngineWorkingDirectory, wzParam + 1, 0); |
1742 | ExitOnFailure(hr, "Failed to allocate the custom working directory."); | 1742 | ExitOnFailure(hr, "Failed to allocate the custom working directory."); |
1743 | } | 1743 | } |
1744 | } | 1744 | } |