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

api: avoid loading version.dll if not used

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-11-06 10:25:15 +01:00
parent a00c8ca685
commit ed0465b8a7
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/adapter.c
View File

@ -1082,8 +1082,8 @@ static _Return_type_success_(return != FALSE) BOOL
return TRUE; return TRUE;
} }
DWORD WINAPI static DWORD WINAPI
WintunGetRunningDriverVersion(void) MaybeGetRunningDriverVersion(BOOL ReturnOneIfRunningInsteadOfVersion)
{ {
PRTL_PROCESS_MODULES Modules; PRTL_PROCESS_MODULES Modules;
ULONG BufferSize = 128 * 1024; ULONG BufferSize = 128 * 1024;
@ -1108,6 +1108,11 @@ WintunGetRunningDriverVersion(void)
const char *NtPath = (const char *)Modules->Modules[i].FullPathName; const char *NtPath = (const char *)Modules->Modules[i].FullPathName;
if (!_stricmp(&NtPath[Modules->Modules[i].OffsetToFileName], "wintun.sys")) if (!_stricmp(&NtPath[Modules->Modules[i].OffsetToFileName], "wintun.sys"))
{ {
if (ReturnOneIfRunningInsteadOfVersion)
{
Version = 1;
goto cleanupModules;
}
WCHAR FilePath[MAX_PATH * 3 + 15]; WCHAR FilePath[MAX_PATH * 3 + 15];
if (_snwprintf_s(FilePath, _countof(FilePath), _TRUNCATE, L"\\\\?\\GLOBALROOT%S", NtPath) == -1) if (_snwprintf_s(FilePath, _countof(FilePath), _TRUNCATE, L"\\\\?\\GLOBALROOT%S", NtPath) == -1)
continue; continue;
@ -1123,11 +1128,17 @@ cleanupModules:
return RET_ERROR(Version, LastError); return RET_ERROR(Version, LastError);
} }
DWORD WINAPI
WintunGetRunningDriverVersion(void)
{
return MaybeGetRunningDriverVersion(FALSE);
}
static BOOL static BOOL
EnsureWintunUnloaded(void) EnsureWintunUnloaded(void)
{ {
BOOL Loaded; BOOL Loaded;
for (int i = 0; (Loaded = WintunGetRunningDriverVersion() != 0) != FALSE && i < 300; ++i) for (int i = 0; (Loaded = MaybeGetRunningDriverVersion(TRUE) != 0) != FALSE && i < 300; ++i)
Sleep(50); Sleep(50);
return !Loaded; return !Loaded;
} }