summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Benditovich <yuri.benditovich@daynix.com>2019-10-18 16:35:22 +0300
committerFrediano Ziglio <fziglio@redhat.com>2019-10-18 14:56:02 +0100
commit66d44f914c67544444b0a6296b597bf7f75de8c0 (patch)
treeb54a1ed28df447d399c6e96d01d23f1d1d51cc67
parentd8894046f8baee37a3822e2cd0b5b986b6ea33de (diff)
win32/vd_agent: Optionally disable installation of x86 MSI on x64 system
Currently the MSI built for x86 system can be easily installed on x64 system. When the script is processed by WIX this can be prevented by passing '-dNoWOW=yes' to the WIX-candle. Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com> Acked-by: Frediano Ziglio <fziglio@redhat.com>
-rw-r--r--spice-vdagent.wxs.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/spice-vdagent.wxs.in b/spice-vdagent.wxs.in
index 7778c27..c451f13 100644
--- a/spice-vdagent.wxs.in
+++ b/spice-vdagent.wxs.in
@@ -31,6 +31,11 @@
<UpgradeVersion Minimum="0.0.0" Maximum="$(var.Version)" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
</Upgrade>
<Condition Message="Product already installed.">NOT NEWERVERSIONDETECTED</Condition>
+ <?if $(var.Win64) = no AND $(var.NoWOW) = yes ?>
+ <Condition Message="Error: 32-bit version of $(env.PRODUCT) can not be installed on 64-bit Windows.">
+ <![CDATA[Not VersionNT64]]>
+ </Condition>
+ <?endif?>
<InstallExecuteSequence>
<RemoveExistingProducts After="InstallFinalize"/>
</InstallExecuteSequence>