From 0aca62b28d1b071031460269ccfd7ffdb7b3e6fd Mon Sep 17 00:00:00 2001
From: a1xd <68629610+a1xd@users.noreply.github.com>
Date: Wed, 2 Dec 2020 05:47:12 -0500
Subject: support win7 while cross-signing is still available

to be dropped by april 2021
---
 common/rawaccel-version.h  |  2 +-
 driver/driver.vcxproj      | 16 ++++++++++++----
 installer/install.manifest |  6 ++++++
 installer/installer.cpp    |  7 +++----
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/common/rawaccel-version.h b/common/rawaccel-version.h
index c9828a0..9470ca0 100644
--- a/common/rawaccel-version.h
+++ b/common/rawaccel-version.h
@@ -4,7 +4,7 @@
 #define RA_VER_MINOR 3
 #define RA_VER_PATCH 0
 
-#define RA_MIN_OS "Win10"
+#define RA_MIN_OS "Win7"
 
 #define M_STR_HELPER(x) #x
 #define M_STR(x) M_STR_HELPER(x)
diff --git a/driver/driver.vcxproj b/driver/driver.vcxproj
index d8cfd40..9034680 100644
--- a/driver/driver.vcxproj
+++ b/driver/driver.vcxproj
@@ -22,9 +22,9 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <TargetVersion>Windows10</TargetVersion>
+    <TargetVersion>Windows7</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -32,9 +32,9 @@
     <SpectreMitigation>Spectre</SpectreMitigation>
   </PropertyGroup>
   <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <TargetVersion>Windows10</TargetVersion>
+    <TargetVersion>Windows7</TargetVersion>
     <UseDebugLibraries>True</UseDebugLibraries>
-    <DriverTargetPlatform>Universal</DriverTargetPlatform>
+    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <DriverType>KMDF</DriverType>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
@@ -55,10 +55,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetName>rawaccel</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
+    <TimeStampServer>http://timestamp.globalsign.com/scripts/timstamp.dll</TimeStampServer>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetName>rawaccel</TargetName>
     <EnableInf2cat>false</EnableInf2cat>
+    <TimeStampServer>http://timestamp.globalsign.com/scripts/timstamp.dll</TimeStampServer>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
@@ -96,6 +98,9 @@
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/common;$(UM_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
+    <DriverSign>
+      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
+    </DriverSign>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
@@ -119,6 +124,9 @@
       </IgnoreAllDefaultLibraries>
       <AdditionalDependencies>%(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfLdr.lib;$(KMDF_LIB_PATH)$(KMDF_VER_PATH)\WdfDriverEntry.lib;$(DDK_LIB_PATH)wdmsec.lib;$(DDK_LIB_PATH)libcntpr.lib</AdditionalDependencies>
     </Link>
+    <DriverSign>
+      <FileDigestAlgorithm>sha256</FileDigestAlgorithm>
+    </DriverSign>
     <ResourceCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/common;$(UM_IncludePath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
diff --git a/installer/install.manifest b/installer/install.manifest
index 0478246..f9b5ea3 100644
--- a/installer/install.manifest
+++ b/installer/install.manifest
@@ -4,6 +4,12 @@
         <application>
             <!-- Windows 10 -->
             <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+            <!-- Windows 8.1 -->
+            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+            <!-- Windows 8 -->
+            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+            <!-- Windows 7 -->
+            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
         </application>
     </compatibility>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
diff --git a/installer/installer.cpp b/installer/installer.cpp
index 06f234e..916209f 100644
--- a/installer/installer.cpp
+++ b/installer/installer.cpp
@@ -1,9 +1,8 @@
-
-
 #include <iostream>
 
 #include <utility-install.hpp>
 #include <VersionHelpers.h>
+
 void add_service(const fs::path& target) {
     SC_HANDLE schSCManager = OpenSCManager(
         NULL,                    // local computer
@@ -43,8 +42,8 @@ void add_service(const fs::path& target) {
 
 int main() {
     try {
-        if (!IsWindows10OrGreater()) {
-            throw std::runtime_error("OS not supported, you need at least Windows 10");
+        if (!IsWindows7OrGreater()) {
+            throw std::runtime_error("OS not supported, you need at least Windows 7");
         }
         fs::path source = fs::path(L"driver") / DRIVER_FILE_NAME;
 
-- 
cgit v1.2.3