diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-07-21 18:19:15 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-10-30 16:50:59 +0100 |
| commit | 08e2993d2335ac3f92f5ca659b6ca9c0fab392ac (patch) | |
| tree | 0295cb335be91d3c35adae7888955a75e4b5776b /api/namespace.c | |
| parent | api: add pre-compiled header support (diff) | |
| download | wintun-08e2993d2335ac3f92f5ca659b6ca9c0fab392ac.tar.xz wintun-08e2993d2335ac3f92f5ca659b6ca9c0fab392ac.zip | |
api: cleanup
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'api/namespace.c')
| -rw-r--r-- | api/namespace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/api/namespace.c b/api/namespace.c index 7807847..c69d5b7 100644 --- a/api/namespace.c +++ b/api/namespace.c @@ -10,10 +10,10 @@ static BOOL HasInitialized = FALSE; static CRITICAL_SECTION Initializing; static BCRYPT_ALG_HANDLE AlgProvider; -static LPWSTR -NormalizeStringAlloc(_In_ NORM_FORM NormForm, _In_z_ LPCWSTR Source) +static WCHAR * +NormalizeStringAlloc(_In_ NORM_FORM NormForm, _In_z_ const WCHAR *Source) { - LPWSTR Result = NULL; + WCHAR *Result = NULL; HANDLE Heap = GetProcessHeap(); int Len = NormalizeString(NormForm, Source, -1, NULL, 0); for (int i = 0; i < 10; ++i) @@ -34,7 +34,7 @@ NormalizeStringAlloc(_In_ NORM_FORM NormForm, _In_z_ LPCWSTR Source) } static void -Bin2Hex(_In_bytecount_(Size) const void *Source, size_t Size, _Out_capcount_(Size * 2) LPWSTR Destination) +Bin2Hex(_In_bytecount_(Size) const void *Source, size_t Size, _Out_capcount_(Size * 2) WCHAR *Destination) { for (size_t i = 0; i < Size; ++i) { @@ -122,7 +122,7 @@ cleanupLeaveCriticalSection: _Check_return_ HANDLE -TakeNameMutex(_In_z_ LPCWSTR Pool) +TakeNameMutex(_In_z_ const WCHAR *Pool) { HANDLE Mutex = NULL; @@ -137,7 +137,7 @@ TakeNameMutex(_In_z_ LPCWSTR Pool) static const char mutex_label[] = "WireGuard Adapter Name Mutex Stable Suffix v1 jason@zx2c4.com"; if (!BCRYPT_SUCCESS(BCryptHashData(Sha256, (PUCHAR)mutex_label, sizeof(mutex_label) - sizeof(char), 0))) goto cleanupSha256; - LPWSTR PoolNorm = NormalizeStringAlloc(NormalizationC, Pool); + WCHAR *PoolNorm = NormalizeStringAlloc(NormalizationC, Pool); if (!PoolNorm) goto cleanupSha256; /* TODO: wireguard-go hashes UTF-8 normalized pool name. We hash UTF-16 here. */ |