Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for PuTTYNG.

Browse Source
This commit is contained in:
rmcardle
2011-12-08 01:15:21 -06:00
parent 99b981b988
commit cb224a352a
2 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mRemoteV1/App/App.Native.vb
View File

@@ -98,6 +98,17 @@ Namespace App
<DllImport("user32")> _
Public Shared Function PostMessage(ByVal hWnd As IntPtr, ByVal wMsg As Integer, ByVal wParam As Integer, ByVal lParam As Integer) As Long
End Function
<DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
Public Shared Function FindWindowEx(ByVal parentHandle As IntPtr, _
ByVal childAfter As IntPtr, _
ByVal lclassName As String, _
ByVal windowTitle As String) As IntPtr
End Function
<DllImport("user32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> _
Public Shared Function SetFocus(ByVal hwnd As IntPtr) As IntPtr
End Function
#End Region
#Region "Constants"

27
mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb
View File

@@ -1,3 +1,5 @@
Imports System.Runtime.InteropServices
Imports System.ComponentModel
Imports mRemoteNG.App.Native
Imports System.Threading
Imports Microsoft.Win32
@@ -139,6 +141,8 @@ Namespace Connection
.Arguments = "-load " & """" & Me.InterfaceControl.Info.PuttySession & """" & " -" & Me._PuttyProtocol.ToString & " -P " & Me.InterfaceControl.Info.Port & " """ & Me.InterfaceControl.Info.Hostname & """"
End Select
.Arguments = .Arguments & " -hwndparent " & Me.InterfaceControl.Handle.ToString()
'REMOVE IN RELEASE!
'mC.AddMessage(Messages.MessageClass.InformationMsg, "PuTTY Arguments: " & .Arguments, True)
End With
@@ -149,21 +153,7 @@ Namespace Connection
PuttyProcess.Start()
PuttyProcess.WaitForInputIdle()
Dim TryCount As Integer = 0
Do Until PuttyProcess.MainWindowHandle <> IntPtr.Zero And Me.InterfaceControl.Handle <> IntPtr.Zero And Me.PuttyProcess.MainWindowTitle <> "Default IME"
If TryCount >= My.Settings.MaxPuttyWaitTime * 2 Then
Exit Do
End If
PuttyProcess.Refresh()
Thread.Sleep(500)
TryCount += 1
Loop
PuttyHandle = PuttyProcess.MainWindowHandle
PuttyHandle = FindWindowEx(Me.InterfaceControl.Handle, 0, vbNullString, vbNullString)
mC.AddMessage(Messages.MessageClass.InformationMsg, My.Resources.strPuttyStuff, True)
@@ -171,8 +161,6 @@ Namespace Connection
mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyTitle, PuttyProcess.MainWindowTitle), True)
mC.AddMessage(Messages.MessageClass.InformationMsg, String.Format(My.Resources.strPuttyParentHandle, Me.InterfaceControl.Parent.Handle.ToString), True)
SetParent(PuttyHandle, InterfaceControl.Parent.Handle)
ShowWindow(PuttyHandle, SW_SHOWMAXIMIZED)
Resize()
MyBase.Connect()
@@ -185,7 +173,7 @@ Namespace Connection
Public Overrides Sub Focus()
Try
'SetForegroundWindow(PuttyHandle)
SetFocus(PuttyHandle)
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyFocusFailed & vbNewLine & ex.Message, True)
End Try
@@ -193,7 +181,7 @@ Namespace Connection
Public Overrides Sub Resize()
Try
MoveWindow(PuttyHandle, -SystemInformation.FrameBorderSize.Width, -(SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height), Me.InterfaceControl.Width + (SystemInformation.FrameBorderSize.Width * 2), Me.InterfaceControl.Height + SystemInformation.CaptionHeight + (SystemInformation.FrameBorderSize.Height * 2), True)
MoveWindow(PuttyHandle, 0, 0, Me.InterfaceControl.Width, Me.InterfaceControl.Height, True)
Catch ex As Exception
mC.AddMessage(Messages.MessageClass.ErrorMsg, My.Resources.strPuttyResizeFailed & vbNewLine & ex.Message, True)
End Try
@@ -279,7 +267,6 @@ Namespace Connection
ssh2 = 2
End Enum
#End Region
End Class
End Namespace
End Namespace