=== modified file 'test/my_param.c'

=== modified file 'wix/mysql-connector-odbc-msi-arpprops.xml'
--- wix/mysql-connector-odbc-msi-arpprops.xml	2010-09-09 18:55:09 +0000
+++ wix/mysql-connector-odbc-msi-arpprops.xml	2010-09-23 18:09:41 +0000
@@ -19,7 +19,11 @@
   <Icon Id="MySQLConnector.ico" SourceFile="$(var.odbc_resource)/MySQLConnector.ico" />
 
   <!-- Set up ARPINSTALLLOCATION property -->
-  <CustomAction Id="SetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+  <?if $(var.odbc_64bit) = 1 ?>
+  <CustomAction Id="SetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[Connector_ODBC_64]" />
+  <?else ?>
+  <CustomAction Id="SetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[Connector_ODBC_32]" />
+  <?endif ?>
   <CustomAction Id="SetARPREADME" Property="ARPREADME" Value="[INSTALLDIR]README" />
 
   <!-- Sequences -->

=== modified file 'wix/mysql_common_ui.xml'
--- wix/mysql_common_ui.xml	2010-08-19 15:37:55 +0000
+++ wix/mysql_common_ui.xml	2010-09-23 17:15:05 +0000
@@ -23,6 +23,7 @@
 -->
 
 <Include>
+  <Property Id="InstallPath2" Value="dummy" />
   <UI>
     <Property Id="ErrorDialog">SetupErrorDialog</Property>
     <Property Id="DefaultUIFont">Tahoma8</Property>
@@ -519,6 +520,14 @@
         <Publish Event="SetInstallLevel" Value="1">SetupType="Typical"</Publish>
         <Publish Event="SetInstallLevel" Value="10">SetupType="Complete"</Publish>
         <Publish Event="SetInstallLevel" Value="1">SetupType="Custom"</Publish>
+	<?if $(var.odbc_64bit) = 1 ?>
+	<Publish Property="TargetPath1" Value="64bit Driver: [Connector_ODBC_64]"><![CDATA[SetupType <> "Custom"]]></Publish>
+	<Publish Property="TargetPath2" Value="32bit Driver: [Connector_ODBC_32]"><![CDATA[SetupType <> "Custom"]]></Publish>
+	<Publish Property="TargetPath1">SetupType = "Custom"</Publish>
+	<Publish Property="TargetPath2">SetupType = "Custom"</Publish>
+	<?else ?>
+	<Publish Property="TargetPath1" Value="[Connector_ODBC_32]">1</Publish>
+	<?endif ?>
       </Control>
       
       <Control Id="Cancel" Type="PushButton" X="301" Y="243" Width="66" Height="17" Cancel="yes"
@@ -562,7 +571,9 @@
     <Dialog Id="CustomSetupDialog" Width="374" Height="266" Title="[ProductName] - Setup Wizard" NoMinimize="yes"
       TrackDiskSpace="yes">
       <Control Id="Tree" Type="SelectionTree" X="8" Y="70" Width="220" Height="118" Property="_BrowseProperty"
-        Sunken="yes" TabSkip="no" />
+        Sunken="yes" TabSkip="no">
+	<!--Condition Action="SetPath2_32">MsiSelectionTreeSelectedFeature="ODBC_32" AND MsiSelectionTreeSelectedAction=2</Condition-->
+      </Control>
       <Control Id="ChangeFolder" Type="PushButton" X="301" Y="203" Width="66" Height="17" Text="&amp;Change...">
         <Publish Event="SelectionBrowse" Value="InstallChangeFolderDialog">1</Publish>
         <Condition Action="hide">Installed</Condition>
@@ -582,14 +593,28 @@
       </Control>
       
       <Control Id="Next" Type="PushButton" X="230" Y="243" Width="66" Height="17" Default="yes"
-        Text="&amp;Next &gt;">
-        <Publish Event="NewDialog" Value="ReadyToInstallDialog">OutOfNoRbDiskSpace &lt;&gt; 1</Publish>
+        Text="&amp;Next &gt;" Disabled="no">
+        <!--Publish Event="NewDialog" Value="ReadyToInstallDialog">OutOfNoRbDiskSpace &lt;&gt; 1</Publish-->
         <Publish Event="NewDialog" Value="OutOfSpaceDialog">OutOfNoRbDiskSpace = 1</Publish>
         <!-- in maintenance mode this dialog is called without the setuptypedialog -->
         <Publish Property="SetupType" Value="Custom">1</Publish>
-        <!-- does not work..
-        <Subscribe Event="SelectionNoItems" Attribute="Disable" />
-        -->
+	<!-- for 32bit only installer we don't need those properties here. All required is set in setup type dialog -->
+	<?if $(var.odbc_64bit) = 1 ?>
+	<Publish Property="TargetPath1" Value="64bit Driver: [Connector_ODBC_64]"><![CDATA[&ODBC_64 > 0 AND &ODBC_64 <> !ODBC_64]]></Publish>
+	<Publish Property="TargetPath2" Value="32bit Driver: [Connector_ODBC_32]"><![CDATA[(&ODBC_64 > 0 AND &ODBC_64 <> !ODBC_64) AND (&ODBC_32> 0 AND &ODBC_32 <> !ODBC_32)]]></Publish>
+	<Publish Property="TargetPath1" Value="32bit Driver: [Connector_ODBC_32]"><![CDATA[NOT (&ODBC_64 > 0 AND &ODBC_64 <> !ODBC_64)]]></Publish>
+	<Publish Property="TargetPath2"><![CDATA[(NOT (&ODBC_64 > 0 AND &ODBC_64 <> !ODBC_64)) OR (&ODBC_32 > 0 AND &ODBC_32 = !ODBC_32)]]></Publish>
+	<?endif ?>
+	<Publish Event="NewDialog" Value="ReadyToInstallDialog">
+        <?if $(var.odbc_64bit) = 1 ?>
+        <![CDATA[(&ODBC_64 > 0 AND &ODBC_64 <> !ODBC_64) OR (&ODBC_32> 0 AND &ODBC_32 <> !ODBC_32)]]>
+	<?else ?>
+	<![CDATA[&ODBC_32> 0 AND &ODBC_32 <> !ODBC_32]]>
+        <?endif ?>	
+        </Publish>
+        <!-- These 2 cenable/disable conditions don't work perfectly, but perhaps they can be improved -->
+	<!--Condition Action="disable"><![CDATA[(NOT (&ODBC_64 > 0 AND &ODBC_64 <> !ODBC_64) OR (&ODBC_32 > 0 AND &ODBC_32 <> !ODBC_32))]]></Condition>
+	<Condition Action="enable"><![CDATA[(&ODBC_64 > 0 AND &ODBC_64 <> !ODBC_64) OR (&ODBC_32 > 0 AND &ODBC_32 <> !ODBC_32)]]></Condition-->
       </Control>
       
       <Control Id="Cancel" Type="PushButton" X="301" Y="243" Width="66" Height="17" Cancel="yes"
@@ -620,8 +645,8 @@
         <Subscribe Event="SelectionPath" Attribute="Text" />
       </Control>
       <Control Id="Banner" Type="Bitmap" X="0" Y="0" Width="374" Height="44" Text="AdminHeader" />
-      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="378" Height="0" />
-      <Control Id="DlgLine" Type="Line" X="0" Y="234" Width="378" Height="0" />
+      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="374" Height="0" />
+      <Control Id="DlgLine" Type="Line" X="0" Y="234" Width="374" Height="0" />
       <Control Id="FeatureGroup" Type="GroupBox" X="235" Y="67" Width="131" Height="120" Text="Feature Description" />
     </Dialog>
 
@@ -695,7 +720,9 @@
       <Control Id="TargetFolderText1" Type="Text" X="24" Y="136" Width="306" Height="11" TabSkip="no"
         Text="Destination Folder:" />
       <Control Id="TargetFolderText2" Type="Text" X="37" Y="151" Width="306" Height="13" TabSkip="no"
-        Text="[INSTALLDIR]" />                          
+              Text="[TargetPath1]" />                          
+      <Control Id="TargetFolderText3" Type="Text" X="37" Y="166" Width="306" Height="13" TabSkip="no"
+              Text="[TargetPath2]" />                          
       <Control Id="CurrentSettingsText" Type="Text" X="19" Y="80" Width="81" Height="10" TabSkip="no"
         Text="Current Settings:" />
       <Control Id="DlgDesc" Type="Text" X="21" Y="23" Width="292" Height="25" Transparent="yes">
@@ -714,8 +741,8 @@
         <Condition Action="show">ProgressType0="install"</Condition>
       </Control>
       <Control Id="Banner" Type="Bitmap" X="0" Y="0" Width="374" Height="44" Text="AdminHeader" />
-      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="378" Height="0" />
-      <Control Id="DlgLine" Type="Line" X="0" Y="234" Width="378" Height="0" />
+      <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="372" Height="0" />
+      <Control Id="DlgLine" Type="Line" X="0" Y="234" Width="372" Height="0" />
       <Control Id="DlgText1" Type="Text" X="21" Y="54" Width="330" Height="24">
         <Text>If you want to review or change any of your installation settings, click Back. Click Cancel to exit the wizard.</Text>
       </Control>

=== modified file 'wix/mysql_odbc_fragment.xml'
--- wix/mysql_odbc_fragment.xml	2010-08-25 13:12:56 +0000
+++ wix/mysql_odbc_fragment.xml	2010-09-23 08:41:35 +0000
@@ -32,9 +32,6 @@
     -->
     <?include myodbc_version.xml ?>
 
-    <Icon Id="MySQLConnector.ico" SourceFile="$(var.odbc_resource)/MySQLConnector.ico" />
-
-  
     <!-- *****************************************************************************************
       Directories / Files
     -->