From db0053897f3c2b3096955f458f272020ac94a41f Mon Sep 17 00:00:00 2001
From: Dmitry Fleytman <dfleytma@redhat.com>
Date: Wed, 28 Oct 2015 10:07:38 +0200
Subject: msi: Add 32-bit UsbDkHelper.dll to 64-bit MSIs

Needed for WoW64 clients.

Signed-off-by: Dmitry Fleytman <dfleytma@redhat.com>
---
 Tools/Installer/UsbDkFiles.wxi     | 11 ++++++++++-
 Tools/Installer/UsbDkInstaller.wxs |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Tools/Installer/UsbDkFiles.wxi b/Tools/Installer/UsbDkFiles.wxi
index 95c9a41..d40b223 100644
--- a/Tools/Installer/UsbDkFiles.wxi
+++ b/Tools/Installer/UsbDkFiles.wxi
@@ -6,8 +6,17 @@
     <File Id="UsbDk.sys$(var.OsName)" Name="UsbDk.sys" Source="$(var.SourceSubPath)\UsbDk_Package\UsbDk.sys" Vital="yes" KeyPath="yes" DiskId="1" ProcessorArchitecture="x64"/>
     <File Id="UsbDk.inf$(var.OsName)" Name="UsbDk.inf" Source="$(var.SourceSubPath)\UsbDk_Package\UsbDk.inf" Vital="yes" KeyPath="no" DiskId="1" ProcessorArchitecture="x64"/>
     <File Id="UsbDkHelper.dll$(var.OsName)" Name="UsbDkHelper.dll" Source="$(var.SourceSubPath)\UsbDk_Package\UsbDkHelper.dll" Vital="yes" KeyPath="no" DiskId="1" ProcessorArchitecture="x64">
-        <CopyFile Id="Windows_UsbDkHelper.dll$(var.OsName)" DestinationProperty ="WindowsFolder"/>
+        <CopyFile Id="Windows_UsbDkHelper.dll$(var.OsName)" DestinationProperty ="$(var.System32Dir)"/>
     </File>
+
+    <?ifdef UsbDk64Bit ?>
+
+        <File Id="WOW64_UsbDkHelper.dll$(var.OsName)" Name="UsbDkHelper_x86.dll" Source="..\x86\$(var.SourceSubPath)\UsbDk_Package\UsbDkHelper.dll" Vital="yes" KeyPath="no" DiskId="1" ProcessorArchitecture="x64">
+            <CopyFile Id="WOW64_UsbDkHelper.dll$(var.OsName)" DestinationProperty ="$(var.SystemWOW64Dir)" DestinationName="UsbDkHelper.dll"/>
+        </File>
+
+    <?endif?>
+
     <File Id="UsbDkController.exe$(var.OsName)" Name="UsbDkController.exe" Source="$(var.SourceSubPath)\UsbDk_Package\UsbDkController.exe" Vital="yes" KeyPath="no" DiskId="1" ProcessorArchitecture="x64" />
     <File Id="UsbDkInstHelper.exe$(var.OsName)" Name="UsbDkInstHelper.exe" Source="$(var.SourceSubPath)\UsbDk_Package\UsbDkInstHelper.exe" Vital="yes" KeyPath="no" DiskId="1" ProcessorArchitecture="x64" />
     <File Id="WdfCoinstaller$(var.CoinstallerVersion).dll$(var.OsName)" Name="WdfCoinstaller$(var.CoinstallerVersion).dll" Source="$(var.SourceSubPath)\UsbDk_Package\WdfCoinstaller$(var.CoinstallerVersion).dll" Vital="yes" KeyPath="no" DiskId="1" ProcessorArchitecture="x64"/>
diff --git a/Tools/Installer/UsbDkInstaller.wxs b/Tools/Installer/UsbDkInstaller.wxs
index 7368e69..5a7459e 100644
--- a/Tools/Installer/UsbDkInstaller.wxs
+++ b/Tools/Installer/UsbDkInstaller.wxs
@@ -5,10 +5,13 @@
     <?define UsbDkPlatform=x64 ?>
     <?define UsbDkProgramFilesFolder= ProgramFiles64Folder ?>
     <?define UsbDkWin64= yes ?>
+    <?define System32Dir= "System64Folder" ?>
+    <?define SystemWOW64Dir= "SystemFolder" ?>
   <?else?>
     <?define UsbDkPlatform=x86 ?>
     <?define UsbDkProgramFilesFolder= ProgramFilesFolder ?>
     <?define UsbDkWin64= no ?>
+    <?define System32Dir= "SystemFolder" ?>
   <?endif?>
 
   <Product
-- 
cgit v1.2.3