diff --git a/mRemoteV1/ChangeLog.txt b/mRemoteV1/ChangeLog.txt index 33a42ee9..c8909144 100644 --- a/mRemoteV1/ChangeLog.txt +++ b/mRemoteV1/ChangeLog.txt @@ -11,6 +11,7 @@ No longer show About page on first run Renamed Quicky toolbar to Quick Connect toolbar Changed back to allowing toolbars to dock to the left or right of the menu bar and added gripper to move it around + Added RDP, VNC and ICA version numbers to Components Check page 1.61: Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX diff --git a/mRemoteV1/Language/Language.EN.vb b/mRemoteV1/Language/Language.EN.vb index 2cb83cc5..de27a9f7 100644 --- a/mRemoteV1/Language/Language.EN.vb +++ b/mRemoteV1/Language/Language.EN.vb @@ -358,19 +358,21 @@ Public Const CcNotInstalledProperly As String = "not installed properly" Public Const CcCheckSucceeded As String = "Check succeeded!" Public Const CcCheckFailed As String = "Check failed!" - Public Const CcRDPOK As String = "All RDP components were found and seem to be registered properly." + Public Const CcRDPOK As String = "All RDP components were found and seem to be registered properly." & vbNewLine & _ + "Remote Desktop Connection Control Version {0}" Public Const CcRDPFailed As String = "For RDP to work properly you need to have at least Remote Desktop Connection (Terminal Services Client) 6.0 installed. You can get it here: http://support.microsoft.com/kb/925876" & vbNewLine & _ "If you have RDP 6.0 installed and the check still fails, try to register mstscax.dll manually. To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\windows\system32\mstscax.dll"" (Where c:\ is your system drive)." & vbNewLine & _ "If you still have trouble getting RDP to work please consult the mRemoteNG Forum at http://forum.mremoteng.org/" - Public Const CcVNCOK As String = "All VNC components were found and seem to be registered properly." - 'Public Const CcVNCFailed As String = "VNC requires the scvncctrl.dll library to be registered. If you are using one of the non-setup packages like the portable package, this must be done manually." & vbNewLine & _ - ' "To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\mRemoteNG\scvncctrl.dll"" (Where c:\Program Files\mRemoteNG\ is the path to your mRemoteNG installation)." & vbNewLine & _ - ' "If you are still not able to pass this check or use VNC in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/" - Public Const CcVNCFailed As String = "Due to licensing issues, this version of mRemoteNG does not support VNC." + Public Const CcVNCOK As String = "All VNC components were found and seem to be registered properly." & vbNewLine & _ + "VncSharpNG Control Version {0}" + Public Const CcVNCFailed As String = "VNC requires VncSharpNG.dll to be located in your mRemoteNG application folder." & vbNewLine & _ + "Please make sure that you have the VncSharpNG.dll file in your mRemoteNG application folder (usually C:\Program Files\mRemoteNG\)." & vbNewLine & _ + "If you are still not able to pass this check or use VNC in mRemoteNG please consult the mRemoteNG Forum at http://forum.mremoteng.org/" Public Const CcPuttyOK As String = "The PuTTY executable was found and should be ready to use." Public Const CcPuttyFailed As String = "The SSH, Telnet, Rlogin and RAW protocols need PuTTY to work. PuTTY comes with every mRemoteNG package and is located in the installation path." & vbNewLine & _ "Please make sure that either you have the Putty.exe in your mRemoteNG directory (default: c:\Program Files\mRemoteNG\) or that you specified a valid path to your PuTTY executable in the Options (Tools - Options - Advanced - Custom PuTTY path)" - Public Const CcICAOK As String = "All ICA components were found and seem to be registered properly." + Public Const CcICAOK As String = "All ICA components were found and seem to be registered properly." & vbNewLine & _ + "Citrix ICA Client Control Version {0}" Public Const CcICAFailed As String = "ICA requires that the Citrix Presentation Server Client is installed and that the wfica.ocx library is registered. You can download the client here: http://www.citrix.com/download/" & vbNewLine & _ "If you have the Citrix Presentation Server Client installed and the check still fails, try to register wfica.ocx manually." & vbNewLine & _ "To do this open up the run dialog (Start - Run) and enter the following: regsvr32 ""c:\Program Files\Citrix\ICA Client\wfica.ocx"" (Where c:\Program Files\Citrix\ICA Client\ is the path to your Citrix Presentation Server Client installation)." & vbNewLine & _ diff --git a/mRemoteV1/UI/UI.Window.ComponentsCheck.vb b/mRemoteV1/UI/UI.Window.ComponentsCheck.vb index a97a879a..c8e6d408 100644 --- a/mRemoteV1/UI/UI.Window.ComponentsCheck.vb +++ b/mRemoteV1/UI/UI.Window.ComponentsCheck.vb @@ -503,7 +503,7 @@ Namespace UI pbCheck1.Image = My.Resources.Good_Symbol lblCheck1.ForeColor = Color.DarkOliveGreen lblCheck1.Text = "RDP (Remote Desktop) " & Language.Base.CcCheckSucceeded - txtCheck1.Text = Language.Base.CcRDPOK + txtCheck1.Text = String.Format(Language.Base.CcRDPOK, RDP.Version) Catch ex As Exception pbCheck1.Image = My.Resources.Bad_Symbol lblCheck1.ForeColor = Color.Firebrick @@ -514,36 +514,35 @@ Namespace UI mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) End Try - RDP.Dispose() + If RDP IsNot Nothing Then RDP.Dispose() - 'Dim VNC As AxViewerX.AxCSC_ViewerXControl = Nothing + Dim VNC As VncSharp.RemoteDesktop = Nothing - 'Try - ' VNC = New AxViewerX.AxCSC_ViewerXControl - ' mRemote.Connection.Protocol.VNC.SetupLicense(VNC) - ' VNC.CreateControl() + Try + VNC = New VncSharp.RemoteDesktop + VNC.CreateControl() - ' Do Until VNC.Created - ' Thread.Sleep(10) - ' System.Windows.Forms.Application.DoEvents() - ' Loop + Do Until VNC.Created + Thread.Sleep(10) + System.Windows.Forms.Application.DoEvents() + Loop - ' pbCheck2.Image = My.Resources.Good_Symbol - ' lblCheck2.ForeColor = Color.DarkOliveGreen - ' lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckSucceeded - ' txtCheck2.Text = Language.Base.CcVNCOK - 'Catch ex As Exception - pbCheck2.Image = My.Resources.Bad_Symbol - lblCheck2.ForeColor = Color.Firebrick - lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckFailed - txtCheck2.Text = Language.Base.CcVNCFailed + pbCheck2.Image = My.Resources.Good_Symbol + lblCheck2.ForeColor = Color.DarkOliveGreen + lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckSucceeded + txtCheck2.Text = String.Format(Language.Base.CcVNCOK, VNC.ProductVersion) + Catch ex As Exception + pbCheck2.Image = My.Resources.Bad_Symbol + lblCheck2.ForeColor = Color.Firebrick + lblCheck2.Text = "VNC (Virtual Network Computing) " & Language.Base.CcCheckFailed + txtCheck2.Text = Language.Base.CcVNCFailed - mC.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True) - 'mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) - 'End Try + mC.AddMessage(Messages.MessageClass.WarningMsg, "VNC " & errorMsg, True) + 'mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) + End Try - 'VNC.Dispose() + If VNC IsNot Nothing Then VNC.Dispose() Dim pPath As String = "" @@ -584,7 +583,7 @@ Namespace UI pbCheck4.Image = My.Resources.Good_Symbol lblCheck4.ForeColor = Color.DarkOliveGreen lblCheck4.Text = "ICA (Citrix ICA) " & Language.Base.CcCheckSucceeded - txtCheck4.Text = Language.Base.CcICAOK + txtCheck4.Text = String.Format(Language.Base.CcICAOK, ICA.Version) Catch ex As Exception pbCheck4.Image = My.Resources.Bad_Symbol lblCheck4.ForeColor = Color.Firebrick @@ -595,7 +594,7 @@ Namespace UI mC.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, True) End Try - ICA.Dispose() + If ICA IsNot Nothing Then ICA.Dispose() Dim GeckoBad As Boolean = False @@ -628,7 +627,6 @@ Namespace UI End If - Dim eol As EOLWTSCOM.WTSCOM = Nothing Try