Makes the Windows x64 setup default to 'Program Files' and not 'Program Files (x86)'.

resources/install/windows/heat-component-defines.xsl

@@ -12,6 +12,13 @@
   </Include>
 </xsl:template>
 
+<xsl:template match="*[local-name()='Component']">
+  <xsl:copy>
+    <xsl:attribute name="Win64">$(var.Win64)</xsl:attribute>
+    <xsl:apply-templates select="@*|node()" />
+  </xsl:copy>
+</xsl:template>
+
 <xsl:template match="@*|node()">
   <xsl:copy>
     <xsl:apply-templates select="@*|node()" /> 

resources/install/windows/installer-windows.wxs

@@ -38,8 +38,32 @@
 </Upgrade>
 
 <Directory Id="TARGETDIR" Name="SourceDir">
-  <Directory Id="ProgramFilesFolder" Name="PFiles">
+
+  <!--
+    The 64-bit MSI should default to "Program Files" and not
+    "Program Files (x86)".
+  -->
+  <?ifndef ProgramFilesFolder ?>
+    <?if $(var.Platform) = x64 ?>
+      <?define ProgramFilesFolder = ProgramFiles64Folder ?>
+    <?else ?>
+      <?define ProgramFilesFolder = ProgramFilesFolder ?>
+    <?endif ?>
+  <?endif ?>
+
+  <Directory Id="$(var.ProgramFilesFolder)" Name="PFiles">
     <Directory Id="INSTALLDIR" Name="@APP_NAME@">
+
+      <!--
+        The variable Win64 which is of YesNoType may be used in
+        component-defines.wxi.
+      -->
+      <?if $(var.Platform) = x64 ?>
+        <?define Win64 = yes ?>
+      <?else ?>
+        <?define Win64 = no ?>
+      <?endif ?>
+
       <?include component-defines.wxi ?>
     </Directory>
   </Directory>