diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-05-15 17:18:36 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-05-16 21:47:46 +1000 |
| commit | 9010bd828e70e91523ed74733cc371eec09f58bb (patch) | |
| tree | 9d40b796b6b29474122bcf0fb99bc717f83e7cf1 /src/balutil/inc/balutil.h | |
| parent | 780cd25e41f2d2982807a0a2a24a734684d27fe6 (diff) | |
| download | wix-9010bd828e70e91523ed74733cc371eec09f58bb.tar.gz wix-9010bd828e70e91523ed74733cc371eec09f58bb.tar.bz2 wix-9010bd828e70e91523ed74733cc371eec09f58bb.zip | |
WIXFEAT:6164 Update BAL_INFO_PACKAGE with bal specific data.
Diffstat (limited to 'src/balutil/inc/balutil.h')
| -rw-r--r-- | src/balutil/inc/balutil.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/balutil/inc/balutil.h b/src/balutil/inc/balutil.h index b2d50752..bbfb16a2 100644 --- a/src/balutil/inc/balutil.h +++ b/src/balutil/inc/balutil.h | |||
| @@ -11,7 +11,10 @@ extern "C" { | |||
| 11 | 11 | ||
| 12 | #define BalExitOnFailure(x, f, ...) if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } | 12 | #define BalExitOnFailure(x, f, ...) if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } |
| 13 | #define BalExitOnRootFailure(x, f, ...) if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); Dutil_RootFailure(__FILE__, __LINE__, x); ExitTrace(x, f, __VA_ARGS__); goto LExit; } | 13 | #define BalExitOnRootFailure(x, f, ...) if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); Dutil_RootFailure(__FILE__, __LINE__, x); ExitTrace(x, f, __VA_ARGS__); goto LExit; } |
| 14 | #define BalExitOnLastError(x, f, ...) { x = ::GetLastError(); x = HRESULT_FROM_WIN32(x); if (FAILED(x)) { BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } } | ||
| 15 | #define BalExitOnNull(p, x, e, f, ...) if (NULL == p) { x = e; BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } | ||
| 14 | #define BalExitOnNullWithLastError(p, x, f, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } | 16 | #define BalExitOnNullWithLastError(p, x, f, ...) if (NULL == p) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } |
| 17 | #define BalExitWithLastError(x, f, ...) { DWORD Dutil_er = ::GetLastError(); x = HRESULT_FROM_WIN32(Dutil_er); if (!FAILED(x)) { x = E_FAIL; } BalLogError(x, f, __VA_ARGS__); ExitTrace(x, f, __VA_ARGS__); goto LExit; } | ||
| 15 | 18 | ||
| 16 | #ifndef FACILITY_WIX | 19 | #ifndef FACILITY_WIX |
| 17 | #define FACILITY_WIX 500 | 20 | #define FACILITY_WIX 500 |