diff options
| author | Andras Timar <atimar@suse.com> | 2012-06-20 21:07:29 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-06-21 09:15:24 +0200 |
| commit | c66efa24eb4b12beaaabbddc88f7c5aef4faf6c5 (patch) | |
| tree | 662fd33611d8ac41890bc293327a47822006727e /instsetoo_native/inc_openoffice/windows/msi_templates | |
| parent | d3fe01de1e004ecf1af1d28d48cc53cf25457e72 (diff) | |
fdo#51270 fix RemoveExtensions custom action
FINDPRODUCT property was not available to this deferred custom action.
Not to mention that registry keys are also deleted at his stage of uninstallation.
The proper solution is to set the installation directory with a type 51 custom action,
and pass it to RemoveExtensions custom action via CustomActionData property.
Change-Id: I0ac18b3a0b19ff1a87bcf580fad9c7fdadb26f76
Diffstat (limited to 'instsetoo_native/inc_openoffice/windows/msi_templates')
3 files changed, 5 insertions, 3 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt index 18b3ca47bdf2..2dd9e91da025 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AdminExe.idt @@ -11,4 +11,4 @@ InstallFinalize 400 InstallInitialize 250 InstallValidate 200 ScheduleReboot ISSCHEDULEREBOOT 375 -SetInstalllocation 390 +SetInstallLocation1 390 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 41c2de258377..5f34a1c2766e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -6,7 +6,8 @@ setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE] SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users setUserProfileNT 51 USERPROFILE [%USERPROFILE] SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION] -SetInstalllocation 51 RegisterExtensions [INSTALLLOCATION] +SetInstallLocation1 51 RegisterExtensions [INSTALLLOCATION] +SetInstallLocation2 51 RemoveExtensions [INSTALLLOCATION] NewProductFound 19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 SetLanguageSelected 51 LANG_SELECTED 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index bf9367bbf3a7..cfcd7ca5e9c0 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -56,7 +56,8 @@ ScheduleReboot ISSCHEDULEREBOOT 3125 SelfRegModules 2850 SelfUnregModules 1100 SetARPInstallLocation 990 -SetInstalllocation 3140 +SetInstallLocation1 3140 +SetInstallLocation2 3141 SetODBCFolders 550 StartServices VersionNT 2800 StopServices VersionNT 950 |