Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

api: cleanup names

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-10-31 23:08:00 +01:00
parent a8f82d5cbf
commit 334a5e619f
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/adapter.c
View File

@ -1890,7 +1890,7 @@ cleanupToken:
} }
WINTUN_STATUS WINAPI WINTUN_STATUS WINAPI
WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_FUNC Func, _In_ LPARAM Param) WintunEnumAdapters(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK_FUNC Func, _In_ LPARAM Param)
{ {
HANDLE Mutex = NamespaceTakeMutex(Pool); HANDLE Mutex = NamespaceTakeMutex(Pool);
if (!Mutex) if (!Mutex)

4
api/logger.c
View File

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

4
api/logger.h
View File

@ -8,13 +8,13 @@
#include "wintun.h" #include "wintun.h"
#include <Windows.h> #include <Windows.h>
extern WINTUN_LOGGER_FUNC Logger; extern WINTUN_LOGGER_CALLBACK_FUNC Logger;
/** /**
* @copydoc WINTUN_SET_LOGGER_FUNC * @copydoc WINTUN_SET_LOGGER_FUNC
*/ */
void WINAPI void WINAPI
WintunSetLogger(_In_ WINTUN_LOGGER_FUNC NewLogger); WintunSetLogger(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger);
_Post_equals_last_error_ DWORD _Post_equals_last_error_ DWORD
LoggerError(_In_z_ const WCHAR *Prefix, _In_ DWORD Error); LoggerError(_In_z_ const WCHAR *Prefix, _In_ DWORD Error);

10
api/wintun.h
View File

@ -79,7 +79,7 @@ typedef WINTUN_STATUS(WINAPI *WINTUN_DELETE_ADAPTER_FUNC)(
* *
* @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_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param); typedef BOOL(CALLBACK *WINTUN_ENUM_CALLBACK_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In_ LPARAM Param);
/** /**
* Enumerates all Wintun adapters. * Enumerates all Wintun adapters.
@ -94,7 +94,7 @@ typedef BOOL(CALLBACK *WINTUN_ENUM_FUNC)(_In_ WINTUN_ADAPTER_HANDLE Adapter, _In
* @return ERROR_SUCCESS on success; Win32 error code otherwise. * @return ERROR_SUCCESS on success; Win32 error code otherwise.
*/ */
typedef WINTUN_STATUS( typedef WINTUN_STATUS(
WINAPI *WINTUN_ENUM_ADAPTERS_FUNC)(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_FUNC Func, _In_ LPARAM Param); WINAPI *WINTUN_ENUM_ADAPTERS_FUNC)(_In_z_ const WCHAR *Pool, _In_ WINTUN_ENUM_CALLBACK_FUNC Callback, _In_ LPARAM Param);
/** /**
* Releases Wintun adapter resources. * Releases Wintun adapter resources.
@ -210,7 +210,7 @@ typedef enum _WINTUN_LOGGER_LEVEL
* *
* @return Anything - return value is ignored. * @return Anything - return value is ignored.
*/ */
typedef BOOL(CALLBACK *WINTUN_LOGGER_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message); typedef BOOL(CALLBACK *WINTUN_LOGGER_CALLBACK_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z_ const WCHAR *Message);
/** /**
* Sets logger callback function. * Sets logger callback function.
@ -219,7 +219,7 @@ typedef BOOL(CALLBACK *WINTUN_LOGGER_FUNC)(_In_ WINTUN_LOGGER_LEVEL Level, _In_z
* 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. * NewLogger.
*/ */
typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_FUNC NewLogger); typedef void(WINAPI *WINTUN_SET_LOGGER_FUNC)(_In_ WINTUN_LOGGER_CALLBACK_FUNC NewLogger);
/** /**
* Minimum ring capacity. * Minimum ring capacity.
@ -289,7 +289,7 @@ typedef void(WINAPI *WINTUN_END_SESSION_FUNC)(_In_ WINTUN_SESSION_HANDLE Session
* ERROR_SUCCESS on success. * ERROR_SUCCESS on success.
* Regardless, if the error was returned, some packets might have been read nevertheless. * Regardless, if the error was returned, some packets might have been read nevertheless.
*/ */
typedef WINTUN_STATUS(WINAPI *WINTUN_RECEIVE_PACKETS_FUNC)( typedef WINTUN_STATUS(WINAPI *WINTUN_RECEIVE_PACKET_FUNC)(
_In_ WINTUN_SESSION_HANDLE *Session, _In_ WINTUN_SESSION_HANDLE *Session,
_Out_bytecapcount_(*PacketSize) BYTE **Packet, _Out_bytecapcount_(*PacketSize) BYTE **Packet,
_Out_ DWORD *PacketSize); _Out_ DWORD *PacketSize);