From 0fa91e0fd3e3d291d4df4cdc2d760c2e3e84a749 Mon Sep 17 00:00:00 2001
From: texot <tete1030@gmail.com>
Date: Wed, 17 Feb 2021 13:48:44 +0800
Subject: [PATCH 1/2] dist: Fix unquoted windows service image path

---
 dist/inno/barrier.iss.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist/inno/barrier.iss.in b/dist/inno/barrier.iss.in
index 8200330a..ab56ebcb 100644
--- a/dist/inno/barrier.iss.in
+++ b/dist/inno/barrier.iss.in
@@ -54,7 +54,7 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks:
 ; to avoid duplicate entries remove the existing rule (fails if it doesn't exist) before adding
 Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall delete rule name=""{#MyAppListenerDesc}"""; Flags: runhidden
 Filename: {sys}\netsh.exe; Parameters: "advfirewall firewall add rule name=""{#MyAppListenerDesc}"" protocol=TCP dir=in localport=24800 action=allow"; Flags: runhidden
-Filename: {sys}\sc.exe; Parameters: "create {#MyAppServiceName} start= auto binPath= ""{app}\{#MyAppServiceExe}"""; Flags: runhidden
+Filename: {sys}\sc.exe; Parameters: "create {#MyAppServiceName} start= auto binPath= ""\""{app}\{#MyAppServiceExe}\"""""; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "description {#MyAppServiceName} ""{#MyAppServiceDesc}"""; Flags: runhidden
 Filename: {sys}\sc.exe; Parameters: "start {#MyAppServiceName}"; Flags: runhidden
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

From 1fac0e66039f07b197f65b57c02c58a1a8b86012 Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Fri, 25 Jun 2021 15:44:21 +0300
Subject: [PATCH 2/2] doc: Add newsfragment

---
 doc/newsfragments/windows-service-path.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/newsfragments/windows-service-path.bugfix

diff --git a/doc/newsfragments/windows-service-path.bugfix b/doc/newsfragments/windows-service-path.bugfix
new file mode 100644
index 00000000..c418b0aa
--- /dev/null
+++ b/doc/newsfragments/windows-service-path.bugfix
@@ -0,0 +1 @@
+Fixed incorrect setup of Barrier service path on Windows.