api: CALLBACK_FUNC -> CALLBACK

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-11-04 15:45:27 +01:00 committed by Simon Rozman
parent b8401ad25b
commit c26b16e06f
4 changed files with 9 additions and 9 deletions

View File

@ -1840,7 +1840,7 @@ cleanupToken:
} }
_Return_type_success_(return != FALSE) BOOL WINAPI _Return_type_success_(return != FALSE) BOOL WINAPI
WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK_FUNC Func, _In_ LPARAM Param) WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK Func, _In_ LPARAM Param)
{ {
HANDLE Mutex = NamespaceTakePoolMutex(Pool); HANDLE Mutex = NamespaceTakePoolMutex(Pool);
if (!Mutex) if (!Mutex)

View File

@ -15,10 +15,10 @@ NopLogger(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *LogLine)
return TRUE; return TRUE;
} }
WINTUN_LOGGER_CALLBACK_FUNC Logger = NopLogger; WINTUN_LOGGER_CALLBACK Logger = NopLogger;
void CALLBACK void CALLBACK
WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger) WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK NewLogger)
{ {
if (!NewLogger) if (!NewLogger)
NewLogger = NopLogger; NewLogger = NopLogger;

View File

@ -9,13 +9,13 @@
#include "entry.h" #include "entry.h"
#include <Windows.h> #include <Windows.h>
extern WINTUN_LOGGER_CALLBACK_FUNC Logger; extern WINTUN_LOGGER_CALLBACK Logger;
/** /**
* @copydoc WINTUN_SET_LOGGER_FUNC * @copydoc WINTUN_SET_LOGGER_FUNC
*/ */
void WINAPI void WINAPI
WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger); WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK NewLogger);
_Post_equals_last_error_ DWORD _Post_equals_last_error_ DWORD
LoggerLog(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Function, _In_z_ const WCHAR *LogLine); LoggerLog(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Function, _In_z_ const WCHAR *LogLine);

View File

@ -89,7 +89,7 @@ typedef _Return_type_success_(return != FALSE)
* *
* @return Non-zero to continue iterating adapters; zero to stop. * @return Non-zero to continue iterating adapters; zero to stop.
*/ */
typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param); typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param);
/** /**
* Enumerates all Wintun adapters. * Enumerates all Wintun adapters.
@ -106,7 +106,7 @@ typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Ada
*/ */
typedef _Return_type_success_(return != FALSE) BOOL(WINAPI *WINTUN_ENUM_ADAPTERS_FUNC)( typedef _Return_type_success_(return != FALSE) BOOL(WINAPI *WINTUN_ENUM_ADAPTERS_FUNC)(
_In_z_ const WCHAR *Pool, _In_z_ const WCHAR *Pool,
_In_ WINTUN_ENUM_CALLBACK_FUNC Callback, _In_ WINTUN_ENUM_CALLBACK Callback,
_In_ LPARAM Param); _In_ LPARAM Param);
/** /**
@ -205,7 +205,7 @@ typedef enum _WINTUN_LOGGER_LEVEL
* *
* @return Anything - return value is ignored. * @return Anything - return value is ignored.
*/ */
typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message); typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message);
/** /**
* Sets logger callback function. * Sets logger callback function.
@ -214,7 +214,7 @@ typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK_FUNC)(_In_ WINTUN_LOGGER_LEVEL Lev
* threads concurrently. Should the logging require serialization, you must handle serialization in * threads concurrently. Should the logging require serialization, you must handle serialization in
* NewLogger. Set to NULL to disable. * NewLogger. Set to NULL to disable.
*/ */
typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger); typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_CALLBACK NewLogger);
/** /**
* Minimum ring capacity. * Minimum ring capacity.