From f0e21b8802c7a69263703a01a24478e046900697 Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy <galeksandrp@gmail.com>
Date: Thu, 1 Jun 2017 12:08:39 +0300
Subject: [PATCH 1/2] Add MSI installer fixes #14

---
 RDPWInst.wxs | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 RDPWInst.wxs

diff --git a/RDPWInst.wxs b/RDPWInst.wxs
new file mode 100644
index 00000000..358ce318
--- /dev/null
+++ b/RDPWInst.wxs
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?define ProductName="RDP Wrapper Library" ?>
+  <?define ProductVersion="1.6.1" ?>
+  <?define ProductCode="37ea5771-3352-4a52-9fac-9297331daebd"?>
+  <?define UpgradeCode="6623f60c-e84f-41e7-a55b-f421165deeb5"?>
+  <?define Manufacturer="Stas'M Corp. and contributors"?>
+
+  <Product Id="$(var.ProductCode)" Name="$(var.ProductName)" Language="1033" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+    <Package InstallerVersion="200" Compressed="yes"/>
+    <Property Id="MSIFASTINSTALL" Value="1" />
+    <Property Id="DISABLEROLLBACK" Value="1" />
+    <MajorUpgrade AllowDowngrades="yes"/>
+
+    <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="CommonAppDataFolder">
+        <Directory Id="PACKAGECACHE" Name="Package Cache">
+          <Directory Id="INSTALLLOCATION" Name="{$(var.ProductCode)}">
+            <Component Id="ProductComponent" Guid="affd77d1-b35c-46f3-a97f-1686dc57b8b8">
+              <File Id='RDPWInst' DiskId='1' Source='RDPWInst.exe'/>
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <Feature Id="ProductFeature" Title="SetupProject1" Level="1">
+      <ComponentRef Id="ProductComponent" />
+    </Feature>
+
+    <CustomAction Id='InstallAction' FileKey='RDPWInst' ExeCommand='-i -o' Execute='immediate' Return='check'/>
+    <CustomAction Id='UninstallAction' FileKey='RDPWInst' ExeCommand='-u' Execute='immediate' Return='check'/>
+    <CustomAction Id='UpdateAction' FileKey='RDPWInst' ExeCommand='-w' Execute='immediate' Return='check'/>
+<!--     <CustomAction Id='ChangeAction' Directory='ProgramFilesFolder' ExeCommand='RDP Wrapper\RDPConf' Execute='immediate' Return='check'/>
+    <CustomAction Id='RepairAction' Directory='ProgramFilesFolder' ExeCommand='RDP Wrapper\RDPCheck' Execute='immediate' Return='check'/> -->
+
+    <InstallExecuteSequence>
+      <Custom Action='InstallAction' After='InstallFinalize'>NOT Installed AND NOT WIX_UPGRADE_DETECTED</Custom>
+      <Custom Action='UninstallAction' Before="RemoveFiles">REMOVE AND NOT UPGRADINGPRODUCTCODE</Custom>
+      <Custom Action='UpdateAction' Before="RemoveFiles">UPGRADINGPRODUCTCODE</Custom>
+<!--       <Custom Action='ChangeAction' After='InstallFinalize'>Installed AND NOT REINSTALL AND NOT UPGRADINGPRODUCTCODE AND NOT REMOVE</Custom>
+      <Custom Action='RepairAction' After='InstallFinalize'>REINSTALL</Custom> -->
+    </InstallExecuteSequence>
+
+  </Product>
+</Wix>

From 7ef04f27c2242e111c8932ae1c36c9f28fe7aabc Mon Sep 17 00:00:00 2001
From: Alexander Georgievskiy <galeksandrp@gmail.com>
Date: Tue, 13 Jun 2017 23:46:19 +0300
Subject: [PATCH 2/2] Create RDPWInst.wxs

---
 RDPWInst.wxs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/RDPWInst.wxs b/RDPWInst.wxs
index 358ce318..fa37565e 100644
--- a/RDPWInst.wxs
+++ b/RDPWInst.wxs
@@ -19,7 +19,7 @@
       <Directory Id="CommonAppDataFolder">
         <Directory Id="PACKAGECACHE" Name="Package Cache">
           <Directory Id="INSTALLLOCATION" Name="{$(var.ProductCode)}">
-            <Component Id="ProductComponent" Guid="affd77d1-b35c-46f3-a97f-1686dc57b8b8">
+            <Component Id="RDPWrap" Guid="affd77d1-b35c-46f3-a97f-1686dc57b8b8">
               <File Id='RDPWInst' DiskId='1' Source='RDPWInst.exe'/>
             </Component>
           </Directory>
@@ -27,8 +27,8 @@
       </Directory>
     </Directory>
 
-    <Feature Id="ProductFeature" Title="SetupProject1" Level="1">
-      <ComponentRef Id="ProductComponent" />
+    <Feature Id="RDPWrapInstall" Title="RDPWrapSetup" Level="1">
+      <ComponentRef Id="RDPWrap" />
     </Feature>
 
     <CustomAction Id='InstallAction' FileKey='RDPWInst' ExeCommand='-i -o' Execute='immediate' Return='check'/>