diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins index 16c8e7b..895f9a6 100644 --- a/CLIENT_DATA/delsub32.ins +++ b/CLIENT_DATA/delsub32.ins @@ -4,7 +4,7 @@ ; credits: http://www.opsi.org/credits/ -Set $MsiIdConv$ = '{90120000-0020-0409-0000-0000000FF1CE}' +Set $MsiIdConv$ = '{90120000-0020-0407-0000-0000000FF1CE}' Set $MsiId$ = '{90850407-6000-11D3-8CFE-0150048383C9}' Set $UninstallProgram$ = $InstallDir$ + "\uninstall.exe" @@ -15,6 +15,11 @@ if FileExists($UninstallProgram$) Winbatch_uninstall sub_check_exitcode endif +if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdConv$ + "] DisplayName") = "") + comment "MSI id " + $MsiIdConv$ + " found in registry, starting msiexec to uninstall" + Winbatch_uninstall_msi_conv + sub_check_exitcode +endif if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" Winbatch_uninstall_msi @@ -40,8 +45,10 @@ LinkFolder_uninstall ; "$UninstallProgram$" /silent /norestart -[Winbatch_uninstall_msi] +[Winbatch_uninstall_msi_conv] msiexec /x $MsiIdConv$ /qb! REBOOT=ReallySuppress + +[Winbatch_uninstall_msi] msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress [Files_uninstall] diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 148c4b1..1424100 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -7,6 +7,7 @@ requiredWinstVersion >= "4.10.8.6" DefVar $MsiId$ +DefVar $MsiIdConv$ DefVar $UninstallProgram$ DefVar $LogDir$ DefVar $ProductId$ diff --git a/CLIENT_DATA/uninstall32.ins b/CLIENT_DATA/uninstall32.ins index 947528d..1f76687 100644 --- a/CLIENT_DATA/uninstall32.ins +++ b/CLIENT_DATA/uninstall32.ins @@ -7,6 +7,7 @@ requiredWinstVersion >= "4.10.8.6" DefVar $MsiId$ +DefVar $MsiIdConv$ DefVar $UninstallProgram$ DefVar $LogDir$ DefVar $ExitCode$