diff options
| author |   Simon Rozman <simon@rozman.si> | 2019-07-03 12:50:01 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-07-04 14:34:56 +0200 |
| commit | 6e947a3813cae970eb6e1d284116eb45b6cbed04 (patch) | |
| tree | 2537ec0f7eacda23229bd71043cacdbeca537357 | |
| parent | Declare TUN_MEMORY_TAG in network-byte order (diff) | |
| download | wintun-6e947a3813cae970eb6e1d284116eb45b6cbed04.tar.xz wintun-6e947a3813cae970eb6e1d284116eb45b6cbed04.zip | |
Add _IRQL_requires_same_ support to clang formatting
Signed-off-by: Simon Rozman <simon@rozman.si>
| -rw-r--r-- | .clang-format | 1 | ||||
| -rw-r--r-- | wintun.c | 18 |
2 files changed, 13 insertions, 6 deletions
diff --git a/.clang-format b/.clang-format index 5721c91..9bbe60a 100644 --- a/.clang-format +++ b/.clang-format @@ -78,6 +78,7 @@ StatementMacros: [ '_IRQL_requires_', '_IRQL_requires_max_', '_IRQL_requires_min_', + '_IRQL_requires_same_', '_IRQL_saves_', '_IRQL_restores_', '_IRQL_saves_global_', @@ -143,7 +143,8 @@ static volatile LONG64 TunAdapterCount; } _IRQL_requires_max_(DISPATCH_LEVEL) -_IRQL_requires_same_ static void +_IRQL_requires_same_ +static void TunIndicateStatus(_In_ NDIS_HANDLE MiniportAdapterHandle, _In_ NDIS_MEDIA_CONNECT_STATE MediaConnectState) { NDIS_LINK_STATE State = { .Header = { .Type = NDIS_OBJECT_TYPE_DEFAULT, @@ -381,7 +382,8 @@ static _Return_type_success_( return Irp; } -_IRQL_requires_same_ static BOOLEAN +_IRQL_requires_same_ +static BOOLEAN TunWontFitIntoIrp(_In_ IRP *Irp, _In_ ULONG Size, _In_ NET_BUFFER *Nb) { return (ULONG_PTR)Size < @@ -417,7 +419,8 @@ TunWriteIntoIrp(_Inout_ IRP *Irp, _Inout_ UCHAR *Buffer, _In_ NET_BUFFER *Nb, _I #define NET_BUFFER_LIST_REFCOUNT(nbl) ((volatile LONG64 *)NET_BUFFER_LIST_MINIPORT_RESERVED(nbl)) -_IRQL_requires_same_ static void +_IRQL_requires_same_ +static void TunNBLRefInit(_Inout_ TUN_CTX *Ctx, _Inout_ NET_BUFFER_LIST *Nbl) { InterlockedIncrement64(&Ctx->ActiveNBLCount); @@ -425,7 +428,8 @@ TunNBLRefInit(_Inout_ TUN_CTX *Ctx, _Inout_ NET_BUFFER_LIST *Nbl) InterlockedExchange64(NET_BUFFER_LIST_REFCOUNT(Nbl), 1); } -_IRQL_requires_same_ static void +_IRQL_requires_same_ +static void TunNBLRefInc(_Inout_ NET_BUFFER_LIST *Nbl) { ASSERT(InterlockedGet64(NET_BUFFER_LIST_REFCOUNT(Nbl))); @@ -450,7 +454,8 @@ TunNBLRefDec(_Inout_ TUN_CTX *Ctx, _Inout_ NET_BUFFER_LIST *Nbl, _In_ ULONG Send return FALSE; } -_IRQL_requires_same_ static void +_IRQL_requires_same_ +static void TunAppendNBL(_Inout_ NET_BUFFER_LIST **Head, _Inout_ NET_BUFFER_LIST **Tail, __drv_aliasesMem _In_ NET_BUFFER_LIST *Nbl) { *(*Tail ? &NET_BUFFER_LIST_NEXT_NBL(*Tail) : Head) = Nbl; @@ -652,7 +657,8 @@ TunQueueProcess(_Inout_ TUN_CTX *Ctx) } } -_IRQL_requires_same_ static void +_IRQL_requires_same_ +static void TunSetNBLStatus(_Inout_opt_ NET_BUFFER_LIST *Nbl, _In_ NDIS_STATUS Status) { for (; Nbl; Nbl = NET_BUFFER_LIST_NEXT_NBL(Nbl)) |