1 files changed, 27 insertions, 0 deletions

diff --git a/src/wcautil/wcautil.cpp b/src/wcautil/wcautil.cpp
index ce5ef151..11867d10 100644
--- a/src/wcautil/wcautil.cpp
+++ b/src/wcautil/wcautil.cpp
@@ -12,6 +12,15 @@ static MSIHANDLE s_hDatabase;
 static char s_szCustomActionLogName[32];
 static UINT s_iRetVal;
 
+static void CALLBACK WcaTraceError(
+    __in_z LPCSTR szFile,
+    __in int iLine,
+    __in REPORT_LEVEL rl,
+    __in UINT source,
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    );
 
 /********************************************************************
  WcaGlobalInitialize() - initializes the Wca library, should be 
@@ -24,6 +33,7 @@ extern "C" void WIXAPI WcaGlobalInitialize(
     )
 {
     g_hInstCADLL = hInst;
+    DutilInitialize(&WcaTraceError);
     MemInitialize();
 
     AssertSetModule(g_hInstCADLL);
@@ -49,6 +59,7 @@ extern "C" void WIXAPI WcaGlobalFinalize()
     }
 #endif
     MemUninitialize();
+    DutilUninitialize();
     g_hInstCADLL = NULL;
 }
 
@@ -214,3 +225,19 @@ extern "C" BOOL WIXAPI WcaCancelDetected()
 {
     return ERROR_INSTALL_USEREXIT == s_iRetVal;
 }
+
+static void CALLBACK WcaTraceError(
+    __in_z LPCSTR /*szFile*/,
+    __in int /*iLine*/,
+    __in REPORT_LEVEL /*rl*/,
+    __in UINT source,
+    __in HRESULT hrError,
+    __in_z __format_string LPCSTR szFormat,
+    __in va_list args
+    )
+{
+    if (DUTIL_SOURCE_DEFAULT == source)
+    {
+        WcaLogErrorArgs(hrError, szFormat, args);
+    }
+}