OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de

[Ttssh2-commit] [7343] Merge branch 'trunk' r7342 into cmake

Zurück zum Archiv-Index
scmno****@osdn***** scmno****@osdn*****
2018年 12月 23日 (日) 02:29:48 JST 

Revision: 7343
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7343
Author:   zmatsuo
Date:     2018-12-23 02:29:42 +0900 (Sun, 23 Dec 2018)
Log Message:
-----------
Merge branch 'trunk' r7342 into cmake

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7342

Modified Paths:
--------------
    branches/cmake/teraterm/common/win16api.c
    branches/cmake/teraterm/teraterm/telnet.c
    branches/cmake/teraterm/ttpdlg/ttdlg.c
    branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters
    branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj
    branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj

-------------- next part --------------
Modified: branches/cmake/teraterm/common/win16api.c
===================================================================
--- branches/cmake/teraterm/common/win16api.c	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/common/win16api.c	2018-12-22 17:29:42 UTC (rev 7343)
@@ -37,7 +37,7 @@
 		// write
 		handle = CreateFileA(FileName,
 							 GENERIC_WRITE, FILE_SHARE_WRITE, NULL,
-							 CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+							 OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
 		break;
 	case OF_READWRITE:
 		// read/write (teratermではttpmacro/ttl.c内の1箇所のみで使用されている

Modified: branches/cmake/teraterm/teraterm/telnet.c
===================================================================
--- branches/cmake/teraterm/teraterm/telnet.c	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/teraterm/telnet.c	2018-12-22 17:29:42 UTC (rev 7343)
@@ -41,6 +41,7 @@
 
 #include "telnet.h"
 #include "tt_res.h"
+#include "win16api.h"
 
 int TelStatus;
 
@@ -62,7 +63,7 @@
 	BOOL SubOptIAC;
 	BOOL ChangeWinSize;
 	POINT WinSize;
-	int LogFile;
+	HANDLE LogFile;
 } TelRec;
 typedef TelRec *PTelRec;
 

Modified: branches/cmake/teraterm/ttpdlg/ttdlg.c
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.c	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.c	2018-12-22 17:29:42 UTC (rev 7343)
@@ -39,7 +39,7 @@
 #include <commdlg.h>
 #include <dlgs.h>
 #include <tchar.h>
-#include "teraterm.h"
+#include <crtdbg.h>
 #include "tttypes.h"
 #include "ttlib.h"
 #include "dlglib.h"
@@ -57,13 +57,17 @@
 //#define DllExport __declspec(dllexport) 
 #define DllExport
 
-static char * ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
-
 #undef EFFECT_ENABLED	// \x83G\x83t\x83F\x83N\x83g\x82̗L\x8C\xF8\x89”\xDB
 #undef TEXTURE_ENABLED	// \x83e\x83N\x83X\x83`\x83\x83\x82̗L\x8C\xF8\x89”\xDB
 
 //#include "compat_w95.h"
 
+#ifdef _DEBUG
+#define calloc(c, s)  _calloc_dbg((c), (s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define free(p)       _free_dbg((p), _NORMAL_BLOCK)
+#define _strdup(s)	  _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+
 #undef DialogBoxParam
 #define DialogBoxParam(p1,p2,p3,p4,p5) \
 	TTDialogBoxParam(p1,p2,p3,p4,p5)
@@ -79,6 +83,7 @@
 
 static char UILanguageFile[MAX_PATH];
 
+static char * ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
 static const char *NLListRcv[] = {"CR","CR+LF", "LF", "AUTO", NULL};
 static const char *NLList[] = {"CR","CR+LF", "LF", NULL};
 static const char *TermList[] =
@@ -2468,6 +2473,20 @@
 #define LANG_PATH "lang"
 #define LANG_EXT ".lng"
 
+// \x83\x81\x83\x82\x83\x8A\x83t\x83\x8A\x81[
+static void free_lang_ui_list()
+{
+	if (LangUIList) {
+		char **p = LangUIList;
+		while (*p) {
+			free(*p);
+			p++;
+		}
+		free(LangUIList);
+		LangUIList = NULL;
+	}
+}
+
 static int make_sel_lang_ui(char *HomeDir)
 {
 	int    i;
@@ -2475,21 +2494,11 @@
 	char   fullpath[1024];
 	HANDLE hFind;
 	WIN32_FIND_DATAA fd;
-	char **p;
 
+	free_lang_ui_list();
+
 	_snprintf_s(fullpath, sizeof(fullpath), _TRUNCATE, "%s\\%s\\*%s", HomeDir, LANG_PATH, LANG_EXT);
 
-	// \x83\x81\x83\x82\x83\x8A\x83t\x83\x8A\x81[
-	if (LangUIList) {
-		p = LangUIList;
-		while (*p) {
-			free(*p);
-			p++;
-		}
-		free(LangUIList);
-		LangUIList = NULL;
-	}
-
 	file_num = 0;
 	hFind = FindFirstFileA(fullpath,&fd);
 	if (hFind != INVALID_HANDLE_VALUE) {
@@ -2662,6 +2671,11 @@
 				case IDC_GENHELP:
 					PostMessage(GetParent(Dialog),WM_USER_DLGHELP2,0,0);
 			}
+			break;
+
+		case WM_DESTROY:
+			free_lang_ui_list();
+			break;
 	}
 	return FALSE;
 }

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2018-12-22 17:29:42 UTC (rev 7343)
@@ -124,6 +124,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\codeconv.cpp" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="errdlg.cpp" />
     <ClCompile Include="fileread.cpp" />
@@ -146,7 +147,9 @@
     <ClCompile Include="wait4all.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\codeconv.h" />
     <ClInclude Include="errdlg.h" />
+    <ClInclude Include="fileread.h" />
     <ClInclude Include="inpdlg.h" />
     <ClInclude Include="ListDlg.h" />
     <ClInclude Include="msgdlg.h" />
@@ -165,6 +168,7 @@
     <ClInclude Include="ttmmain.h" />
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
+    <ClInclude Include="..\common\win16api.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="ttmacro.ico" />

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters	2018-12-22 17:29:42 UTC (rev 7343)
@@ -73,6 +73,15 @@
     <ClCompile Include="wait4all.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fileread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -132,6 +141,15 @@
     <ClInclude Include="ttmparse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fileread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="ttmacro.ico">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2018-12-22 17:29:42 UTC (rev 7343)
@@ -124,6 +124,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\common\codeconv.cpp" />
     <ClCompile Include="..\common\win16api.c" />
     <ClCompile Include="errdlg.cpp" />
     <ClCompile Include="fileread.cpp" />
@@ -146,7 +147,9 @@
     <ClCompile Include="wait4all.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\common\codeconv.h" />
     <ClInclude Include="errdlg.h" />
+    <ClInclude Include="fileread.h" />
     <ClInclude Include="inpdlg.h" />
     <ClInclude Include="ListDlg.h" />
     <ClInclude Include="msgdlg.h" />
@@ -165,6 +168,7 @@
     <ClInclude Include="ttmmain.h" />
     <ClInclude Include="ttmmsg.h" />
     <ClInclude Include="ttmparse.h" />
+    <ClInclude Include="..\common\win16api.h" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico" />

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters	2018-12-22 17:29:42 UTC (rev 7343)
@@ -73,6 +73,15 @@
     <ClCompile Include="wait4all.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fileread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -132,6 +141,15 @@
     <ClInclude Include="ttmparse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fileread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters	2018-12-22 17:29:42 UTC (rev 7343)
@@ -73,6 +73,15 @@
     <ClCompile Include="wait4all.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fileread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -132,6 +141,15 @@
     <ClInclude Include="ttmparse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fileread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters	2018-12-22 17:29:42 UTC (rev 7343)
@@ -73,6 +73,15 @@
     <ClCompile Include="wait4all.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
+    <ClCompile Include="..\common\win16api.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\common\codeconv.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="fileread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="errdlg.h">
@@ -132,6 +141,15 @@
     <ClInclude Include="ttmparse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\common\win16api.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\common\codeconv.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="fileread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="ttmacro.ico">

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.v9.vcproj	2018-12-22 17:29:42 UTC (rev 7343)
@@ -203,6 +203,10 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.cpp"
 				>
 			</File>
@@ -244,10 +248,18 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
+				RelativePath="..\common\codeconv.h"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.h"
 				>
 			</File>
 			<File
+				RelativePath="fileread.h"
+				>
+			</File>
+			<File
 				RelativePath="inpdlg.h"
 				>
 			</File>
@@ -319,6 +331,10 @@
 				RelativePath="ttmparse.h"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"

Modified: branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj	2018-12-22 16:18:21 UTC (rev 7342)
+++ branches/cmake/teraterm/ttpmacro/ttpmacro.vcproj	2018-12-22 17:29:42 UTC (rev 7343)
@@ -204,6 +204,10 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
+				RelativePath="..\common\codeconv.cpp"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.cpp"
 				>
 			</File>
@@ -245,10 +249,18 @@
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
 			<File
+				RelativePath="..\common\codeconv.h"
+				>
+			</File>
+			<File
 				RelativePath="errdlg.h"
 				>
 			</File>
 			<File
+				RelativePath="fileread.h"
+				>
+			</File>
+			<File
 				RelativePath="inpdlg.h"
 				>
 			</File>
@@ -320,6 +332,10 @@
 				RelativePath="ttmparse.h"
 				>
 			</File>
+			<File
+				RelativePath="..\common\win16api.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -404,6 +420,10 @@
 				RelativePath="..\common\win16api.c"
 				>
 			</File>
+			<File
+				RelativePath="fileread.cpp"
+				>
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

Ttssh2-commit メーリングリストの案内
Zurück zum Archiv-Index