1 files changed, 17 insertions, 4 deletions

diff --git a/src/wcautil/inc/wcautil.h b/src/wcautil/inc/wcautil.h
index 8139a7ca..982173f4 100644
--- a/src/wcautil/inc/wcautil.h
+++ b/src/wcautil/inc/wcautil.h
@@ -6,14 +6,22 @@
 extern "C" {
 #endif
 
+#include "dutilsources.h"
+
 #define WIXAPI __stdcall
-#define ExitTrace WcaLogError
+#ifndef DUTIL_SOURCE_DEFAULT
+#define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_EXTERNAL
+#endif
 
 #include "dutil.h"
 
-#define MessageExitOnLastError(x, e, s, ...)      { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (FAILED(x)) { ExitTrace(x, "%s", s, __VA_ARGS__); WcaErrorMessage(e, x, MB_OK, -1, __VA_ARGS__);  goto LExit; } }
-#define MessageExitOnFailure(x, e, s, ...)           if (FAILED(x)) { ExitTrace(x, "%s", s, __VA_ARGS__); WcaErrorMessage(e, x, INSTALLMESSAGE_ERROR | MB_OK, -1, __VA_ARGS__);  goto LExit; }
-#define MessageExitOnNullWithLastError(p, x, e, s, ...) if (NULL == p) { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (!FAILED(x)) { x = E_FAIL; } ExitTrace(x, "%s", s, __VA_ARGS__); WcaErrorMessage(e, x, MB_OK, -1, __VA_ARGS__);  goto LExit; }
+#define MessageExitOnLastErrorSource(d, x, e, s, ...)      { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (FAILED(x)) { ExitTraceSource(d, x, "%s", s, __VA_ARGS__); WcaErrorMessage(e, x, MB_OK, -1, __VA_ARGS__);  goto LExit; } }
+#define MessageExitOnFailureSource(d, x, e, s, ...)           if (FAILED(x)) { ExitTraceSource(d, x, "%s", s, __VA_ARGS__); WcaErrorMessage(e, x, INSTALLMESSAGE_ERROR | MB_OK, -1, __VA_ARGS__);  goto LExit; }
+#define MessageExitOnNullWithLastErrorSource(d, p, x, e, s, ...) if (NULL == p) { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (!FAILED(x)) { x = E_FAIL; } ExitTraceSource(d, x, "%s", s, __VA_ARGS__); WcaErrorMessage(e, x, MB_OK, -1, __VA_ARGS__);  goto LExit; }
+
+#define MessageExitOnLastError(x, e, s, ...) MessageExitOnLastErrorSource(DUTIL_SOURCE_DEFAULT, x, e, s, __VA_ARGS__)
+#define MessageExitOnFailure(x, e, s, ...) MessageExitOnFailureSource(DUTIL_SOURCE_DEFAULT, x, e, s, __VA_ARGS__)
+#define MessageExitOnNullWithLastError(p, x, e, s, ...) MessageExitOnNullWithLastErrorSource(DUTIL_SOURCE_DEFAULT, p, x, e, s, __VA_ARGS__)
 
 // Generic action enum.
 typedef enum WCA_ACTION
@@ -101,6 +109,11 @@ void __cdecl WcaLogError(
     __in LPCSTR szMessage,
     ...
     );
+void WIXAPI WcaLogErrorArgs(
+    __in HRESULT hr,
+    __in LPCSTR szMessage,
+    __in va_list args
+    );
 
 UINT WIXAPI WcaProcessMessage(
     __in INSTALLMESSAGE eMessageType,