drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-30 05:50:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: drygdryg:5ff3172991e0ab5a2a1cf48b7198c059f1cb0253
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64
..
compare: drygdryg:7e2ed880dc82c5bda29f73d973a4da78fabb59ab
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64

No commits in common. "5ff3172991e0ab5a2a1cf48b7198c059f1cb0253" and "7e2ed880dc82c5bda29f73d973a4da78fabb59ab" have entirely different histories.
5ff3172991 ... 7e2ed880dc

3 changed files with 18 additions and 12 deletions
Show Stats Expand all files Collapse all files

BIN
binaries/win64/winws.exe
View File

Binary file not shown.

BIN
binaries/win64/zapret-winws/winws.exe
View File

Binary file not shown.

30
nfq/darkmagic.c
View File

@ -977,7 +977,7 @@ static bool str2guid(const char* str, GUID *guid)
{ {
unsigned int u[11],k; unsigned int u[11],k;
if (36 != strlen(str) || 11 != sscanf(str, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", u+0, u+1, u+2, u+3, u+4, u+5, u+6, u+7, u+8, u+9, u+10)) if (11 != sscanf(str, "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X", u+0, u+1, u+2, u+3, u+4, u+5, u+6, u+7, u+8, u+9, u+10))
return false; return false;
guid->Data1 = u[0]; guid->Data1 = u[0];
if ((u[1] & 0xFFFF0000) || (u[2] & 0xFFFF0000)) return false; if ((u[1] & 0xFFFF0000) || (u[2] & 0xFFFF0000)) return false;
@ -1110,9 +1110,10 @@ static bool nlm_filter_match(const struct str_list_head *nlm_list)
bool bRet = true, bMatch = false; bool bRet = true, bMatch = false;
IEnumNetworks* pEnum; IEnumNetworks* pEnum;
if (SUCCEEDED(w_win32_error = pNetworkListManager->lpVtbl->GetNetworks(pNetworkListManager, NLM_ENUM_NETWORK_CONNECTED, &pEnum))) if (SUCCEEDED(w_win32_error = pNetworkListManager->lpVtbl->GetNetworks(pNetworkListManager, NLM_ENUM_NETWORK_ALL, &pEnum)))
{ {
INetwork* pNet; INetwork* pNet;
VARIANT_BOOL bIsConnected;
GUID idNet,g; GUID idNet,g;
BSTR bstrName; BSTR bstrName;
char Name[128]; char Name[128];
@ -1125,21 +1126,26 @@ static bool nlm_filter_match(const struct str_list_head *nlm_list)
break; break;
} }
if (!pNet) break; if (!pNet) break;
if (SUCCEEDED(w_win32_error = pNet->lpVtbl->GetNetworkId(pNet, &idNet)) && if (SUCCEEDED(w_win32_error = pNet->lpVtbl->get_IsConnected(pNet, &bIsConnected)) &&
SUCCEEDED(w_win32_error = pNet->lpVtbl->GetNetworkId(pNet, &idNet)) &&
SUCCEEDED(w_win32_error = pNet->lpVtbl->GetName(pNet, &bstrName))) SUCCEEDED(w_win32_error = pNet->lpVtbl->GetName(pNet, &bstrName)))
{ {
if (WideCharToMultiByte(CP_UTF8, 0, bstrName, -1, Name, sizeof(Name), NULL, NULL)) if (bIsConnected)
{ {
LIST_FOREACH(nlm, nlm_list, next) if (WideCharToMultiByte(CP_UTF8, 0, bstrName, -1, Name, sizeof(Name), NULL, NULL))
{ {
bMatch = !strcmp(Name,nlm->str) || str2guid(nlm->str,&g) && !memcmp(&idNet,&g,sizeof(GUID)); LIST_FOREACH(nlm, nlm_list, next)
if (bMatch) break; {
bMatch = !strcmp(Name,nlm->str) || str2guid(nlm->str,&g) && !memcmp(&idNet,&g,sizeof(GUID));
if (bMatch) break;
}
} }
} else
else {
{ w_win32_error = HRESULT_FROM_WIN32(GetLastError());
w_win32_error = HRESULT_FROM_WIN32(GetLastError()); bRet = false;
bRet = false; }
} }
SysFreeString(bstrName); SysFreeString(bstrName);
} }