diff --git a/BUILD.CMD b/BUILD.CMD
index 654550fc8..5e4bdf414 100644
--- a/BUILD.CMD
+++ b/BUILD.CMD
@@ -3,30 +3,40 @@
SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
SET DEVENV="devenv.exe"
SET MAKENSIS="%ProgramFiles(x86)%\NSIS\makensis.exe"
+<<<<<<< HEAD
+SET RAR="%ProgramFiles%\WinRAR\WinRAR.exe"
+SET BINARYZIP="%~dp0\Release\mRemoteNG-1.63.zip"
+SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.63.zip"
+=======
SET RAR="%ProgramFiles%\WinRAR\Rar.exe"
SET BINARYZIP="%~dp0\Release\mRemoteNG-1.64.zip"
SET PORTABLEZIP="%~dp0\Release\mRemoteNG-Portable-1.64.zip"
+>>>>>>> f24b1b5cec015433e7f47e36aac2ad20256f1a37
-call %VCVARSALL% x86
+call %VCVARSALL% x86 > NUL 2>&1
-rmdir /s /q "%~dp0\mRemoteV1\bin"
-rmdir /s /q "%~dp0\mRemoteV1\obj"
+rmdir /s /q "%~dp0\mRemoteV1\bin" > NUL 2>&1
+rmdir /s /q "%~dp0\mRemoteV1\obj" > NUL 2>&1
+echo Building release version...
%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release"
+
+echo Building portable version...
%DEVENV% "%~dp0\mRemoteV1.sln" /build "Release Portable"
mkdir "%~dp0\Release"
+echo Creating installer package...
%MAKENSIS% "%~dp0\Installer\mRemote.nsi"
-del /f /q %BINARYZIP%
+echo Creating release ZIP file...
+del /f /q %BINARYZIP% > NUL 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %BINARYZIP% "%~dp0\*.TXT"
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\mRemoteV1\bin\Release\*.*"
-%RAR% a -m5 -r -ep1 %BINARYZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %BINARYZIP% "%~dp0\*.TXT"
-
-del /f /q %PORTABLEZIP%
-
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
-%RAR% a -m5 -r -ep1 %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
-%RAR% a -m5 -ep %PORTABLEZIP% "%~dp0\*.TXT"
+echo Creating portable ZIP file...
+del /f /q %PORTABLEZIP% > NUL 2>&1
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\mRemoteV1\bin\Release Portable\*.*"
+%RAR% a -m5 -r -ep1 -afzip -inul %PORTABLEZIP% "%~dp0\Installer\Dependencies\*.*"
+%RAR% a -m5 -ep -afzip -inul %PORTABLEZIP% "%~dp0\*.TXT"
diff --git a/mRemoteV1/Connection/Connection.Protocol.VNC.vb b/mRemoteV1/Connection/Connection.Protocol.VNC.vb
index 18f1b090e..997bceb65 100644
--- a/mRemoteV1/Connection/Connection.Protocol.VNC.vb
+++ b/mRemoteV1/Connection/Connection.Protocol.VNC.vb
@@ -1,5 +1,6 @@
Imports mRemoteNG.App.Runtime
Imports System.ComponentModel
+Imports System.Windows.Forms
Imports mRemoteNG.Tools.LocalizedAttributes
Namespace Connection
@@ -207,6 +208,7 @@ Namespace Connection
Try
AddHandler VNC.ConnectComplete, AddressOf VNCEvent_Connected
AddHandler VNC.ConnectionLost, AddressOf VNCEvent_Disconnected
+ AddHandler VNC.GotFocus, AddressOf VNCEvent_GotFocus
If Not String.IsNullOrEmpty(Info.Password) Then
VNC.GetPassword = AddressOf VNCEvent_Authenticate
End If
@@ -227,6 +229,10 @@ Namespace Connection
MyBase.Close()
End Sub
+ Private Sub VNCEvent_GotFocus(ByVal sender As Object, ByVal e As EventArgs)
+ Me.VNC.FillServerClipboard()
+ End Sub
+
Private Function VNCEvent_Authenticate() As String
Return Info.Password
End Function
diff --git a/mRemoteV1/mRemoteV1.vbproj b/mRemoteV1/mRemoteV1.vbproj
index 66be03dee..98f525b7f 100644
--- a/mRemoteV1/mRemoteV1.vbproj
+++ b/mRemoteV1/mRemoteV1.vbproj
@@ -92,6 +92,10 @@
False
References\ADTree.dll
+
+ False
+ do not check in\AxInterop.WFICALib.dll
+
False
References\DiffieHellman.dll
@@ -100,6 +104,14 @@
False
References\FilteredPropertyGrid.dll
+
+ False
+ do not check in\Interop.EOLWTSCOM.dll
+
+
+ False
+ do not check in\Interop.WFICALib.dll
+
False
References\IPTextBox.dll
@@ -894,22 +906,6 @@
aximp
False
-
- {238F6F80-B8B4-11CF-8771-00A024541EE3}
- 2
- 7
- 0
- aximp
- False
-
-
- {96C3FA7A-3211-4D93-BFEA-4589DA4ABDE2}
- 1
- 0
- 0
- tlbimp
- False
-
{8C11EFA1-92C3-11D1-BC1E-00C04FA31489}
1
@@ -934,14 +930,6 @@
primary
False
-
- {238F6F80-B8B4-11CF-8771-00A024541EE3}
- 2
- 7
- 0
- tlbimp
- False
-