RDP - Do not add the scrolls on our own anymore - clients manage them…

… theirself. Added support for choosing RDP client location and added support for FreeRDP 2 as an RDP client.
xteen16 · May 10, 2020 · 4129996 · 4129996
1 parent aa9cf84
commit 4129996
Show file tree

Hide file tree

Showing 8 changed files with 129 additions and 31 deletions.
diff --git a/SuperPutty/App.config b/SuperPutty/App.config
@@ -128,6 +128,9 @@
       <setting name="VNCExe" serializeAs="String">
         <value />
       </setting>
+      <setting name="RDPExe" serializeAs="String">
+        <value />
+      </setting>
       <setting name="TabTextBehavior" serializeAs="String">
         <value>Static</value>
       </setting>

diff --git a/SuperPutty/Properties/Settings.Designer.cs b/SuperPutty/Properties/Settings.Designer.cs
diff --git a/SuperPutty/Properties/Settings.settings b/SuperPutty/Properties/Settings.settings
@@ -59,6 +59,9 @@
     <Setting Name="VNCExe" Provider="SuperPutty.Utils.PortableSettingsProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="RDPExe" Provider="SuperPutty.Utils.PortableSettingsProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
     <Setting Name="TabTextBehavior" Provider="SuperPutty.Utils.PortableSettingsProvider" Type="System.String" Scope="User">
       <Value Profile="(Default)">Static</Value>
     </Setting>

diff --git a/SuperPutty/Utils/PuttyStartInfo.cs b/SuperPutty/Utils/PuttyStartInfo.cs
@@ -25,7 +25,7 @@ public static String GetExecutable(SessionData session)
                     return TryParseEnvVars(SuperPuTTY.Settings.VNCExe);
 
                 case ConnectionProtocol.RDP:
-                    return Environment.ExpandEnvironmentVariables("%systemroot%\\system32\\mstsc.exe");
+                    return TryParseEnvVars(SuperPuTTY.Settings.RDPExe);
 
                 case ConnectionProtocol.WINCMD:
                     return Environment.ExpandEnvironmentVariables("%systemroot%\\system32\\cmd.exe");
@@ -63,7 +63,7 @@ public PuttyStartInfo(SessionData session)
             }
             else if (session.Proto == ConnectionProtocol.RDP)
             {
-                RDPStartInfo rdp = new RDPStartInfo(session);
+                RDPStartInfo rdp = new RDPStartInfo(session, this.Executable);
                 this.Args = rdp.Args;
                 this.WorkingDir = rdp.StartingDir;
             }

diff --git a/SuperPutty/Utils/RDPStartinfo.cs b/SuperPutty/Utils/RDPStartinfo.cs
@@ -37,18 +37,34 @@ public class RDPStartInfo
 
         private SessionData session;
 
-        public RDPStartInfo(SessionData session)
+        public RDPStartInfo(SessionData session, String binName)
         {
             this.session = session;
-            this.Args = "-v:" + session.Host;
+            if (binName.EndsWith("\\wfreerdp.exe"))
+            {
+                this.Args = "/cert-ignore /size:1920x1080 +window-drag /disp /workarea /network:wan +auto-reconnect /auto-reconnect-max-retries:0 +bitmap-cache /v:" + session.Host;
 
-            if (session.Port != 0)
-                this.Args += ":" + session.Port.ToString() + " ";
+                if (session.Port != 0)
+                    this.Args += ":" + session.Port.ToString() + " ";
+
+                if (session.Username != "")
+                    this.Args += "/u:"+session.Username;
 
-            if (!String.IsNullOrEmpty(session.ExtraArgs))
-                this.Args += session.ExtraArgs + " ";
+                if (!String.IsNullOrEmpty(session.ExtraArgs))
+                    this.Args += session.ExtraArgs + " ";
+            }
+            else
+            {
+                this.Args = "-v:" + session.Host;
 
-            this.Args += "/span";
+                if (session.Port != 0)
+                    this.Args += ":" + session.Port.ToString() + " ";
+
+                if (!String.IsNullOrEmpty(session.ExtraArgs))
+                    this.Args += session.ExtraArgs + " ";
+
+                this.Args += "/span";
+            }
 
             this.StartingDir = "%userprofile%\\Desktop";
         }

diff --git a/SuperPutty/ctlApplicationPanel.cs b/SuperPutty/ctlApplicationPanel.cs
@@ -206,7 +206,7 @@ private void AttachToWindow()
                 // set window parameters (how it's displayed)
                 long lStyle = NativeMethods.GetWindowLong(m_AppWin, NativeMethods.GWL_STYLE);
                 lStyle &= ~NativeMethods.WS_BORDER;
-                if (this.proto == SuperPutty.Data.ConnectionProtocol.RDP || this.proto == SuperPutty.Data.ConnectionProtocol.VNC)
+                if (this.proto == SuperPutty.Data.ConnectionProtocol.VNC)
                     lStyle |= NativeMethods.WS_HSCROLL | NativeMethods.WS_VSCROLL;
                 NativeMethods.SetWindowLong(m_AppWin, NativeMethods.GWL_STYLE, lStyle);
                 NativeMethods.WinEventDelegate lpfnWinEventProc = new NativeMethods.WinEventDelegate(WinEventProc);
@@ -246,7 +246,7 @@ private bool IsWindowAppliesForInherit(IntPtr hWnd)
                     StringBuilder winTitleBuf = new StringBuilder(256);
                     int winTitleLen = NativeMethods.GetWindowText(hWnd, winTitleBuf, winTitleBuf.Capacity - 1);
                     Log.Info("IsWindowAppliesForInherit: Evaluating window " + winTitleBuf.ToString());
-                    if (winTitleLen > 0 && winTitleBuf.ToString().Contains(" - Remote Desktop Connection"))
+                    if (winTitleLen > 0 && (winTitleBuf.ToString().Contains(" - Remote Desktop Connection") || winTitleBuf.ToString().Contains("FreeRDP: ")))
                         return true;
                     return false;
                 default:

diff --git a/SuperPutty/dlgFindPutty.Designer.cs b/SuperPutty/dlgFindPutty.Designer.cs