From 09561e692200fed71d618e627b41e826a20de287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= <nefarius@dhmx.at>
Date: Wed, 9 Sep 2020 20:35:39 +0200
Subject: [PATCH] Working setup Updated driver settings to universal model

---
 setup/Product.wxs            | 52 +++++++++++++++++++++++++-----------
 setup/ViGEmBusSetup.wixproj  |  6 +++++
 sys/ViGEmBus.inf             |  2 +-
 sys/ViGEmBus.vcxproj         | 20 ++++++++------
 sys/ViGEmBus.vcxproj.filters |  6 ++---
 5 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/setup/Product.wxs b/setup/Product.wxs
index 0524aa5..2000edb 100644
--- a/setup/Product.wxs
+++ b/setup/Product.wxs
@@ -8,13 +8,16 @@
   <?define Win64 = "yes" ?>
   <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
   <?define ArchDir = "x64" ?>
+  <?define WixQuietExec="WixQuietExec64"?>
   <?else ?>
   <?define bitness = "(32 bit)" ?>
   <?define Win64 = "no" ?>
   <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
   <?define ArchDir = "x86" ?>
+  <?define WixQuietExec="WixQuietExec"?>
   <?endif ?>
 
+  <!-- basic product properties -->
   <Product Id="*" Name="Nefarius Virtual Gamepad Emulation Bus Driver" Language="1033" Version="1.0.0.0"
            Manufacturer="Nefarius Software Solutions e.U."
            UpgradeCode="b935b0e2-a67f-4f2f-88de-2457dbd70c6e">
@@ -29,30 +32,47 @@
     <Property Id="ARPURLINFOABOUT" Value="https://github.com/ViGEm/ViGEmBus" />
     <Property Id="ARPNOMODIFY" Value="1" />
 
+    <!-- always perform major upgrade and remove previous versions -->
+    <Property Id="PREVIOUSVERSIONSINSTALLED" Secure="yes" />
+    <Upgrade Id="b935b0e2-a67f-4f2f-88de-2457dbd70c6e">
+      <UpgradeVersion
+        Minimum="1.0.0.0" Maximum="99.0.0.0"
+        Property="PREVIOUSVERSIONSINSTALLED"
+        IncludeMinimum="yes" IncludeMaximum="no" />
+    </Upgrade>
+
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Feature Id="ProductFeature" Title="Nefarius Virtual Gamepad Emulation Bus Driver" Level="1">
       <ComponentGroupRef Id="ProductComponents" />
     </Feature>
 
-    <CustomAction Id="DevconInstall"
-                  Directory="INSTALLFOLDER"
-                  ExeCommand="[INSTALLFOLDER]devcon.exe install .\ViGEmBus.inf Nefarius\ViGEmBus\Gen1"
-                  Execute="deferred" 
-                  Impersonate="no" />
+    <!-- build installation command -->
+    <CustomAction Id="DevconInstallPropertyAssign"
+                  Property="DevconInstallQuiet"
+                  Value="&quot;[INSTALLFOLDER]devcon.exe&quot; install &quot;[INSTALLFOLDER]ViGEmBus.inf&quot; Nefarius\ViGEmBus\Gen1"
+                  Execute="immediate" />
 
-    <CustomAction Id="DevconRemove"
-                  Directory="INSTALLFOLDER"
-                  ExeCommand="[INSTALLFOLDER]devcon.exe remove &quot;Nefarius\ViGEmBus\Gen1&quot;"
-                  Execute="deferred" 
-                  Impersonate="no" />
+    <!-- execute installation with suppressed UI -->
+    <CustomAction Id="DevconInstallQuiet" BinaryKey="WixCA" DllEntry="$(var.WixQuietExec)"
+                  Execute="deferred" Return="check" Impersonate="no" />
 
+    <!-- build removal command -->
+    <CustomAction Id="DevconRemovePropertyAssign"
+                  Property="DevconRemoveQuiet"
+                  Value="&quot;[INSTALLFOLDER]devcon.exe&quot; remove &quot;Nefarius\ViGEmBus\Gen1&quot;"
+                  Execute="immediate" />
+
+    <!-- execute removal with suppressed UI -->
+    <CustomAction Id="DevconRemoveQuiet" BinaryKey="WixCA" DllEntry="$(var.WixQuietExec)"
+                  Execute="deferred" Return="ignore" Impersonate="no" />
+
+    <!-- custom installation and removal actions -->
     <InstallExecuteSequence>
-      <Custom Action="DevconInstall" Before="InstallFinalize" />
-    </InstallExecuteSequence>
-
-    <InstallExecuteSequence>
-      <Custom Action='DevconRemove' After='InstallInitialize'>REMOVE="ALL"</Custom>
+      <Custom Action="DevconInstallPropertyAssign" Before="DevconInstallQuiet">NOT Installed AND NOT REMOVE</Custom>
+      <Custom Action="DevconRemovePropertyAssign" Before="DevconRemoveQuiet">REMOVE="ALL"</Custom>
+      <Custom Action="DevconInstallQuiet" Before="InstallFinalize">NOT Installed AND NOT REMOVE</Custom>
+      <Custom Action='DevconRemoveQuiet' After='InstallInitialize'>REMOVE="ALL"</Custom>
     </InstallExecuteSequence>
   </Product>
 
@@ -72,7 +92,9 @@
         <File Name="ViGEmBus.sys" Source="$(var.SolutionDir)\drivers\$(var.ArchDir)\ViGEmBus.sys" />
         <File Name="ViGEmBus.inf" Source="$(var.SolutionDir)\drivers\$(var.ArchDir)\ViGEmBus.inf" />
         <File Name="ViGEmBus.cat" Source="$(var.SolutionDir)\drivers\$(var.ArchDir)\ViGEmBus.cat" />
+        <File Name="WdfCoinstaller01009.dll" Source="$(var.SolutionDir)\drivers\$(var.ArchDir)\WdfCoinstaller01009.dll" />
         <File Name="devcon.exe" Source="$(var.SolutionDir)\drivers\$(var.ArchDir)\devcon.exe" />
+        <File Name="LICENSE" Source="$(var.SolutionDir)\LICENSE" />
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/setup/ViGEmBusSetup.wixproj b/setup/ViGEmBusSetup.wixproj
index 643935c..0ca49bd 100644
--- a/setup/ViGEmBusSetup.wixproj
+++ b/setup/ViGEmBusSetup.wixproj
@@ -34,6 +34,12 @@
   <ItemGroup>
     <Content Include="ViGEm.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
diff --git a/sys/ViGEmBus.inf b/sys/ViGEmBus.inf
index 0e1f134..0d90220 100644
--- a/sys/ViGEmBus.inf
+++ b/sys/ViGEmBus.inf
@@ -78,7 +78,7 @@ AddService = ViGEmBus,%SPSVCINST_ASSOCSERVICE%, ViGEmBus_Service_Inst
 [ViGEmBus_Service_Inst]
 DisplayName    = %ViGEmBus.SVCDESC%
 ServiceType    = 1               ; SERVICE_KERNEL_DRIVER
-StartType      = 3               ; SERVICE_DEMAND_START
+StartType      = 1               ; SERVICE_SYSTEM_START
 ErrorControl   = 1               ; SERVICE_ERROR_NORMAL
 ServiceBinary  = %12%\ViGEmBus.sys
 
diff --git a/sys/ViGEmBus.vcxproj b/sys/ViGEmBus.vcxproj
index 4db0f01..4e545fb 100644
--- a/sys/ViGEmBus.vcxproj
+++ b/sys/ViGEmBus.vcxproj
@@ -32,46 +32,50 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
+    <TargetVersion>
+    </TargetVersion>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
     <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>9</KMDF_VERSION_MINOR>
     <ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
+    <TargetVersion>
+    </TargetVersion>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
     <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>9</KMDF_VERSION_MINOR>
     <ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
     <SignMode>Off</SignMode>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
+    <TargetVersion>
+    </TargetVersion>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
     <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>9</KMDF_VERSION_MINOR>
     <ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <TargetVersion>Windows7</TargetVersion>
+    <TargetVersion>
+    </TargetVersion>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
     <ConfigurationType>Driver</ConfigurationType>
     <DriverType>KMDF</DriverType>
-    <DriverTargetPlatform>Desktop</DriverTargetPlatform>
+    <DriverTargetPlatform>Universal</DriverTargetPlatform>
     <KMDF_VERSION_MAJOR>1</KMDF_VERSION_MAJOR>
     <KMDF_VERSION_MINOR>9</KMDF_VERSION_MINOR>
     <ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
diff --git a/sys/ViGEmBus.vcxproj.filters b/sys/ViGEmBus.vcxproj.filters
index 996ec62..4da282a 100644
--- a/sys/ViGEmBus.vcxproj.filters
+++ b/sys/ViGEmBus.vcxproj.filters
@@ -33,9 +33,6 @@
     <ClInclude Include="trace.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\client\include\ViGEm\km\BusShared.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -57,6 +54,9 @@
     <ClInclude Include="Driver.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\sdk\include\ViGEm\km\BusShared.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="XusbPdo.cpp">