mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-25 11:18:37 +08:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8ddb71758e | ||
|
|
54f19eaeb6 | ||
|
|
960096273b | ||
|
|
b360902bd9 | ||
|
|
8006bb49ca |
@@ -1,3 +1,8 @@
|
||||
1.71 Beta 5 (2013-06-09):
|
||||
Fixed issue MR-491 - Could not start RDP Connection
|
||||
Fixed issue MR-499 - TS Gateway is not working in latest release 1.71
|
||||
Fixed typo in SQL queries.
|
||||
|
||||
1.71 Beta 4 (2013-05-28):
|
||||
Added feature MR-435 - Add digital signature check to updater
|
||||
Fixed issue MR-255 - The version of the RDP AX client should be updated to 7
|
||||
|
||||
@@ -99,7 +99,7 @@ Namespace Config
|
||||
|
||||
If databaseVersion.CompareTo(New Version(2, 4)) = 0 Then ' 2.4
|
||||
MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, String.Format("Upgrading database from version {0} to version {1}.", databaseVersion.ToString, "2.5"))
|
||||
sqlCommand = New SqlCommand("ALTER TABLE tblCons ADD LoadBalanceInfo varchar (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, AutomaticResize bit NOT NULL DEFAULT 1 InheritLoadBalanceInfo bit NOT NULL DEFAULT 0, InheritAutomaticResize bit NOT NULL DEFAULT 0;", sqlConnection)
|
||||
sqlCommand = New SqlCommand("ALTER TABLE tblCons ADD LoadBalanceInfo varchar (1024) COLLATE SQL_Latin1_General_CP1_CI_AS NULL, AutomaticResize bit NOT NULL DEFAULT 1, InheritLoadBalanceInfo bit NOT NULL DEFAULT 0, InheritAutomaticResize bit NOT NULL DEFAULT 0;", sqlConnection)
|
||||
sqlCommand.ExecuteNonQuery()
|
||||
databaseVersion = New Version(2, 5)
|
||||
End If
|
||||
@@ -192,8 +192,8 @@ Namespace Config
|
||||
"InheritIcon, InheritPanel, InheritPassword, InheritPort, " & _
|
||||
"InheritProtocol, InheritPuttySession, InheritRedirectDiskDrives, " & _
|
||||
"InheritRedirectKeys, InheritRedirectPorts, InheritRedirectPrinters, " & _
|
||||
"InheritRedirectSmartCards, InheritRedirectSound, InheritResolution, InheritAutomaticResize" & _
|
||||
"InheritUseConsoleSession, InheritRenderingEngine, InheritUsername, InheritICAEncryptionStrength, InheritRDPAuthenticationLevel, InheritLoadBalanceInfo" & _
|
||||
"InheritRedirectSmartCards, InheritRedirectSound, InheritResolution, InheritAutomaticResize, " & _
|
||||
"InheritUseConsoleSession, InheritRenderingEngine, InheritUsername, InheritICAEncryptionStrength, InheritRDPAuthenticationLevel, InheritLoadBalanceInfo, " & _
|
||||
"InheritPreExtApp, InheritPostExtApp, InheritMacAddress, InheritUserField, InheritExtApp, InheritVNCCompression, InheritVNCEncoding, " & _
|
||||
"InheritVNCAuthMode, InheritVNCProxyType, InheritVNCProxyIP, InheritVNCProxyPort, " & _
|
||||
"InheritVNCProxyUsername, InheritVNCProxyPassword, InheritVNCColors, " & _
|
||||
|
||||
@@ -61,7 +61,7 @@ Namespace Connection
|
||||
|
||||
#Region "Public Methods"
|
||||
Public Sub New()
|
||||
Control = New AxMsRdpClient8NotSafeForScripting
|
||||
Control = New AxMsRdpClient5NotSafeForScripting
|
||||
End Sub
|
||||
|
||||
Public Overrides Function SetProps() As Boolean
|
||||
@@ -77,7 +77,7 @@ Namespace Connection
|
||||
System.Windows.Forms.Application.DoEvents()
|
||||
Loop
|
||||
|
||||
_rdpClient = CType(Control, AxMsRdpClient8NotSafeForScripting).GetOcx()
|
||||
_rdpClient = CType(Control, AxMsRdpClient5NotSafeForScripting).GetOcx()
|
||||
Catch ex As Runtime.InteropServices.COMException
|
||||
MessageCollector.AddExceptionMessage(My.Language.strRdpControlCreationFailed, ex)
|
||||
Control.Dispose()
|
||||
@@ -103,7 +103,7 @@ Namespace Connection
|
||||
_rdpClient.AdvancedSettings2.overallConnectionTimeout = 20
|
||||
|
||||
_rdpClient.AdvancedSettings2.BitmapPeristence = Me._connectionInfo.CacheBitmaps
|
||||
If _rdpVersion >= Versions.RDC60 Then
|
||||
If _rdpVersion >= Versions.RDC61 Then
|
||||
_rdpClient.AdvancedSettings7.EnableCredSspSupport = _connectionInfo.UseCredSsp
|
||||
End If
|
||||
|
||||
@@ -233,20 +233,22 @@ Namespace Connection
|
||||
End Sub
|
||||
|
||||
Private Sub SetRdGateway()
|
||||
If Not _rdpClient.TransportSettings.GatewayIsSupported Then Return
|
||||
Try
|
||||
If _rdpClient.TransportSettings.GatewayIsSupported = 0 Then Return
|
||||
MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strRdpGatewayIsSupported, True)
|
||||
If Not _connectionInfo.RDGatewayUsageMethod = RDGatewayUsageMethod.Never Then
|
||||
_rdpClient.TransportSettings.GatewayUsageMethod = _connectionInfo.RDGatewayUsageMethod
|
||||
_rdpClient.TransportSettings.GatewayHostname = _connectionInfo.RDGatewayHostname
|
||||
If _rdpVersion >= Versions.RDC60 Then
|
||||
_rdpClient.TransportSettings2.GatewayProfileUsageMethod = 1
|
||||
_rdpClient.TransportSettings.GatewayProfileUsageMethod = 1 ' TSC_PROXY_PROFILE_MODE_EXPLICIT
|
||||
If _connectionInfo.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard Then
|
||||
_rdpClient.TransportSettings.GatewayCredsSource = 1 ' TSC_PROXY_CREDS_MODE_SMARTCARD
|
||||
End If
|
||||
If _rdpVersion >= Versions.RDC61 Then
|
||||
If _connectionInfo.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.Yes Then
|
||||
_rdpClient.TransportSettings2.GatewayUsername = _connectionInfo.Username
|
||||
_rdpClient.TransportSettings2.GatewayPassword = _connectionInfo.Password
|
||||
_rdpClient.TransportSettings2.GatewayDomain = _connectionInfo.Domain
|
||||
ElseIf _connectionInfo.RDGatewayUseConnectionCredentials = RDGatewayUseConnectionCredentials.SmartCard Then
|
||||
_rdpClient.TransportSettings2.GatewayCredsSource = 1 ' TSC_PROXY_CREDS_MODE_SMARTCARD
|
||||
_rdpClient.TransportSettings2.GatewayCredSharing = 0
|
||||
Else
|
||||
_rdpClient.TransportSettings2.GatewayUsername = _connectionInfo.RDGatewayUsername
|
||||
|
||||
@@ -489,10 +489,10 @@ Namespace UI
|
||||
pnlCheck6.Visible = True
|
||||
|
||||
|
||||
Dim rdpClient As AxMSTSCLib.AxMsRdpClient8NotSafeForScripting = Nothing
|
||||
Dim rdpClient As AxMSTSCLib.AxMsRdpClient5NotSafeForScripting = Nothing
|
||||
|
||||
Try
|
||||
rdpClient = New AxMSTSCLib.AxMsRdpClient8NotSafeForScripting
|
||||
rdpClient = New AxMSTSCLib.AxMsRdpClient5NotSafeForScripting
|
||||
rdpClient.CreateControl()
|
||||
|
||||
Do Until rdpClient.Created
|
||||
|
||||
Reference in New Issue
Block a user