|
44 | 44 |
|
45 | 45 | #include <strsafe.h> |
46 | 46 |
|
47 | | -#include <wine2ros.h> |
| 47 | +#include <wine/debug.h> |
48 | 48 |
|
49 | 49 | /* #define UNEXPECTED() (ASSERT(FALSE), TRUE) */ |
50 | 50 | #define UNEXPECTED() TRUE |
51 | 51 |
|
| 52 | +#define ERR_PRINTF(fmt, ...) (__WINE_IS_DEBUG_ON(_ERR, __wine_dbch___default) ? \ |
| 53 | + (wine_dbg_printf(fmt, ##__VA_ARGS__), UNEXPECTED()) : UNEXPECTED()) |
| 54 | + |
52 | 55 | /* Unexpected Condition Checkers */ |
53 | 56 | #if DBG |
54 | 57 | #define FAILED_UNEXPECTEDLY(hr) \ |
55 | | - (FAILED(hr) ? (ERR("FAILED(0x%08X)\n", hr), UNEXPECTED()) : FALSE) |
| 58 | + (FAILED(hr) ? ERR_PRINTF("FAILED(0x%08X)\n", hr) : FALSE) |
56 | 59 | #define IS_NULL_UNEXPECTEDLY(p) \ |
57 | | - (!(p) ? (ERR("%s was NULL\n", #p), UNEXPECTED()) : FALSE) |
| 60 | + (!(p) ? ERR_PRINTF("%s was NULL\n", #p) : FALSE) |
58 | 61 | #define IS_ZERO_UNEXPECTEDLY(p) \ |
59 | | - (!(p) ? (ERR("%s was zero\n", #p), UNEXPECTED()) : FALSE) |
| 62 | + (!(p) ? ERR_PRINTF("%s was zero\n", #p) : FALSE) |
60 | 63 | #define IS_TRUE_UNEXPECTEDLY(x) \ |
61 | | - ((x) ? (ERR("%s was %d\n", #x, (int)(x)), UNEXPECTED()) : FALSE) |
| 64 | + ((x) ? ERR_PRINTF("%s was non-zero\n", #x) : FALSE) |
62 | 65 | #define IS_ERROR_UNEXPECTEDLY(x) \ |
63 | | - ((x) != ERROR_SUCCESS ? (ERR("%s was %d\n", #x, (int)(x)), UNEXPECTED()) : FALSE) |
| 66 | + ((x) != ERROR_SUCCESS ? ERR_PRINTF("%s was %d\n", #x, (int)(x)) : FALSE) |
64 | 67 | #else |
65 | 68 | #define FAILED_UNEXPECTEDLY(hr) FAILED(hr) |
66 | 69 | #define IS_NULL_UNEXPECTEDLY(p) (!(p)) |
|
0 commit comments