From 745a8ec928fba1eb0553479199e0e7cb9101a1cf Mon Sep 17 00:00:00 2001
From: bol-van <none@none.none>
Date: Tue, 30 Jul 2024 20:04:39 +0300
Subject: [PATCH] winws: fix unicode lengths

---
 binaries/win64/winws.exe              | Bin 233472 -> 233472 bytes
 binaries/win64/zapret-winws/winws.exe | Bin 233472 -> 233472 bytes
 nfq/darkmagic.c                       |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/binaries/win64/winws.exe b/binaries/win64/winws.exe
index 27beedddecbf79a4e6b199e37e35a9b1b9f478ba..a9cd32489d18ebe7a66294e9e55b21db98d3f20a 100644
GIT binary patch
delta 157
zcmZozz}K*VZ$bytR+))i{)_<|Zz)AH{+s+a+L`I%i^&c#+WzI|m>F6R@VET>_y507
z_ZpQI3=9k&-90Klfb@USm1mj3yboaBY#`64yG5k|$n)uZ<<ZN#eJvxy3!6knhL_8K
z|NqY~-_X1#rhQKg<Mur<Oes$VIPchbh6=3I=ACDkevxw>%XR}NW(QWro!blDnfpBe
DEl@uf

delta 156
zcmZozz}K*VZ$bwXkL1KIe@2Imx0Iq8|4;rK?L65jMmw<b95X}f0sfXh|Nj5?>0YC<
zf`Ng-qq|4t2ax_Ry80|LnD+t9n+xRmbhoH90C_&0uRMBrcdlh*cwv{w$nbLI@BjbP
z_~ly|n)k%C?}=gDz9)t$<*C3le*<>!6YZB=LO1fJ>nNPtZs5f1z{<FNd!ajXzXt$F
CS3UXw

diff --git a/binaries/win64/zapret-winws/winws.exe b/binaries/win64/zapret-winws/winws.exe
index 27beedddecbf79a4e6b199e37e35a9b1b9f478ba..a9cd32489d18ebe7a66294e9e55b21db98d3f20a 100644
GIT binary patch
delta 157
zcmZozz}K*VZ$bytR+))i{)_<|Zz)AH{+s+a+L`I%i^&c#+WzI|m>F6R@VET>_y507
z_ZpQI3=9k&-90Klfb@USm1mj3yboaBY#`64yG5k|$n)uZ<<ZN#eJvxy3!6knhL_8K
z|NqY~-_X1#rhQKg<Mur<Oes$VIPchbh6=3I=ACDkevxw>%XR}NW(QWro!blDnfpBe
DEl@uf

delta 156
zcmZozz}K*VZ$bwXkL1KIe@2Imx0Iq8|4;rK?L65jMmw<b95X}f0sfXh|Nj5?>0YC<
zf`Ng-qq|4t2ax_Ry80|LnD+t9n+xRmbhoH90C_&0uRMBrcdlh*cwv{w$nbLI@BjbP
z_~ly|n)k%C?}=gDz9)t$<*C3le*<>!6YZB=LO1fJ>nNPtZs5f1z{<FNd!ajXzXt$F
CS3UXw

diff --git a/nfq/darkmagic.c b/nfq/darkmagic.c
index e6e5fe2..1a859c9 100644
--- a/nfq/darkmagic.c
+++ b/nfq/darkmagic.c
@@ -1026,10 +1026,10 @@ static bool AdapterID2Name(const GUID *guid,char *name,DWORD name_len)
 						val[dwLen]='\0';
 						if (!strcmp(val,sguid))
 						{
-							namew_len = sizeof(namew)-1;
+							namew_len = sizeof(namew)-sizeof(WCHAR);
 							if ((w_win32_error = RegQueryValueExW(hkCard,L"Description",NULL,NULL,(LPBYTE)namew,&namew_len)) == ERROR_SUCCESS)
 							{
-								namew[namew_len]='\0';
+								namew[namew_len/sizeof(WCHAR)]=L'\0';
 								if (WideCharToMultiByte(CP_UTF8, 0, namew, -1, name, name_len, NULL, NULL))
 									bRet = true;
 							}