From a32ab8059e9b0f888dcc2f8d6ecab81c43d4805a Mon Sep 17 00:00:00 2001
From: Rod Widdowson <rdw@steadingsoftware.com>
Date: Sun, 13 May 2012 16:06:35 +0000
Subject: [PATCH] Complete dialog as per current installer.  More tinkering
 required

---
 msi/WiX/Compile.bat                   | 13 ++++-
 msi/WiX/ShibbolethSP-Gui.wxi          | 29 -----------
 msi/WiX/ShibbolethSP-gui.wxs          | 91 +++++++++++++++++++++++++++++++++++
 msi/WiX/ShibbolethSP-iis-dialog.wxs   | 60 +++++++++++++++++++++++
 msi/WiX/ShibbolethSP-main-x64.wxs     |  6 ++-
 msi/WiX/ShibbolethSP-main-x86.wxs     |  4 +-
 msi/WiX/ShibbolethSP-noarch.wxs       |  4 +-
 msi/WiX/ShibbolethSP-shibd-dialog.wxs | 78 ++++++++++++++++++++++++++++++
 8 files changed, 250 insertions(+), 35 deletions(-)
 delete mode 100644 msi/WiX/ShibbolethSP-Gui.wxi
 create mode 100644 msi/WiX/ShibbolethSP-gui.wxs
 create mode 100644 msi/WiX/ShibbolethSP-iis-dialog.wxs
 create mode 100644 msi/WiX/ShibbolethSP-shibd-dialog.wxs

diff --git a/msi/WiX/Compile.bat b/msi/WiX/Compile.bat
index c94cff6..2f09089 100644
--- a/msi/WiX/Compile.bat
+++ b/msi/WiX/Compile.bat
@@ -13,12 +13,21 @@ candle ShibbolethSP-exe-x86.wxs
 wixcop -indent:2 ShibbolethSP-registry-x86.wxs
 candle ShibbolethSP-registry-x86.wxs
 
+wixcop -indent:2 ShibbolethSP-gui.wxs
+candle ShibbolethSP-gui.wxs
+
+wixcop -indent:2 ShibbolethSP-shibd-dialog.wxs
+candle ShibbolethSP-shibd-dialog.wxs
+
+wixcop -indent:2 ShibbolethSP-iis-dialog.wxs
+candle ShibbolethSP-iis-dialog.wxs
+
 wixcop -indent:2 ShibbolethSP-main-x64.wxs
 candle ShibbolethSP-main-x64.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj -ext WixUtilExtension.dll -ext WixUIExtension
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x64.msi ShibbolethSP-main-x64.wixobj ShibbolethSP-exe-x64.wixobj ShibbolethSP-registry-x64.wixobj  ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension
 
 wixcop -indent:2 ShibbolethSP-main-x86.wxs
 candle ShibbolethSP-main-x86.wxs
-light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj -ext WixUtilExtension.dll -ext WixUIExtension
+light -sw1055 -sice:ICE82 -o ShibbolethSP-main-x86.msi ShibbolethSP-main-x86.wixobj ShibbolethSP-noarch.wixobj ShibbolethSP-exe-x86.wixobj ShibbolethSP-registry-x86.wixobj ShibbolethSP-shibd-dialog.wixobj ShibbolethSP-iis-dialog.wixobj ShibbolethSP-gui.wixobj -ext WixUtilExtension.dll -ext WixUIExtension
 
 
diff --git a/msi/WiX/ShibbolethSP-Gui.wxi b/msi/WiX/ShibbolethSP-Gui.wxi
deleted file mode 100644
index 9d80b11..0000000
--- a/msi/WiX/ShibbolethSP-Gui.wxi
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!-- Licensed to the University Corporation for Advanced Internet
-     Development, Inc. (UCAID) under one or more contributor license
-     agreements.  See the NOTICE file distributed with this work for
-     additional information regarding copyright ownership. The UCAID
-     licenses this file to You under the Apache License, Version 2.0
-     (the 'License'); you may not use this file except in compliance
-     with the License.  You may obtain a copy of the License at
-     
-     http://www.apache.org/licenses/LICENSE-2.0
-     
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an 'AS IS' BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-     implied.  See the License for the specific language governing
-     permissions and limitations under the License.  -->
-
-<Include>
-
-  <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
-  <UIRef Id="WixUI_InstallDir" />
-
-  <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
-  <WixVariable Id="WixUIBannerBmp" Value="TopBanner.bmp" />
-  <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />
-
-
-</Include>
diff --git a/msi/WiX/ShibbolethSP-gui.wxs b/msi/WiX/ShibbolethSP-gui.wxs
new file mode 100644
index 0000000..15dcc9c
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-gui.wxs
@@ -0,0 +1,91 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+     Development, Inc. (UCAID) under one or more contributor license
+     agreements.  See the NOTICE file distributed with this work for
+     additional information regarding copyright ownership. The UCAID
+     licenses this file to You under the Apache License, Version 2.0
+     (the 'License'); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an 'AS IS' BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+     implied.  See the License for the specific language governing
+     permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Fragment>
+
+    <!-- our local copy of the InstallDir Dialog  from the Wix Sources under CPT.txt -->
+    <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
+    <WixVariable Id="WixUIBannerBmp" Value="TopBanner.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="Dialog.bmp" />
+
+    <UI Id="Shib_InstallDir">
+      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+      <Property Id="WixUI_Mode" Value="InstallDir" />
+      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
+
+      <DialogRef Id="BrowseDlg" />
+      <DialogRef Id="DiskCostDlg" />
+      <DialogRef Id="ErrorDlg" />
+      <DialogRef Id="FatalError" />
+      <DialogRef Id="FilesInUse" />
+      <DialogRef Id="MsiRMFilesInUse" />
+      <DialogRef Id="PrepareDlg" />
+      <DialogRef Id="ProgressDlg" />
+      <DialogRef Id="ResumeDlg" />
+      <DialogRef Id="UserExit" />
+
+      <!-- Our dialogs -->
+      <DialogRef Id="ShibdDlg" />
+      <DialogRef Id="IISDlg" />
+
+      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+      <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>
+
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="ShibdDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+      <Publish Dialog="ShibdDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
+      <Publish Dialog="ShibdDlg" Control="Next" Event="NewDialog" Value="IISDlg">1</Publish>
+
+      <Publish Dialog="IISDlg" Control="Back" Event="NewDialog" Value="ShibdDlg">1</Publish>
+      <Publish Dialog="IISDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="IISDlg" Order="1">NOT Installed</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+    </UI>
+
+    <UIRef Id="WixUI_Common" />
+
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-iis-dialog.wxs b/msi/WiX/ShibbolethSP-iis-dialog.wxs
new file mode 100644
index 0000000..4564712
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-iis-dialog.wxs
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Fragment>
+    <UI>
+      <Dialog Id='IISDlg' Width='370' Height='270' Title='[ProductName] Setup' >
+        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Default='yes' 
+                 Text='!(loc.WixUINext)' />
+        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' 
+                 Text='!(loc.WixUIBack)' />
+        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Cancel='yes' 
+                 Text='!(loc.WixUICancel)'>
+          <Publish Event='SpawnDialog' Value='CancelDlg'>1</Publish>
+        </Control>
+
+        <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' 
+                 Text='{\WixUI_Font_Title}Install ISAPI Filter' />
+        <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' 
+                 Text='!(loc.InstallDirDlgBannerBitmap)' />
+        <Control Id='Description' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes'
+                 NoPrefix='yes' Text='Install the ISAPI filter for IIS' />
+        <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />
+        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />
+
+
+        <Control Id='IISLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
+                 Text='This will install the ISAPI filter for IIS, register the specified file extension and create a Web Services Extension entry (IIS 6 and later).'/>
+        <Control Id='InstallISAPICheckBox' Type='CheckBox' X='86' Y='154' Width='180' Height='14' 
+                 Property='INSTALL_ISAPI_FILTER' Text='Install ISAPI filter and configure IIS' 
+                 CheckBoxValue='TRUE' TabSkip='yes' />
+
+        <Control Id='ShibExtensionBox' Type='GroupBox' X='99' Y='165' Width='175' Height='35' TabSkip='yes' />
+        <Control Id='ShibExtensionText' Type='Text' X='114' Y='180' Width='96' Height='12' 
+                 Text='Shibboleth File Extension:' TabSkip='yes'/>
+        <Control Id='ShibExtensionEdit' Type='Edit' X='211' Y='177' Width='51' Height='16' 
+                 Property='SHIB_FILE_EXTENSION' TabSkip='yes'>
+          <Condition Action='disable'>INSTALL_ISAPI_FILTER &lt;&gt; "TRUE"</Condition>
+          <Condition Action='enable'>INSTALL_ISAPI_FILTER = "TRUE"</Condition>
+        </Control>
+
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
diff --git a/msi/WiX/ShibbolethSP-main-x64.wxs b/msi/WiX/ShibbolethSP-main-x64.wxs
index 1da3e15..7377aaf 100644
--- a/msi/WiX/ShibbolethSP-main-x64.wxs
+++ b/msi/WiX/ShibbolethSP-main-x64.wxs
@@ -37,9 +37,13 @@
 
     <Media Id='1' Cabinet='product.cab' EmbedCab='yes' />
 
+
     <?include ShibbolethSP-properties.wxi?>
 
-    <?include ShibbolethSP-gui.wxi ?>
+    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
+    <Property Id='IS64BITINSTALL' Value='TRUE'/>
+    <UIRef Id="Shib_InstallDir"/>
+
 
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
diff --git a/msi/WiX/ShibbolethSP-main-x86.wxs b/msi/WiX/ShibbolethSP-main-x86.wxs
index 4921d6b..280b010 100644
--- a/msi/WiX/ShibbolethSP-main-x86.wxs
+++ b/msi/WiX/ShibbolethSP-main-x86.wxs
@@ -40,7 +40,9 @@
 
     <?include ShibbolethSP-properties.wxi?>
 
-    <?include ShibbolethSP-gui.wxi ?>
+    <!-- NOTE we should not use sys.BUILDARCH since that reflects the candle parameters, *NOT* the architecture -->
+    <Property Id='IS64BITINSTALL' Value='FALSE'/>
+    <UIRef Id="Shib_InstallDir"/>
 
     <!-- Files -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
diff --git a/msi/WiX/ShibbolethSP-noarch.wxs b/msi/WiX/ShibbolethSP-noarch.wxs
index fda3ae9..462a111 100644
--- a/msi/WiX/ShibbolethSP-noarch.wxs
+++ b/msi/WiX/ShibbolethSP-noarch.wxs
@@ -225,9 +225,9 @@
       <!-- set service path to 64 bit one if this is an install and if we werre told to -->
 
       <Custom Action='SetServicePath64' 
-              Before='CostInitialize'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT)</Custom>
+              Before='CostInitialize'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")</Custom>
       <Custom Action='ServicePath64' 
-              After='InstallServices'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT)</Custom>
+              After='InstallServices'>(NOT Installed) AND (INSTALL_SHIBD_SERVICE = "TRUE") AND (NOT ALREADYINSTALLED) AND (NOT INSTALL_32BIT) AND (IS64BITINSTALL = "TRUE")</Custom>
 
 
       <!-- Do not mess with SCM if this is an upgrade -->
diff --git a/msi/WiX/ShibbolethSP-shibd-dialog.wxs b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
new file mode 100644
index 0000000..a1485f7
--- /dev/null
+++ b/msi/WiX/ShibbolethSP-shibd-dialog.wxs
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<!-- Licensed to the University Corporation for Advanced Internet
+   Development, Inc. (UCAID) under one or more contributor license
+   agreements.  See the NOTICE file distributed with this work for
+   additional information regarding copyright ownership. The UCAID
+   licenses this file to You under the Apache License, Version 2.0
+   (the 'License'); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an 'AS IS' BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied.  See the License for the specific language governing
+   permissions and limitations under the License.  -->
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+  <Fragment>
+    <UI>
+      <Dialog Id='ShibdDlg' Width='370' Height='270' Title='[ProductName] Setup'>
+        <Control Id='Next' Type='PushButton' X='236' Y='243' Width='56' Height='17' Default='yes' Text='!(loc.WixUINext)' />
+        <Control Id='Back' Type='PushButton' X='180' Y='243' Width='56' Height='17' Text='!(loc.WixUIBack)' />
+        <Control Id='Cancel' Type='PushButton' X='304' Y='243' Width='56' Height='17' Cancel='yes' Text='!(loc.WixUICancel)'>
+          <Publish Event='SpawnDialog' Value='CancelDlg'>1</Publish>
+        </Control>
+
+        <Control Id='Title' Type='Text' X='15' Y='6' Width='200' Height='15' Transparent='yes' NoPrefix='yes' 
+                 Text='{\WixUI_Font_Title}Shibd Service' />
+
+        <Control Id='BannerBitmap' Type='Bitmap' X='0' Y='0' Width='370' Height='44' TabSkip='no' 
+                 Text='!(loc.InstallDirDlgBannerBitmap)' />
+
+        <Control Id='Description64' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes' NoPrefix='yes' 
+                 Text='Specify which architecture to run and the port for the Shibd daemon'>
+          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
+        </Control>
+        <Control Id='Description32' Type='Text' X='25' Y='23' Width='280' Height='15' Transparent='yes' NoPrefix='yes' Text='Specify the port for the Shibd daemon'>
+          <Condition Action='hide' >IS64BITINSTALL = "TRUE"</Condition>
+        </Control>
+
+
+        <Control Id='BannerLine' Type='Line' X='0' Y='44' Width='370' Height='0' />
+        <Control Id='BottomLine' Type='Line' X='0' Y='234' Width='370' Height='0' />
+
+        <Control Id='ShibdLine1' Type='Text' X='25' Y='60' Width='312' Height='10' 
+                 Text='Please enter the TCP port number in which the shibd daemon should run'/>
+        <Control Id='ShibdLine2' Type='Text' X='25' Y='79' Width='312' Height='20' 
+                 Text='NOTE: This is NOT the web server port and MUST be a valid Windows port number that is NOT in use by any other process!'/>
+        <Control Id='ShibdLine3' Type='Text' X='25' Y='108' Width='312' Height='20' 
+                 Text='If a copy of shibboleth.xml already exists in the installation path, it will NOT be updated with this new port number.'/>
+        <Control Id='InstallShibdCheckBox' Type='CheckBox' X='118' Y='154' Width='96' Height='14' 
+                 Property='INSTALL_SHIBD_SERVICE' Text='Install Shibd daemon' 
+                 CheckBoxValue='TRUE' TabSkip='yes' />
+
+        <Control Id='ShibdPortBox' Type='GroupBox' X='131' Y='165' Width='104' Height='35' />
+
+        <Control Id='ShibdPortText' Type='Text' X='146' Y='181' Width='40' Height='12' Text='Shibd port' >
+          <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>
+          <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>
+        </Control>
+        <Control Id='ShibdPortEnter' Type='Edit' X='187' Y='178' Width='35' Height='16' 
+                 Property='SHIBD_PORT' TabSkip='no'>
+          <Condition Action='disable'>INSTALL_SHIBD_SERVICE &lt;&gt; "TRUE"</Condition>
+          <Condition Action='enable'>INSTALL_SHIBD_SERVICE = "TRUE"</Condition>
+        </Control>
+
+        <Control Id='Install32BitShibd' Type='CheckBox' X='118' Y='205' Width='140' Height='14' 
+                 Property='INSTALL_32BIT' Text='Install 32 bit shibd and plugins' 
+                 CheckBoxValue='TRUE' TabSkip='yes'>
+          <Condition Action='hide' >IS64BITINSTALL &lt;&gt; "TRUE"</Condition>
+        </Control>
+
+      </Dialog>
+    </UI>
+  </Fragment>
+</Wix>
-- 
2.1.4