Implement 32-bit installer

Author: eiz

SarInstaller/Product.wxs

@@ -24,17 +24,27 @@
     <UIRef Id="WixUI_Minimal"/>
 
 		<Feature Id="Main" Title="Synchronous Audio Router" Level="1">
-      <ComponentRef Id="KernelDriver64"/>
-      <?if $(var.Platform) = x86 ?>
+      <?if $(var.Platform) = x64 ?>
+        <ComponentRef Id="KernelDriver64"/>
+      <?else ?>
         <ComponentRef Id="KernelDriver32"/>
       <?endif ?>
-      <ComponentRef Id="AsioDriver64"/>
-      <ComponentRef Id="AsioDriver64_32"/>
-      <!--<ComponentRef Id="AsioDriver32"/>-->
+
+      <?if $(var.Platform) = x64 ?>
+        <ComponentRef Id="AsioDriver64"/>
+        <ComponentRef Id="AsioDriver64_32"/>
+      <?else ?>
+        <ComponentRef Id="AsioDriver32"/>
+      <?endif ?>
 		</Feature>
 
-    <Binary Id="SarInstallerActions"
-            SourceFile="..\x64\Release\SarInstallerActions.dll"/>
+    <?if $(var.Platform) = x64 ?>
+      <Binary Id="SarInstallerActions"
+              SourceFile="..\x64\Release\SarInstallerActions.dll"/>
+    <?else ?>
+      <Binary Id="SarInstallerActions"
+              SourceFile="..\Release\SarInstallerActions.dll"/>
+    <?endif ?>
 
     <CustomAction Id="CreateDeviceNode"
                   BinaryKey="SarInstallerActions"
@@ -68,6 +78,7 @@
       </Directory>
     </Directory>
 
+    <?if $(var.Platform) = x64 ?>
     <DirectoryRef Id="INSTALLDIR64">
       <Component Id="KernelDriver64"
                  Guid="{48C7E358-9797-42F7-B86D-5AA1DD3E0E44}"
@@ -190,24 +201,34 @@
                        Action="write" />
       </Component>
     </DirectoryRef>
-
+    <?else ?>
     <DirectoryRef Id="INSTALLDIR">
-      <?if $(var.Platform) = x86 ?>
-        <Component Id="KernelDriver32"
-             Guid="{865DF004-18BD-448C-A63B-BF3B758CAE99}"
-             Win64="no">
-          <File Id="SynchronousAudioRouter.sys"
-                Source="..\Release\SynchronousAudioRouter.sys"
-                KeyPath="yes"/>
-        </Component>
-      <?endif ?>
-
-      <!--<Component Id="AsioDriver32"
-                 Guid="{FFBEFDDB-FBC6-4CE5-9187-267DE9BB93D9}"
+      <Component Id="KernelDriver32"
+                 Guid="{865DF004-18BD-448C-A63B-BF3B758CAE99}"
                  Win64="no">
+        <File Id="SynchronousAudioRouter.sys"
+              Name="SynchronousAudioRouter.sys"
+              Source="..\Release\SynchronousAudioRouter.sys"
+              KeyPath="yes"/>
+        <File Id="SynchronousAudioRouter.cat"
+              Name="SynchronousAudioRouter.cat"
+              Source="..\Release\SynchronousAudioRouter\SynchronousAudioRouter.cat"
+              KeyPath="no"/>
+        <File Id="SynchronousAudioRouter.inf"
+              Name="SynchronousAudioRouter.inf"
+              Source="..\Release\SynchronousAudioRouter\SynchronousAudioRouter.inf"
+              KeyPath="no"/>
+        <difx:Driver PlugAndPlayPrompt="no"/>
+      </Component>
+
+      <Component Id="AsioDriver32"
+           Guid="{FFBEFDDB-FBC6-4CE5-9187-267DE9BB93D9}"
+           Win64="no">
         <File Id="SarAsio.dll"
+              Name="SarAsio.dll"
               Source="..\Release\SarAsio.dll"
               KeyPath="yes"/>
+        <!--<File Id="SarCtl.exe" Source="..\x64\Release\SarCtl.exe" KeyPath="no"/>-->
         <RegistryValue Root="HKCR"
                        Key="CLSID\{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}\InProcServer32"
                        Value="[#SarAsio.dll]"
@@ -219,6 +240,17 @@
                        Value="Apartment"
                        Type="string"
                        Action="write" />
+        <RegistryValue Root="HKCR"
+                       Key="CLSID\{9FB96668-9EDD-4574-AD77-76BD89659D5D}\InProcServer32"
+                       Value="[#SarAsio.dll]"
+                       Type="string"
+                       Action="write" />
+        <RegistryValue Root="HKCR"
+                       Key="CLSID\{9FB96668-9EDD-4574-AD77-76BD89659D5D}\InProcServer32"
+                       Name="ThreadingModel"
+                       Value="both"
+                       Type="string"
+                       Action="write" />
         <RegistryValue Root="HKCR"
                        Key="CLSID\{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}\ProgID"
                        Value="SynchronousAudioRouter.1"
@@ -229,17 +261,18 @@
                        Value="Synchronous Audio Router ASIO"
                        Type="string"
                        Action="write" />
-        <RegistryValue Root="HKLM" Key="Software\ASIO\Synchronous Audio Router"
+        <RegistryValue Root="HKLM" Key="SOFTWARE\ASIO\Synchronous Audio Router"
                        Name="CLSID" Value="{0569D852-1F6A-44A7-B7B5-EFB78B66BE21}"
                        Type="string"
                        Action="write" />
         <RegistryValue Root="HKLM"
-                       Key="Software\ASIO\Synchronous Audio Router"
+                       Key="SOFTWARE\ASIO\Synchronous Audio Router"
                        Name="Description"
                        Value="Synchronous Audio Router"
                        Type="string"
                        Action="write" />
-      </Component>-->
+      </Component>
     </DirectoryRef>
+    <?endif ?>
 	</Product>
 </Wix>

SarInstallerActions/SarInstallerActions.vcxproj

@@ -22,6 +22,7 @@
     <ProjectGuid>{D7CBDD84-368E-4E50-8196-8BF372DF648E}</ProjectGuid>
     <RootNamespace>SarInstallerActions</RootNamespace>
     <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -66,8 +67,6 @@
     <_ProjectFileVersion>14.0.23107.0</_ProjectFileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>bin\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
     <LinkIncremental>true</LinkIncremental>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />
@@ -80,8 +79,6 @@
     <CodeAnalysisRuleAssemblies />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>bin\$(Configuration)\</OutDir>
-    <IntDir>obj\$(Configuration)\</IntDir>
     <LinkIncremental>false</LinkIncremental>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules />

SynchronousAudioRouter.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.24720.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SynchronousAudioRouter", "SynchronousAudioRouter\SynchronousAudioRouter.vcxproj", "{E918EA5F-86DD-4175-A879-D0C143290750}"
 EndProject
@@ -80,6 +80,7 @@ Global
 		{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x64.ActiveCfg = Release|x64
 		{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x64.Build.0 = Release|x64
 		{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x86.ActiveCfg = Release|x86
+		{C13B0688-9AE1-412F-83C7-1745C303C4B3}.Release|x86.Build.0 = Release|x86
 		{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Debug|ARM.ActiveCfg = Debug|Win32
 		{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{D7CBDD84-368E-4E50-8196-8BF372DF648E}.Debug|x64.ActiveCfg = Debug|Win32