From: Tom Yu <tlyu@mit.edu>
Date: Fri, 30 Mar 2007 00:35:04 +0000 (+0000)
Subject: pull up r19078 from trunk
X-Git-Tag: kfw-3.2.0-beta1~55
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9db14d571db3714bfb82a27db2fb56ac4c247894;p=krb5.git
pull up r19078 from trunk
r19078@cathode-dark-space: jaltman | 2007-01-20 00:50:41 -0500
ticket: new
subject: KFW MSI installer corrections
tags: pullup
component: windows
Add missing registry keys and values for
Network Identity Manager plug-ins.
Correct short names.
ticket: 5409
version_fixed: 1.6.1
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@19322 dc483132-0cff-0310-8789-dd5450dbe970
---
diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi
index 9ee81bb42..5fc096631 100644
--- a/src/windows/installer/wix/files.wxi
+++ b/src/windows/installer/wix/files.wxi
@@ -338,12 +338,35 @@
</Component>
<Component Id="cmf_krb5cred_dll" Guid="27A7723A-F0D9-4F06-892C-54F0AC6014C3" DiskId="1">
<File Id="fil_krb5cred_dll" LongName="krb5cred.dll" Name="krb5cred.dll" 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 Id="cmf_krb5cred_en_us_dll" Guid="EA9ABE05-A85B-43BB-8741-50D3C3128632" DiskId="1">
<File Id="fil_krb5cred_en_us_dll" LongName="krb5cred_en_us.dll" Name="krb5cenu.dll" KeyPath="yes" />
</Component>
<Component Id="cmf_krb4cred_dll" Guid="E3B86954-9D5D-4929-A5E6-B22ED03E6D6C" DiskId="1">
<File Id="fil_krb4cred_dll" LongName="krb4cred.dll" Name="krb4cred.dll" 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 Id="cmf_krb4cred_en_us_dll" Guid="3FF40A29-E2C3-40F3-B81C-2948494BE4B0" DiskId="1">
<File Id="fil_krb4cred_en_us_dll" LongName="krb4cred_en_us.dll" Name="krb4cenu.dll" KeyPath="yes" />
@@ -353,8 +376,8 @@
<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]"/>
+ <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 > 500</Condition>
</Component>
<Component Id="cmf_netidmgr_exe_w2k" Guid="0F85D4F3-7897-4FE3-8501-AD0C383CCB4F" DiskId="1" Transitive="yes">
@@ -362,8 +385,8 @@
<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]"/>
+ <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 <= 500</Condition>
</Component>
<!-- /NetIDMgr -->
@@ -628,8 +651,8 @@
<Directory Id="dirinc_krb5_gssapi" Name="gssapi" src="$(var.IncDir)\krb5\gssapi\">
<Component 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~1.H" />
- <File Id="fil_gssapi_krb5_h" LongName="gssapi_krb5.h" Name="GSSAPI~2.H" />
+ <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" />
</Component>
</Directory>
<Directory Id="dirinc_krb5_KerberosIV" LongName="KerberosIV" Name="krb4" src="$(var.IncDir)\krb5\KerberosIV\">
@@ -638,7 +661,7 @@
<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-CO~1.H" />
+ <File Id="fil_mit_copyright_.h" LongName="mit-copyright.h" Name="MIT-COPY.H" />
</Component>
</Directory>
<Component Id="cmp_dirinc_krb5" Guid="7FD8008B-2F46-4613-8A09-989F643258F1" DiskId="1">
@@ -656,46 +679,46 @@
<Directory Id="dirinc_leash" Name="leash" src="$(var.IncDir)leash\">
<Component 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="LEASHI~1.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" />
</Component>
</Directory>
<Directory Id="dirinc_loadfuncs" LongName="loadfuncs" Name="loadfunc" src="$(var.IncDir)loadfuncs\">
<Component Id="cmp_dirinc_loadfuncs" Guid="C8E59D05-4502-498b-A107-1DF65C3A27D3" DiskId="1">
- <File Id="fil_loadfuncs_afs_h" LongName="loadfuncs-afs.h" Name="LOADFU~1.H" />
- <File Id="fil_loadfuncs_afs36_h" LongName="loadfuncs-afs36.h" Name="LOADFU~2.H" />
- <File Id="fil_loadfuncs_com_err_h" LongName="loadfuncs-com_err.h" Name="LOADFU~3.H" />
- <File Id="fil_loadfuncs_krb_h" LongName="loadfuncs-krb.h" Name="LOADFU~4.H" />
- <File Id="fil_loadfuncs_krb5_h" LongName="loadfuncs-krb5.h" Name="LOC37B~1.H" />
- <File Id="fil_loadfuncs_krb524_h" LongName="loadfuncs-krb524.h" Name="LOCEB8~1.H" />
- <File Id="fil_loadfuncs_leash_h" LongName="loadfuncs-leash.h" Name="LOF608~1.H" />
- <File Id="fil_loadfuncs_lsa_h" LongName="loadfuncs-lsa.h" Name="LO1903~1.H" />
- <File Id="fil_loadfuncs_profile_h" LongName="loadfuncs-profile.h" Name="LOD197~1.H" />
- <File Id="fil_loadfuncs_wshelper_h" LongName="loadfuncs-wshelper.h" Name="LO8FF4~1.H" />
- <File Id="fil_loadfuncs_c" LongName="loadfuncs.c" Name="LOADFU~1.C" />
- <File Id="fil_loadfuncs_h" LongName="loadfuncs.h" Name="LO87BD~1.H" KeyPath="yes" />
+ <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 Id="cmp_dirinc_netidmgr" Guid="EBD8BA04-574A-4081-A994-BCEC8ACBC878" DiskId="1">
- <File Id="fil_hashtable_h" LongName="hashtable.h" Name="HASHTA~1.H" />
+ <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="KHACTI~1.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="KHCONF~1.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="KHMSGT~1.H" />
- <File Id="fil_khnewcred_h" LongName="khnewcred.h" Name="KHNEWC~1.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="KHRESC~1.H" />
- <File Id="fil_khtracker_h" LongName="khtracker.h" Name="KHTRAC~1.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" />
@@ -727,7 +750,7 @@
<Directory Id="dirlib_i386" Name="i386" src="$(var.LibDir)">
<Component 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_lib" LongName="delaydlls.lib" Name="DELAYD~1.LIB" />
+ <File Id="fil_delaydlls_lib" LongName="delaydlls.lib" Name="DELAYDLL.LIB" />
<File Id="fil_getopt_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" />
@@ -736,7 +759,7 @@
<File Id="fil_krbcc32_lib" LongName="krbcc32.lib" Name="krbcc32.lib" />
<File Id="fil_krbv4w32_lib" LongName="krbv4w32.lib" Name="krbv4w32.lib" />
<File Id="fil_leashw32_lib" LongName="leashw32.lib" Name="leashw32.lib" />
- <File Id="fil_loadfuncs_lib" LongName="loadfuncs.lib" Name="LOADFU~1.LIB" />
+ <File Id="fil_loadfuncs_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" />
@@ -747,14 +770,14 @@
<Directory Id="dirinstall" Name="install" src="$(var.InstallDir)">
<Directory Id="dirinstall_nsis" Name="nsis" src="$(var.InstallDir)nsis\">
<Component Id="cmp_dirinstall_nsis" Guid="711C3910-5369-44f3-A023-E09E86A1C749" DiskId="1">
- <File Id="fil_kfw_fixed_nsi" LongName="kfw-fixed.nsi" Name="KFW-FI~1.NSI" KeyPath="yes" />
+ <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="KFWCON~1.INI" />
- <File Id="fil_KfWConfigPage2_ini" LongName="KfWConfigPage2.ini" Name="KFWCON~2.INI" />
+ <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.nsi" Name="SITE-L~1.NSI" />
+ <File Id="fil_site_local_nsi" LongName="site-local.nsi" Name="SITE-LCN.NSI" />
<File Id="fil_utils_nsi" LongName="utils.nsi" Name="utils.nsi" />
</Component>
</Directory>
@@ -766,12 +789,12 @@
<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.wxi" Name="SITE-L~1.WXI" />
+ <File Id="fil_site_local_wxi" LongName="site-local.wxi" Name="SITE-LCL.WXI" />
</Component>
<Directory Id="dirinstall_wix_lang" Name="lang" src="$(var.InstallDir)wix\lang\">
<Component Id="cmp_dirinstall_wix_lang" Guid="70741A69-1103-4B54-B146-2E14C271945D" DiskId="1">
- <File Id="fil_config_1033_wxi" LongName="config_1033.wxi" Name="CONFIG~1.WXI" KeyPath="yes" />
- <File Id="fil_strings_1033_wxl" LongName="strings_1033.wxl" Name="STRING~1.WXL" />
+ <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" />
</Component>
</Directory>
@@ -819,7 +842,7 @@
<Condition>USENETIDMGR</Condition>
</Component>
<Component Id="efl_relnotes_html" Guid="C65F920A-039D-4839-848F-0AD7B445F376" DiskId="1">
- <File Id="fil_relnotes_html" LongName="relnotes.html" Name="RELNOT~1.HTM" KeyPath="yes">
+ <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>
diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index bc0ab2a8d..f6262459d 100644
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -147,8 +147,8 @@
<!-- Installation Sequences -->
<AdminExecuteSequence />
<InstallExecuteSequence>
- <RemoveExistingProducts After="InstallValidate">UPGRADEPISMERE Or UPGRADEKFW</RemoveExistingProducts>
<Custom Action="KillRunningProcesses" After="InstallValidate"/>
+ <RemoveExistingProducts After="KillRunningProcesses">UPGRADEPISMERE Or UPGRADEKFW</RemoveExistingProducts>
<!-- When running with a UI, CCP_Success property is not passed down to the server. -->
<Custom Action="AbortNoIE" Before="RemoveNsisInstallation">UILevel = 0 And (Not Installed) And (CCP_Success <> 1)</Custom>
<Custom Action="RemoveNsisInstallation" Before="AbortCantRemoveNSIS">UPGRADENSIS <> "" And UILevel >= 4</Custom>
@@ -157,7 +157,7 @@
<Custom Action="EnableTgtSessionKey" After="RollbackTgtSessionKey">VersionNT >= 500 And &feaKfwClient=3</Custom>
<Custom Action="RevertTgtSessionKey" Before="RemoveRegistryValues">VersionNT >= 500 And &feaKfwClient=2</Custom>
- <Custom Action="RollbackNetProvider" After="RollbackTgtSessionKey">&feaKfwClient=3</Custom>
+ <Custom Action="RollbackNetProvider" After="EnableTgtSessionKey">&feaKfwClient=3</Custom>
<Custom Action="InstallNetProvider" After="RollbackNetProvider">&feaKfwClient=3</Custom>
<Custom Action="RemoveNetProvider" After="InstallNetProvider">&feaKfwClient=2</Custom>
</InstallExecuteSequence>
@@ -171,7 +171,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="$(var.VersionString)" IncludeMaximum="no" MigrateFeatures="yes" Property="UPGRADEKFW" />
</Upgrade>
<!-- NSIS installation -->
diff --git a/src/windows/installer/wix/lang/ui_1033.wxi b/src/windows/installer/wix/lang/ui_1033.wxi
index de4cc366d..ca0bdb700 100644
--- a/src/windows/installer/wix/lang/ui_1033.wxi
+++ b/src/windows/installer/wix/lang/ui_1033.wxi
@@ -1203,12 +1203,12 @@
<Show Dialog="ProgressDlg" After="AdminWelcomeDlg" />
</AdminUISequence>
<InstallUISequence>
- <Custom Action="ListRunningProcesses" Before="WelcomeDlg" />
+ <Custom Action="ListRunningProcesses" After="MigrateFeatureStates" />
<Show Dialog="FatalError" OnExit="error" />
<Show Dialog="UserExit" OnExit="cancel" />
<Show Dialog="ExitDialog" OnExit="success" />
<Show Dialog="PrepareDlg" After="LaunchConditions" />
- <Show Dialog="WelcomeDlg" After="MigrateFeatureStates">NOT Installed</Show>
+ <Show Dialog="WelcomeDlg" After="ListRunningProcesses">NOT Installed</Show>
<Show Dialog="ResumeDlg" After="WelcomeDlg">Installed AND (RESUME OR Preselected)</Show>
<Show Dialog="MaintenanceWelcomeDlg" After="ResumeDlg">Installed AND NOT RESUME AND NOT Preselected</Show>
<Show Dialog="ProgressDlg" After="MaintenanceWelcomeDlg" />