From 91baa4f133a4a6beb5ea71566d51f166ee96935b Mon Sep 17 00:00:00 2001
From: albertony <12441419+albertony@users.noreply.github.com>
Date: Fri, 11 Dec 2020 18:38:51 +0100
Subject: [PATCH 1/2] Perform clean uninstall on windows

---
 dist/inno/barrier.iss.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dist/inno/barrier.iss.in b/dist/inno/barrier.iss.in
index 54b2036a..908a38eb 100644
--- a/dist/inno/barrier.iss.in
+++ b/dist/inno/barrier.iss.in
@@ -26,6 +26,7 @@ SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
 Compression=lzma
 SolidCompression=yes
 ArchitecturesInstallIn64BitMode=x64 ia64
+UninstallDisplayIcon={app}\{#MyAppExeName}
 
 #include "scripts\lang\english.iss"
 
@@ -51,10 +52,11 @@ Filename: {sys}\sc.exe; Parameters: "start {#MyAppServiceName}"; Flags: runhidde
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 
 [UninstallDelete]
-Type: files; Name: "{app}\barrierd.log"
+Type: filesandordirs; Name: "{commonappdata}\Barrier"
 
 [UninstallRun]
-Filename: {sys}\sc.exe; Parameters: "stop {#MyAppServiceName}"; Flags: runhidden
+Filename: {sys}\taskkill; Parameters: "/im {#MyAppExeName} /f /t"; Flags: runhidden
+Filename: {sys}\net.exe; Parameters: "stop {#MyAppServiceName}"; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "delete {#MyAppServiceName}"; Flags: runhidden
 Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall delete rule name=""{#MyAppListenerDesc}"""; Flags: runhidden
 

From 2c5cdf1037177885a986750bb9b304f981031aa8 Mon Sep 17 00:00:00 2001
From: albertony <12441419+albertony@users.noreply.github.com>
Date: Sat, 12 Dec 2020 11:31:21 +0100
Subject: [PATCH 2/2] Add version info resource to windows setup exe

---
 dist/inno/barrier.iss.in | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/dist/inno/barrier.iss.in b/dist/inno/barrier.iss.in
index 908a38eb..8200330a 100644
--- a/dist/inno/barrier.iss.in
+++ b/dist/inno/barrier.iss.in
@@ -1,7 +1,9 @@
 #define MyAppName "Barrier"
-#define MyAppVersion "@BARRIER_VERSION@"
+#define MyAppVersion "@BARRIER_VERSION_MAJOR@.@BARRIER_VERSION_MINOR@.@BARRIER_VERSION_PATCH@.@BARRIER_BUILD_NUMBER@"
+#define MyAppTextVersion "@BARRIER_VERSION@"
 #define MyAppPublisher "Debauchee Open Source Group"
-#define MyAppURL "https://github.com/debauchee/barrier/wiki"
+#define MyAppURL "https://github.com/debauchee/barrier/wiki"
+#define MyAppCopyright "Copyright (C) 2018 Debauchee Open Source Group"
 #define MyAppExeName "barrier.exe"
 #define MyAppServiceName "Barrier"
 #define MyAppServiceExe "barrierd.exe"
@@ -11,8 +13,8 @@
 [Setup]
 AppId={{41036EA6-3F7A-4803-8AE0-469E5E91EFCC}
 AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-AppVerName={#MyAppName} {#MyAppVersion}
+AppVersion={#MyAppTextVersion}
+AppVerName={#MyAppName} {#MyAppTextVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
@@ -21,12 +23,18 @@ DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
 LicenseFile=@CMAKE_CURRENT_SOURCE_DIR@/res/License.rtf
 OutputDir=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/../installer-inno/bin
-OutputBaseFilename=BarrierSetup-{#MyAppVersion}
+OutputBaseFilename=BarrierSetup-{#MyAppTextVersion}
 SetupIconFile=@CMAKE_CURRENT_SOURCE_DIR@/res/barrier.ico
+VersionInfoProductTextVersion={#MyAppTextVersion}
+VersionInfoProductVersion={#MyAppVersion}
+VersionInfoTextVersion={#MyAppTextVersion}
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCopyright={#MyAppCopyright}
+
 Compression=lzma
 SolidCompression=yes
 ArchitecturesInstallIn64BitMode=x64 ia64
-UninstallDisplayIcon={app}\{#MyAppExeName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
 
 #include "scripts\lang\english.iss"