From: Tom Yu <tlyu@mit.edu>
Date: Wed, 2 Jan 2008 23:48:36 +0000 (+0000)
Subject: pull up r20174 from trunk
X-Git-Tag: krb5-1.6.4-beta1~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9823b2b4056797a2757bc01b31a35b846cba9303;p=krb5.git

pull up r20174 from trunk

 r20174@cathode-dark-space:  jaltman | 2007-12-11 22:45:42 -0500
 ticket: new
 subject: KFW BUG: WIX: 64-bit installer attempts to uninstall 32-bit NSIS
 component: windows
 tags: pullup

 The 64-bit MSI must examine Win64 registry keys and not the 32-bit registry
 keys which is where the 32-bit NSIS installation will be detected.



ticket: 5851
version_fixed: 1.6.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20197 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/installer/wix/property.wxi b/src/windows/installer/wix/property.wxi
index b1f5c599b..1477acc07 100644
--- a/src/windows/installer/wix/property.wxi
+++ b/src/windows/installer/wix/property.wxi
@@ -2,6 +2,7 @@
 <!--
 
   Copyright (C) 2004, 2005, 2006 by the Massachusetts Institute of Technology.
+  Copyright (C) 2007 Secure Endpoints Inc.
   All rights reserved.
  
   Export of this software from the United States of America may
@@ -40,11 +41,11 @@
     <Property Id="ComponentDownload">http://web.mit.edu/kerberos</Property>
 
     <Property Id="UPGRADENSIS">
-        <RegistrySearch Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="raw"/>
+        <RegistrySearch Win64="$(var.Win64)" Id="regsrch_NSIS" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="UninstallString" Type="raw"/>
     </Property>
     
     <Property Id="NSISVERSION">
-        <RegistrySearch Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="raw" />
+        <RegistrySearch Win64="$(var.Win64)" Id="regsrch_NSISV" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Kerberos for Windows" Name="DisplayVersion" Type="raw" />
     </Property>
 
     <Property Id="CantRemoveNSISError">$(loc.CantRemoveNSIS)</Property>