some small tweaks for rdclientax

royalapplications · Apr 15, 2024 · cba50c6 · cba50c6
1 parent db0d8b3
commit cba50c6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/RoyalApps.Community.Rdp.WinForms/Controls/RdpControl.cs b/src/RoyalApps.Community.Rdp.WinForms/Controls/RdpControl.cs
@@ -564,8 +564,9 @@ private void CreateRdpClient()
 
         if (RdpConfiguration.UseMsRdc)
         {
-            string? msRdcAxLibrary = null;
+            var msTscAxLibrary = Environment.ExpandEnvironmentVariables("%SystemRoot%\\System32\\mstscax.dll");
 
+            string? msRdcAxLibrary = null;
             if (!string.IsNullOrWhiteSpace(RdpConfiguration.MsRdcPath) && File.Exists(RdpConfiguration.MsRdcPath))
                 msRdcAxLibrary = RdpConfiguration.MsRdcPath;
 
@@ -585,13 +586,20 @@ private void CreateRdpClient()
             if (string.IsNullOrWhiteSpace(msRdcAxLibrary))
             {
                 Logger.LogWarning("Microsoft Remote Desktop Client cannot be used, rdclientax.dll was not found");
+
+                Environment.SetEnvironmentVariable("MSRDPEX_MSTSCAX_DLL", msTscAxLibrary);
+                Environment.SetEnvironmentVariable("MSRDPEX_AXNAME", "mstsc");
+
                 RdpConfiguration.UseMsRdc = false;
+                RdpClient.AxName = "mstsc";
+                RdpClient.RdpExDll = null!;
             }
             else
             {
+                Logger.LogInformation("Microsoft Remote Desktop Client will be used");
+
                 Environment.SetEnvironmentVariable("MSRDPEX_RDCLIENTAX_DLL", msRdcAxLibrary);
                 Environment.SetEnvironmentVariable("MSRDPEX_AXNAME", "msrdc");
-                Logger.LogInformation("Microsoft Remote Desktop Client will be used");
 
                 RdpClient.AxName = "msrdc";
                 RdpClient.RdpExDll = MsRdpExManager.Instance.CoreApi.MsRdpExDllPath;