From da39c03a6f95f81b70ea474a22befcb6758c6cf4 Mon Sep 17 00:00:00 2001
From: Riley McArdle <riley@glyff.net>
Date: Wed, 13 Nov 2013 18:20:52 -0600
Subject: [PATCH] Fix issue MR-592 - Unable to run VBS script as an external
 tool

Fix issue MR-596 - Incorrect escaping of quotation marks in external tool arguments
---
 CHANGELOG.TXT                                      | 4 ++++
 mRemoteV1/Connection/Connection.Protocol.IntApp.vb | 4 ++--
 mRemoteV1/My Project/AssemblyInfo.vb               | 2 +-
 mRemoteV1/Tools/Tools.ExternalApp.vb               | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 1142f1412..f8e47dde4 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,7 @@
+1.72 (2013-11-13):
+  Fixed issue MR-592 - Unable to run VBS script as an external tool
+  Fixed issue MR-596 - Incorrect escaping of quotation marks in external tool arguments
+
 1.71 (2013-10-29):
   Fixed issue MR-574 - Crash when retrieving RDP session list if eolwtscom.dll is not registered
   Fixed issue MR-578 - Connections file is reset
diff --git a/mRemoteV1/Connection/Connection.Protocol.IntApp.vb b/mRemoteV1/Connection/Connection.Protocol.IntApp.vb
index b40391398..f54b11ee3 100644
--- a/mRemoteV1/Connection/Connection.Protocol.IntApp.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.IntApp.vb
@@ -87,9 +87,9 @@ Namespace Connection
                         Return Nothing
                     End If
 
-                    IntAppProcessStartInfo.UseShellExecute = False
+                    IntAppProcessStartInfo.UseShellExecute = True
                     IntAppProcessStartInfo.FileName = _IntAppPath
-                    IntAppProcessStartInfo.Arguments = CommandLineArguments.EscapeBackslashes(Arguments)
+                    IntAppProcessStartInfo.Arguments = Arguments
 
                     IntAppProcess = Process.Start(IntAppProcessStartInfo)
                     IntAppProcess.EnableRaisingEvents = True
diff --git a/mRemoteV1/My Project/AssemblyInfo.vb b/mRemoteV1/My Project/AssemblyInfo.vb
index 63e988063..ce9da8d28 100644
--- a/mRemoteV1/My Project/AssemblyInfo.vb	
+++ b/mRemoteV1/My Project/AssemblyInfo.vb	
@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("1.71.*")> 
+<Assembly: AssemblyVersion("1.72.*")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("en")> 
diff --git a/mRemoteV1/Tools/Tools.ExternalApp.vb b/mRemoteV1/Tools/Tools.ExternalApp.vb
index 106ada953..45536eac7 100644
--- a/mRemoteV1/Tools/Tools.ExternalApp.vb
+++ b/mRemoteV1/Tools/Tools.ExternalApp.vb
@@ -119,10 +119,10 @@ Namespace Tools
 
                 Dim process As New Process()
                 With process.StartInfo
-                    .UseShellExecute = False
+                    .UseShellExecute = True
                     .FileName = ParseText(_FileName)
 
-                    .Arguments = CommandLineArguments.EscapeBackslashes(ParseText(_Arguments))
+                    .Arguments = ParseText(_Arguments)
                 End With
 
                 process.Start()