Tera Term

[Ttssh2-commit] [8425] codeconv周り修正 [Ttssh2-devel 4404]

• 前の記事 (スレッド) [Ttssh2-commit] [8424] 未使用コードを削除した
• 次の記事 (スレッド) [Ttssh2-commit] [8426] マクロウィンドウの行情報が欠けていたので、高さを広げた。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 8425
          https://osdn.net/projects/ttssh2/scm/svn/commits/8425
Author:   doda
Date:     2019-11-29 19:08:55 +0900 (Fri, 29 Nov 2019)
Log Message:
-----------
codeconv周り修正 [Ttssh2-devel 4404]

 - codeconv を static link するようにした
 - 変換後文字列を free するようにした

Modified Paths:
--------------
    trunk/teraterm/ttpcmn/ttpcmn.def
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters
    trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters
    trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters
    trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters
    trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
    trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
    trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters
    trunk/ttssh2/ttxssh/ttxssh.v9.vcproj
    trunk/ttssh2/ttxssh/ttxssh.vcproj

-------------- next part --------------
Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/teraterm/ttpcmn/ttpcmn.def	2019-11-29 10:08:55 UTC (rev 8425)
@@ -42,8 +42,6 @@
   SetCustomNotifyIcon @85
   GetCustomNotifyIcon @86
 
-  ToCharU8 @94
-  
   SJIS2JIS @30
   SJIS2EUC @31
   JIS2SJIS @32

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ssh.c	2019-11-29 10:08:55 UTC (rev 8425)
@@ -7625,7 +7625,7 @@
 			msgA = ToCharU8(msg);
 			if (msgA) {
 				MessageBox(pvar->cv->HWin, msgA, "Authentication Banner", MB_OK | MB_ICONINFORMATION);
-//				free(msgA);
+				free(msgA);
 			}
 			break;
 		case 3:
@@ -7632,7 +7632,7 @@
 			msgA = ToCharU8(msg);
 			if (msgA) {
 				NotifyInfoMessage(pvar->cv, msgA, "Authentication Banner");
-//				free(msgA);
+				free(msgA);
 			}
 			break;
 		}

Modified: trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -135,6 +135,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib.c" />
     <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
@@ -173,6 +174,7 @@
     <ClCompile Include="x11util.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h" />
     <ClInclude Include="arc4random.h" />
     <ClInclude Include="auth.h" />
     <ClInclude Include="buffer.h" />

Modified: trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v10.vcxproj.filters	2019-11-29 10:08:55 UTC (rev 8425)
@@ -109,6 +109,9 @@
     <ClCompile Include="..\..\teraterm\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -195,6 +198,9 @@
     <ClInclude Include="x11util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttsecure.ico">

Modified: trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -140,6 +140,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib.c" />
     <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
@@ -178,6 +179,7 @@
     <ClCompile Include="x11util.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h" />
     <ClInclude Include="arc4random.h" />
     <ClInclude Include="auth.h" />
     <ClInclude Include="buffer.h" />

Modified: trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v11.vcxproj.filters	2019-11-29 10:08:55 UTC (rev 8425)
@@ -109,6 +109,9 @@
     <ClCompile Include="..\..\teraterm\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -195,6 +198,9 @@
     <ClInclude Include="x11util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttsecure.ico">

Modified: trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -140,6 +140,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib.c" />
     <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
@@ -178,6 +179,7 @@
     <ClCompile Include="x11util.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h" />
     <ClInclude Include="arc4random.h" />
     <ClInclude Include="auth.h" />
     <ClInclude Include="buffer.h" />

Modified: trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v12.vcxproj.filters	2019-11-29 10:08:55 UTC (rev 8425)
@@ -195,6 +195,9 @@
     <ClInclude Include="x11util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttsecure.ico">

Modified: trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -140,6 +140,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib.c" />
     <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
@@ -178,6 +179,7 @@
     <ClCompile Include="x11util.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h" />
     <ClInclude Include="arc4random.h" />
     <ClInclude Include="auth.h" />
     <ClInclude Include="buffer.h" />

Modified: trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v14.vcxproj.filters	2019-11-29 10:08:55 UTC (rev 8425)
@@ -109,6 +109,9 @@
     <ClCompile Include="..\..\teraterm\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -195,6 +198,9 @@
     <ClInclude Include="x11util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttsecure.ico">

Modified: trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -141,6 +141,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib.c" />
     <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
@@ -179,6 +180,7 @@
     <ClCompile Include="x11util.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h" />
     <ClInclude Include="arc4random.h" />
     <ClInclude Include="auth.h" />
     <ClInclude Include="buffer.h" />

Modified: trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v15.vcxproj.filters	2019-11-29 10:08:55 UTC (rev 8425)
@@ -109,6 +109,9 @@
     <ClCompile Include="..\..\teraterm\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -195,6 +198,9 @@
     <ClInclude Include="x11util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttsecure.ico">
@@ -236,4 +242,4 @@
       <Filter>Def File</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -141,6 +141,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib.c" />
     <ClCompile Include="..\..\teraterm\common\dlglib_cpp.cpp" />
     <ClCompile Include="..\..\teraterm\common\dlglib_tmpl.cpp" />
@@ -179,6 +180,7 @@
     <ClCompile Include="x11util.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h" />
     <ClInclude Include="arc4random.h" />
     <ClInclude Include="auth.h" />
     <ClInclude Include="buffer.h" />
@@ -233,4 +235,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v16.vcxproj.filters	2019-11-29 10:08:55 UTC (rev 8425)
@@ -109,6 +109,9 @@
     <ClCompile Include="..\..\teraterm\common\ttlib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\teraterm\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="arc4random.h">
@@ -195,6 +198,9 @@
     <ClInclude Include="x11util.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\teraterm\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttsecure.ico">
@@ -236,4 +242,4 @@
       <Filter>Def File</Filter>
     </None>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/ttssh2/ttxssh/ttxssh.v9.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.v9.vcproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.v9.vcproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -247,6 +247,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\teraterm\common\codeconv.h"
+				>
+			</File>
+			<File
 				RelativePath="config.h"
 				>
 			</File>
@@ -351,6 +355,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\teraterm\common\codeconv.cpp"
+				>
+			</File>
+			<File
 				RelativePath="crypt.c"
 				>
 			</File>

Modified: trunk/ttssh2/ttxssh/ttxssh.vcproj
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.vcproj	2019-11-28 15:03:52 UTC (rev 8424)
+++ trunk/ttssh2/ttxssh/ttxssh.vcproj	2019-11-29 10:08:55 UTC (rev 8425)
@@ -236,6 +236,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\teraterm\common\codeconv.h"
+				>
+			</File>
+			<File
 				RelativePath="config.h"
 				>
 			</File>
@@ -352,6 +356,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\teraterm\common\codeconv.cpp"
+				>
+			</File>
+			<File
 				RelativePath="crypt.c"
 				>
 			</File>

• 前の記事 (スレッド) [Ttssh2-commit] [8424] 未使用コードを削除した
• 次の記事 (スレッド) [Ttssh2-commit] [8426] マクロウィンドウの行情報が欠けていたので、高さを広げた。
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]