From 779d0e0c38d6ae2d676b6bc31a548fe4edc2de0c Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 30 Oct 2020 12:25:20 +0100
Subject: [PATCH] api: simplify driver selection by always including EV driver

When Windows 7-8.1 support is sunset, there will be no more EV driver
deployment at all.

Suggested-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Simon Rozman <simon@rozman.si>
---
 api/adapter.c    | 4 +---
 api/api.vcxproj  | 2 --
 api/resources.rc | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/api/adapter.c b/api/adapter.c
index 6ad7ec7..8ace66c 100644
--- a/api/adapter.c
+++ b/api/adapter.c
@@ -799,12 +799,10 @@ RtlGetNtVersionNumbers(_Out_opt_ DWORD *MajorVersion, _Out_opt_ DWORD *MinorVers
 static BOOL
 HaveWHQL(void)
 {
-#if defined(HAVE_EV) && defined(HAVE_WHQL)
+#if defined(HAVE_WHQL)
     DWORD MajorVersion;
     RtlGetNtVersionNumbers(&MajorVersion, NULL, NULL);
     return MajorVersion >= 10;
-#elif defined(HAVE_WHQL)
-    return TRUE;
 #else
     return FALSE;
 #endif
diff --git a/api/api.vcxproj b/api/api.vcxproj
index bb70111..3c7dca7 100644
--- a/api/api.vcxproj
+++ b/api/api.vcxproj
@@ -143,14 +143,12 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64' Or '$(Platform)'=='ARM' Or '$(Configuration)|$(Platform)'=='Debug|ARM64'">HAVE_EV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="Exists('$(OutDir)whql\')">HAVE_WHQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
     </ClCompile>
     <ResourceCompile>
       <AdditionalIncludeDirectories>..\$(Configuration)\$(WintunPlatform);..\$(Configuration);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32' Or '$(Platform)'=='x64' Or '$(Platform)'=='ARM' Or '$(Configuration)|$(Platform)'=='Debug|ARM64'">HAVE_EV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="Exists('$(OutDir)whql\')">HAVE_WHQL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">_M_IX86=600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_M_AMD64=100;%(PreprocessorDefinitions)</PreprocessorDefinitions>
diff --git a/api/resources.rc b/api/resources.rc
index e2abe18..5716b9d 100644
--- a/api/resources.rc
+++ b/api/resources.rc
@@ -6,11 +6,9 @@
 #include <windows.h>
 #include <ntverp.h>
 
-#ifdef HAVE_EV
 wintun.cat RCDATA "wintun\\wintun.cat"
 wintun.inf RCDATA "wintun\\wintun.inf"
 wintun.sys RCDATA "wintun\\wintun.sys"
-#endif
 
 #ifdef HAVE_WHQL
 wintun-whql.cat RCDATA "whql\\wintun.cat"