diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-12 17:07:55 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-07-12 17:16:16 +1000 |
| commit | dc558da002794cc07013e8376f3c55c73391aa0e (patch) | |
| tree | faba96f981f1ea0c6888b387cf43cc78d0bc2927 /src/test/DUtilUnitTest/error.h | |
| parent | aeddc77fc021f11f68a4c1a093eabf9776866b80 (diff) | |
| download | wix-dc558da002794cc07013e8376f3c55c73391aa0e.tar.gz wix-dc558da002794cc07013e8376f3c55c73391aa0e.tar.bz2 wix-dc558da002794cc07013e8376f3c55c73391aa0e.zip | |
Update Dutil_TraceErrorSource to filter based on the report level.
Diffstat (limited to 'src/test/DUtilUnitTest/error.h')
| -rw-r--r-- | src/test/DUtilUnitTest/error.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/test/DUtilUnitTest/error.h b/src/test/DUtilUnitTest/error.h index a52db56d..b973acaf 100644 --- a/src/test/DUtilUnitTest/error.h +++ b/src/test/DUtilUnitTest/error.h | |||
| @@ -1,8 +1,14 @@ | |||
| 1 | #pragma once | ||
| 1 | // 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. | 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. |
| 2 | 3 | ||
| 3 | const int ERROR_STRING_BUFFER = 1024; | 4 | #define DUTIL_SOURCE_DEFAULT DUTIL_SOURCE_EXTERNAL |
| 4 | 5 | ||
| 5 | static char szMsg[ERROR_STRING_BUFFER]; | 6 | void CALLBACK DutilTestTraceError( |
| 6 | static WCHAR wzMsg[ERROR_STRING_BUFFER]; | 7 | __in_z LPCSTR szFile, |
| 7 | 8 | __in int iLine, | |
| 8 | #define ExitTrace(x, f, ...) { HRESULT hrTemp = x; hr = ::StringCchPrintfA(szMsg, countof(szMsg), f, __VA_ARGS__); MultiByteToWideChar(CP_ACP, 0, szMsg, -1, wzMsg, countof(wzMsg)); throw gcnew System::Exception(System::String::Format("hr = 0x{0:X8}, message = {1}", hrTemp, gcnew System::String(wzMsg))); } | 9 | __in REPORT_LEVEL rl, |
| 10 | __in UINT source, | ||
| 11 | __in HRESULT hrError, | ||
| 12 | __in_z __format_string LPCSTR szFormat, | ||
| 13 | __in va_list args | ||
| 14 | ); | ||
