mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX.
This commit is contained in:
Binary file not shown.
@@ -3,7 +3,7 @@
|
||||
!insertmacro VersionCompare
|
||||
|
||||
!DEFINE PRODUCT_VERSION_MAJOR 1
|
||||
!DEFINE PRODUCT_VERSION_MINOR 60
|
||||
!DEFINE PRODUCT_VERSION_MINOR 61
|
||||
|
||||
!DEFINE PRODUCT_VERSION "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}"
|
||||
!DEFINE PRODUCT_VERSION_LONG "${PRODUCT_VERSION_MAJOR}.${PRODUCT_VERSION_MINOR}.0.0"
|
||||
@@ -95,7 +95,6 @@ Section "" ; Install
|
||||
|
||||
; Register ActiveX components
|
||||
RegDLL "$INSTDIR\eolwtscom.dll"
|
||||
RegDLL "$INSTDIR\scvncctrl.dll"
|
||||
|
||||
; Start Menu
|
||||
CreateDirectory "$SMPROGRAMS\mRemoteNG"
|
||||
@@ -114,7 +113,6 @@ SectionEnd
|
||||
Section "un.Uninstall"
|
||||
; Unregister ActiveX components
|
||||
UnregDLL "$INSTDIR\eolwtscom.dll"
|
||||
UnregDLL "$INSTDIR\scvncctrl.dll"
|
||||
|
||||
; Delete Files
|
||||
RMDIR /r $INSTDIR
|
||||
|
||||
@@ -1,4 +1,8 @@
|
||||
1.60:
|
||||
1.61:
|
||||
Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX
|
||||
This version of mRemoteNG does not support VNC
|
||||
|
||||
1.60:
|
||||
Changed name to mRemoteNG
|
||||
Fixed menu bar not staying docked to left side
|
||||
Removed snakes game Easter egg
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Imports mRemote.App.Runtime
|
||||
Imports AxViewerX
|
||||
'Imports AxViewerX
|
||||
Imports System.ComponentModel
|
||||
|
||||
Namespace Connection
|
||||
@@ -10,132 +10,133 @@ Namespace Connection
|
||||
#Region "Properties"
|
||||
Public Property SmartSize() As Boolean
|
||||
Get
|
||||
If VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE Then
|
||||
Return False
|
||||
Else
|
||||
Return True
|
||||
End If
|
||||
'If VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE Then
|
||||
Return False
|
||||
'Else
|
||||
' Return True
|
||||
'End If
|
||||
End Get
|
||||
Set(ByVal value As Boolean)
|
||||
If value = False Then
|
||||
VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE
|
||||
Else
|
||||
If Info.VNCSmartSizeMode = SmartSizeMode.SmartSFree Then
|
||||
VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_FREE
|
||||
Else
|
||||
VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
|
||||
End If
|
||||
End If
|
||||
'If value = False Then
|
||||
' VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE
|
||||
'Else
|
||||
' If Info.VNCSmartSizeMode = SmartSizeMode.SmartSFree Then
|
||||
' VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_FREE
|
||||
' Else
|
||||
' VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
|
||||
' End If
|
||||
'End If
|
||||
End Set
|
||||
End Property
|
||||
|
||||
Public Property ViewOnly() As Boolean
|
||||
Get
|
||||
Return VNC.ViewOnly
|
||||
'Return VNC.ViewOnly
|
||||
Return False
|
||||
End Get
|
||||
Set(ByVal value As Boolean)
|
||||
VNC.ViewOnly = value
|
||||
'VNC.ViewOnly = value
|
||||
End Set
|
||||
End Property
|
||||
#End Region
|
||||
|
||||
#Region "Private Declarations"
|
||||
Private VNC As AxCSC_ViewerXControl
|
||||
'Private VNC As AxCSC_ViewerXControl
|
||||
Private Info As Connection.Info
|
||||
#End Region
|
||||
|
||||
#Region "Public Methods"
|
||||
Public Sub New()
|
||||
Me.Control = New AxCSC_ViewerXControl
|
||||
SetupLicense(Me.Control)
|
||||
'Me.Control = New AxCSC_ViewerXControl
|
||||
'SetupLicense(Me.Control)
|
||||
End Sub
|
||||
|
||||
Public Overrides Function SetProps() As Boolean
|
||||
MyBase.SetProps()
|
||||
|
||||
Try
|
||||
VNC = Me.Control
|
||||
'VNC = Me.Control
|
||||
|
||||
Info = Me.InterfaceControl.Info
|
||||
'Info = Me.InterfaceControl.Info
|
||||
|
||||
VNC.BeginInit()
|
||||
'VNC.BeginInit()
|
||||
|
||||
VNC.Port = Me.Info.Port
|
||||
VNC.HostIP = Me.Info.Hostname
|
||||
'VNC.Port = Me.Info.Port
|
||||
'VNC.HostIP = Me.Info.Hostname
|
||||
|
||||
If Info.VNCCompression <> Compression.CompNone Then
|
||||
VNC.JPEGCompression = True
|
||||
VNC.JPEGCompressionLevel = Info.VNCCompression
|
||||
End If
|
||||
'If Info.VNCCompression <> Compression.CompNone Then
|
||||
' VNC.JPEGCompression = True
|
||||
' VNC.JPEGCompressionLevel = Info.VNCCompression
|
||||
'End If
|
||||
|
||||
Select Case Info.VNCEncoding
|
||||
Case Encoding.EncCorre
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_CORRE
|
||||
Case Encoding.EncHextile
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_HEXTILE
|
||||
Case Encoding.EncRaw
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_RAW
|
||||
Case Encoding.EncRRE
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_RRE
|
||||
Case Encoding.EncTight
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_TIGHT
|
||||
Case Encoding.EncZlib
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIB
|
||||
Case Encoding.EncZLibHex
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIBHEX
|
||||
Case Encoding.EncZRLE
|
||||
VNC.Encoding = ViewerX.VNCEncoding.RFB_ZRLE
|
||||
End Select
|
||||
'Select Case Info.VNCEncoding
|
||||
' Case Encoding.EncCorre
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_CORRE
|
||||
' Case Encoding.EncHextile
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_HEXTILE
|
||||
' Case Encoding.EncRaw
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_RAW
|
||||
' Case Encoding.EncRRE
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_RRE
|
||||
' Case Encoding.EncTight
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_TIGHT
|
||||
' Case Encoding.EncZlib
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIB
|
||||
' Case Encoding.EncZLibHex
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_ZLIBHEX
|
||||
' Case Encoding.EncZRLE
|
||||
' VNC.Encoding = ViewerX.VNCEncoding.RFB_ZRLE
|
||||
'End Select
|
||||
|
||||
If Info.VNCAuthMode = AuthMode.AuthWin Then
|
||||
VNC.LoginType = ViewerX.ViewerLoginType.VLT_MSWIN
|
||||
VNC.MsUser = Me.Info.Username
|
||||
VNC.MsDomain = Me.Info.Domain
|
||||
VNC.MsPassword = Me.Info.Password
|
||||
Else
|
||||
VNC.LoginType = ViewerX.ViewerLoginType.VLT_VNC
|
||||
VNC.Password = Me.Info.Password
|
||||
End If
|
||||
'If Info.VNCAuthMode = AuthMode.AuthWin Then
|
||||
' VNC.LoginType = ViewerX.ViewerLoginType.VLT_MSWIN
|
||||
' VNC.MsUser = Me.Info.Username
|
||||
' VNC.MsDomain = Me.Info.Domain
|
||||
' VNC.MsPassword = Me.Info.Password
|
||||
'Else
|
||||
' VNC.LoginType = ViewerX.ViewerLoginType.VLT_VNC
|
||||
' VNC.Password = Me.Info.Password
|
||||
'End If
|
||||
|
||||
Select Case Info.VNCProxyType
|
||||
Case ProxyType.ProxyNone
|
||||
VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_NONE
|
||||
Case ProxyType.ProxyHTTP
|
||||
VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_HTTP
|
||||
Case ProxyType.ProxySocks5
|
||||
VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_SOCKS5
|
||||
Case ProxyType.ProxyUltra
|
||||
VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_ULTRA_REPEATER
|
||||
End Select
|
||||
'Select Case Info.VNCProxyType
|
||||
' Case ProxyType.ProxyNone
|
||||
' VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_NONE
|
||||
' Case ProxyType.ProxyHTTP
|
||||
' VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_HTTP
|
||||
' Case ProxyType.ProxySocks5
|
||||
' VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_SOCKS5
|
||||
' Case ProxyType.ProxyUltra
|
||||
' VNC.ProxyType = ViewerX.ConnectionProxyType.VPT_ULTRA_REPEATER
|
||||
'End Select
|
||||
|
||||
If Info.VNCProxyType <> ProxyType.ProxyNone Then
|
||||
VNC.ProxyIP = Info.VNCProxyIP
|
||||
VNC.ProxyPort = Info.VNCProxyPort
|
||||
VNC.ProxyUser = Info.VNCProxyUsername
|
||||
VNC.ProxyPassword = Info.VNCProxyPassword
|
||||
End If
|
||||
'If Info.VNCProxyType <> ProxyType.ProxyNone Then
|
||||
' VNC.ProxyIP = Info.VNCProxyIP
|
||||
' VNC.ProxyPort = Info.VNCProxyPort
|
||||
' VNC.ProxyUser = Info.VNCProxyUsername
|
||||
' VNC.ProxyPassword = Info.VNCProxyPassword
|
||||
'End If
|
||||
|
||||
If Info.VNCColors = Colors.Col8Bit Then
|
||||
VNC.RestrictPixel = True
|
||||
Else
|
||||
VNC.RestrictPixel = False
|
||||
End If
|
||||
'If Info.VNCColors = Colors.Col8Bit Then
|
||||
' VNC.RestrictPixel = True
|
||||
'Else
|
||||
' VNC.RestrictPixel = False
|
||||
'End If
|
||||
|
||||
Select Case Info.VNCSmartSizeMode
|
||||
Case SmartSizeMode.SmartSNo
|
||||
VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE
|
||||
Case SmartSizeMode.SmartSFree
|
||||
VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_FREE
|
||||
Case SmartSizeMode.SmartSAspect
|
||||
VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
|
||||
End Select
|
||||
'Select Case Info.VNCSmartSizeMode
|
||||
' Case SmartSizeMode.SmartSNo
|
||||
' VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_NONE
|
||||
' Case SmartSizeMode.SmartSFree
|
||||
' VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_FREE
|
||||
' Case SmartSizeMode.SmartSAspect
|
||||
' VNC.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
|
||||
'End Select
|
||||
|
||||
VNC.ViewOnly = Info.VNCViewOnly
|
||||
'VNC.ViewOnly = Info.VNCViewOnly
|
||||
|
||||
VNC.ConnectingText = Language.Base.Connecting & " (SmartCode VNC viewer)"
|
||||
VNC.DisconnectedText = Language.Base.Disconnected
|
||||
VNC.MessageBoxes = False
|
||||
VNC.EndInit()
|
||||
'VNC.ConnectingText = Language.Base.Connecting & " (SmartCode VNC viewer)"
|
||||
'VNC.DisconnectedText = Language.Base.Disconnected
|
||||
'VNC.MessageBoxes = False
|
||||
'VNC.EndInit()
|
||||
|
||||
Return True
|
||||
Catch ex As Exception
|
||||
@@ -148,7 +149,7 @@ Namespace Connection
|
||||
Me.SetEventHandlers()
|
||||
|
||||
Try
|
||||
VNC.ConnectAsync()
|
||||
'VNC.ConnectAsync()
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "Opening connection failed" & vbNewLine & ex.Message)
|
||||
Return False
|
||||
@@ -159,7 +160,7 @@ Namespace Connection
|
||||
|
||||
Public Overrides Sub Disconnect()
|
||||
Try
|
||||
VNC.Disconnect()
|
||||
'VNC.Disconnect()
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC Disconnect failed" & vbNewLine & ex.Message, True)
|
||||
End Try
|
||||
@@ -169,9 +170,9 @@ Namespace Connection
|
||||
Try
|
||||
Select Case Keys
|
||||
Case SpecialKeys.CtrlAltDel
|
||||
VNC.SendCAD()
|
||||
'VNC.SendCAD()
|
||||
Case SpecialKeys.CtrlEsc
|
||||
VNC.SendCtrlEsq()
|
||||
'VNC.SendCtrlEsq()
|
||||
End Select
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SendSpecialKeys failed" & vbNewLine & ex.Message, True)
|
||||
@@ -198,11 +199,11 @@ Namespace Connection
|
||||
|
||||
Public Sub StartChat()
|
||||
Try
|
||||
If VNC.Capabilities.Chat = True Then
|
||||
VNC.OpenChat()
|
||||
Else
|
||||
mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support chat")
|
||||
End If
|
||||
'If VNC.Capabilities.Chat = True Then
|
||||
' VNC.OpenChat()
|
||||
'Else
|
||||
' mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support chat")
|
||||
'End If
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC StartChat failed" & vbNewLine & ex.Message, True)
|
||||
End Try
|
||||
@@ -210,11 +211,11 @@ Namespace Connection
|
||||
|
||||
Public Sub StartFileTransfer()
|
||||
Try
|
||||
If VNC.Capabilities.FileTransfer = True Then
|
||||
VNC.OpenFileTransfer()
|
||||
Else
|
||||
mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support file transfers")
|
||||
End If
|
||||
'If VNC.Capabilities.FileTransfer = True Then
|
||||
' VNC.OpenFileTransfer()
|
||||
'Else
|
||||
' mC.AddMessage(Messages.MessageClass.InformationMsg, "VNC Server doesn't support file transfers")
|
||||
'End If
|
||||
Catch ex As Exception
|
||||
|
||||
End Try
|
||||
@@ -222,7 +223,7 @@ Namespace Connection
|
||||
|
||||
Public Sub RefreshScreen()
|
||||
Try
|
||||
VNC.RequestRefresh()
|
||||
'VNC.RequestRefresh()
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC RefreshScreen failed" & vbNewLine & ex.Message, True)
|
||||
End Try
|
||||
@@ -232,8 +233,8 @@ Namespace Connection
|
||||
#Region "Private Methods"
|
||||
Private Sub SetEventHandlers()
|
||||
Try
|
||||
AddHandler VNC.ConnectedEvent, AddressOf VNCEvent_Connected
|
||||
AddHandler VNC.Disconnected, AddressOf VNCEvent_Disconnected
|
||||
'AddHandler VNC.ConnectedEvent, AddressOf VNCEvent_Connected
|
||||
'AddHandler VNC.Disconnected, AddressOf VNCEvent_Disconnected
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetEventHandlers failed" & vbNewLine & ex.Message, True)
|
||||
End Try
|
||||
|
||||
@@ -363,9 +363,10 @@
|
||||
"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 = "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 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)"
|
||||
|
||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
||||
' by using the '*' as shown below:
|
||||
' <Assembly: AssemblyVersion("1.0.*")>
|
||||
|
||||
<Assembly: AssemblyVersion("1.60")>
|
||||
<Assembly: AssemblyFileVersion("1.60")>
|
||||
<Assembly: AssemblyVersion("1.61")>
|
||||
<Assembly: AssemblyFileVersion("1.61")>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -237,8 +237,10 @@ Namespace UI
|
||||
|
||||
Me.lblCopyright.Text = My.Application.Info.Copyright
|
||||
|
||||
Me.llblCopyright2.Text = "Contains VNC viewer software licensed from SmartCode Solutions"
|
||||
Me.llblCopyright2.Links.Add(43, 100, (App.Info.General.SmartCodeURL))
|
||||
'Me.llblCopyright2.Text = "Contains VNC viewer software licensed from SmartCode Solutions"
|
||||
'Me.llblCopyright2.Links.Add(43, 100, (App.Info.General.SmartCodeURL))
|
||||
Me.llblCopyright2.Text = "This version of mRemoteNG does not support VNC"
|
||||
Me.llblCopyright2.Links.Clear()
|
||||
|
||||
Me.llblCopyright3.Text = "Some Icons by FAMFAMFAM"
|
||||
Me.llblCopyright3.Links.Add(14, 100, (App.Info.General.FamFamFamURL))
|
||||
|
||||
@@ -517,33 +517,33 @@ Namespace UI
|
||||
RDP.Dispose()
|
||||
|
||||
|
||||
Dim VNC As AxViewerX.AxCSC_ViewerXControl = Nothing
|
||||
'Dim VNC As AxViewerX.AxCSC_ViewerXControl = Nothing
|
||||
|
||||
Try
|
||||
VNC = New AxViewerX.AxCSC_ViewerXControl
|
||||
mRemote.Connection.Protocol.VNC.SetupLicense(VNC)
|
||||
VNC.CreateControl()
|
||||
'Try
|
||||
' VNC = New AxViewerX.AxCSC_ViewerXControl
|
||||
' mRemote.Connection.Protocol.VNC.SetupLicense(VNC)
|
||||
' 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 = 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
|
||||
|
||||
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()
|
||||
'VNC.Dispose()
|
||||
|
||||
|
||||
Dim pPath As String = ""
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Imports WeifenLuo.WinFormsUI.Docking
|
||||
Imports mRemote.App.Runtime
|
||||
Imports AxViewerX
|
||||
'Imports AxViewerX
|
||||
|
||||
Namespace UI
|
||||
Namespace Window
|
||||
@@ -67,7 +67,7 @@ Namespace UI
|
||||
#End Region
|
||||
|
||||
#Region "Declarations"
|
||||
Private WithEvents vnc As AxCSC_ViewerXControl
|
||||
'Private WithEvents vnc As AxCSC_ViewerXControl
|
||||
#End Region
|
||||
|
||||
#Region "Public Methods"
|
||||
@@ -91,22 +91,22 @@ Namespace UI
|
||||
|
||||
Private Sub StartListening()
|
||||
Try
|
||||
If vnc IsNot Nothing Then
|
||||
vnc.Dispose()
|
||||
vnc = Nothing
|
||||
End If
|
||||
'If vnc IsNot Nothing Then
|
||||
' vnc.Dispose()
|
||||
' vnc = Nothing
|
||||
'End If
|
||||
|
||||
vnc = New AxCSC_ViewerXControl()
|
||||
SetupLicense()
|
||||
'vnc = New AxCSC_ViewerXControl()
|
||||
'SetupLicense()
|
||||
|
||||
vnc.Parent = pnlContainer
|
||||
vnc.Dock = DockStyle.Fill
|
||||
vnc.Show()
|
||||
'vnc.Parent = pnlContainer
|
||||
'vnc.Dock = DockStyle.Fill
|
||||
'vnc.Show()
|
||||
|
||||
vnc.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
|
||||
vnc.ListeningText = Language.Base.ListeningForIncomingVNCConnections & " " & My.Settings.UVNCSCPort
|
||||
'vnc.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
|
||||
'vnc.ListeningText = Language.Base.ListeningForIncomingVNCConnections & " " & My.Settings.UVNCSCPort
|
||||
|
||||
vnc.ListenEx(My.Settings.UVNCSCPort)
|
||||
'vnc.ListenEx(My.Settings.UVNCSCPort)
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "StartListening (UI.Window.UltraVNCSC) failed" & vbNewLine & ex.Message, False)
|
||||
Close()
|
||||
@@ -115,24 +115,24 @@ Namespace UI
|
||||
|
||||
Private Sub SetupLicense()
|
||||
Try
|
||||
Dim f As System.Reflection.FieldInfo
|
||||
f = GetType(AxHost).GetField("licenseKey", Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Instance)
|
||||
f.SetValue(vnc, "{072169039103041044176252035252117103057101225235137221179204110241121074}")
|
||||
'Dim f As System.Reflection.FieldInfo
|
||||
'f = GetType(AxHost).GetField("licenseKey", Reflection.BindingFlags.NonPublic Or Reflection.BindingFlags.Instance)
|
||||
'f.SetValue(vnc, "{072169039103041044176252035252117103057101225235137221179204110241121074}")
|
||||
Catch ex As Exception
|
||||
mC.AddMessage(Messages.MessageClass.ErrorMsg, "VNC SetupLicense failed (UI.Window.UltraVNCSC)" & vbNewLine & ex.Message, True)
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Sub vnc_ConnectionAccepted(ByVal sender As Object, ByVal e As AxViewerX._ISmartCodeVNCViewerEvents_ConnectionAcceptedEvent) Handles vnc.ConnectionAccepted
|
||||
mC.AddMessage(Messages.MessageClass.InformationMsg, e.bstrServerAddress & " is now connected to your UltraVNC SingleClick panel!")
|
||||
End Sub
|
||||
'Private Sub vnc_ConnectionAccepted(ByVal sender As Object, ByVal e As AxViewerX._ISmartCodeVNCViewerEvents_ConnectionAcceptedEvent) Handles vnc.ConnectionAccepted
|
||||
' mC.AddMessage(Messages.MessageClass.InformationMsg, e.bstrServerAddress & " is now connected to your UltraVNC SingleClick panel!")
|
||||
'End Sub
|
||||
|
||||
Private Sub vnc_Disconnected(ByVal sender As Object, ByVal e As System.EventArgs) Handles vnc.Disconnected
|
||||
StartListening()
|
||||
End Sub
|
||||
'Private Sub vnc_Disconnected(ByVal sender As Object, ByVal e As System.EventArgs) Handles vnc.Disconnected
|
||||
' StartListening()
|
||||
'End Sub
|
||||
|
||||
Private Sub btnDisconnect_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnDisconnect.Click
|
||||
vnc.Dispose()
|
||||
'vnc.Dispose()
|
||||
Dispose()
|
||||
App.Runtime.Windows.Show(Type.UltraVNCSC)
|
||||
End Sub
|
||||
|
||||
@@ -77,10 +77,6 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\AxInterop.MSTSCLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="AxInterop.ViewerX, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\AxInterop.ViewerX.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="AxInterop.WFICALib, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\AxInterop.WFICALib.dll</HintPath>
|
||||
@@ -101,10 +97,6 @@
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\Interop.MSTSCLib.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Interop.ViewerX, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\Interop.ViewerX.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Interop.WFICALib, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||
<SpecificVersion>False</SpecificVersion>
|
||||
<HintPath>References\Interop.WFICALib.dll</HintPath>
|
||||
|
||||
Reference in New Issue
Block a user