summaryrefslogtreecommitdiff
path: root/src/burn/engine/logging.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-06-03 17:47:31 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-06-07 19:44:36 -0500
commit8a4d03207633e9fdc364aaed82bd167f844679f9 (patch)
tree9ca862bb51fd3507fc5867c292aef236e3411867 /src/burn/engine/logging.cpp
parent5d35ff01e33b8ffdab04a49ddc5927185309391a (diff)
downloadwix-8a4d03207633e9fdc364aaed82bd167f844679f9.tar.gz
wix-8a4d03207633e9fdc364aaed82bd167f844679f9.tar.bz2
wix-8a4d03207633e9fdc364aaed82bd167f844679f9.zip
Resolve paths while parsing them from the command line.
The current directory is a process wide setting that can potentially be changed by any thread. Remove fileutil methods that had equivalent pathutil methods.
Diffstat (limited to 'src/burn/engine/logging.cpp')
-rw-r--r--src/burn/engine/logging.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/burn/engine/logging.cpp b/src/burn/engine/logging.cpp
index 8e89957b..3a403025 100644
--- a/src/burn/engine/logging.cpp
+++ b/src/burn/engine/logging.cpp
@@ -84,9 +84,6 @@ extern "C" HRESULT LoggingOpen(
84 { 84 {
85 DWORD cRetry = 0; 85 DWORD cRetry = 0;
86 86
87 hr = DirGetCurrent(&sczLoggingBaseFolder);
88 ExitOnFailure(hr, "Failed to get current directory.");
89
90 // Try pretty hard to open the log file when appending. 87 // Try pretty hard to open the log file when appending.
91 do 88 do
92 { 89 {
@@ -95,7 +92,7 @@ extern "C" HRESULT LoggingOpen(
95 ::Sleep(LOG_OPEN_RETRY_WAIT); 92 ::Sleep(LOG_OPEN_RETRY_WAIT);
96 } 93 }
97 94
98 hr = LogOpen(sczLoggingBaseFolder, pLog->sczPath, NULL, NULL, pLog->dwAttributes & BURN_LOGGING_ATTRIBUTE_APPEND, FALSE, &pLog->sczPath); 95 hr = LogOpen(NULL, pLog->sczPath, NULL, NULL, pLog->dwAttributes & BURN_LOGGING_ATTRIBUTE_APPEND, FALSE, &pLog->sczPath);
99 if (pLog->dwAttributes & BURN_LOGGING_ATTRIBUTE_APPEND && HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION) == hr) 96 if (pLog->dwAttributes & BURN_LOGGING_ATTRIBUTE_APPEND && HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION) == hr)
100 { 97 {
101 ++cRetry; 98 ++cRetry;