From 672bbcd7411b20e87eca7845aceed81f361d6424 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Wed, 27 Apr 2016 16:13:14 +0200
Subject: MDEV-9973 : Do not set permissions for serviceaccount user (Win7 and
 later) This appears to break some installation, and it did not do anything
 useful anyway.

---
 win/packaging/extra.wxs.in | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'win/packaging/extra.wxs.in')

diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 48d15cbf91c..8ee2909511b 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -542,17 +542,6 @@
             Value="utf8" />
       </Component>
 
-      <!--- Grant service account permission to the database folder (Windows 7 and later) -->
-      <Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'>
-        <Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition>
-        <RegistryValue Root='HKLM'
-             Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
-             Name='servicepermission' Value='1' Type='string' KeyPath='yes'/>
-        <CreateFolder>
-          <util:PermissionEx User="NT SERVICE\[SERVICENAME]" GenericAll="yes" />
-        </CreateFolder>
-      </Component>
-
       <!-- Shortcuts in program menu (mysql client etc) -->
       <Component Id="c.shortcuts" Guid="*" Directory="ShortcutFolder">
         <!-- shortcut to my.ini-->
-- 
cgit v1.2.1


From 18487ed60ecf8d8e8416a45e1f45c3a012662ce7 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Tue, 24 May 2016 14:18:55 +0200
Subject: MDEV-10108 Fix errors in installations by domain user

---
 win/packaging/extra.wxs.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'win/packaging/extra.wxs.in')

diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 8ee2909511b..6e5d1bf0fb2 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\@MANUFACTURER@\@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'
-- 
cgit v1.2.1


From 9eb0fbda3e28df3b36ab941fae0b76246fe32828 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Tue, 24 May 2016 14:20:53 +0200
Subject: MDEV-10071 Block installation on XP/Windows 2003 Server(they are no
 more supported)

---
 win/packaging/extra.wxs.in | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'win/packaging/extra.wxs.in')

diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 6e5d1bf0fb2..b716bbf7e88 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -899,6 +899,9 @@
     <Condition Message=
        '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>
-- 
cgit v1.2.1