[Ttssh2-commit] [7618] Merge branch 'trunk' into ssh_auth_dialog

scmno****@osdn***** scmno****@osdn*****
2019年 4月 24日 (水) 23:10:27 JST


Revision: 7618
          https://osdn.net/projects/ttssh2/scm/svn/commits/7618
Author:   zmatsuo
Date:     2019-04-24 23:10:27 +0900 (Wed, 24 Apr 2019)
Log Message:
-----------
Merge branch 'trunk' into ssh_auth_dialog

Modified Paths:
--------------
    branches/ssh_auth_dialog/installer/release/lang/English.lng
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj
    branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters
    branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c

-------------- next part --------------
Modified: branches/ssh_auth_dialog/installer/release/lang/English.lng
===================================================================
--- branches/ssh_auth_dialog/installer/release/lang/English.lng	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/installer/release/lang/English.lng	2019-04-24 14:10:27 UTC (rev 7618)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2019-04-17)
+; Updated by TeraTerm Project (2019-04-22)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -593,6 +593,8 @@
 DLG_AUTH_PRIVATEKEY=Private &key file:
 DLG_AUTH_LOCALUSER=Local &user name:
 DLG_AUTH_HOST_PRIVATEKEY=Host private key &file:
+DLG_AUTH_TIP_CONTROL_CODE=control character is entered
+DLG_AUTH_TIP_PASTE_KEY=Use Shift + Insert to paste from clipboard
 MSG_PAGEANT_NOTFOUND=Can't find Pageant.
 MSG_PAGEANT_NOKEY=Pageant has no valid key.
 

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v10.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -124,7 +124,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_s.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -188,8 +188,10 @@
     <None Include="..\..\cygterm\cygterm.ico" />
     <None Include="..\common\tek.ico" />
     <None Include="..\common\Teraterm.ico" />
+    <None Include="..\common\teraterm_3d.ico" />
     <None Include="..\common\teraterm_classic.ico" />
     <None Include="..\common\vt.ico" />
+    <None Include="..\common\vt_3d.ico" />
     <None Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v11.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -121,7 +121,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>onig_s.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>$(SolutionDir)..\libs\oniguruma\src;$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <DelayLoadDLLs>imagehlp.dll;user32.dll;shell32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
@@ -185,8 +185,10 @@
     <Image Include="..\..\cygterm\cygterm.ico" />
     <Image Include="..\common\tek.ico" />
     <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_3d.ico" />
     <Image Include="..\common\teraterm_classic.ico" />
     <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_3d.ico" />
     <Image Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v12.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -185,8 +185,10 @@
     <Image Include="..\..\cygterm\cygterm.ico" />
     <Image Include="..\common\tek.ico" />
     <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_3d.ico" />
     <Image Include="..\common\teraterm_classic.ico" />
     <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_3d.ico" />
     <Image Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v14.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -76,7 +76,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -187,8 +187,10 @@
     <Image Include="..\..\cygterm\cygterm.ico" />
     <Image Include="..\common\tek.ico" />
     <Image Include="..\common\Teraterm.ico" />
+    <Image Include="..\common\teraterm_3d.ico" />
     <Image Include="..\common\teraterm_classic.ico" />
     <Image Include="..\common\vt.ico" />
+    <Image Include="..\common\vt_3d.ico" />
     <Image Include="..\common\vt_classic.ico" />
   </ItemGroup>
   <ItemGroup>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v15.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -78,7 +78,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/teraterm/ttermpro.v16.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -78,7 +78,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>

Modified: branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/teraterm/vtwin.cpp	2019-04-24 14:10:27 UTC (rev 7618)
@@ -1372,7 +1372,7 @@
 	ModifyMenu(SetupMenu, ID_SETUP_FONT, MF_BYCOMMAND, ID_SETUP_FONT, ts.UIMsg);
 	GetMenuString(SetupMenu, ID_SETUP_DLG_FONT, uimsg, sizeof(uimsg), MF_BYCOMMAND);
 	get_lang_msg("MENU_SETUP_DIALOG_FONT", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
-	ModifyMenu(SetupMenu, ID_SETUP_DLG_FONT, MF_BYCOMMAND, ID_SETUP_FONT, ts.UIMsg);
+	ModifyMenu(SetupMenu, ID_SETUP_DLG_FONT, MF_BYCOMMAND, ID_SETUP_DLG_FONT, ts.UIMsg);
 	GetMenuString(SetupMenu, 2, uimsg, sizeof(uimsg), MF_BYPOSITION);
 	get_lang_msg("MENU_SETUP_FONT_SUBMENU", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
 	ModifyMenu(SetupMenu, 2, MF_BYPOSITION, 2, ts.UIMsg);

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -181,6 +181,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ttmacro.ico" />
+    <None Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -181,6 +181,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -181,6 +181,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -181,6 +181,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -184,6 +184,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/ttpmacro/ttpmacro.v16.vcxproj	2019-04-24 14:10:27 UTC (rev 7618)
@@ -184,6 +184,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />
+    <Image Include="ttmacro_3d.ico" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttm-version.rc" />

Modified: branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters
===================================================================
--- branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/teraterm/ttpset/ttpset.v16.vcxproj.filters	2019-04-24 14:10:27 UTC (rev 7618)
@@ -47,7 +47,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="ttpset-version.rc">
-      <Filter>Source Files</Filter>
+      <Filter>Resource File</Filter>
     </ResourceCompile>
   </ItemGroup>
 </Project>

Modified: branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c
===================================================================
--- branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c	2019-04-24 14:10:04 UTC (rev 7617)
+++ branches/ssh_auth_dialog/ttssh2/ttxssh/auth.c	2019-04-24 14:10:27 UTC (rev 7618)
@@ -130,6 +130,12 @@
 			}
 		}
 		break;
+	case WM_KILLFOCUS:
+		if (data->tipwin != NULL) {
+			TipWinDestroy(data->tipwin);
+			data->tipwin = NULL;
+		}
+		break;
 	}
 
 	result = CallWindowProc((WNDPROC)data->ProcOrg,


Ttssh2-commit メーリングリストの案内