aboutsummaryrefslogtreecommitdiff
path: root/src/dutil/inc/gdiputil.h
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-06-22 19:06:48 +1000
committerSean Hall <r.sean.hall@gmail.com>2020-06-24 20:23:44 +1000
commit7fc25bc32547277c38bbedceb39c454843af8aac (patch)
treeddc28b69bc4d39a15fd788069a5d8a0f903a0ad4 /src/dutil/inc/gdiputil.h
parent57536725e6061c7f6cd0f532c07beca7cd1228c9 (diff)
downloadwix-7fc25bc32547277c38bbedceb39c454843af8aac.tar.gz
wix-7fc25bc32547277c38bbedceb39c454843af8aac.tar.bz2
wix-7fc25bc32547277c38bbedceb39c454843af8aac.zip
Replace ExitTrace with new DUTIL_CALLBACK_TRACEERROR callback.
This allows capturing internal dutil errors and eventually supports filtering to certain parts of dutil. Add Exit...Source macros to simplify calling both TraceError/TraceErrorDebug and Dutil_TraceErrorSource. Make existing Exit macros call the new Exit...Source macros so the logic is in one place.
Diffstat (limited to 'src/dutil/inc/gdiputil.h')
-rw-r--r--src/dutil/inc/gdiputil.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dutil/inc/gdiputil.h b/src/dutil/inc/gdiputil.h
index 3708053c..f2145828 100644
--- a/src/dutil/inc/gdiputil.h
+++ b/src/dutil/inc/gdiputil.h
@@ -2,7 +2,8 @@
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// 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 3
4 4
5#define ExitOnGdipFailure(g, x, s, ...) { x = GdipHresultFromStatus(g); if (FAILED(x)) { Dutil_RootFailure(__FILE__, __LINE__, x); ExitTrace(x, s, __VA_ARGS__); goto LExit; } } 5#define ExitOnGdipFailureSource(d, g, x, s, ...) { x = GdipHresultFromStatus(g); if (FAILED(x)) { Dutil_RootFailure(__FILE__, __LINE__, x); ExitTraceSource(d, x, s, __VA_ARGS__); goto LExit; } }
6#define ExitOnGdipFailure(g, x, s, ...) ExitOnGdipFailureSource(DUTIL_SOURCE_DEFAULT, g, x, s, __VA_ARGS__)
6 7
7#ifdef __cplusplus 8#ifdef __cplusplus
8extern "C" { 9extern "C" {