aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-01-27 20:35:12 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-01-27 20:38:48 -0600
commit0e41fb8be9690ca7b81ec4df0734ead1978a9cf0 (patch)
tree6f3bb0ddd07107b50b579285f2423b6ff8c403c4
parent84e3b69bdd1b6811dec8041ebc2a23020ac4c179 (diff)
downloadwix-0e41fb8be9690ca7b81ec4df0734ead1978a9cf0.tar.gz
wix-0e41fb8be9690ca7b81ec4df0734ead1978a9cf0.tar.bz2
wix-0e41fb8be9690ca7b81ec4df0734ead1978a9cf0.zip
When logging at the debug level, log errors from all sources.
-rw-r--r--src/engine/engine.vcxproj1
-rw-r--r--src/engine/inc/burnsources.h4
-rw-r--r--src/engine/precomp.h3
-rw-r--r--src/stub/precomp.h3
-rw-r--r--src/stub/stub.cpp14
5 files changed, 20 insertions, 5 deletions
diff --git a/src/engine/engine.vcxproj b/src/engine/engine.vcxproj
index 52f71b1d..3db6802b 100644
--- a/src/engine/engine.vcxproj
+++ b/src/engine/engine.vcxproj
@@ -119,6 +119,7 @@
119 <ClInclude Include="EngineForExtension.h" /> 119 <ClInclude Include="EngineForExtension.h" />
120 <ClInclude Include="exeengine.h" /> 120 <ClInclude Include="exeengine.h" />
121 <ClInclude Include="externalengine.h" /> 121 <ClInclude Include="externalengine.h" />
122 <ClInclude Include="inc\burnsources.h" />
122 <ClInclude Include="inc\engine.h" /> 123 <ClInclude Include="inc\engine.h" />
123 <ClInclude Include="logging.h" /> 124 <ClInclude Include="logging.h" />
124 <ClInclude Include="manifest.h" /> 125 <ClInclude Include="manifest.h" />
diff --git a/src/engine/inc/burnsources.h b/src/engine/inc/burnsources.h
new file mode 100644
index 00000000..bff79ed5
--- /dev/null
+++ b/src/engine/inc/burnsources.h
@@ -0,0 +1,4 @@
1#pragma once
2// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
3
4#define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_EXTERNAL
diff --git a/src/engine/precomp.h b/src/engine/precomp.h
index a8a656d1..c0019476 100644
--- a/src/engine/precomp.h
+++ b/src/engine/precomp.h
@@ -20,8 +20,7 @@
20#include <stddef.h> 20#include <stddef.h>
21 21
22#include <dutilsources.h> 22#include <dutilsources.h>
23 23#include <burnsources.h>
24#define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_EXTERNAL
25 24
26#include <dutil.h> 25#include <dutil.h>
27#include <verutil.h> 26#include <verutil.h>
diff --git a/src/stub/precomp.h b/src/stub/precomp.h
index ad0988b5..bb7ded9c 100644
--- a/src/stub/precomp.h
+++ b/src/stub/precomp.h
@@ -5,8 +5,7 @@
5#include <windows.h> 5#include <windows.h>
6 6
7#include <dutilsources.h> 7#include <dutilsources.h>
8 8#include <burnsources.h>
9#define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_EXTERNAL
10 9
11#include <dutil.h> 10#include <dutil.h>
12#include <apputil.h> 11#include <apputil.h>
diff --git a/src/stub/stub.cpp b/src/stub/stub.cpp
index d3ace1f3..0cb202e0 100644
--- a/src/stub/stub.cpp
+++ b/src/stub/stub.cpp
@@ -87,7 +87,19 @@ static void CALLBACK BurnTraceError(
87 __in va_list args 87 __in va_list args
88 ) 88 )
89{ 89{
90 if (DUTIL_SOURCE_DEFAULT == source) 90 BOOL fLog = FALSE;
91
92 switch (source)
93 {
94 case DUTIL_SOURCE_DEFAULT:
95 fLog = TRUE;
96 break;
97 default:
98 fLog = REPORT_VERBOSE < LogGetLevel();
99 break;
100 }
101
102 if (fLog)
91 { 103 {
92 LogErrorStringArgs(hrError, szFormat, args); 104 LogErrorStringArgs(hrError, szFormat, args);
93 } 105 }