From 66cf655d5d6b4d5ed825ef652128a439f0c50963 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@mit.edu>
Date: Wed, 28 Sep 2011 21:03:52 +0000
Subject: Installer wip.  Actually builds semi-functional kfw.msi

Still many things missing and/or misplaced

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25281 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/windows/installer/wix/config.wxi            |  16 +-
 src/windows/installer/wix/features.wxi          |  64 +-
 src/windows/installer/wix/files.wxi             | 750 ++++++++----------------
 src/windows/installer/wix/kfw.wxs               |   4 +-
 src/windows/installer/wix/lang/strings_1033.wxl |   2 +-
 src/windows/installer/wix/platform.wxi          |  35 +-
 6 files changed, 269 insertions(+), 602 deletions(-)

(limited to 'src/windows/installer')

diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi
index e1f48a8b14..813e1259fa 100644
--- a/src/windows/installer/wix/config.wxi
+++ b/src/windows/installer/wix/config.wxi
@@ -30,7 +30,7 @@
     <?include site-local.wxi?>
     
     <!-- Sanity checks -->
-    <?ifndef var.CL1200?>
+    <!-- <?ifndef var.CL1200?>
         <?ifndef var.CL1300?>
             <?ifndef var.CL1310?>
                 <?ifndef var.CL1400?>
@@ -38,24 +38,22 @@
                 <?endif?>
             <?endif?>
         <?endif?>
-    <?endif?>
+    <?endif?> -->
 
     <!-- Build type specifications -->
     <?ifndef env.CPU?>
         <?error CPU is not set ?>
     <?endif?>
+    <?define BinDir="$(env.KRB_INSTALL_DIR)\bin\"?>
+    <?define LibDir="$(env.KRB_INSTALL_DIR)\lib\"?>
     <?if $(env.CPU) = "i386"?>
         <?define InstallerVersion="110"?>
         <?define Platform="Intel"?>
         <?define Win64="no"?>
-        <?define BinDir="$(var.TargetDir)bin\i386\"?>
-        <?define LibDir="$(var.TargetDir)lib\i386\"?>
     <?elseif $(env.CPU) = "AMD64"?>
         <?define InstallerVersion="200"?>
         <?define Platform="x64"?>
         <?define Win64="yes"?>
-        <?define BinDir="$(var.TargetDir)bin\amd64\"?>
-        <?define LibDir="$(var.TargetDir)lib\amd64\"?>
     <?else?>
         <?error Unknown build type?>
     <?endif?>
@@ -63,9 +61,11 @@
     <?define KfwRegRoot="SOFTWARE\MIT\Kerberos"?>
 
     <?define DocDir="$(var.TargetDir)doc\"?>
-    <?define IncDir="$(var.TargetDir)inc\"?>
-    <?define InstallDir="$(var.TargetDir)install\"?>
+    <?define IncDir="$(var.TargetDir)include\"?>
+    <?define SrcDir="$(var.TargetDir)"?>
+    <?define InstallDir="$(var.TargetDir)windows\installer\"?>
     <?define SampleDir="$(var.TargetDir)sample\"?>
+    <?define ConfigDir=".\"?>
     <?define SystemDir="$(env.SystemRoot)\System32\"?>
 
     <?include lang\config_$(var.BuildLang).wxi?>
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi
index a15cfcd86f..fcb6d59ce8 100644
--- a/src/windows/installer/wix/features.wxi
+++ b/src/windows/installer/wix/features.wxi
@@ -57,7 +57,6 @@
 	    <?endif?>
 
             <ComponentRef Id="cmf_comerr32_dll" />
-            <ComponentRef Id="cmf_gss_exe" />
             <ComponentRef Id="cmf_gss_client_exe" />
             <ComponentRef Id="cmf_gss_server_exe" />
             <ComponentRef Id="cmf_gssapi32_dll" />
@@ -67,53 +66,26 @@
             <ComponentRef Id="cmf_kinit_exe" />
             <ComponentRef Id="cmf_klist_exe" />
             <ComponentRef Id="cmf_kpasswd_exe" />
+            <ComponentRef Id="cmf_kswitch_exe" />
             <ComponentRef Id="cmf_kvno_exe" />
             <ComponentRef Id="cmf_krb5_32_dll" />
             <ComponentRef Id="cmf_k5sprt32_dll" />
             <ComponentRef Id="cmf_krbcc32_dll" />
-            <ComponentRef Id="cmf_krbcc32s_exe" />
+            <ComponentRef Id="cmf_ccapiserver_exe" />
             <ComponentRef Id="cmf_ms2mit_exe" />
             <ComponentRef Id="cmf_mit2ms_exe" />
             <ComponentRef Id="cmf_wshelp32_dll" />
-            <ComponentRef Id="cmf_xpprof32_dll" />
+<!--            <ComponentRef Id="cmf_xpprof32_dll" /> -->
 
             <ComponentRef Id="cmf_leashw32_dll" />
 
         <?if $(var.Platform) = "Intel" ?>
-            <ComponentRef Id="cmf_leash32_exe" />
-            <ComponentRef Id="csc_leash32_exe" />
-
-            <ComponentRef Id="cmf_k524init_exe" />
-            <ComponentRef Id="cmf_kclnt32_dll" />
-            <ComponentRef Id="cmf_krb524_dll" />
-            <ComponentRef Id="cmf_krbv4w32_dll" />
-        <?endif?>
-            
-            <ComponentRef Id="cmf_nidmgr32_dll" />
-        <?if $(var.Platform) = "Intel" ?>
-            <ComponentRef Id="cmf_nidmgr32_dll_w2k" />
-        <?endif?>
-            <ComponentRef Id="cmf_krb5cred_dll" />
-            <ComponentRef Id="cmf_krb5cred_en_us_dll" />
-        <?if $(var.Platform) = "Intel" ?>
-            <ComponentRef Id="cmf_krb4cred_dll" />
-            <ComponentRef Id="cmf_krb4cred_en_us_dll" />
-        <?endif?>
-            <ComponentRef Id="cmf_netidmgr_exe" />
-        <?if $(var.Platform) = "Intel" ?>
-            <ComponentRef Id="cmf_netidmgr_exe_w2k" />
+<!--            <ComponentRef Id="cmf_leash32_exe" /> -->
+<!--            <ComponentRef Id="csc_leash32_exe" /> -->
         <?endif?>
 	    <ComponentRef Id="cmf_kfwlogon_DLL" />
             <ComponentRef Id="cmf_kfwcpcc_EXE" />
 
-        <?if $(var.Platform) = "Intel" ?>
-            <!-- Kerberos IV options -->
-            <ComponentRef Id="rcm_krb4_1" />
-            <ComponentRef Id="rcm_krb4_2" />
-            <ComponentRef Id="rcm_krb4_3" />
-            <ComponentRef Id="rcm_krb4_4" />
-        <?endif?>
-            
             <!-- Kerberos V options -->
             <ComponentRef Id="rcm_krb5_1" />
             <ComponentRef Id="rcm_krb5_2" />
@@ -127,11 +99,11 @@
             <ComponentRef Id="rcm_leash_5" />
             <ComponentRef Id="rcm_leash_6" />
             
-        <?ifdef OldHelp?>
+<!--        <?ifdef OldHelp?>
             <ComponentRef Id="cmf_leash32_hlp" />
         <?else?>
             <ComponentRef Id="cmf_leash32_chm" />
-        <?endif?>
+        <?endif?> -->
         <?endif?>
             
             <!-- Leash dll options -->
@@ -163,12 +135,11 @@
             
             <Feature Id="feaKfwLeashStartup" AllowAdvertise="no" Display="hidden" Level="130">
                 <Condition Level="30">LEASHAUTOSTART = 1</Condition>
-                <ComponentRef Id="csc_NetIDMgrStartup" />
                 <?if $(var.Platform) = "Intel"?>
-                        <ComponentRef Id="csc_LeashStartup" />
+<!--                        <ComponentRef Id="csc_LeashStartup" /> -->
                 <?endif?>
             </Feature>
-
+            <ComponentRef Id="cmf_remove_folder" />
             <?include runtime.wxi?>
         </Feature> <!-- /feaKfwClient -->
         
@@ -180,32 +151,23 @@
             Level="130" 
             Title="$(loc.KerberosSDKTitle)">
             
-            <ComponentRef Id="cmp_dirdoc_netid" />
         <?if $(var.Platform) = "Intel" ?>
-            <ComponentRef Id="cmp_dirinc_kclient" />
-            <ComponentRef Id="cmp_dirinc_krb4" />
             <ComponentRef Id="cmp_dirlib_i386" />
         <?else?>
             <ComponentRef Id="cmp_dirlib_amd64" />
         <?endif?>
             <ComponentRef Id="cmp_dirinc_krb5_gssapi" />
-            <ComponentRef Id="cmp_dirinc_krb5_KerberosIV" />
             <ComponentRef Id="cmp_dirinc_krb5_krb5" />
             <ComponentRef Id="cmp_dirinc_krb5" />
-            <ComponentRef Id="cmp_dirinc_krbcc" />
+<!--            <ComponentRef Id="cmp_dirinc_krbcc" /> -->
             <ComponentRef Id="cmp_dirinc_leash" />
             <ComponentRef Id="cmp_dirinc_loadfuncs" />
             <ComponentRef Id="cmp_dirinc_wshelper" />
             <ComponentRef Id="cmp_dirinc_wshelper_arpa" />
-	    <ComponentRef Id="cmp_dirinc_netidmgr" />
-            <ComponentRef Id="cmp_dirinstall_nsis" />
             <ComponentRef Id="cmp_dirinstall_wix" />
             <ComponentRef Id="cmp_dirinstall_wix_lang" />
             <ComponentRef Id="cmp_dirinstall_wix_Binary" />
             <ComponentRef Id="cmp_dirinstall_wix_custom" />
-            <ComponentRef Id="cmp_credprov_files" />
-            <ComponentRef Id="cmp_credprov_images_files" />
-            <ComponentRef Id="cmp_credprov_en_us_files" />
             <ComponentRef Id="rcm_common" />
             <ComponentRef Id="rcm_sdk" />
         </Feature> <!-- /feaKfwSDK -->
@@ -218,11 +180,9 @@
             Level="30" 
             Title="$(loc.KerberosDocTitle)">
 
-            <?if $(var.Platform) = "Intel"?>
+<!--            <?if $(var.Platform) = "Intel"?>
                     <ComponentRef Id="efl_leash_userdoc_pdf" />
-            <?endif?>
-            <ComponentRef Id="efl_netidmgr_userdoc_pdf" />
-            <ComponentRef Id="efl_relnotes_html" />
+            <?endif?> -->
             
             <ComponentRef Id="rcm_common" />
             <ComponentRef Id="rcm_docs" />
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 5a391d03df..b73a2fd777 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -24,32 +24,32 @@
   or implied warranty.
   
   -->
-<Include xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
 <Directory Id="TARGETDIR" Name="SourceDir">
     <Directory Id="$(var.PISystemFolder)" SourceName="System">
         <Component Win64="$(var.Win64)" Id="cmf_kfwlogon_DLL" Guid="$(var.cmf_kfwlogon_DLL_guid)">
-             <File Id="filekfwlogon_DLL" Name="kfwlogon.dll" LongName="kfwlogon.dll" KeyPath="yes" DiskId="1" src="$(var.BinDir)kfwlogon.dll" />
-             <Registry Id="reg_kfwlogon01" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" Action="createKeyAndRemoveKeyOnUninstall" />
-             <Registry Id="reg_kfwlogon02" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" />
-             <Registry Id="reg_kfwlogon03" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" Name="Asynchronous" Type="integer" Value="0" />
-             <Registry Id="reg_kfwlogon04" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" Name="Impersonate" Type="integer" Value="0" />
-             <Registry Id="reg_kfwlogon05" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" Name="DLLName" Type="string" Value="[#filekfwlogon_DLL]" />
-             <Registry Id="reg_kfwlogon06" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" Name="Logon" Type="string" Value="KFW_Logon_Event" />
-             <Registry Id="reg_kfwlogon07" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider" Action="createKeyAndRemoveKeyOnUninstall" />
-             <Registry Id="reg_kfwlogon08" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider" Name="AuthentProviderPath" Type="expandable" Value="[$(var.PISystemFolder)]kfwlogon.dll"/>
-             <Registry Id="reg_kfwlogon09" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider"/>
-             <Registry Id="reg_kfwlogon10" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider" Name="VerboseLogging" Type="integer" Value="10"/>
-             <Registry Id="reg_kfwlogon11" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider" Name="ProviderPath" Type="expandable" Value="[$(var.PISystemFolder)]kfwlogon.dll"/>
-             <Registry Id="reg_kfwlogon12" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider" Name="Class" Type="integer" Value="2" />
-             <Registry Id="reg_kfwlogon13" Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider" Name="Name" Type="string" Value="MIT Kerberos"/>
+            <File Id="filekfwlogon_DLL" Name="kfwlogon.dll" KeyPath="yes" DiskId="1" Source="$(var.BinDir)kfwlogon.dll" />
+            <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion\WinLogon\Notify\MIT_KFW" Action="createAndRemoveOnUninstall">
+                <RegistryValue Name="Asynchronous" Type="integer" Value="0" />
+                <RegistryValue Name="Impersonate" Type="integer" Value="0" />
+                <RegistryValue Name="DLLName" Type="string" Value="[#filekfwlogon_DLL]" />
+                <RegistryValue Name="Logon" Type="string" Value="KFW_Logon_Event" />
+            </RegistryKey>
+          <RegistryKey Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\MIT Kerberos\NetworkProvider" Action="createAndRemoveOnUninstall">
+            <RegistryValue Name="AuthentProviderPath" Type="expandable" Value="[$(var.PISystemFolder)]kfwlogon.dll"/>
+            <RegistryValue Name="VerboseLogging" Type="integer" Value="10"/>
+            <RegistryValue Name="ProviderPath" Type="expandable" Value="[$(var.PISystemFolder)]kfwlogon.dll"/>
+            <RegistryValue Name="Class" Type="integer" Value="2" />
+            <RegistryValue Name="Name" Type="string" Value="MIT Kerberos"/>
+          </RegistryKey>
          </Component>
          <Component Win64="$(var.Win64)" Id="cmf_kfwcpcc_EXE" Guid="$(var.cmf_kfwcpcc_EXE_guid)">
-             <File Id="filekfwcpcc_EXE"  Name="kfwcpcc.exe"  LongName="kfwcpcc.exe"  DiskId="1" src="$(var.BinDir)kfwcpcc.exe" />
+             <File Id="filekfwcpcc_EXE"  Name="kfwcpcc.exe"  DiskId="1" src="$(var.BinDir)kfwcpcc.exe" />
          </Component>
      <?ifdef DebugSyms?>
          <Component Win64="$(var.Win64)" Id="cmp_ClientSystemDebug" Guid="$(var.cmp_ClientSystemDebug_guid)">
-     		<File Id="filekfwlogon_PDB" Name="kfwlogon.pdb" LongName="kfwlogon.pdb" KeyPath="yes" DiskId="1" src="$(var.BinDir)kfwlogon.pdb" />
-     		<File Id="filekfwcpcc_PDB" Name="kfwcpcc.pdb" LongName="kfwcpcc.pdb" DiskId="1" src="$(var.BinDir)kfwcpcc.pdb" />
+		<File Id="filekfwlogon_PDB" Name="kfwlogon.pdb" KeyPath="yes" DiskId="1" src="$(var.BinDir)kfwlogon.pdb" />
+		<File Id="filekfwcpcc_PDB" Name="kfwcpcc.pdb" DiskId="1" src="$(var.BinDir)kfwcpcc.pdb" />
          </Component>
      <?endif?>
      </Directory>
@@ -58,26 +58,6 @@
             <Directory Id="KERBEROSDIR" Name="Kerberos">
                 <Directory Id="dirbin" Name="bin" src="$(var.BinDir)">
                 
-                <?if $(var.Platform) = "Intel" ?>
-		    <!-- Kerberos IV options -->
-		    <Component Win64="$(var.Win64)" Id="rcm_krb4_1" Guid="$(var.rcm_krb4_1_guid)" DiskId="1">
-		    	<Registry Id="reg_krb4_1" Root="HKLM" Key="Software\MIT\Kerberos4" Name="krb.realms" Type="string" Value="[KRB4KRBREALMS]" KeyPath="yes"/>
-		    	<Condition>KRB4KRBREALMS</Condition>
-		    </Component>
-		    <Component Win64="$(var.Win64)" Id="rcm_krb4_2" Guid="$(var.rcm_krb4_2_guid)" DiskId="1">
-		    	<Registry Id="reg_krb4_2" Root="HKLM" Key="Software\MIT\Kerberos4" Name="krb.conf" Type="string" Value="[KRB4KRBCONF]" KeyPath="yes"/>
-		    	<Condition>KRB4KRBCONF</Condition>
-		    </Component>
-		    <Component Win64="$(var.Win64)" Id="rcm_krb4_3" Guid="$(var.rcm_krb4_3_guid)" DiskId="1">
-		    	<Registry Id="reg_krb4_3" Root="HKLM" Key="Software\MIT\Kerberos4" Name="configdir" Type="string" Value="[KRB4CONFIGDIR]" KeyPath="yes"/>
-		    	<Condition>KRB4CONFIGDIR</Condition>
-		    </Component>
-		    <Component Win64="$(var.Win64)" Id="rcm_krb4_4" Guid="$(var.rcm_krb4_4_guid)" DiskId="1">
-		    	<Registry Id="reg_krb4_4" Root="HKLM" Key="Software\MIT\Kerberos4" Name="ticketfile" Type="string" Value="[KRB4TICKETFILE]" KeyPath="yes"/>
-		    	<Condition>KRB4TICKETFILE</Condition>
-		    </Component>
-                <?endif?>
-		    
 		    <!-- Kerberos V options -->
 		    <Component Win64="$(var.Win64)" Id="rcm_krb5_1" Guid="$(var.rcm_krb5_1_guid)" DiskId="1">
 		    	<Registry Id="reg_krb5_1" Root="HKLM" Key="Software\MIT\kerberos5" Name="config" Type="string" Value="[KRB5CONFIG]" KeyPath="yes" />
@@ -93,106 +73,87 @@
 		    </Component>
                 
                     <Component Win64="$(var.Win64)" Id="cmf_comerr32_dll" Guid="$(var.cmf_comerr32_dll_guid)" DiskId="1">
-	                    <File Id="fil_comerr32_dll" LongName="$(var.cmf_comerr32_dll_name)" Name="$(var.cmf_comerr32_dll_name)" KeyPath="yes" />
-                    </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_gss_exe" Guid="$(var.cmf_gss_exe_guid)" DiskId="1">
-	                    <File Id="fil_gss_exe" LongName="gss.exe" Name="gss.exe" KeyPath="yes" />
-	                    <Registry Id="reg_ts_gss_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\gss" Action="createKeyAndRemoveKeyOnUninstall" />
-	                    <Registry Id="reg_ts_gss_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\gss" Name="Flags" Type="integer" Value="1032" />
+	                    <File Id="fil_comerr32_dll" Name="$(var.cmf_comerr32_dll_name)" KeyPath="yes" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_gss_client_exe" Guid="$(var.cmf_gss_client_exe_guid)" DiskId="1">
-	                    <File Id="fil_gss_client_exe" LongName="gss-client.exe" Name="gss-clnt.exe" KeyPath="yes" />
+	                    <File Id="fil_gss_client_exe" Name="gss-client.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_gss_client_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\gss-client" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_gss_client_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\gss-client" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_gss_server_exe" Guid="$(var.cmf_gss_server_exe_guid)" DiskId="1">
-	                    <File Id="fil_gss_server_exe" LongName="gss-server.exe" Name="gss-srvr.exe" KeyPath="yes" />
+	                    <File Id="fil_gss_server_exe" Name="gss-server.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_gss_server_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\gss-server" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_gss_server_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\gss-server" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_gssapi32_dll" Guid="$(var.cmf_gssapi32_dll_guid)" DiskId="1">
-	                    <File Id="fil_gssapi32_dll" LongName="$(var.cmf_gssapi32_dll_name)" Name="$(var.cmf_gssapi32_dll_name)" KeyPath="yes" />
-                    </Component>
-                <?if $(var.Platform) = "Intel" ?>
-                    <Component Win64="$(var.Win64)" Id="cmf_k524init_exe" Guid="$(var.cmf_k524init_exe_guid)" DiskId="1">
-	                    <File Id="fil_k524init_exe" LongName="k524init.exe" Name="k524init.exe" KeyPath="yes" />
-	                    <Registry Id="reg_ts_k524init_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\k524init" Action="createKeyAndRemoveKeyOnUninstall" />
-	                    <Registry Id="reg_ts_k524init_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\k524init" Name="Flags" Type="integer" Value="1032" />
-                    </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_kclnt32_dll" Guid="$(var.cmf_kclnt32_dll_guid)" DiskId="1">
-	                    <File Id="fil_kclnt32_dll" LongName="$(var.cmf_kclnt32_dll_name)" Name="$(var.cmf_kclnt32_dll_name)" KeyPath="yes" />
+	                    <File Id="fil_gssapi32_dll" Name="$(var.cmf_gssapi32_dll_name)" KeyPath="yes" />
                     </Component>
-                <?endif?>
                     <Component Win64="$(var.Win64)" Id="cmf_kdestroy_exe" Guid="$(var.cmf_kdestroy_exe_guid)" DiskId="1">
-	                    <File Id="fil_kdestroy_exe" LongName="kdestroy.exe" Name="kdestroy.exe" KeyPath="yes" />
+	                    <File Id="fil_kdestroy_exe" Name="kdestroy.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_kdestroy_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kdestroy" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_kdestroy_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kdestroy" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_kcpytkt_exe" Guid="$(var.cmf_kcpytkt_exe_guid)" DiskId="1">
-	                    <File Id="fil_kcpytkt_exe" LongName="kcpytkt.exe" Name="kcpytkt.exe" KeyPath="yes" />
+	                    <File Id="fil_kcpytkt_exe" Name="kcpytkt.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_kcpytkt_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kcpytkt" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_kcpytkt_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kcpytkt" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_kdeltkt_exe" Guid="$(var.cmf_kdeltkt_exe_guid)" DiskId="1">
-	                    <File Id="fil_kdeltkt_exe" LongName="kdeltkt.exe" Name="kdeltkt.exe" KeyPath="yes" />
+	                    <File Id="fil_kdeltkt_exe" Name="kdeltkt.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_kdeltkt_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kdeltkt" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_kdeltkt_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kdeltkt" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_kinit_exe" Guid="$(var.cmf_kinit_exe_guid)" DiskId="1">
-	                    <File Id="fil_kinit_exe" LongName="kinit.exe" Name="kinit.exe" KeyPath="yes" />
+	                    <File Id="fil_kinit_exe" Name="kinit.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_kinit_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kinit" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_kinit_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kinit" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_klist_exe" Guid="$(var.cmf_klist_exe_guid)" DiskId="1">
-	                    <File Id="fil_klist_exe" LongName="klist.exe" Name="klist.exe" KeyPath="yes" />
+	                    <File Id="fil_klist_exe" Name="klist.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_klist_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\klist" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_klist_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\klist" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_kpasswd_exe" Guid="$(var.cmf_kpasswd_exe_guid)" DiskId="1">
-	                    <File Id="fil_kpasswd_exe" LongName="kpasswd.exe" Name="kpasswd.exe" KeyPath="yes" />
+	                    <File Id="fil_kpasswd_exe" Name="kpasswd.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_kpasswd_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kpasswd" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_kpasswd_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kpasswd" Name="Flags" Type="integer" Value="1032" />
                     </Component>
+                    <Component Win64="$(var.Win64)" Id="cmf_kswitch_exe" Guid="$(var.cmf_kswitch_exe_guid)" DiskId="1">
+                      <File Id="fil_kswitch_exe" Name="kswitch.exe" KeyPath="yes" />
+                      <Registry Id="reg_ts_kswitch_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kswitch" Action="createKeyAndRemoveKeyOnUninstall" />
+                      <Registry Id="reg_ts_kswitch_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kswitch" Name="Flags" Type="integer" Value="1032" />
+                    </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_kvno_exe" Guid="$(var.cmf_kvno_exe_guid)" DiskId="1">
-	                    <File Id="fil_kvno_exe" LongName="kvno.exe" Name="kvno.exe" KeyPath="yes" />
+	                    <File Id="fil_kvno_exe" Name="kvno.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_kvno_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kvno" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_kvno_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\kvno" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_krb5_32_dll" Guid="$(var.cmf_krb5_32_dll_guid)" DiskId="1">
-	                    <File Id="fil_krb5_32_dll" LongName="$(var.cmf_krb5_32_dll_name)" Name="$(var.cmf_krb5_32_dll_name)" KeyPath="yes" />
+	                    <File Id="fil_krb5_32_dll" Name="$(var.cmf_krb5_32_dll_name)" KeyPath="yes" />
 	                    <Environment Id="env_kclient_path" Action="set" Name="PATH" Part="last" System="yes" Value="[KERBEROSDIR]bin" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_k5sprt32_dll" Guid="$(var.cmf_k5sprt32_dll_guid)" DiskId="1">
-	                    <File Id="fil_k5sprt32_dll" LongName="$(var.cmf_k5sprt32_dll_name)" Name="$(var.cmf_k5sprt32_dll_name)" />
+	                    <File Id="fil_k5sprt32_dll" Name="$(var.cmf_k5sprt32_dll_name)" />
                     </Component>
-        <?if $(var.Platform) = "Intel" ?>
-                    <Component Win64="$(var.Win64)" Id="cmf_krb524_dll" Guid="$(var.cmf_krb524_dll_guid)" DiskId="1">
-	                    <File Id="fil_krb524_dll" LongName="$(var.cmf_krb524_dll_name)" Name="$(var.cmf_krb524_dll_name)" KeyPath="yes" />
-                    </Component>
-        <?endif?>
                     <Component Win64="$(var.Win64)" Id="cmf_krbcc32_dll" Guid="$(var.cmf_krbcc32_dll_guid)" DiskId="1">
-	                    <File Id="fil_krbcc32_dll" LongName="$(var.cmf_krbcc32_dll_name)" Name="$(var.cmf_krbcc32_dll_name)" KeyPath="yes" />
+	                    <File Id="fil_krbcc32_dll" Name="$(var.cmf_krbcc32_dll_name)" KeyPath="yes" />
                     </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_krbcc32s_exe" Guid="$(var.cmf_krbcc32s_exe_guid)" DiskId="1">
-	                    <File Id="fil_krbcc32s_exe" LongName="$(var.cmf_krbcc32s_exe_name)" Name="$(var.cmf_krbcc32s_exe_name)" KeyPath="yes" />
-	                    <Registry Id="reg_ts_krbcc32s_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\krbcc32s" Action="createKeyAndRemoveKeyOnUninstall" />
-	                    <Registry Id="reg_ts_krbcc32s_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\krbcc32s" Name="Flags" Type="integer" Value="1032" />
+                    <Component Win64="$(var.Win64)" Id="cmf_ccapiserver_exe" Guid="$(var.cmf_ccapiserver_exe_guid)" DiskId="1">
+	                    <File Id="fil_ccapiserver_exe" Name="$(var.cmf_ccapiserver_exe_name)" KeyPath="yes" />
+	                    <Registry Id="reg_ts_krbcc32s_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ccapiserver" Action="createKeyAndRemoveKeyOnUninstall" />
+	                    <Registry Id="reg_ts_krbcc32s_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ccapiserver" Name="Flags" Type="integer" Value="1032" />
                     </Component>
         <?if $(var.Platform) = "Intel" ?>
-                    <Component Win64="$(var.Win64)" Id="cmf_krbv4w32_dll" Guid="$(var.cmf_krbv4w32_dll_guid)" DiskId="1">
-	                    <File Id="fil_krbv4w32_dll" LongName="$(var.cmf_krbv4w32_dll_name)" Name="$(var.cmf_krbv4w32_dll_name)" KeyPath="yes" />
-                    </Component>
-
-                    <Component Win64="$(var.Win64)" Id="cmf_leash32_exe" Guid="$(var.cmf_leash32_exe_guid)" DiskId="1">
-	                    <File Id="fil_leash32_exe" LongName="leash32.exe" Name="leash32.exe" KeyPath="yes" />
-	                    <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" />
+                  <!--                    <Component Win64="$(var.Win64)" Id="cmf_leash32_exe" Guid="$(var.cmf_leash32_exe_guid)" DiskId="1">
+	                    <File Id="fil_leash32_exe" Name="leash32.exe" KeyPath="yes" />
+	                    <Registry Id="reg_ts_leash32_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Action="createKeyAndRemoveKeyOnUninstall" KeyPath="yes"/>
 	                    <Registry Id="reg_ts_leash32_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\leash32" Name="Flags" Type="integer" Value="1032" />
-                    </Component>
+                    </Component> -->
 
-                    <Component Win64="$(var.Win64)" Id="csc_leash32_exe" Guid="$(var.csc_leash32_exe_guid)" DiskId="1">
-                        <Shortcut Id="sc_leash32_exe" Advertise="no" Directory="dirShortcut" LongName="Leash Kerberos Ticket Manager.lnk" Name="Leash32.lnk" Arguments="[LEASHAUTOINIT]" Target="[!fil_leash32_exe]" />
+<!--                    <Component Win64="$(var.Win64)" Id="csc_leash32_exe" Guid="$(var.csc_leash32_exe_guid)" DiskId="1">
+                        <Shortcut Id="sc_leash32_exe" Advertise="no" Directory="dirShortcut" Name="Leash Kerberos Ticket Manager.lnk" Arguments="[LEASHAUTOINIT]" Target="[!fil_leash32_exe]" />
                         <Condition>USELEASH</Condition>
-                    </Component>
+                    </Component> -->
 
                     <!-- Leash32 configuration -->
                     <Component Win64="$(var.Win64)" Id="rcm_leash_1" Guid="$(var.rcm_leash_1_guid)" DiskId="1">
@@ -220,25 +181,25 @@
 	                    <Registry Id="reg_leash_6" Root="HKLM" Key="Software\MIT\Leash" Name="MsLsaImport" Type="integer" Value="[LEASHMSLSAIMPORT]" KeyPath="yes"/>
 	                    <Condition>LEASHMSLSAIMPORT</Condition>
                     </Component>
-                    <Component Win64="$(var.Win64)" Id="csc_LeashStartup" Guid="$(var.csc_LeashStartup_guid)" DiskId="1">
+<!--                    <Component Win64="$(var.Win64)" Id="csc_LeashStartup" Guid="$(var.csc_LeashStartup_guid)" DiskId="1">
                         <Registry Id="reg_sc_leash_marker" Root="HKLM" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="LeashAutoStart" Type="integer" Value="1" KeyPath="yes" />
-                        <Shortcut Id="sc_leash_exe_startup" Advertise="no" Directory="StartupFolder" LongName="Leash Credentials Manager.lnk" Name="leash32.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]leash32.exe" Show="minimized" />
+                        <Shortcut Id="sc_leash_exe_startup" Advertise="no" Directory="StartupFolder" Name="Leash Credentials Manager.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]leash32.exe" Show="minimized" />
                         <Condition>USELEASH</Condition>
-                    </Component>
+                    </Component> -->
 
-                <?ifdef OldHelp?>
+<!--                <?ifdef OldHelp?>
                     <Component Win64="$(var.Win64)" Id="cmf_leash32_hlp" Guid="$(var.cmf_leash32_hlp_guid)" DiskId="1">
-	                    <File Id="fil_leash32_hlp" LongName="leash32.hlp" Name="leash32.hlp" KeyPath="yes" />
+	                    <File Id="fil_leash32_hlp" Name="leash32.hlp" KeyPath="yes" />
                     </Component>
                 <?else?>
                     <Component Win64="$(var.Win64)" Id="cmf_leash32_chm" Guid="$(var.cmf_leash32_chm_guid)" DiskId="1">
-	                    <File Id="fil_leash32_chm" LongName="leash32.chm" Name="leash32.chm" KeyPath="yes" />
+	                    <File Id="fil_leash32_chm" Name="leash32.chm" KeyPath="yes" />
                     </Component>
-                <?endif?>
+                <?endif?> -->
         <?endif?>
                     
                     <Component Win64="$(var.Win64)" Id="cmf_leashw32_dll" Guid="$(var.cmf_leashw32_dll_guid)" DiskId="1">
-	                    <File Id="fil_leashw32_dll" LongName="$(var.cmf_leashw32_dll_name)" Name="$(var.cmf_leashw32_dll_name)" KeyPath="yes" />
+	                    <File Id="fil_leashw32_dll" Name="$(var.cmf_leashw32_dll_name)" KeyPath="yes" />
                     </Component>
                     
                     <!-- Leash DLL configuration -->
@@ -313,145 +274,59 @@
                     </Component>
                     
                     <Component Win64="$(var.Win64)" Id="cmf_ms2mit_exe" Guid="$(var.cmf_ms2mit_exe_guid)" DiskId="1">
-	                    <File Id="fil_ms2mit_exe" LongName="ms2mit.exe" Name="ms2mit.exe" KeyPath="yes" />
+	                    <File Id="fil_ms2mit_exe" Name="ms2mit.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_ms2mit_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ms2mit" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_ms2mit_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\ms2mit" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_mit2ms_exe" Guid="$(var.cmf_mit2ms_exe_guid)" DiskId="1">
-	                    <File Id="fil_mit2ms_exe" LongName="mit2ms.exe" Name="mit2ms.exe" KeyPath="yes" />
+	                    <File Id="fil_mit2ms_exe" Name="mit2ms.exe" KeyPath="yes" />
 	                    <Registry Id="reg_ts_mit2ms_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\mit2ms" Action="createKeyAndRemoveKeyOnUninstall" />
 	                    <Registry Id="reg_ts_mit2ms_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\mit2ms" Name="Flags" Type="integer" Value="1032" />
                     </Component>
                     <Component Win64="$(var.Win64)" Id="cmf_wshelp32_dll" Guid="$(var.cmf_wshelp32_dll_guid)" DiskId="1">
-	                    <File Id="fil_wshelp32_dll" LongName="$(var.cmf_wshelp32_dll_name)" Name="$(var.cmf_wshelp32_dll_name)" KeyPath="yes" />
-                    </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1">
-	                    <File Id="fil_xpprof32_dll" LongName="$(var.cmf_xpprof32_dll_name)" Name="$(var.cmf_xpprof32_dll_name)" KeyPath="yes" />
-                    </Component>
-                    
-                    <!-- NetIDMgr  -->
-                    <Component Win64="$(var.Win64)" Id="cmf_nidmgr32_dll" Guid="$(var.cmf_nidmgr32_dll_guid)" DiskId="1" Transitive="yes">
-						<File Id="fil_nidmgr32_dll" LongName="$(var.cmf_nidmgr32_dll_name)" Name="$(var.cmf_nidmgr32_dll_name)" KeyPath="yes" />
-                        <Condition>VersionNT &gt; 500</Condition>
-                    </Component>
-                    <?if $(var.Platform) = "Intel" ?>
-                    <Component Win64="$(var.Win64)" Id="cmf_nidmgr32_dll_w2k" Guid="$(var.cmf_nidmgr32_dll_w2k_guid)" DiskId="1" Transitive="yes">
-                        <File Id="fil_nidmgr32_dll_w2k" LongName="$(var.cmf_nidmgr32_dll_name)" Name="$(var.cmf_nidmgr32_dll_name)" KeyPath="yes" src="$(var.BinDir)W2K\nidmgr32.dll" />
-                        <Condition>VersionNT &lt;= 500</Condition>
-                    </Component>
-                    <?endif?>
-                    <Component Win64="$(var.Win64)" Id="cmf_krb5cred_dll" Guid="$(var.cmf_krb5cred_dll_guid)" DiskId="1">
-			<File Id="fil_krb5cred_dll" LongName="$(var.cmf_krb5cred_dll_name)" Name="$(var.cmf_krb5cred_dll_name)" KeyPath="yes" />
-                        <Registry Id="reg_krb5cred_1" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb5" Action="createKeyAndRemoveKeyOnUninstall" />
-                        <Registry Id="reg_krb5cred_2" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb5" Name="ImagePath" Type="string" Value="[#fil_krb5cred_dll]" />
-                        <Registry Id="reg_krb5cred_3" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb5" Name="PluginList" Type="string" Value="Krb5Cred,Krb5Ident" />
-                        <Registry Id="reg_krb5cred_4" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" Action="createKeyAndRemoveKeyOnUninstall" />
-                        <Registry Id="reg_krb5cred_5" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" Name="Module" Type="string" Value="MITKrb5" />
-                        <Registry Id="reg_krb5cred_6" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" Name="Description" Type="string" Value="Kerberos v5 Credentials Provider" />
-                        <Registry Id="reg_krb5cred_7" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" Name="Type" Type="integer" Value="1" />
-                        <Registry Id="reg_krb5cred_8" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Cred" Name="Flags" Type="integer" Value="0" />
-                        <Registry Id="reg_krb5cred_9" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" Action="createKeyAndRemoveKeyOnUninstall" />
-                        <Registry Id="reg_krb5cred_a" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" Name="Module" Type="string" Value="MITKrb5" />
-                        <Registry Id="reg_krb5cred_b" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" Name="Description" Type="string" Value="Kerberos v5 Identity Provider" />
-                        <Registry Id="reg_krb5cred_c" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" Name="Dependencies" Type="string" Value="Krb5Cred" />
-                        <Registry Id="reg_krb5cred_d" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" Name="Type" Type="integer" Value="2" />
-                        <Registry Id="reg_krb5cred_e" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb5Ident" Name="Flags" Type="integer" Value="0" />
-                    </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_krb5cred_en_us_dll" Guid="$(var.cmf_krb5cred_en_us_dll_guid)" DiskId="1">
-			<File Id="fil_krb5cred_en_us_dll" LongName="$(var.cmf_krb5cred_en_us_dll_name)" Name="krb5cenu.dll" KeyPath="yes" />
-                    </Component>
-        <?if $(var.Platform) = "Intel" ?>
-                    <Component Win64="$(var.Win64)" Id="cmf_krb4cred_dll" Guid="$(var.cmf_krb4cred_dll_guid)" DiskId="1">
-			<File Id="fil_krb4cred_dll" LongName="$(var.cmf_krb4cred_dll_name)" Name="$(var.cmf_krb4cred_dll_name)" KeyPath="yes" />
-                        <Registry Id="reg_krb4cred_1" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" Action="createKeyAndRemoveKeyOnUninstall" />
-                        <Registry Id="reg_krb4cred_2" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" Name="ImagePath" Type="string" Value="[#fil_krb4cred_dll]" />
-                        <Registry Id="reg_krb4cred_3" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Modules\MITKrb4" Name="PluginList" Type="string" Value="Krb4Cred" />
-                        <Registry Id="reg_krb4cred_4" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Action="createKeyAndRemoveKeyOnUninstall" />
-                        <Registry Id="reg_krb4cred_5" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Module" Type="string" Value="MITKrb4" />
-                        <Registry Id="reg_krb4cred_6" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Description" Type="string" Value="Kerberos v4 Credentials Provider" />
-                        <Registry Id="reg_krb4cred_7" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Dependencies" Type="string" Value="Krb5Cred" />
-                        <Registry Id="reg_krb4cred_8" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Type" Type="integer" Value="1" />
-                        <Registry Id="reg_krb4cred_9" Root="HKLM" Key="Software\MIT\NetIDMgr\PluginManager\Plugins\Krb4Cred" Name="Flags" Type="integer" Value="0" />
-                    </Component>
-                    <Component Win64="$(var.Win64)" Id="cmf_krb4cred_en_us_dll" Guid="$(var.cmf_krb4cred_en_us_dll_guid)" DiskId="1">
-			<File Id="fil_krb4cred_en_us_dll" LongName="$(var.cmf_krb4cred_en_us_dll_name)" Name="krb4cenu.dll" KeyPath="yes" />
-                    </Component>
-        <?endif?>
-                    <Component Win64="$(var.Win64)" Id="cmf_netidmgr_exe" Guid="$(var.cmf_netidmgr_exe_guid)" DiskId="1" Transitive="yes">
-			<File Id="fil_netidmgr_exe" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" />
-			<File Id="fil_netidmgr_chm" LongName="netidmgr.chm" Name="netidmgr.chm" />
-                        <Registry Id="reg_ts_netidmgr_0" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Action="createKeyAndRemoveKeyOnUninstall" />
-                        <Registry Id="reg_ts_netidmgr_1" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Name="Flags" Type="integer" Value="1032" />
-                        <Shortcut Id="sc_netidmgr_exe" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Target="[dirbin]netidmgr.exe" Show="minimized" WorkingDirectory="dirbin"/>
-                        <Shortcut Id="sc_netidmgr_chm" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager Documentation.lnk" Name="netidchm.lnk" Target="[dirbin]netidmgr.chm" WorkingDirectory="dirbin"/>
-                        <Condition>VersionNT &gt; 500</Condition>
-                    </Component>
-                    <?if $(var.Platform) = "Intel" ?>
-                    <Component Win64="$(var.Win64)" Id="cmf_netidmgr_exe_w2k" Guid="$(var.cmf_netidmgr_exe_w2k_guid)" DiskId="1" Transitive="yes">
-			<File Id="fil_netidmgr_exe_w2k" LongName="netidmgr.exe" Name="netidmgr.exe" KeyPath="yes" src="$(var.BinDir)W2K\netidmgr.exe"/>
-			<File Id="fil_netidmgr_chm_w2k" LongName="netidmgr.chm" Name="netidmgr.chm" />
-                        <Registry Id="reg_ts_netidmgr_0_w2k" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Action="createKeyAndRemoveKeyOnUninstall" />
-                        <Registry Id="reg_ts_netidmgr_1_w2k" Root="HKLM" Key="Software\Microsoft\Windows NT\CurrentVersion\Terminal Server\Compatibility\Applications\netidmgr" Name="Flags" Type="integer" Value="1032" />
-                        <Shortcut Id="sc_netidmgr_exe_w2k" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Target="[dirbin]netidmgr.exe" Show="minimized" WorkingDirectory="dirbin"/>
-                        <Shortcut Id="sc_netidmgr_chm_w2k" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager Documentation.lnk" Name="netidchm.lnk" Target="[dirbin]netidmgr.chm" WorkingDirectory="dirbin"/>
-                        <Condition>VersionNT &lt;= 500</Condition>
-                    </Component>
-                    <?endif?>
-                    <Component Win64="$(var.Win64)" Id="csc_NetIDMgrStartup" Guid="$(var.csc_NetIDMgrStartup_guid)" DiskId="1">
-                        <Registry Id="reg_sc_nidmgr_marker" Root="HKLM" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="NetIDMgrAutoStart" Type="integer" Value="1" KeyPath="yes" />
-                        <Shortcut Id="sc_netidmgr_exe_startup" Advertise="no" Directory="StartupFolder" LongName="Network Identity Manager.lnk" Name="netidmgr.lnk" Target="[dirbin]netidmgr.exe" Show="minimized" />
-                        <Condition>USENETIDMGR</Condition>
+	                    <File Id="fil_wshelp32_dll" Name="$(var.cmf_wshelp32_dll_name)" KeyPath="yes" />
                     </Component>
-                    <!-- /NetIDMgr -->
+<!--                    <Component Win64="$(var.Win64)" Id="cmf_xpprof32_dll" Guid="$(var.cmf_xpprof32_dll_guid)" DiskId="1">
+	                    <File Id="fil_xpprof32_dll" Name="$(var.cmf_xpprof32_dll_name)" KeyPath="yes" />
+                    </Component> -->
                     
                     <!-- Debug symbols -->
                 <?ifdef DebugSyms?>
                     <Component Win64="$(var.Win64)" Id="cmf_bin_debug" Guid="$(var.cmf_bin_debug_guid)" DiskId="1">
                         <?if $(var.Platform) = "Intel" ?>
-	                    <File Id="fil_k524init_pdb" LongName="k524init.pdb" Name="k524init.pdb" />
-	                    <File Id="fil_krb524_pdb" LongName="krb524.pdb" Name="krb524.pdb" />
-	                    <File Id="fil_kclnt32_pdb" LongName="kclnt32.pdb" Name="kclnt32.pdb" />
-	                    <File Id="fil_leash32_pdb" LongName="leash32.pdb" Name="leash32.pdb" />
+	                    <File Id="fil_leash32_pdb" Name="leash32.pdb" />
 
-	                    <File Id="fil_comerr32_pdb" LongName="comerr32.pdb" Name="comerr32.pdb" />
-	                    <File Id="fil_gssapi32_pdb" LongName="gssapi32.pdb" Name="gssapi32.pdb" />
-	                    <File Id="fil_krb5_32_pdb" LongName="krb5_32.pdb" Name="krb5_32.pdb" KeyPath="yes" />
-	                    <File Id="fil_k5sprt32_pdb" LongName="k5sprt32.pdb" Name="k5sprt32.pdb" />
-	                    <File Id="fil_krbcc32_pdb" LongName="krbcc32.pdb" Name="krbcc32.pdb" />
-	                    <File Id="fil_krbcc32s_pdb" LongName="krbcc32s.pdb" Name="krbcc32s.pdb" />
-	                    <File Id="fil_krbv4w32_pdb" LongName="krbv4w32.pdb" Name="krbv4w32.pdb" />
-	                    <File Id="fil_leashw32_pdb" LongName="leashw32.pdb" Name="leashw32.pdb" />
-	                    <File Id="fil_wshelp32_pdb" LongName="wshelp32.pdb" Name="wshelp32.pdb" />
-	                    <File Id="fil_xpprof32_pdb" LongName="xpprof32.pdb" Name="xpprof32.pdb" />
-	                    <File Id="fil_krb4cred_pdb" LongName="krb4cred.pdb" Name="krb4cred.pdb" />
-	                    <File Id="fil_krb5cred_pdb" LongName="krb5cred.pdb" Name="krb5cred.pdb" />
-	                    <File Id="fil_nidmgr32_pdb" LongName="nidmgr32.pdb" Name="nidmgr32.pdb" />
+	                    <File Id="fil_comerr32_pdb" Name="comerr32.pdb" />
+	                    <File Id="fil_gssapi32_pdb" Name="gssapi32.pdb" />
+	                    <File Id="fil_krb5_32_pdb" Name="krb5_32.pdb" KeyPath="yes" />
+	                    <File Id="fil_k5sprt32_pdb" Name="k5sprt32.pdb" />
+	                    <File Id="fil_krbcc32_pdb" Name="krbcc32.pdb" />
+	                    <File Id="fil_leashw32_pdb" Name="leashw32.pdb" />
+	                    <File Id="fil_wshelp32_pdb" Name="wshelp32.pdb" />
+	                    <File Id="fil_xpprof32_pdb" Name="xpprof32.pdb" />
                         <?else?>
-	                    <File Id="fil_comerr64_pdb" LongName="comerr64.pdb" Name="comerr64.pdb" />
-	                    <File Id="fil_gssapi64_pdb" LongName="gssapi64.pdb" Name="gssapi64.pdb" />
-	                    <File Id="fil_krb5_64_pdb" LongName="krb5_64.pdb" Name="krb5_64.pdb" KeyPath="yes" />
-	                    <File Id="fil_k5sprt64_pdb" LongName="k5sprt64.pdb" Name="k5sprt64.pdb" />
-	                    <File Id="fil_krbcc64_pdb" LongName="krbcc64.pdb" Name="krbcc64.pdb" />
-	                    <File Id="fil_krbcc64s_pdb" LongName="krbcc64s.pdb" Name="krbcc64s.pdb" />
-	                    <File Id="fil_leashw64_pdb" LongName="leashw64.pdb" Name="leashw64.pdb" />
-	                    <File Id="fil_wshelp64_pdb" LongName="wshelp64.pdb" Name="wshelp64.pdb" />
-	                    <File Id="fil_xpprof64_pdb" LongName="xpprof64.pdb" Name="xpprof64.pdb" />
-	                    <File Id="fil_krb5cred_pdb" LongName="krb5cred.pdb" Name="krb5cred.pdb" />
-	                    <File Id="fil_nidmgr64_pdb" LongName="nidmgr64.pdb" Name="nidmgr64.pdb" />
+	                    <File Id="fil_comerr64_pdb" Name="comerr64.pdb" />
+	                    <File Id="fil_gssapi64_pdb" Name="gssapi64.pdb" />
+	                    <File Id="fil_krb5_64_pdb" Name="krb5_64.pdb" KeyPath="yes" />
+	                    <File Id="fil_k5sprt64_pdb" Name="k5sprt64.pdb" />
+	                    <File Id="fil_krbcc64_pdb" Name="krbcc64.pdb" />
+	                    <File Id="fil_leashw64_pdb" Name="leashw64.pdb" />
+	                    <File Id="fil_wshelp64_pdb" Name="wshelp64.pdb" />
+	                    <File Id="fil_xpprof64_pdb" Name="xpprof64.pdb" />
                         <?endif?>
-	                    <File Id="fil_gss_pdb" LongName="gss.pdb" Name="gss.pdb" />
-	                    <File Id="fil_gss_client_pdb" LongName="gss-client.pdb" Name="gss-clnt.pdb" />
-	                    <File Id="fil_gss_server_pdb" LongName="gss-server.pdb" Name="gss-srvr.pdb" />
-	                    <File Id="fil_kdestroy_pdb" LongName="kdestroy.pdb" Name="kdestroy.pdb" />
-	                    <File Id="fil_kcpytkt_pdb" LongName="kcpytkt.pdb" Name="kcpytkt.pdb" />
-	                    <File Id="fil_kdeltkt_pdb" LongName="kdeltkt.pdb" Name="kdeltkt.pdb" />
-	                    <File Id="fil_kinit_pdb" LongName="kinit.pdb" Name="kinit.pdb" />
-	                    <File Id="fil_klist_pdb" LongName="klist.pdb" Name="klist.pdb" />
-	                    <File Id="fil_kpasswd_pdb" LongName="kpasswd.pdb" Name="kpasswd.pdb" />
-	                    <File Id="fil_kvno_pdb" LongName="kvno.pdb" Name="kvno.pdb" />
-	                    <File Id="fil_ms2mit_pdb" LongName="ms2mit.pdb" Name="ms2mit.pdb" />
-	                    <File Id="fil_mit2ms_pdb" LongName="mit2ms.pdb" Name="mit2ms.pdb" />
-	                    <File Id="fil_netidmgr_pdb" LongName="netidmgr.pdb" Name="netidmgr.pdb" />
+                      <File Id="fil_ccapiserver_pdb" Name="ccapiserver.pdb" />
+                      <File Id="fil_gss_client_pdb" Name="gss-client.pdb" />
+	                    <File Id="fil_gss_server_pdb" Name="gss-server.pdb" />
+	                    <File Id="fil_kdestroy_pdb" Name="kdestroy.pdb" />
+	                    <File Id="fil_kcpytkt_pdb" Name="kcpytkt.pdb" />
+	                    <File Id="fil_kdeltkt_pdb" Name="kdeltkt.pdb" />
+	                    <File Id="fil_kinit_pdb" Name="kinit.pdb" />
+	                    <File Id="fil_klist_pdb" Name="klist.pdb" />
+	                    <File Id="fil_kpasswd_pdb" Name="kpasswd.pdb" />
+                      <File Id="fil_kswitch_pdb" Name="kswitch.pdb" />
+                      <File Id="fil_kvno_pdb" Name="kvno.pdb" />
+	                    <File Id="fil_ms2mit_pdb" Name="ms2mit.pdb" />
+	                    <File Id="fil_mit2ms_pdb" Name="mit2ms.pdb" />
                     </Component>
                 <?endif?>
                 
@@ -459,323 +334,250 @@
                 <?ifndef Debug?>
                     <?ifdef CL1200?>
                         <Component Win64="$(var.Win64)" Id="cmf_mfc42_dll" Guid="BE2D0D08-E26E-4906-BEEA-1C550BA9B405" DiskId="1">
-	                        <File Id="fil_mfc42_dll" LongName="mfc42.dll" Name="mfc42.dll" src="$(var.SystemDir)mfc42.dll" KeyPath="yes" />
+	                        <File Id="fil_mfc42_dll" Name="mfc42.dll" src="$(var.SystemDir)mfc42.dll" KeyPath="yes" />
                         </Component>
                         <Component Win64="$(var.Win64)" Id="cmf_msvcp60_dll" Guid="7DBB5E61-AA59-4FD8-87CA-7F139D355050" DiskId="1">
-	                        <File Id="fil_msvcp60_dll" LongName="msvcp60.dll" Name="msvcp60.dll" src="$(var.SystemDir)msvcp60.dll" KeyPath="yes" />
+	                        <File Id="fil_msvcp60_dll" Name="msvcp60.dll" src="$(var.SystemDir)msvcp60.dll" KeyPath="yes" />
                         </Component>
                         <Component Win64="$(var.Win64)" Id="cmf_msvcrt_dll" Guid="07B1612B-F52B-4A22-BC20-948BB7D50916" DiskId="1">
-	                        <File Id="fil_msvcrt_dll" LongName="msvcrt.dll" Name="msvcrt.dll" src="$(var.SystemDir)msvcrt.dll" KeyPath="yes" />
+	                        <File Id="fil_msvcrt_dll" Name="msvcrt.dll" src="$(var.SystemDir)msvcrt.dll" KeyPath="yes" />
                         </Component>
                     <?endif?>
                     <?ifdef CL1300?>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70_dll" Guid="E064D66F-45A5-46FA-A0C0-EE68B5DCA248" DiskId="1">
-	                            <File Id="fil_mfc70_dll" LongName="mfc70.dll" Name="mfc70.dll" src="$(var.SystemDir)mfc70.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70_dll" Name="mfc70.dll" src="$(var.SystemDir)mfc70.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_msvcr70_dll" Guid="3489059D-B8C5-4F9A-9DF9-CC8F19B97898" DiskId="1">
-	                            <File Id="fil_msvcr70_dll" LongName="msvcr70.dll" Name="msvcr70.dll" src="$(var.SystemDir)msvcr70.dll" KeyPath="yes" />
+	                            <File Id="fil_msvcr70_dll" Name="msvcr70.dll" src="$(var.SystemDir)msvcr70.dll" KeyPath="yes" />
                             </Component>
-                            <Component Win64="$(var.Win64)" Id="cmf_msvcp70_dll" Guid="E3E6DC28-A229-45D7-804B-BC5A2CAB86B6" DiskId="1">
-	                            <File Id="fil_msvcp70_dll" LongName="msvcp70.dll" Name="msvcp70.dll" src="$(var.SystemDir)msvcp70.dll" KeyPath="yes" />
+                            <Component Win64="$(var.Win64)" Guid="E3E6DC28-A229-45D7-804B-BC5A2CAB86B6" DiskId="1">
+	                            <File Id="fil_msvcp70_dll" Name="msvcp70.dll" src="$(var.SystemDir)msvcp70.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70chs_dll" Guid="CAFD61A5-8A13-4A7C-AA15-6FEED7D43A3A" DiskId="1">
-	                            <File Id="fil_mfc70chs_dll" LongName="mfc70chs.dll" Name="mfc70chs.dll" src="$(var.SystemDir)mfc70chs.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70chs_dll" Name="mfc70chs.dll" src="$(var.SystemDir)mfc70chs.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70cht_dll" Guid="A3F60016-825A-4096-A45F-98B4972FF1CA" DiskId="1">
-	                            <File Id="fil_mfc70cht_dll" LongName="mfc70cht.dll" Name="mfc70cht.dll" src="$(var.SystemDir)mfc70cht.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70cht_dll" Name="mfc70cht.dll" src="$(var.SystemDir)mfc70cht.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70deu_dll" Guid="D146EE00-8880-4E39-A131-784B947883DB" DiskId="1">
-	                            <File Id="fil_mfc70deu_dll" LongName="mfc70deu.dll" Name="mfc70deu.dll" src="$(var.SystemDir)mfc70deu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70deu_dll" Name="mfc70deu.dll" src="$(var.SystemDir)mfc70deu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70enu_dll" Guid="11E2059D-62E6-40DF-87C1-B03E425048CE" DiskId="1">
-	                            <File Id="fil_mfc70enu_dll" LongName="mfc70enu.dll" Name="mfc70enu.dll" src="$(var.SystemDir)mfc70enu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70enu_dll" Name="mfc70enu.dll" src="$(var.SystemDir)mfc70enu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70esp_dll" Guid="3D1AAC2A-0FB1-4EF7-8406-1BF771CEB4BB" DiskId="1">
-	                            <File Id="fil_mfc70esp_dll" LongName="mfc70esp.dll" Name="mfc70esp.dll" src="$(var.SystemDir)mfc70esp.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70esp_dll" Name="mfc70esp.dll" src="$(var.SystemDir)mfc70esp.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70fra_dll" Guid="36A2B8B3-E6C6-4725-96B8-82905D2ADE4E" DiskId="1">
-	                            <File Id="fil_mfc70fra_dll" LongName="mfc70fra.dll" Name="mfc70fra.dll" src="$(var.SystemDir)mfc70fra.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70fra_dll" Name="mfc70fra.dll" src="$(var.SystemDir)mfc70fra.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70ita_dll" Guid="4EE49FC8-ED41-48F4-90A9-1FC06FE6237D" DiskId="1">
-	                            <File Id="fil_mfc70ita_dll" LongName="mfc70ita.dll" Name="mfc70ita.dll" src="$(var.SystemDir)mfc70ita.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70ita_dll" Name="mfc70ita.dll" src="$(var.SystemDir)mfc70ita.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70jpn_dll" Guid="A6ADFFF1-C48B-446C-9B7D-6137F00EC0E4" DiskId="1">
-	                            <File Id="fil_mfc70jpn_dll" LongName="mfc70jpn.dll" Name="mfc70jpn.dll" src="$(var.SystemDir)mfc70jpn.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70jpn_dll" Name="mfc70jpn.dll" src="$(var.SystemDir)mfc70jpn.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70kor_dll" Guid="720F98E2-5525-41CA-8734-98B0A5756708" DiskId="1">
-	                            <File Id="fil_mfc70kor_dll" LongName="mfc70kor.dll" Name="mfc70kor.dll" src="$(var.SystemDir)mfc70kor.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70kor_dll" Name="mfc70kor.dll" src="$(var.SystemDir)mfc70kor.dll" KeyPath="yes" />
                             </Component>
                     <?endif?>
                     <?ifdef CL1310?>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71_dll" Guid="6A4854A8-35AE-42CB-9671-9F6F096BE20C" DiskId="1">
-	                            <File Id="fil_mfc71_dll" LongName="mfc71.dll" Name="mfc71.dll" src="$(var.SystemDir)mfc71.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71_dll" Name="mfc71.dll" src="$(var.SystemDir)mfc71.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_msvcr71_dll" Guid="C6952DEE-E62A-4635-9CE8-405F1E459FB2" DiskId="1">
-	                            <File Id="fil_msvcr71_dll" LongName="msvcr71.dll" Name="msvcr71.dll" src="$(var.SystemDir)msvcr71.dll" KeyPath="yes" />
+	                            <File Id="fil_msvcr71_dll" Name="msvcr71.dll" src="$(var.SystemDir)msvcr71.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_msvcp71_dll" Guid="CA7D0EDE-0B81-4709-86E9-31DC8543918F" DiskId="1">
-	                            <File Id="fil_msvcp71_dll" LongName="msvcp71.dll" Name="msvcp71.dll" src="$(var.SystemDir)msvcp71.dll" KeyPath="yes" />
+	                            <File Id="fil_msvcp71_dll" Name="msvcp71.dll" src="$(var.SystemDir)msvcp71.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71chs_dll" Guid="693F64CF-1AE5-4756-94CC-095ED48C217F" DiskId="1">
-	                            <File Id="fil_mfc71chs_dll" LongName="mfc71chs.dll" Name="mfc71chs.dll" src="$(var.SystemDir)mfc71chs.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71chs_dll" Name="mfc71chs.dll" src="$(var.SystemDir)mfc71chs.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71cht_dll" Guid="A5552AAE-048F-41AB-AC2D-6C96411D812D" DiskId="1">
-	                            <File Id="fil_mfc71cht_dll" LongName="mfc71cht.dll" Name="mfc71cht.dll" src="$(var.SystemDir)mfc71cht.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71cht_dll" Name="mfc71cht.dll" src="$(var.SystemDir)mfc71cht.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71deu_dll" Guid="E8AE39B8-1B23-4DC9-944F-CA823F53CFF3" DiskId="1">
-	                            <File Id="fil_mfc71deu_dll" LongName="mfc71deu.dll" Name="mfc71deu.dll" src="$(var.SystemDir)mfc71deu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71deu_dll" Name="mfc71deu.dll" src="$(var.SystemDir)mfc71deu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71enu_dll" Guid="1FF5B6B6-4015-40F1-AEFF-004DBCFDB5E7" DiskId="1">
-	                            <File Id="fil_mfc71enu_dll" LongName="mfc71enu.dll" Name="mfc71enu.dll" src="$(var.SystemDir)mfc71enu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71enu_dll" Name="mfc71enu.dll" src="$(var.SystemDir)mfc71enu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71esp_dll" Guid="028AC2DA-B4F9-4A9E-A728-1100B3C7E259" DiskId="1">
-	                            <File Id="fil_mfc71esp_dll" LongName="mfc71esp.dll" Name="mfc71esp.dll" src="$(var.SystemDir)mfc71esp.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71esp_dll" Name="mfc71esp.dll" src="$(var.SystemDir)mfc71esp.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71fra_dll" Guid="7D6C3457-F08C-426C-BEE2-8D9F214223C5" DiskId="1">
-	                            <File Id="fil_mfc71fra_dll" LongName="mfc71fra.dll" Name="mfc71fra.dll" src="$(var.SystemDir)mfc71fra.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71fra_dll" Name="mfc71fra.dll" src="$(var.SystemDir)mfc71fra.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71ita_dll" Guid="5CE98F88-CD33-4887-9634-B6263B6DB3CB" DiskId="1">
-	                            <File Id="fil_mfc71ita_dll" LongName="mfc71ita.dll" Name="mfc71ita.dll" src="$(var.SystemDir)mfc71ita.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71ita_dll" Name="mfc71ita.dll" src="$(var.SystemDir)mfc71ita.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71jpn_dll" Guid="6DE66BB3-5DD2-4D87-89E4-D73FF405932C" DiskId="1">
-	                            <File Id="fil_mfc71jpn_dll" LongName="mfc71jpn.dll" Name="mfc71jpn.dll" src="$(var.SystemDir)mfc71jpn.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71jpn_dll" Name="mfc71jpn.dll" src="$(var.SystemDir)mfc71jpn.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71kor_dll" Guid="B7290849-638E-4C39-9E56-0D73CF564D69" DiskId="1">
-	                            <File Id="fil_mfc71kor_dll" LongName="mfc71kor.dll" Name="mfc71kor.dll" src="$(var.SystemDir)mfc71kor.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71kor_dll" Name="mfc71kor.dll" src="$(var.SystemDir)mfc71kor.dll" KeyPath="yes" />
                             </Component>
                     <?endif?>
                 <?else?> <!-- Debug -->
                     <?ifdef CL1200?>
                         <Component Win64="$(var.Win64)" Id="cmf_mfc42d_dll" Guid="B7360C15-61FA-409F-8F0A-87B96FB30BBD" DiskId="1">
-	                        <File Id="fil_mfc42d_dll" LongName="mfc42d.dll" Name="mfc42d.dll" src="$(var.SystemDir)mfc42d.dll" KeyPath="yes" />
+	                        <File Id="fil_mfc42d_dll" Name="mfc42d.dll" src="$(var.SystemDir)mfc42d.dll" KeyPath="yes" />
                         </Component>
                         <Component Win64="$(var.Win64)" Id="cmf_msvcp60d_dll" Guid="BFF28D63-B60A-48B6-A403-A7DE00BDB37E" DiskId="1">
-	                        <File Id="fil_msvcp60d_dll" LongName="msvcp60d.dll" Name="msvcp60d.dll" src="$(var.SystemDir)msvcp60d.dll" KeyPath="yes" />
+	                        <File Id="fil_msvcp60d_dll" Name="msvcp60d.dll" src="$(var.SystemDir)msvcp60d.dll" KeyPath="yes" />
                         </Component>
                         <Component Win64="$(var.Win64)" Id="cmf_msvcrtd_dll" Guid="69069738-3202-43C3-92A3-4139816B6527" DiskId="1">
-	                        <File Id="fil_msvcrtd_dll" LongName="msvcrtd.dll" Name="msvcrtd.dll" src="$(var.SystemDir)msvcrtd.dll" KeyPath="yes" />
+	                        <File Id="fil_msvcrtd_dll" Name="msvcrtd.dll" src="$(var.SystemDir)msvcrtd.dll" KeyPath="yes" />
                         </Component>
                         <Component Win64="$(var.Win64)" Id="cmf_runtime_debug1200" Guid="3FAD9513-AB33-4eed-9359-E96F8D5ABD2A" DiskId="1">
-	                        <File Id="fil_mfc42d_pdb" LongName="mfc42d.pdb" Name="mfc42d.pdb" src="$(var.SystemDir)mfc42d.pdb" />
-	                        <File Id="fil_msvcp60d_pdb" LongName="msvcp60d.pdb" Name="msvcp60d.pdb" src="$(var.SystemDir)msvcp60d.pdb" />
-	                        <File Id="fil_msvcrtd_pdb" LongName="msvcrtd.pdb" Name="msvcrtd.pdb" src="$(var.SystemDir)msvcrtd.pdb" KeyPath="yes" />
+	                        <File Id="fil_mfc42d_pdb" Name="mfc42d.pdb" src="$(var.SystemDir)mfc42d.pdb" />
+	                        <File Id="fil_msvcp60d_pdb" Name="msvcp60d.pdb" src="$(var.SystemDir)msvcp60d.pdb" />
+	                        <File Id="fil_msvcrtd_pdb" Name="msvcrtd.pdb" src="$(var.SystemDir)msvcrtd.pdb" KeyPath="yes" />
                         </Component>
                     <?endif?>
                     <?ifdef CL1300?>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70d_dll" Guid="40C7120A-9B28-4DD1-86D0-9F66056A2463" DiskId="1">
-	                            <File Id="fil_mfc70d_dll" LongName="mfc70d.dll" Name="mfc70d.dll" src="$(var.SystemDir)mfc70d.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70d_dll" Name="mfc70d.dll" src="$(var.SystemDir)mfc70d.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_msvcr70d_dll" Guid="D0A7B06E-6F65-4559-A99A-63C4C837BE0E" DiskId="1">
-	                            <File Id="fil_msvcr70d_dll" LongName="msvcr70d.dll" Name="msvcr70d.dll" src="$(var.SystemDir)msvcr70d.dll" KeyPath="yes" />
+	                            <File Id="fil_msvcr70d_dll" Name="msvcr70d.dll" src="$(var.SystemDir)msvcr70d.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_msvcp70d_dll" Guid="DC82F644-8705-4C89-BE63-4CD6680BF580" DiskId="1">
-	                            <File Id="fil_msvcp70d_dll" LongName="msvcp70d.dll" Name="msvcp70d.dll" src="$(var.SystemDir)msvcp70d.dll" KeyPath="yes" />
+	                            <File Id="fil_msvcp70d_dll" Name="msvcp70d.dll" src="$(var.SystemDir)msvcp70d.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70chs_dll" Guid="CAFD61A5-8A13-4A7C-AA15-6FEED7D43A3A" DiskId="1">
-	                            <File Id="fil_mfc70chs_dll" LongName="mfc70chs.dll" Name="mfc70chs.dll" src="$(var.SystemDir)mfc70chs.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70chs_dll" Name="mfc70chs.dll" src="$(var.SystemDir)mfc70chs.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70cht_dll" Guid="A3F60016-825A-4096-A45F-98B4972FF1CA" DiskId="1">
-	                            <File Id="fil_mfc70cht_dll" LongName="mfc70cht.dll" Name="mfc70cht.dll" src="$(var.SystemDir)mfc70cht.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70cht_dll" Name="mfc70cht.dll" src="$(var.SystemDir)mfc70cht.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70deu_dll" Guid="D146EE00-8880-4E39-A131-784B947883DB" DiskId="1">
-	                            <File Id="fil_mfc70deu_dll" LongName="mfc70deu.dll" Name="mfc70deu.dll" src="$(var.SystemDir)mfc70deu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70deu_dll" Name="mfc70deu.dll" src="$(var.SystemDir)mfc70deu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70enu_dll" Guid="11E2059D-62E6-40DF-87C1-B03E425048CE" DiskId="1">
-	                            <File Id="fil_mfc70enu_dll" LongName="mfc70enu.dll" Name="mfc70enu.dll" src="$(var.SystemDir)mfc70enu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70enu_dll" Name="mfc70enu.dll" src="$(var.SystemDir)mfc70enu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70esp_dll" Guid="3D1AAC2A-0FB1-4EF7-8406-1BF771CEB4BB" DiskId="1">
-	                            <File Id="fil_mfc70esp_dll" LongName="mfc70esp.dll" Name="mfc70esp.dll" src="$(var.SystemDir)mfc70esp.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70esp_dll" Name="mfc70esp.dll" src="$(var.SystemDir)mfc70esp.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70fra_dll" Guid="36A2B8B3-E6C6-4725-96B8-82905D2ADE4E" DiskId="1">
-	                            <File Id="fil_mfc70fra_dll" LongName="mfc70fra.dll" Name="mfc70fra.dll" src="$(var.SystemDir)mfc70fra.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70fra_dll" Name="mfc70fra.dll" src="$(var.SystemDir)mfc70fra.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70ita_dll" Guid="4EE49FC8-ED41-48F4-90A9-1FC06FE6237D" DiskId="1">
-	                            <File Id="fil_mfc70ita_dll" LongName="mfc70ita.dll" Name="mfc70ita.dll" src="$(var.SystemDir)mfc70ita.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70ita_dll" Name="mfc70ita.dll" src="$(var.SystemDir)mfc70ita.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70jpn_dll" Guid="A6ADFFF1-C48B-446C-9B7D-6137F00EC0E4" DiskId="1">
-	                            <File Id="fil_mfc70jpn_dll" LongName="mfc70jpn.dll" Name="mfc70jpn.dll" src="$(var.SystemDir)mfc70jpn.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70jpn_dll" Name="mfc70jpn.dll" src="$(var.SystemDir)mfc70jpn.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc70kor_dll" Guid="720F98E2-5525-41CA-8734-98B0A5756708" DiskId="1">
-	                            <File Id="fil_mfc70kor_dll" LongName="mfc70kor.dll" Name="mfc70kor.dll" src="$(var.SystemDir)mfc70kor.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc70kor_dll" Name="mfc70kor.dll" src="$(var.SystemDir)mfc70kor.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_runtime_debug1300" Guid="157D7DE8-6AFE-44b3-A317-840667C76D0D" DiskId="1">
-	                            <File Id="fil_mfc70d_pdb" LongName="mfc70d.pdb" Name="mfc70d.pdb" src="$(var.SystemDir)mfc70d.pdb" />
-	                            <File Id="fil_msvcr70d_pdb" LongName="msvcr70d.pdb" Name="msvcr70d.pdb" src="$(var.SystemDir)msvcr70d.pdb" KeyPath="yes" />
-	                            <File Id="fil_msvcp70d_pdb" LongName="msvcp70d.pdb" Name="msvcp70d.pdb" src="$(var.SystemDir)msvcp70d.pdb" />
+	                            <File Id="fil_mfc70d_pdb" Name="mfc70d.pdb" src="$(var.SystemDir)mfc70d.pdb" />
+	                            <File Id="fil_msvcr70d_pdb" Name="msvcr70d.pdb" src="$(var.SystemDir)msvcr70d.pdb" KeyPath="yes" />
+	                            <File Id="fil_msvcp70d_pdb" Name="msvcp70d.pdb" src="$(var.SystemDir)msvcp70d.pdb" />
                             </Component>
                     <?endif?>
                     <?ifdef CL1310?>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71d_dll" Guid="0E0A47A3-892C-4526-8591-C719E1A184F2" DiskId="1">
-	                            <File Id="fil_mfc71d_dll" LongName="mfc71d.dll" Name="mfc71d.dll" src="$(var.SystemDir)mfc71d.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71d_dll" Name="mfc71d.dll" src="$(var.SystemDir)mfc71d.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_msvcr71d_dll" Guid="CB2A282D-CF73-4DA8-929D-8035776F4FB8" DiskId="1">
-	                            <File Id="fil_msvcr71d_dll" LongName="msvcr71d.dll" Name="msvcr71d.dll" src="$(var.SystemDir)msvcr71d.dll" KeyPath="yes" />
+	                            <File Id="fil_msvcr71d_dll" Name="msvcr71d.dll" src="$(var.SystemDir)msvcr71d.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_msvcp71d_dll" Guid="7D6003B6-B3A1-417A-BE16-5DDD52023456" DiskId="1">
-	                            <File Id="fil_msvcp71d_dll" LongName="msvcp71d.dll" Name="msvcp71d.dll" src="$(var.SystemDir)msvcp71d.dll" KeyPath="yes" />
+	                            <File Id="fil_msvcp71d_dll" Name="msvcp71d.dll" src="$(var.SystemDir)msvcp71d.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71chs_dll" Guid="693F64CF-1AE5-4756-94CC-095ED48C217F" DiskId="1">
-	                            <File Id="fil_mfc71chs_dll" LongName="mfc71chs.dll" Name="mfc71chs.dll" src="$(var.SystemDir)mfc71chs.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71chs_dll" Name="mfc71chs.dll" src="$(var.SystemDir)mfc71chs.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71cht_dll" Guid="A5552AAE-048F-41AB-AC2D-6C96411D812D" DiskId="1">
-	                            <File Id="fil_mfc71cht_dll" LongName="mfc71cht.dll" Name="mfc71cht.dll" src="$(var.SystemDir)mfc71cht.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71cht_dll" Name="mfc71cht.dll" src="$(var.SystemDir)mfc71cht.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71deu_dll" Guid="E8AE39B8-1B23-4DC9-944F-CA823F53CFF3" DiskId="1">
-	                            <File Id="fil_mfc71deu_dll" LongName="mfc71deu.dll" Name="mfc71deu.dll" src="$(var.SystemDir)mfc71deu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71deu_dll" Name="mfc71deu.dll" src="$(var.SystemDir)mfc71deu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71enu_dll" Guid="1FF5B6B6-4015-40F1-AEFF-004DBCFDB5E7" DiskId="1">
-	                            <File Id="fil_mfc71enu_dll" LongName="mfc71enu.dll" Name="mfc71enu.dll" src="$(var.SystemDir)mfc71enu.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71enu_dll" Name="mfc71enu.dll" src="$(var.SystemDir)mfc71enu.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71esp_dll" Guid="028AC2DA-B4F9-4A9E-A728-1100B3C7E259" DiskId="1">
-	                            <File Id="fil_mfc71esp_dll" LongName="mfc71esp.dll" Name="mfc71esp.dll" src="$(var.SystemDir)mfc71esp.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71esp_dll" Name="mfc71esp.dll" src="$(var.SystemDir)mfc71esp.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71fra_dll" Guid="7D6C3457-F08C-426C-BEE2-8D9F214223C5" DiskId="1">
-	                            <File Id="fil_mfc71fra_dll" LongName="mfc71fra.dll" Name="mfc71fra.dll" src="$(var.SystemDir)mfc71fra.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71fra_dll" Name="mfc71fra.dll" src="$(var.SystemDir)mfc71fra.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71ita_dll" Guid="5CE98F88-CD33-4887-9634-B6263B6DB3CB" DiskId="1">
-	                            <File Id="fil_mfc71ita_dll" LongName="mfc71ita.dll" Name="mfc71ita.dll" src="$(var.SystemDir)mfc71ita.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71ita_dll" Name="mfc71ita.dll" src="$(var.SystemDir)mfc71ita.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71jpn_dll" Guid="6DE66BB3-5DD2-4D87-89E4-D73FF405932C" DiskId="1">
-	                            <File Id="fil_mfc71jpn_dll" LongName="mfc71jpn.dll" Name="mfc71jpn.dll" src="$(var.SystemDir)mfc71jpn.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71jpn_dll" Name="mfc71jpn.dll" src="$(var.SystemDir)mfc71jpn.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_mfc71kor_dll" Guid="B7290849-638E-4C39-9E56-0D73CF564D69" DiskId="1">
-	                            <File Id="fil_mfc71kor_dll" LongName="mfc71kor.dll" Name="mfc71kor.dll" src="$(var.SystemDir)mfc71kor.dll" KeyPath="yes" />
+	                            <File Id="fil_mfc71kor_dll" Name="mfc71kor.dll" src="$(var.SystemDir)mfc71kor.dll" KeyPath="yes" />
                             </Component>
                             <Component Win64="$(var.Win64)" Id="cmf_runtime_debug1310" Guid="0125814E-9EED-4d57-A4E6-3E685CE5AB5C" DiskId="1">
-	                            <File Id="fil_mfc71d_pdb" LongName="mfc71d.pdb" Name="mfc71d.pdb" src="$(var.SystemDir)mfc71d.pdb" />
-	                            <File Id="fil_msvcr71d_pdb" LongName="msvcr71d.pdb" Name="msvcr71d.pdb" src="$(var.SystemDir)msvcr71d.pdb" KeyPath="yes" />
-	                            <File Id="fil_msvcp71d_pdb" LongName="msvcp71d.pdb" Name="msvcp71d.pdb" src="$(var.SystemDir)msvcp71d.pdb" />
+	                            <File Id="fil_mfc71d_pdb" Name="mfc71d.pdb" src="$(var.SystemDir)mfc71d.pdb" />
+	                            <File Id="fil_msvcr71d_pdb" Name="msvcr71d.pdb" src="$(var.SystemDir)msvcr71d.pdb" KeyPath="yes" />
+	                            <File Id="fil_msvcp71d_pdb" Name="msvcp71d.pdb" src="$(var.SystemDir)msvcp71d.pdb" />
                             </Component>
                     <?endif?>
                 <?endif?>
                 
                     <Component Win64="$(var.Win64)" Id="cmf_psapi_dll" Guid="877F4DD5-8AE0-451C-8F4D-C27F6F30D221" DiskId="1">
-	                    <File Id="fil_psapi_dll" LongName="psapi.dll" Name="psapi.dll" src="$(var.SystemDir)psapi.dll" KeyPath="yes" />
+	                    <File Id="fil_psapi_dll" Name="psapi.dll" src="$(var.SystemDir)psapi.dll" KeyPath="yes" />
                     </Component>
                 
                 </Directory> <!-- /bin -->
                 
-                <Directory Id="dirinc" Name="inc" src="$(var.IncDir)">
-                  <?if $(var.Platform) = "Intel"?>
-                    <Directory Id="dirinc_kclient" Name="kclient" src="$(var.IncDir)kclient\">
-                        <Component Win64="$(var.Win64)" Id="cmp_dirinc_kclient" Guid="96215203-7FF5-4576-AAC5-F5035B64CC37" DiskId="1">
-                            <File Id="fil_kclient_h" LongName="kclient.h" Name="kclient.h" KeyPath="yes" />
-                            <File Id="fil_kcmacerr_h" LongName="kcmacerr.h" Name="kcmacerr.h" />
-                        </Component>
-                    </Directory>
-                    <Directory Id="dirinc_krb4" Name="krb4" src="$(var.IncDir)krb4\">
-                        <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb4" Guid="5D2E3F2E-87AE-4905-84AC-AC503662D1B0" DiskId="1">
-                            <File Id="fil_com_err_h" LongName="com_err.h" Name="com_err.h" />
-                            <File Id="fil_conf_pc_h" LongName="conf-pc.h" Name="conf-pc.h" />
-                            <File Id="fil_conf_h" LongName="conf.h" Name="conf.h" />
-                            <File Id="fil_des_h" LongName="des.h" Name="des.h" />
-                            <File Id="fil_kadm_err_h" LongName="kadm_err.h" Name="kadm_err.h" />
-                            <File Id="fil_krb_h" LongName="krb.h" Name="krb.h" KeyPath="yes" />
-                            <File Id="fil_krberr_h" LongName="krberr.h" Name="krberr.h" />
-                            <File Id="fil_mit_copy_h" LongName="mit_copy.h" Name="mit_copy.h" />
-                            <File Id="fil_osconf_h" LongName="osconf.h" Name="osconf.h" />
-                        </Component>
-                    </Directory>
-                  <?endif?>
-                    <Directory Id="dirinc_krb5" Name="krb5" src="$(var.IncDir)krb5\">
-                        <Directory Id="dirinc_krb5_gssapi" Name="gssapi" src="$(var.IncDir)\krb5\gssapi\">
+                <Directory Id="dirinc" Name="include" src="$(var.IncDir)">
+                        <Directory Id="dirinc_krb5_gssapi" Name="gssapi" src="$(var.IncDir)gssapi\">
                             <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5_gssapi" Guid="BD3C190B-1EBB-4d14-81DD-B2000DC4EAC7" DiskId="1">
-                                <File Id="fil_gssapi_h" LongName="gssapi.h" Name="gssapi.h" KeyPath="yes" />
-                                <File Id="fil_gssapi_generic_h" LongName="gssapi_generic.h" Name="GSSAPI_G.H" />
-                                <File Id="fil_gssapi_krb5_h" LongName="gssapi_krb5.h" Name="GSSAPI_K.H" />
+                                <File Id="fil_gssapi_h" Name="gssapi.h" KeyPath="yes" />
+                                <File Id="fil_gssapi_ext_h" Name="gssapi_ext.h" />
+                                <File Id="fil_gssapi_generic_h" Name="gssapi_generic.h" />
+                                <File Id="fil_gssapi_krb5_h" Name="gssapi_krb5.h" />
                             </Component>
                         </Directory>
-                        <Directory Id="dirinc_krb5_KerberosIV" LongName="KerberosIV" Name="krb4" src="$(var.IncDir)\krb5\KerberosIV\">
-                            <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5_KerberosIV" Guid="307B8031-2589-4f92-A303-EF4231328490" DiskId="1">
-                                <File Id="fil_des_.h" LongName="des.h" Name="des.h" />
-                                <File Id="fil_kadm_err_.h" LongName="kadm_err.h" Name="kadm_err.h" />
-                                <File Id="fil_krb_.h" LongName="krb.h" Name="krb.h" KeyPath="yes" />
-                                <File Id="fil_krb_err_.h" LongName="krb_err.h" Name="krb_err.h" />
-                                <File Id="fil_mit_copyright_.h" LongName="mit-copyright.h" Name="MIT-COPY.H" />
-                            </Component>
-                        </Directory>
-                        <Directory Id="dirinc_krb5_krb5" Name="krb5" src="$(var.IncDir)\krb5\krb5\">
+                        <Directory Id="dirinc_krb5_krb5" Name="krb5" src="$(var.IncDir)krb5\">
                             <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5_krb5" Guid="D1E4E3D8-EF04-4DD6-B01E-F87876509869" DiskId="1">
-                                <File Id="fil_krb5_h_inc" LongName="krb5.h" Name="krb5.h" KeyPath="yes" />
+                                <File Id="fil_krb5_h_inc" Name="krb5.h" KeyPath="yes" />
                             </Component>
                         </Directory>
                         <Component Win64="$(var.Win64)" Id="cmp_dirinc_krb5" Guid="7FD8008B-2F46-4613-8A09-989F643258F1" DiskId="1">
-                            <File Id="fil_com_err_.h" LongName="com_err.h" Name="com_err.h" />
-                            <File Id="fil_krb5_.h" LongName="krb5.h" Name="krb5.h" KeyPath="yes" />
-                            <File Id="fil_profile_.h" LongName="profile.h" Name="profile.h" />
-                            <File Id="fil_win_mac_.h" LongName="win-mac.h" Name="win-mac.h" />
+                            <File Id="fil_com_err_.h" Name="com_err.h" />
+                            <File Id="fil_krb5_.h" Name="krb5.h" KeyPath="yes" />
+                            <File Id="fil_profile_.h" Name="profile.h" />
+                            <File Id="fil_win_mac_.h" Name="win-mac.h" />
                         </Component>
-                    </Directory>
-                    <Directory Id="dirinc_krbcc" Name="krbcc" src="$(var.IncDir)krbcc\">
+                    <Directory Id="dirinc_windows" Name="windows" src="$(var.SrcDir)windows\include\">
+<!-- TODO: CredentialCache.h?
                         <Component Win64="$(var.Win64)" Id="cmp_dirinc_krbcc" Guid="2CE4B708-7D45-41e4-8A53-BF2D78451A81" DiskId="1">
-                            <File Id="fil_cacheapi_h" LongName="cacheapi.h" Name="cacheapi.h" KeyPath="yes" />
-                        </Component>
-                    </Directory>
-                    <Directory Id="dirinc_leash" Name="leash" src="$(var.IncDir)leash\">
+                            <File Id="fil_cacheapi_h" Name="cacheapi.h" KeyPath="yes" />
+                        </Component> -->
                         <Component Win64="$(var.Win64)" Id="cmp_dirinc_leash" Guid="FCF269AB-D9BC-49bd-B9F3-D6EA9697D8D7" DiskId="1">
-                            <File Id="fil_leasherr_h" LongName="leasherr.h" Name="leasherr.h" />
-                            <File Id="fil_leashinfo_h" LongName="leashinfo.h" Name="LEASHINF.H" />
-                            <File Id="fil_leashwin_h" LongName="leashwin.h" Name="leashwin.h" KeyPath="yes" />
+                            <File Id="fil_leasherr_h" Name="leasherr.h" />
+                            <File Id="fil_leashinfo_h" Name="leashinfo.h" />
+                            <File Id="fil_leashwin_h" Name="leashwin.h" KeyPath="yes" />
                         </Component>
-                    </Directory>
-                    <Directory Id="dirinc_loadfuncs" LongName="loadfuncs" Name="loadfunc" src="$(var.IncDir)loadfuncs\">
                         <Component Win64="$(var.Win64)" Id="cmp_dirinc_loadfuncs" Guid="C8E59D05-4502-498b-A107-1DF65C3A27D3" DiskId="1">
-                            <File Id="fil_loadfuncs_afs_h" LongName="loadfuncs-afs.h" Name="LF-AFS.H" />
-                            <File Id="fil_loadfuncs_afs36_h" LongName="loadfuncs-afs36.h" Name="LF-AFS36.H" />
-                            <File Id="fil_loadfuncs_com_err_h" LongName="loadfuncs-com_err.h" Name="LF-COMER.H" />
-                            <File Id="fil_loadfuncs_krb_h" LongName="loadfuncs-krb.h" Name="LF-KRB.H" />
-                            <File Id="fil_loadfuncs_krb5_h" LongName="loadfuncs-krb5.h" Name="LF-KRB5.H" />
-                            <File Id="fil_loadfuncs_krb524_h" LongName="loadfuncs-krb524.h" Name="LF-K524.H" />
-                            <File Id="fil_loadfuncs_leash_h" LongName="loadfuncs-leash.h" Name="LF-LEASH.H" />
-                            <File Id="fil_loadfuncs_lsa_h" LongName="loadfuncs-lsa.h" Name="LF-LFA.H" />
-                            <File Id="fil_loadfuncs_profile_h" LongName="loadfuncs-profile.h" Name="LF-PROF.H" />
-                            <File Id="fil_loadfuncs_wshelper_h" LongName="loadfuncs-wshelper.h" Name="LF-WSHLP.H" />
-                            <File Id="fil_loadfuncs_c" LongName="loadfuncs.c" Name="LOADFUNC.C" />
-                            <File Id="fil_loadfuncs_h" LongName="loadfuncs.h" Name="LOADFUNC.H" KeyPath="yes" />
-                        </Component>
-                    </Directory>
-                    <Directory Id="dirinc_netidmgr" Name="netidmgr" src="$(var.IncDir)netidmgr\">
-                        <Component Win64="$(var.Win64)" Id="cmp_dirinc_netidmgr" Guid="EBD8BA04-574A-4081-A994-BCEC8ACBC878" DiskId="1">
-                            <File Id="fil_hashtable_h" LongName="hashtable.h" Name="HASHTABL.H" />
-                            <File Id="fil_kconfig_h" LongName="kconfig.h" Name="kconfig.h" /> 
-                            <File Id="fil_kcreddb_h" LongName="kcreddb.h" Name="kcreddb.h" /> 
-                            <File Id="fil_khaction_h" LongName="khaction.h" Name="khaction.h" /> 
-                            <File Id="fil_khactiondef_h" LongName="khactiondef.h" Name="KHACTDEF.H" /> 
-                            <File Id="fil_khalerts_h" LongName="khalerts.h" Name="khalerts.h" /> 
-                            <File Id="fil_khconfigui_h" LongName="khconfigui.h" Name="KHCONFUI.H" /> 
-                            <File Id="fil_khdefs_h" LongName="khdefs.h" Name="khdefs.h" /> 
-                            <File Id="fil_kherr_h" LongName="kherr.h" Name="kherr.h" /> 
-                            <File Id="fil_kherror_h" LongName="kherror.h" Name="kherror.h" /> 
-                            <File Id="fil_khhtlink_h" LongName="khhtlink.h" Name="khhtlink.h" /> 
-                            <File Id="fil_khlist_h" LongName="khlist.h" Name="khlist.h" /> 
-                            <File Id="fil_khmsgtypes_h" LongName="khmsgtypes.h" Name="KHMSGTYP.H" /> 
-                            <File Id="fil_khnewcred_h" LongName="khnewcred.h" Name="KHNEWCRD.H" /> 
-                            <File Id="fil_khprops_h" LongName="khprops.h" Name="khprops.h" /> 
-                            <File Id="fil_khremote_h" LongName="khremote.h" Name="khremote.h" /> 
-                            <File Id="fil_khrescache_h" LongName="khrescache.h" Name="KHRESCHE.H" /> 
-                            <File Id="fil_khtracker_h" LongName="khtracker.h" Name="KHTRACKR.H" />
-                            <File Id="fil_khuidefs_h" LongName="khuidefs.h" Name="khuidefs.h" KeyPath="yes" />
-                            <File Id="fil_kmm_h" LongName="kmm.h" Name="kmm.h" />
-                            <File Id="fil_kmq_h" LongName="kmq.h" Name="kmq.h" />
-                            <File Id="fil_kplugin_h" LongName="kplugin.h" Name="kplugin.h" />
-                            <File Id="fil_mstring_h" LongName="mstring.h" Name="mstring.h" />
-                            <File Id="fil_sync_h" LongName="sync.h" Name="sync.h" />
-                            <File Id="fil_utils_h" LongName="utils.h" Name="utils.h" />
-                            <File Id="fil_perfstat_h" LongName="perfstat.h" Name="perfstat.h" />
-                            <File Id="fil_netidmgr_h" LongName="netidmgr.h" Name="netidmgr.h" /> 
-                            <File Id="fil_netidmgr_version_h" LongName="netidmgr_version.h" Name="netidmvr.h" />
+                            <File Id="fil_loadfuncs_com_err_h" Name="loadfuncs-com_err.h" />
+                            <File Id="fil_loadfuncs_krb5_h" Name="loadfuncs-krb5.h" />
+                            <File Id="fil_loadfuncs_leash_h" Name="loadfuncs-leash.h" />
+                            <File Id="fil_loadfuncs_lsa_h" Name="loadfuncs-lsa.h" />
+                            <File Id="fil_loadfuncs_profile_h" Name="loadfuncs-profile.h" />
+<!--                            <File Id="fil_loadfuncs_c" Name="loadfuncs.c" /> -->
+                            <File Id="fil_loadfuncs_h" Name="loadfuncs.h" KeyPath="yes" />
                         </Component>
-                    </Directory>
-                    <Directory Id="dirinc_wshelper" Name="wshelper" src="$(var.IncDir)wshelper\">
                         <Component Win64="$(var.Win64)" Id="cmp_dirinc_wshelper" Guid="5A4FCD76-6DC6-455c-B465-FD8123252EBD" DiskId="1">
-                            <File Id="fil_hesiod_h" LongName="hesiod.h" Name="hesiod.h" />
-                            <File Id="fil_mitwhich_h" LongName="mitwhich.h" Name="mitwhich.h" />
-                            <File Id="fil_resolv_h" LongName="resolv.h" Name="resolv.h" />
-                            <File Id="fil_wshelper_h" LongName="wshelper.h" Name="wshelper.h" KeyPath="yes" />
+                            <File Id="fil_hesiod_h" Name="hesiod.h" />
+                            <File Id="fil_mitwhich_h" Name="mitwhich.h" />
+                            <File Id="fil_resolv_h" Name="resolv.h" />
+                            <File Id="fil_wshelper_h" Name="wshelper.h" KeyPath="yes" />
                         </Component>
-                        <Directory Id="dirinc_wshelper_arpa" Name="arpa" src="$(var.IncDir)\wshelper\arpa\">
+                        <Directory Id="dirinc_wshelper_arpa" Name="arpa" src="$(var.SrcDir)\windows\include\arpa\">
                             <Component Win64="$(var.Win64)" Id="cmp_dirinc_wshelper_arpa" Guid="42A19215-91D6-4cd6-8BE8-95105849B862" DiskId="1">
-                                <File Id="fil_nameser_h" LongName="nameser.h" Name="nameser.h" KeyPath="yes" />
+                                <File Id="fil_nameser_h" Name="nameser.h" KeyPath="yes" />
                             </Component>
                         </Directory>
                     </Directory>
@@ -785,179 +587,107 @@
                    <?if $(var.Platform) = "Intel" ?>
                     <Directory Id="dirlib_i386" Name="i386" src="$(var.LibDir)">
                         <Component Win64="$(var.Win64)" Id="cmp_dirlib_i386" Guid="CFEE3ED4-92D4-49e1-BB78-8BCBC60C3E57" DiskId="1">
-                            <File Id="fil_comerr32_lib" LongName="comerr32.lib" Name="comerr32.lib" />
-                            <File Id="fil_delaydlls_32_lib" LongName="delaydlls.lib" Name="DELAYDLL.LIB" />
-                            <File Id="fil_getopt_32_lib" LongName="getopt.lib" Name="getopt.lib" />
-                            <File Id="fil_gssapi32_lib" LongName="gssapi32.lib" Name="gssapi32.lib" />
-                            <File Id="fil_kclnt32_lib" LongName="kclnt32.lib" Name="kclnt32.lib" />
-                            <File Id="fil_krb524_32_lib" LongName="krb524.lib" Name="krb524.lib" />
-                            <File Id="fil_krbv4w32_lib" LongName="krbv4w32.lib" Name="krbv4w32.lib" />
-                            <File Id="fil_krb5_32_lib" LongName="krb5_32.lib" Name="krb5_32.lib" KeyPath="yes" />
-                            <File Id="fil_krbcc32_lib" LongName="krbcc32.lib" Name="krbcc32.lib" />
-                            <File Id="fil_leashw32_lib" LongName="leashw32.lib" Name="leashw32.lib" />
-                            <File Id="fil_loadfuncs_32_lib" LongName="loadfuncs.lib" Name="LOADFUNC.LIB" />
-                            <File Id="fil_wshelp32_lib" LongName="wshelp32.lib" Name="wshelp32.lib" />
-                            <File Id="fil_xpprof32_lib" LongName="xpprof32.lib" Name="xpprof32.lib" />
-                            <File Id="fil_nidmgr32_lib" LongName="nidmgr32.lib" Name="nidmgr32.lib" />
+                            <File Id="fil_comerr32_lib" Name="comerr32.lib" />
+                            <File Id="fil_getopt_32_lib" Name="getopt.lib" />
+                            <File Id="fil_gssapi32_lib" Name="gssapi32.lib" />
+                            <File Id="fil_krb5_32_lib" Name="krb5_32.lib" KeyPath="yes" />
+                            <File Id="fil_krbcc32_lib" Name="krbcc32.lib" />
+                            <File Id="fil_leashw32_lib" Name="leashw32.lib" />
+                            <File Id="fil_wshelp32_lib" Name="wshelp32.lib" />
+<!--                            <File Id="fil_xpprof32_lib" Name="xpprof32.lib" /> -->
                         </Component>
                     </Directory>
                     <?endif?>
                     <?if $(var.Platform) = "x64" ?>
                     <Directory Id="dirlib_amd64" Name="amd64" src="$(var.LibDir)">
                         <Component Win64="$(var.Win64)" Id="cmp_dirlib_amd64" Guid="F9A54201-FFD6-4a45-B021-276D9F6C40A2" DiskId="1">
-                            <File Id="fil_comerr64_lib" LongName="comerr64.lib" Name="comerr64.lib" />
-                            <File Id="fil_delaydlls_64_lib" LongName="delaydlls.lib" Name="DELAYDLL.LIB" />
-                            <File Id="fil_getopt_64_lib" LongName="getopt.lib" Name="getopt.lib" />
-                            <File Id="fil_gssapi64_lib" LongName="gssapi64.lib" Name="gssapi64.lib" />
-                            <File Id="fil_krb5_64_lib" LongName="krb5_64.lib" Name="krb5_64.lib" KeyPath="yes" />
-                            <File Id="fil_krbcc64_lib" LongName="krbcc64.lib" Name="krbcc64.lib" />
-                            <File Id="fil_leashw64_lib" LongName="leashw64.lib" Name="leashw64.lib" />
-                            <File Id="fil_loadfuncs_64_lib" LongName="loadfuncs.lib" Name="LOADFUNC.LIB" />
-                            <File Id="fil_wshelp64_lib" LongName="wshelp64.lib" Name="wshelp64.lib" />
-                            <File Id="fil_xpprof64_lib" LongName="xpprof64.lib" Name="xpprof64.lib" />
-                            <File Id="fil_nidmgr64_lib" LongName="nidmgr64.lib" Name="nidmgr64.lib" />
+                            <File Id="fil_comerr64_lib" Name="comerr64.lib" />
+                            <File Id="fil_getopt_64_lib" Name="getopt.lib" />
+                            <File Id="fil_gssapi64_lib" Name="gssapi64.lib" />
+                            <File Id="fil_krb5_64_lib" Name="krb5_64.lib" KeyPath="yes" />
+                            <File Id="fil_krbcc64_lib" Name="krbcc64.lib" />
+                            <File Id="fil_leashw64_lib" Name="leashw64.lib" />
+                            <File Id="fil_wshelp64_lib" Name="wshelp64.lib" />
+<!--                            <File Id="fil_xpprof64_lib" Name="xpprof64.lib" /> -->
                         </Component>
                     </Directory>
                     <?endif?>
                 </Directory>
                 
                 <Directory Id="dirinstall" Name="install" src="$(var.InstallDir)">
-                    <Directory Id="dirinstall_nsis" Name="nsis" src="$(var.InstallDir)nsis\">
-                        <Component Win64="$(var.Win64)" Id="cmp_dirinstall_nsis" Guid="711C3910-5369-44f3-A023-E09E86A1C749" DiskId="1">
-                            <File Id="fil_kfw_fixed_nsi" LongName="kfw-fixed.nsi" Name="KFW-FIXD.NSI" KeyPath="yes" />
-                            <File Id="fil_kfw_ico" LongName="kfw.ico" Name="kfw.ico" />
-                            <File Id="fil_kfw_nsi" LongName="kfw.nsi" Name="kfw.nsi" />
-                            <File Id="fil_KfWConfigPage_ini" LongName="KfWConfigPage.ini" Name="KFWCONP.INI" />
-                            <File Id="fil_KfWConfigPage2_ini" LongName="KfWConfigPage2.ini" Name="KFWCONP2.INI" />
-                            <File Id="fil_killer_cpp" LongName="killer.cpp" Name="killer.cpp" />
-                            <File Id="fil_licenses_rtf" LongName="licenses.rtf" Name="licenses.rtf" />
-                            <File Id="fil_site_local_nsi" LongName="site-local-tagged.nsi" Name="SITE-LCN.NSI" />
-                            <File Id="fil_nsi_incl" LongName="nsi-includes-tagged.nsi" Name="NSI-INCL.NSI" />
-                            <File Id="fil_utils_nsi" LongName="utils.nsi" Name="utils.nsi" />
-                        </Component>
-                    </Directory>
                     <Directory Id="dirinstall_wix" Name="wix" src="$(var.InstallDir)wix\">
                         <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix" Guid="14DD16AB-6920-4ee1-8B78-623F39DB70BB" DiskId="1">
-                            <File Id="fil_config_wxi" LongName="config.wxi" Name="config.wxi" />
-                            <File Id="fil_features_wxi" LongName="features.wxi" Name="features.wxi" />
-                            <File Id="fil_files_wxi" LongName="files.wxi" Name="files.wxi" />
-                            <File Id="fil_kfw_wxs" LongName="kfw.wxs" Name="kfw.wxs" KeyPath="yes" />
-                            <File Id="fil_Makefile_" LongName="Makefile" Name="Makefile" />
-                            <File Id="fil_property_wxi" LongName="property.wxi" Name="property.wxi" />
-                            <File Id="fil_site_local_wxi" LongName="site-local-tagged.wxi" Name="SITE-LCL.WXI" />
+                            <File Id="fil_config_wxi" Name="config.wxi" />
+                            <File Id="fil_features_wxi" Name="features.wxi" />
+                            <File Id="fil_files_wxi" Name="files.wxi" />
+                            <File Id="fil_kfw_wxs" Name="kfw.wxs" KeyPath="yes" />
+                            <File Id="fil_Makefile_" Name="Makefile" />
+                            <File Id="fil_property_wxi" Name="property.wxi" />
+                            <File Id="fil_site_local_wxi" Name="site-local-tagged.wxi" />
                         </Component>
                         <Directory Id="dirinstall_wix_lang" Name="lang" src="$(var.InstallDir)wix\lang\">
                             <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix_lang" Guid="70741A69-1103-4B54-B146-2E14C271945D" DiskId="1">
-                                <File Id="fil_config_1033_wxi" LongName="config_1033.wxi" Name="CFG-1033.WXI" KeyPath="yes" />
-                                <File Id="fil_strings_1033_wxl" LongName="strings_1033.wxl" Name="STR-1033.WXL" />
-                                <File Id="fil_ui_1033_wxi" LongName="ui_1033.wxi" Name="ui_1033.wxi" />
+                                <File Id="fil_config_1033_wxi" Name="config_1033.wxi" KeyPath="yes" />
+                                <File Id="fil_strings_1033_wxl" Name="strings_1033.wxl"  />
+                                <File Id="fil_ui_1033_wxi" Name="ui_1033.wxi" />
                             </Component>
                         </Directory>
                         <Directory Id="dirinstall_wix_Binary" Name="Binary" src="$(var.InstallDir)wix\Binary\">
                             <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix_Binary" Guid="5F021D71-A398-41FD-8F9C-9C0665C18660" DiskId="1">
-                                <File Id="fil_bannrbmp_bmp" LongName="bannrbmp.bmp" Name="bannrbmp.bmp" />
-                                <File Id="fil_completi_ico" LongName="completi.ico" Name="completi.ico" />
-                                <File Id="fil_custicon_ico" LongName="custicon.ico" Name="custicon.ico" />
-                                <File Id="fil_dlgbmp_bmp" LongName="dlgbmp.bmp" Name="dlgbmp.bmp" />
-                                <File Id="fil_exclamic_ico" LongName="exclamic.ico" Name="exclamic.ico" />
-                                <File Id="fil_info_bmp" LongName="info.bmp" Name="info.bmp" />
-                                <File Id="fil_insticon_ico" LongName="insticon.ico" Name="insticon.ico" />
-                                <File Id="fil_new_bmp" LongName="new.bmp" Name="new.bmp" />
-                                <File Id="fil_removico_ico" LongName="removico.ico" Name="removico.ico" />
-                                <File Id="fil_repairic_ico" LongName="repairic.ico" Name="repairic.ico" />
-                                <File Id="fil_up_bmp" LongName="up.bmp" Name="up.bmp" />
+                                <File Id="fil_bannrbmp_bmp" Name="bannrbmp.bmp" />
+                                <File Id="fil_completi_ico" Name="completi.ico" />
+                                <File Id="fil_custicon_ico" Name="custicon.ico" />
+                                <File Id="fil_dlgbmp_bmp" Name="dlgbmp.bmp" />
+                                <File Id="fil_exclamic_ico" Name="exclamic.ico" />
+                                <File Id="fil_info_bmp" Name="info.bmp" />
+                                <File Id="fil_insticon_ico" Name="insticon.ico" />
+                                <File Id="fil_new_bmp" Name="new.bmp" />
+                                <File Id="fil_removico_ico" Name="removico.ico" />
+                                <File Id="fil_repairic_ico" Name="repairic.ico" />
+                                <File Id="fil_up_bmp" Name="up.bmp" />
                             </Component>
                         </Directory>
                         <Directory Id="dirinstall_wix_custom" Name="custom" src="$(var.InstallDir)wix\custom\">
                             <Component Win64="$(var.Win64)" Id="cmp_dirinstall_wix_custom" Guid="872AA948-39B0-4CDC-B764-7EB69F280E50" DiskId="1">
-                                <File Id="fil_custom_cpp" LongName="custom.cpp" Name="custom.cpp" KeyPath="yes" />
-                                <File Id="fil_custom_h" LongName="custom.h" Name="custom.h" />
+                                <File Id="fil_custom_cpp" Name="custom.cpp" KeyPath="yes" />
+                                <File Id="fil_custom_h" Name="custom.h" />
                             </Component>
                         </Directory>
                     </Directory>
                 </Directory>
                 
-                <Directory Id="dirdoc" Name="doc" src="$(var.DocDir)">
+<!--                <Directory Id="dirdoc" Name="doc" src="$(var.DocDir)">
                 <?if $(var.Platform) = "Intel" ?>
                     <Component Win64="$(var.Win64)" Id="efl_leash_userdoc_pdf" Guid="68FB24DD-5EC2-4db1-AD42-5B9DDEC247C5" DiskId="1">
-                        <File Id="fil_leash_userdoc_pdf" LongName="leash_userdoc.pdf" Name="leash.pdf" KeyPath="yes">
-			    <Shortcut Id="sc_leash_userdoc_pdf" Advertise="no" Directory="dirShortcut" LongName="Leash User Documentation.lnk" Name="leashdoc.lnk" />
+                        <File Id="fil_leash_userdoc_pdf" Name="leash_userdoc.pdf" KeyPath="yes">
+			    <Shortcut Id="sc_leash_userdoc_pdf" Advertise="no" Directory="dirShortcut" Name="Leash User Documentation.lnk" />
                         </File>
                         <Condition>USELEASH</Condition>
                     </Component>
                 <?endif?>
-                    <Component Win64="$(var.Win64)" Id="efl_netidmgr_userdoc_pdf" Guid="7F5A91C1-C6D3-4F64-A6AC-C0AF337B4ED6" DiskId="1">
-                        <File Id="fil_netidmgr_userdoc_pdf" LongName="netidmgr_userdoc.pdf" Name="netidmgr.pdf" KeyPath="yes">
-			    <Shortcut Id="sc_netidmgr_userdoc_pdf" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager User Documentation.lnk" Name="netiddoc.lnk" />
-                        </File>
-                        <Condition>USENETIDMGR</Condition>
-                    </Component>
-                    <Component Win64="$(var.Win64)" Id="cmp_dirdoc_netid" Guid="D501BAF7-7E63-4864-AFED-1528D1C59B1B" DiskId="1">
-                        <File Id="fil_netidmgr_devdoc_chm" Name="netiddev.chm" KeyPath="yes">
-			    <Shortcut Id="sc_netidmgr_devdoc_chm" Advertise="no" Directory="dirShortcut" LongName="Network Identity Manager Developer Documentation.lnk" Name="netiddev.lnk" />
-                        </File>
-                        <Condition>USENETIDMGR</Condition>
-                    </Component>
-                    <Component Win64="$(var.Win64)" Id="efl_relnotes_html" Guid="C65F920A-039D-4839-848F-0AD7B445F376" DiskId="1">
-                        <File Id="fil_relnotes_html" LongName="relnotes.html" Name="RELNOTES.HTM" KeyPath="yes">
-			    <Shortcut Id="sc_relnotes_html" Advertise="no" Directory="dirShortcut" LongName="Release Notes.lnk" Name="relnotes.lnk" />
-                        </File>
-                    </Component>
-                </Directory>
-
-                <Directory Id="dirsample" Name="sample" src="$(var.SampleDir)">
-                    <Directory Id="dirsample_templ" LongName="templates" Name="template" src="$(var.SampleDir)templates\">
-                        <Directory Id="dirsample_t_credprov" Name="credprov" src="$(var.SampleDir)templates\credprov\">
-                            <Component Win64="$(var.Win64)" Id="cmp_credprov_files" Guid="0D5A01A0-8DA9-4FED-9766-8B4DE6273145" DiskId="1">
-                                <File Id="fil_credprov_Makefile" Name="Makefile" KeyPath="yes" />
-                                <File Id="fil_credprov_config_id_c" Name="conf_id.c" LongName="config_id.c" />
-                                <File Id="fil_credprov_config_ids_c" Name="conf_ids.c" LongName="config_ids.c" />
-                                <File Id="fil_credprov_config_main_c" Name="conf_mn.c" LongName="config_main.c" />
-                                <File Id="fil_credprov_credacq_c" Name="credacq.c" />
-                                <File Id="fil_credprov_credprov_h" Name="credprov.h" />
-                                <File Id="fil_credprov_credtype_c" Name="credtype.c" />
-                                <File Id="fil_credprov_langres_h" Name="langres.h" />
-                                <File Id="fil_credprov_main_c" Name="main.c" />
-                                <File Id="fil_credprov_plugin_c" Name="plugin.c" />
-                                <File Id="fil_credprov_proppage_c" Name="proppage.c" />
-                                <File Id="fil_credprov_README" Name="README" />
-                                <File Id="fil_credprov_version_rc" Name="version.rc" />
-                            </Component>
+                </Directory> -->
 
-                            <Directory Id="dirsample_t_credprov_images" Name="images" src="$(var.SampleDir)templates\credprov\images\">
-                                <Component Win64="$(var.Win64)" Id="cmp_credprov_images_files" Guid="8A6CD5B8-482D-435F-9172-8F0B6AAA3C3F" DiskId="1">
-                                    <File Id="fil_credprov_plugin_ico" Name="plugin.ico" KeyPath="yes" />
-                                </Component>
-                            </Directory>
-
-                            <Directory Id="dirsample_t_credprov_lang" Name="lang" src="$(var.SampleDir)templates\credprov\lang\">
-                                <Directory Id="dirsample_t_credprov_lang_enus" Name="en_us" src="$(var.SampleDir)templates\credprov\lang\en_us\">
-                                    <Component Win64="$(var.Win64)" Id="cmp_credprov_en_us_files" Guid="69C982D3-A1D3-4E23-9629-DE1842937F1D" DiskId="1">
-                                        <File Id="fil_credprov_en_us_langres_rc" Name="langres.rc" KeyPath="yes" />
-                                    </Component>
-                                </Directory>
-                            </Directory>
-                        </Directory>
-                    </Directory>
-                </Directory>
-            
             </Directory> <!-- /Kerberos -->
         </Directory> <!-- /MIT -->
     </Directory> <!-- /Program Files -->
     <Directory Id="WindowsFolder">
         <Component Win64="$(var.Win64)" Id="cmf_krb5_ini" Guid="C1AF0670-BBF1-4AA6-B2A6-6C8B1584A1F4" NeverOverwrite="yes" Permanent="yes" DiskId="1">
-	        <File Id="fil_krb5_ini" LongName="krb5.ini" Name="krb5.ini" src="$(var.ConfigDir)krb5.ini" KeyPath="yes" />
+	        <File Id="fil_krb5_ini" Name="krb5.ini" src="$(var.ConfigDir)krb5.ini" KeyPath="yes" />
         </Component>
         <Component Win64="$(var.Win64)" Id="cmf_krb_con" Guid="5E91A051-CF14-45FF-BF64-CEE78A7A90C2" NeverOverwrite="yes" Permanent="yes" DiskId="1">
-	        <File Id="fil_krb_con" LongName="krb.con" Name="krb.con" src="$(var.ConfigDir)krb.con" KeyPath="yes" />
+	        <File Id="fil_krb_con" Name="krb.con" src="$(var.ConfigDir)krb.con" KeyPath="yes" />
         </Component>
         <Component Win64="$(var.Win64)" Id="cmf_krbrealm_con" Guid="D667B54F-1C98-43FB-87C6-0F0517623B90" NeverOverwrite="yes" Permanent="yes" DiskId="1">
-	        <File Id="fil_krbrealm_con" LongName="krbrealm.con" Name="krbrealm.con" src="$(var.ConfigDir)krbrealm.con" KeyPath="yes" />
+	        <File Id="fil_krbrealm_con" Name="krbrealm.con" src="$(var.ConfigDir)krbrealm.con" KeyPath="yes" />
         </Component>
     </Directory>
     
     <Directory Id="ProgramMenuFolder">
-        <Directory Id="dirShortcut" LongName="$(var.BaseProductName)" Name="KFW">
+        <Directory Id="dirShortcut" Name="$(var.BaseProductName)">
+          <Component Id="cmf_remove_folder" Guid="BAE73197-1894-4fff-86B9-EFFB78A24CA2">
+            <Registry Id="reg_bogus" Root="HKCU" Key="Software\MIT\Kerberos5" Name="omfg" Type="string" Value="sigh" KeyPath="yes"/>
+            <RemoveFolder Id="removeFolder" On ="uninstall" />
+          </Component>
         </Directory>
     </Directory>
     <Directory Id="StartupFolder">
diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index c01d1bfe59..6b85faaf83 100644
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -29,7 +29,7 @@
 <?include config.wxi?>
 <?include platform.wxi?>
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product 
         Id="$(var.ProductCode)"
         Codepage="$(var.CodePage)"
@@ -178,7 +178,7 @@
         
         <!-- KfW MSI -->
         <Upgrade Id="61211594-AAA1-4A98-A299-757326763CC7">
-            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="$(var.VersionString)" IncludeMaximum="yes" MigrateFeatures="yes" Property="UPGRADEKFW" />
+            <UpgradeVersion IgnoreRemoveFailure="no" IncludeMinimum="no" Maximum="3.9.9" IncludeMaximum="yes" MigrateFeatures="yes" Property="UPGRADEKFW" />
         </Upgrade>
        
         <!-- NSIS installation -->
diff --git a/src/windows/installer/wix/lang/strings_1033.wxl b/src/windows/installer/wix/lang/strings_1033.wxl
index 60b680fbad..cd515895be 100644
--- a/src/windows/installer/wix/lang/strings_1033.wxl
+++ b/src/windows/installer/wix/lang/strings_1033.wxl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WixLocalization>
+<WixLocalization Culture="en-US">
 <!--
 
   Copyright (C) 2004 by the Massachusetts Institute of Technology.
diff --git a/src/windows/installer/wix/platform.wxi b/src/windows/installer/wix/platform.wxi
index 65de105432..ab7d0f5d78 100644
--- a/src/windows/installer/wix/platform.wxi
+++ b/src/windows/installer/wix/platform.wxi
@@ -9,10 +9,6 @@
         <?define cmf_kfwlogon_DLL_guid="CFC0B7C9-9A59-4022-89B3-25E0941D0369"?>
         <?define cmf_kfwcpcc_EXE_guid="83F51B6D-F3C6-44cf-AC91-D1D6498FFA44"?>
         <?define cmp_ClientSystemDebug_guid="7B25B1E0-A22A-43c7-BA97-C30FCA3B1230"?>
-        <?define rcm_krb4_1_guid="B3CF770A-2C0F-44c0-8F5B-7B808369D225"?>
-        <?define rcm_krb4_2_guid="0CF5732A-7659-4cf9-8D01-7E75E6DA2639"?>                                        
-        <?define rcm_krb4_3_guid="6A279F11-E441-49cb-80F0-3D807D7230DE"?>
-        <?define rcm_krb4_4_guid="CACB3731-C532-4d28-9E44-FFF35C1376D5"?>
         <?define rcm_krb5_1_guid="21883AD6-1C00-4f1d-9922-477CF63CE6BF"?>
         <?define rcm_krb5_2_guid="88CEA446-4617-46bc-916F-2AAA1E1EACF8"?>
         <?define rcm_krb5_3_guid="28BFF4DB-D09E-4031-AB5D-232F6F707A45"?>
@@ -32,6 +28,7 @@
         <?define cmf_kinit_exe_guid="6855B2B9-D3EB-42ce-B0EA-EFCD5960B635"?>
         <?define cmf_klist_exe_guid="1AE98193-6596-4460-9B42-15C734E28CE8"?>
         <?define cmf_kpasswd_exe_guid="669A2965-413F-4003-9F43-4615CC7C3B1A"?>
+        <?define cmf_kswitch_exe_guid="EFBA642C-D1E8-441b-A31D-8B44715B2EAB"?>
         <?define cmf_kvno_exe_guid="56C95EBA-2A53-4567-AA44-9A0EE01BB390"?>
         <?define cmf_krb5_32_dll_guid="8B7190D6-76BD-442b-893B-1EED4E26EC0A"?>
         <?define cmf_krb5_32_dll_name="krb5_64.dll"?>
@@ -41,8 +38,8 @@
         <?define cmf_krb524_dll_name="krb524.dll"?>
         <?define cmf_krbcc32_dll_guid="56DAD1B9-4A59-46e6-81CA-54E2B6C9D618"?>
         <?define cmf_krbcc32_dll_name="krbcc64.dll"?>
-        <?define cmf_krbcc32s_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?>
-        <?define cmf_krbcc32s_exe_name="krbcc64s.exe"?>
+        <?define cmf_ccpaiserver_exe_guid="0192F58B-9129-426d-A271-E18455EDC80E"?>
+        <?define cmf_ccapiserver_exe_name="ccapiserver.exe"?>
         <?define cmf_krbv4w32_dll_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
         <?define cmf_krbv4w32_dll_name="krbv4w64.dll"?>
         <?define cmf_leash32_exe_guid="D195FADB-A3B0-4023-A824-8895552CDC56"?>
@@ -88,13 +85,6 @@
         <?define cmf_krb5cred_dll_name="krb5cred.dll"?>
         <?define cmf_krb5cred_en_us_dll_guid="223B7E9D-290F-40b8-89B3-F8337A8E082D"?>
         <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?>
-        <?define cmf_krb4cred_dll_guid="AF3DB848-786B-4e0b-9D8F-F9074D0631F2"?>
-        <?define cmf_krb4cred_dll_name="krb4cred.dll"?>
-        <?define cmf_krb4cred_en_us_dll_guid="4D180CEF-59CD-4c39-872C-F84F58008107"?>
-        <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?>
-        <?define cmf_netidmgr_exe_guid="487545C9-F145-4fb9-8610-5652A6C3FE48"?>
-        <?define cmf_netidmgr_exe_w2k_guid="F9D3A2A1-8BAE-41ff-BB50-2E6923D3368B"?>
-        <?define csc_NetIDMgrStartup_guid="7081976D-E9D5-424a-9564-917E0529E4D0"?>
         <?define cmf_bin_debug_guid="F3432C85-89D9-4bd6-BD82-4ED49A118338"?>
 <?elseif $(var.Platform) = "Intel"?>
         <?define UpgradeCode="61211594-AAA1-4A98-A299-757326763CC7"?>
@@ -104,10 +94,6 @@
         <?define cmf_kfwlogon_DLL_guid="2F104FEB-2D61-458A-BAE3-B153F151E728"?>
         <?define cmf_kfwcpcc_EXE_guid="C3284E7A-3665-45A6-B64E-C909B1D1BAA6"?>
         <?define cmp_ClientSystemDebug_guid="2D13ED48-53C2-4878-B196-2AD7F4100998"?>
-        <?define rcm_krb4_1_guid="34262966-9196-49D6-86C9-AE98D3116DC0"?>
-        <?define rcm_krb4_2_guid="812334C6-EBDF-482C-8CB3-A6398AF9EDFC"?>                                        
-        <?define rcm_krb4_3_guid="5556ECD9-8721-41C2-846C-034C239B48F1"?>
-        <?define rcm_krb4_4_guid="61371A93-7F59-439D-A89C-070E100F465B"?>
         <?define rcm_krb5_1_guid="E190F8B9-51FA-4FB1-884C-C8AFA37F8653"?>
         <?define rcm_krb5_2_guid="AE7D4305-6193-4094-8C82-73862AE01DCE"?>
         <?define rcm_krb5_3_guid="853EE035-99AA-489A-8FB6-74C76624E92A"?>
@@ -127,6 +113,7 @@
         <?define cmf_kinit_exe_guid="80643A09-EF28-4714-BC62-B64FC5B17CAA"?>
         <?define cmf_klist_exe_guid="24FB6003-BC7A-4BF1-9503-82D398EC02D7"?>
         <?define cmf_kpasswd_exe_guid="3FA4AB96-FF12-460A-814E-3380E220787C"?>
+        <?define cmf_kswitch_exe_guid="C1A575D3-DEF3-4fce-861E-9C6BA7F93072"?>
         <?define cmf_kvno_exe_guid="7759D524-1F88-4483-975F-DDD33A511512"?>
         <?define cmf_krb5_32_dll_guid="31E40356-CBAC-4FC6-9A34-C6F6C72A27CA"?>
         <?define cmf_krb5_32_dll_name="krb5_32.dll"?>
@@ -136,8 +123,8 @@
         <?define cmf_krb524_dll_name="krb524.dll"?>
         <?define cmf_krbcc32_dll_guid="A50FA27D-F203-4C19-9047-B7976171FB94"?>
         <?define cmf_krbcc32_dll_name="krbcc32.dll"?>
-        <?define cmf_krbcc32s_exe_guid="7D5F0817-DACF-4B54-BB8D-94DD63626DB5"?>
-        <?define cmf_krbcc32s_exe_name="krbcc32s.exe"?>
+        <?define cmf_ccapiserver_exe_guid="7D5F0817-DACF-4B54-BB8D-94DD63626DB5"?>
+        <?define cmf_ccapiserver_exe_name="ccapiserver.exe"?>
         <?define cmf_krbv4w32_dll_guid="DFA23F6C-5297-4876-AF52-6F7CF2CB34AC"?>
         <?define cmf_krbv4w32_dll_name="krbv4w32.dll"?>
         <?define cmf_leash32_exe_guid="990D5F6B-4CEE-4706-96F4-F7AF12F97DF7"?>
@@ -176,20 +163,10 @@
         <?define cmf_wshelp32_dll_name="wshelp32.dll"?>
         <?define cmf_xpprof32_dll_guid="A7DF8BAF-7188-4C24-89FB-C8EB51571FD2"?>
         <?define cmf_xpprof32_dll_name="xpprof32.dll"?>
-        <?define cmf_nidmgr32_dll_guid="EEBA3A0D-CE3D-42F1-8854-D7F63F597202"?>
-        <?define cmf_nidmgr32_dll_name="nidmgr32.dll"?>
-        <?define cmf_nidmgr32_dll_w2k_guid="33F42D7C-03CE-465F-9E0A-5F486FE64B04"?>
         <?define cmf_krb5cred_dll_guid="27A7723A-F0D9-4F06-892C-54F0AC6014C3"?>
         <?define cmf_krb5cred_dll_name="krb5cred.dll"?>
         <?define cmf_krb5cred_en_us_dll_guid="EA9ABE05-A85B-43BB-8741-50D3C3128632"?>
         <?define cmf_krb5cred_en_us_dll_name="krb5cred_en_us.dll"?>
-        <?define cmf_krb4cred_dll_guid="E3B86954-9D5D-4929-A5E6-B22ED03E6D6C"?>
-        <?define cmf_krb4cred_dll_name="krb4cred.dll"?>
-        <?define cmf_krb4cred_en_us_dll_guid="3FF40A29-E2C3-40F3-B81C-2948494BE4B0"?>
-        <?define cmf_krb4cred_en_us_dll_name="krb4cred_en_us.dll"?>
-        <?define cmf_netidmgr_exe_guid="AEB06D67-B4F3-45B1-AC1E-5C1AFF747756"?>
-        <?define cmf_netidmgr_exe_w2k_guid="0F85D4F3-7897-4FE3-8501-AD0C383CCB4F"?>
-        <?define csc_NetIDMgrStartup_guid="669227E3-0ADC-4173-90C3-631FCFC8EBC3"?>
         <?define cmf_bin_debug_guid="C8468854-8261-4781-8119-A612636841E3"?>
 <?else?>
         <?error Unknown platform?>
-- 
cgit