diff --git a/CREDITS.TXT b/CREDITS.TXT index d1f8f9b7a9..064a760072 100644 --- a/CREDITS.TXT +++ b/CREDITS.TXT @@ -6,6 +6,15 @@ Riley McArdle David Vidmar +Included Source Code +==================== + +Command Line Arguments Parser 1.0 +Copyright © 2002 Richard Lopes +MIT License +http://www.codeproject.com/KB/recipes/command_line.aspx + + Included Components =================== diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb index 9ec48eab73..b607e86c73 100644 --- a/mRemoteV1/App/App.Runtime.vb +++ b/mRemoteV1/App/App.Runtime.vb @@ -1530,7 +1530,7 @@ Namespace App Public Shared Sub GoToURL(ByVal URL As String) Dim cI As New mRemote.Connection.Info - cI.Name = "Website" + cI.Name = "" cI.Hostname = URL If URL.StartsWith("https:") Then cI.Protocol = Connection.Protocol.Protocols.HTTPS diff --git a/mRemoteV1/CHANGELOG.TXT b/mRemoteV1/CHANGELOG.TXT index 6f51ad51dc..f7d542ed84 100644 --- a/mRemoteV1/CHANGELOG.TXT +++ b/mRemoteV1/CHANGELOG.TXT @@ -10,6 +10,7 @@ Improved RDP error reporting Added support for Credential Security Support Provider (CredSSP) which is required for Network Level Authentication (NLA) Added support for connecting through Remote Desktop Gateway servers + Popups can now be allowed in Internet Explorer by holding Ctrl+Alt when clicking a link 1.62: Switched to VncSharp, an open source VNC component diff --git a/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb b/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb index 73c97e3f5b..de0988a30a 100644 --- a/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb +++ b/mRemoteV1/Connection/Connection.Protocol.HTTPBase.vb @@ -1,6 +1,5 @@ Imports System.Windows.Forms Imports mRemote.App.Runtime -Imports Skybound.Gecko Imports System.ComponentModel Namespace Connection @@ -19,7 +18,6 @@ Namespace Connection Public Sub New(ByVal RenderingEngine As RenderingEngine) Try If RenderingEngine = RenderingEngine.Gecko Then - 'Skybound.Gecko.Xpcom.Initialize(My.Settings.XULRunnerPath) Me.Control = New MiniGeckoBrowser.MiniGeckoBrowser TryCast(Me.Control, MiniGeckoBrowser.MiniGeckoBrowser).XULrunnerPath = My.Settings.XULRunnerPath Else @@ -39,19 +37,29 @@ Namespace Connection MyBase.SetProps() Try - wBrowser = Me.Control + Dim objTabPage As Crownwood.Magic.Controls.TabPage = TryCast(Me.InterfaceControl.Parent, Crownwood.Magic.Controls.TabPage) + Me.tabTitle = objTabPage.Title + Catch ex As Exception + Me.tabTitle = "" + End Try + + Try + Me.wBrowser = Me.Control If InterfaceControl.Info.RenderingEngine = RenderingEngine.Gecko Then - 'AddHandler TryCast(wBrowser, GeckoWebBrowser).CreateWindow, AddressOf gex_CreateWindow - AddHandler TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser).TitleChanged, AddressOf wBrowser_DocumentTitleChanged - AddHandler TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser).LastTabRemoved, AddressOf wBrowser_LastTabRemoved - 'wBrowser.Width = wBrowser.Width + Dim objMiniGeckoBrowser As MiniGeckoBrowser.MiniGeckoBrowser = TryCast(wBrowser, MiniGeckoBrowser.MiniGeckoBrowser) + + AddHandler objMiniGeckoBrowser.TitleChanged, AddressOf wBrowser_DocumentTitleChanged + AddHandler objMiniGeckoBrowser.LastTabRemoved, AddressOf wBrowser_LastTabRemoved Else - TryCast(wBrowser, WebBrowser).AllowWebBrowserDrop = False - TryCast(wBrowser, WebBrowser).ScrollBarsEnabled = True + Dim objWebBrowser As WebBrowser = TryCast(wBrowser, WebBrowser) + Dim objAxWebBrowser As SHDocVw.WebBrowser = DirectCast(objWebBrowser.ActiveXInstance, SHDocVw.WebBrowser) + + objWebBrowser.AllowWebBrowserDrop = False + objWebBrowser.ScrollBarsEnabled = True - AddHandler TryCast(wBrowser, WebBrowser).DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged - AddHandler TryCast(wBrowser, WebBrowser).NewWindow, AddressOf wBrowser_NewWindow + AddHandler objWebBrowser.DocumentTitleChanged, AddressOf wBrowser_DocumentTitleChanged + AddHandler objAxWebBrowser.NewWindow3, AddressOf wBrowser_NewWindow3 End If Return True @@ -111,14 +119,15 @@ Namespace Connection #Region "Events" Private Sub gex_CreateWindow(ByVal sender As Object, ByVal e As Skybound.Gecko.GeckoCreateWindowEventArgs) - 'Dim tP As TabPage = AddTab() - 'e.WebBrowser = tP.Controls(0) e.WebBrowser = Me.wBrowser End Sub - Private Sub wBrowser_NewWindow(ByVal sender As Object, ByVal e As CancelEventArgs) - e.Cancel = True - TryCast(wBrowser, WebBrowser).Navigate(TryCast(wBrowser, WebBrowser).StatusText) + Private Sub wBrowser_NewWindow3(ByRef ppDisp As Object, ByRef Cancel As Boolean, ByVal dwFlags As Long, ByVal bstrUrlContext As String, ByVal bstrUrl As String) + If (dwFlags And NWMF.NWMF_OVERRIDEKEY) Then + Cancel = False + Else + Cancel = True + End If End Sub Private Sub wBrowser_LastTabRemoved(ByVal sender As Object) @@ -131,10 +140,6 @@ Namespace Connection tabP = TryCast(InterfaceControl.Parent, Crownwood.Magic.Controls.TabPage) If tabP IsNot Nothing Then - If tabTitle = "" Then - tabTitle = tabP.Title - End If - Dim shortTitle As String = "" If Me.InterfaceControl.Info.RenderingEngine = RenderingEngine.Gecko Then @@ -151,7 +156,11 @@ Namespace Connection End If End If - tabP.Title = tabTitle & " - " & shortTitle + If Me.tabTitle <> "" Then + tabP.Title = tabTitle & " - " & shortTitle + Else + tabP.Title = shortTitle + End If End If Catch ex As Exception mC.AddMessage(Messages.MessageClass.WarningMsg, "wBrowser_DocumentTitleChanged (Connection.Protocol.HTTPBase) failed" & vbNewLine & ex.Message, True) @@ -159,12 +168,31 @@ Namespace Connection End Sub #End Region +#Region "Enums" Public Enum RenderingEngine _ IE = 1 _ Gecko = 2 End Enum + + Private Enum NWMF + NWMF_UNLOADING = &H1 + NWMF_USERINITED = &H2 + NWMF_FIRST = &H4 + NWMF_OVERRIDEKEY = &H8 + NWMF_SHOWHELP = &H10 + NWMF_HTMLDIALOG = &H20 + NWMF_FROMDIALOGCHILD = &H40 + NWMF_USERREQUESTED = &H80 + NWMF_USERALLOWED = &H100 + NWMF_FORCEWINDOW = &H10000 + NWMF_FORCETAB = &H20000 + NWMF_SUGGESTWINDOW = &H40000 + NWMF_SUGGESTTAB = &H80000 + NWMF_INACTIVETAB = &H100000 + End Enum +#End Region End Class End Namespace End Namespace \ No newline at end of file diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj index 72c09bcb1c..3d4c490597 100644 --- a/mRemoteV1/mRemoteV1.vbproj +++ b/mRemoteV1/mRemoteV1.vbproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {4934A491-40BC-4E5B-9166-EA1169A220F6} WinExe @@ -361,6 +361,7 @@ UI.Window.Announcment.vb + Designer UI.Window.ComponentsCheck.vb @@ -809,6 +810,16 @@ false + + + {EAB22AC0-30C1-11CF-A7EB-0000C05BAE0B} + 1 + 1 + 0 + tlbimp + False + +