Add ability to suppress pfnTraceErrorCallback for the current thread.

Suppress BurnTraceError while logging errors from BurnTraceError.

#6378

1 files changed, 26 insertions, 1 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.cpp b/src/libs/dutil/WixToolset.DUtil/dutil.cpp
index 56b85207..dd4fa8bf 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.cpp
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.cpp
@@ -30,6 +30,8 @@ static REPORT_LEVEL Dutil_rlCurrentTrace = REPORT_STANDARD;
 static BOOL Dutil_fTraceFilenames = FALSE;
 static DUTIL_CALLBACK_TRACEERROR vpfnTraceErrorCallback = NULL;
 
+thread_local static DWORD vtdwSuppressTraceErrorSource = 0;
+
 
 DAPI_(HRESULT) DutilInitialize(
     __in_opt DUTIL_CALLBACK_TRACEERROR pfnTraceErrorCallback
@@ -48,6 +50,28 @@ DAPI_(void) DutilUninitialize()
     vpfnTraceErrorCallback = NULL;
 }
 
+DAPI_(BOOL) DutilSuppressTraceErrorSource()
+{
+    if (DWORD_MAX == vtdwSuppressTraceErrorSource)
+    {
+        return FALSE;
+    }
+
+    ++vtdwSuppressTraceErrorSource;
+    return TRUE;
+}
+
+DAPI_(BOOL) DutilUnsuppressTraceErrorSource()
+{
+    if (0 == vtdwSuppressTraceErrorSource)
+    {
+        return FALSE;
+    }
+
+    --vtdwSuppressTraceErrorSource;
+    return TRUE;
+}
+
 /*******************************************************************
 Dutil_SetAssertModule
 
@@ -427,8 +451,9 @@ DAPIV_(void) Dutil_TraceErrorSource(
     ...
     )
 {
+    // if this callback is currently suppressed, or
     // if this is NOT an error report and we're not logging at this level, bail
-    if (REPORT_ERROR != rl && Dutil_rlCurrentTrace < rl)
+    if (vtdwSuppressTraceErrorSource || REPORT_ERROR != rl && Dutil_rlCurrentTrace < rl)
     {
         return;
     }