diff options
Diffstat (limited to 'win/packaging/extra.wxs.in')
| -rw-r--r-- | win/packaging/extra.wxs.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 978a5c9c90d..befe070b404 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -66,6 +66,7 @@ <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" /> + <!-- User interface dialogs --> @@ -463,7 +464,7 @@ Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@' Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/> <CreateFolder> - <util:PermissionEx User="[LogonUser]" GenericAll="yes" /> + <util:PermissionEx User="[LogonUser]" Domain="[USER_DOMAIN]" GenericAll="yes" /> <util:PermissionEx User="NetworkService" GenericAll="yes" /> </CreateFolder> </Component> @@ -851,6 +852,7 @@ <Property Id="ARPSYSTEMCOMPONENT" Value="1" Secure="yes" /> <Property Id="ARPINSTALLLOCATION" Secure="yes"/> <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="InstallValidate" Sequence="execute"/> + <SetProperty Id="USER_DOMAIN" Value="[%USERDOMAIN]" After="LaunchConditions" Sequence="first" /> <Feature Id='ARPRegistryEntries' Title='Add or remove program entries' Description='Add or remove program entries' @@ -898,5 +900,8 @@ 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'> <![CDATA[ALLUSERS = "1"]]> </Condition> + <Condition Message='This application is only supported on Windows Vista, Windows Server 2008, or higher.'> + <![CDATA[Installed OR (VersionNT >= 600)]]> + </Condition> </Fragment> </Wix> |