diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-10-11 23:21:31 -0600 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-10-12 18:54:20 +0000 |
commit | 544fdaaf8fb970d9657a59c1fc4c4569de4f2d3e (patch) | |
tree | 715e49e1f325bf7795face50ff84936b05ab86e2 /api/logger.h | |
parent | proj: remove SDV and DVL support (diff) | |
download | wintun-544fdaaf8fb970d9657a59c1fc4c4569de4f2d3e.tar.xz wintun-544fdaaf8fb970d9657a59c1fc4c4569de4f2d3e.zip |
api: rewrite based on SwDevice
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'api/logger.h')
-rw-r--r-- | api/logger.h | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/api/logger.h b/api/logger.h index 72853cc..d83839e 100644 --- a/api/logger.h +++ b/api/logger.h @@ -18,71 +18,63 @@ extern WINTUN_LOGGER_CALLBACK Logger; /** * @copydoc WINTUN_SET_LOGGER_FUNC */ -WINTUN_SET_LOGGER_FUNC_IMPL WintunSetLogger; +WINTUN_SET_LOGGER_FUNC WintunSetLogger; _Post_equals_last_error_ DWORD -LoggerLog(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ LPCWSTR Function, _In_z_ LPCWSTR LogLine); +LoggerLog(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ LPCWSTR LogLine); _Post_equals_last_error_ DWORD -LoggerLogV( - _In_ WINTUN_LOGGER_LEVEL Level, - _In_z_ LPCWSTR Function, - _In_z_ _Printf_format_string_ LPCWSTR Format, - _In_ va_list Args); +LoggerLogV(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ _Printf_format_string_ LPCWSTR Format, _In_ va_list Args); _Post_equals_last_error_ static inline DWORD -LoggerLogFmt(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ LPCWSTR Function, _In_z_ _Printf_format_string_ LPCWSTR Format, ...) +LoggerLogFmt(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ _Printf_format_string_ LPCWSTR Format, ...) { va_list Args; va_start(Args, Format); - DWORD LastError = LoggerLogV(Level, Function, Format, Args); + DWORD LastError = LoggerLogV(Level, Format, Args); va_end(Args); return LastError; } _Post_equals_last_error_ DWORD -LoggerError(_In_ DWORD Error, _In_z_ LPCWSTR Function, _In_z_ LPCWSTR Prefix); +LoggerError(_In_ DWORD Error, _In_z_ LPCWSTR Prefix); _Post_equals_last_error_ DWORD -LoggerErrorV( - _In_ DWORD Error, - _In_z_ LPCWSTR Function, - _In_z_ _Printf_format_string_ LPCWSTR Format, - _In_ va_list Args); +LoggerErrorV(_In_ DWORD Error, _In_z_ _Printf_format_string_ LPCWSTR Format, _In_ va_list Args); _Post_equals_last_error_ static inline DWORD -LoggerErrorFmt(_In_ DWORD Error, _In_z_ LPCWSTR Function, _In_z_ _Printf_format_string_ LPCWSTR Format, ...) +LoggerErrorFmt(_In_ DWORD Error, _In_z_ _Printf_format_string_ LPCWSTR Format, ...) { va_list Args; va_start(Args, Format); - DWORD LastError = LoggerErrorV(Error, Function, Format, Args); + DWORD LastError = LoggerErrorV(Error, Format, Args); va_end(Args); return LastError; } _Post_equals_last_error_ static inline DWORD -LoggerLastErrorV(_In_z_ LPCWSTR Function, _In_z_ _Printf_format_string_ LPCWSTR Format, _In_ va_list Args) +LoggerLastErrorV(_In_z_ _Printf_format_string_ LPCWSTR Format, _In_ va_list Args) { DWORD LastError = GetLastError(); - LoggerErrorV(LastError, Function, Format, Args); + LoggerErrorV(LastError, Format, Args); SetLastError(LastError); return LastError; } _Post_equals_last_error_ static inline DWORD -LoggerLastErrorFmt(_In_z_ LPCWSTR Function, _In_z_ _Printf_format_string_ LPCWSTR Format, ...) +LoggerLastErrorFmt(_In_z_ _Printf_format_string_ LPCWSTR Format, ...) { va_list Args; va_start(Args, Format); - DWORD LastError = LoggerLastErrorV(Function, Format, Args); + DWORD LastError = LoggerLastErrorV(Format, Args); va_end(Args); return LastError; } @@ -90,11 +82,9 @@ LoggerLastErrorFmt(_In_z_ LPCWSTR Function, _In_z_ _Printf_format_string_ LPCWST VOID LoggerGetRegistryKeyPath(_In_ HKEY Key, _Out_writes_z_(MAX_REG_PATH) LPWSTR Path); -#define __L(x) L##x -#define _L(x) __L(x) -#define LOG(lvl, msg, ...) (LoggerLogFmt((lvl), _L(__FUNCTION__), msg, __VA_ARGS__)) -#define LOG_ERROR(err, msg, ...) (LoggerErrorFmt((err), _L(__FUNCTION__), msg, __VA_ARGS__)) -#define LOG_LAST_ERROR(msg, ...) (LoggerLastErrorFmt(_L(__FUNCTION__), msg, __VA_ARGS__)) +#define LOG(lvl, msg, ...) (LoggerLogFmt((lvl), msg, __VA_ARGS__)) +#define LOG_ERROR(err, msg, ...) (LoggerErrorFmt((err), msg, __VA_ARGS__)) +#define LOG_LAST_ERROR(msg, ...) (LoggerLastErrorFmt(msg, __VA_ARGS__)) #define RET_ERROR(Ret, Error) ((Error) == ERROR_SUCCESS ? (Ret) : (SetLastError(Error), 0)) @@ -130,6 +120,9 @@ LoggerReAlloc(_In_z_ LPCWSTR Function, _In_ DWORD Flags, _Frees_ptr_opt_ LPVOID } return Data; } + +#define __L(x) L##x +#define _L(x) __L(x) #define Alloc(Size) LoggerAlloc(_L(__FUNCTION__), 0, Size) #define ReAlloc(Mem, Size) LoggerReAlloc(_L(__FUNCTION__), 0, Mem, Size) #define Zalloc(Size) LoggerAlloc(_L(__FUNCTION__), HEAP_ZERO_MEMORY, Size) @@ -179,4 +172,4 @@ Free(_Frees_ptr_opt_ VOID *Ptr) DWORD LastError = GetLastError(); HeapFree(ModuleHeap, 0, Ptr); SetLastError(LastError); -}
\ No newline at end of file +} |