diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-22 19:06:48 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 20:23:44 +1000 |
commit | 7fc25bc32547277c38bbedceb39c454843af8aac (patch) | |
tree | ddc28b69bc4d39a15fd788069a5d8a0f903a0ad4 /src/dutil/dirutil.cpp | |
parent | 57536725e6061c7f6cd0f532c07beca7cd1228c9 (diff) | |
download | wix-7fc25bc32547277c38bbedceb39c454843af8aac.tar.gz wix-7fc25bc32547277c38bbedceb39c454843af8aac.tar.bz2 wix-7fc25bc32547277c38bbedceb39c454843af8aac.zip |
Replace ExitTrace with new DUTIL_CALLBACK_TRACEERROR callback.
This allows capturing internal dutil errors and eventually supports filtering to certain parts of dutil.
Add Exit...Source macros to simplify calling both TraceError/TraceErrorDebug and Dutil_TraceErrorSource.
Make existing Exit macros call the new Exit...Source macros so the logic is in one place.
Diffstat (limited to 'src/dutil/dirutil.cpp')
-rw-r--r-- | src/dutil/dirutil.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dutil/dirutil.cpp b/src/dutil/dirutil.cpp index ddd621ac..1f06f551 100644 --- a/src/dutil/dirutil.cpp +++ b/src/dutil/dirutil.cpp | |||
@@ -254,7 +254,7 @@ extern "C" HRESULT DAPI DirEnsureDeleteEx( | |||
254 | if (FAILED(hr)) | 254 | if (FAILED(hr)) |
255 | { | 255 | { |
256 | // if we failed to delete a subdirectory, keep trying to finish any remaining files | 256 | // if we failed to delete a subdirectory, keep trying to finish any remaining files |
257 | ExitTrace(hr, "Failed to delete subdirectory; continuing: %ls", sczDelete); | 257 | ExitTraceSource(DUTIL_SOURCE_DEFAULT, hr, "Failed to delete subdirectory; continuing: %ls", sczDelete); |
258 | hr = S_OK; | 258 | hr = S_OK; |
259 | } | 259 | } |
260 | } | 260 | } |