OSDN -- Develop and Download Open Source Software

[Ttssh2-commit] [9055] ttpfile.dll を使用しないようにした

Back to archive index
scmno****@osdn***** scmno****@osdn*****
2020年 12月 20日 (日) 21:06:51 JST 

Revision: 9055
          https://osdn.net/projects/ttssh2/scm/svn/commits/9055
Author:   zmatsuo
Date:     2020-12-20 21:06:51 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
ttpfile.dll を使用しないようにした

- ttpfile.dll を参照するコードを無効化
- ttpfile.dll をビルド対象から外した
- インストーラーに ttpfile.dll を含まないようにした

Modified Paths:
--------------
    trunk/installer/teraterm.iss
    trunk/installer/teraterm_cmake.iss.in
    trunk/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/teraterm/filesys.h
    trunk/teraterm/teraterm/filesys_proto.cpp
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttermpro.v16.sln
    trunk/teraterm/ttermpro.v8.sln

-------------- next part --------------
Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/installer/teraterm.iss	2020-12-20 12:06:51 UTC (rev 9055)
@@ -69,7 +69,6 @@
 [Files]
 Source: ..\teraterm\release\ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpcmn.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
-Source: ..\teraterm\release\ttpfile.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttpset.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: ..\teraterm\release\ttptek.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: release\TERATERM.INI; DestDir: {app}; Components: TeraTerm; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify

Modified: trunk/installer/teraterm_cmake.iss.in
===================================================================
--- trunk/installer/teraterm_cmake.iss.in	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/installer/teraterm_cmake.iss.in	2020-12-20 12:06:51 UTC (rev 9055)
@@ -64,7 +64,6 @@
 [Files]
 Source: @CMAKE_INSTALL_PREFIX@/ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: @CMAKE_INSTALL_PREFIX@/ttpcmn.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
-Source: @CMAKE_INSTALL_PREFIX@/ttpfile.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: @CMAKE_INSTALL_PREFIX@/ttpset.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: @CMAKE_INSTALL_PREFIX@/ttptek.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
 Source: @PROJECT_SOURCE_DIR@/installer\release\TERATERM.INI; DestDir: {app}; Components: TeraTerm; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify

Modified: trunk/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/CMakeLists.txt	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/teraterm/CMakeLists.txt	2020-12-20 12:06:51 UTC (rev 9055)
@@ -4,11 +4,6 @@
   ttpcmn
   PROPERTIES FOLDER teraterm)
 
-add_subdirectory(ttpfile)
-set_target_properties(
-  ttpfile
-  PROPERTIES FOLDER teraterm)
-
 add_subdirectory(ttpset)
 set_target_properties(
   ttpset

Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/teraterm/teraterm/filesys.cpp	2020-12-20 12:06:51 UTC (rev 9055)
@@ -98,6 +98,7 @@
 PSetFileVar SetFileVar;
 PGetXFname GetXFname;
 #endif
+#if 0
 PProtoInit ProtoInit;
 PProtoParse ProtoParse;
 PProtoTimeOutProc ProtoTimeOutProc;
@@ -104,6 +105,7 @@
 PProtoCancel ProtoCancel;
 PTTFILESetUILanguageFile TTFILESetUILanguageFile;
 PTTFILESetFileSendFilter TTFILESetFileSendFilter;
+#endif
 
 #if 0
 #define IdGetSetupFname  1
@@ -122,6 +124,7 @@
 #define IdTTFILESetUILanguageFile 11
 #define IdTTFILESetFileSendFilter 12
 
+#if 0
 BOOL LoadTTFILE(void)
 {
 	BOOL Err;
@@ -236,6 +239,7 @@
 	}
 	return TRUE;
 }
+#endif
 
 static PFileTransDlg SendDlg = NULL;
 //static PProtoDlg PtDlg = NULL;
@@ -564,11 +568,15 @@
 		return;
 	}
 
+#if 0
 	if (! LoadTTFILE())
 		return;
+#endif
 	if (! NewFileVar(&SendVar))
 	{
+#if 0
 		FreeTTFILE();
+#endif
 		return;
 	}
 	SendVar->OpId = OpSendFile;
@@ -663,7 +671,9 @@
 			SendDlg = NULL;
 		}
 		FreeFileVar(&SendVar);
+#if 0
 		FreeTTFILE();
+#endif
 	}
 
 	EndDdeCmnd(0);

Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/teraterm/teraterm/filesys.h	2020-12-20 12:06:51 UTC (rev 9055)
@@ -47,6 +47,7 @@
 typedef BOOL (PASCAL *PGetXFname)
   (HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir);
 #endif
+#if 0
 typedef void (PASCAL *PProtoInit)
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts);
 typedef BOOL (PASCAL *PProtoParse)
@@ -59,6 +60,7 @@
   (char *file);
 typedef BOOL (PASCAL *PTTFILESetFileSendFilter)
   (char *file);
+#endif
 
 #if 0
 extern PGetSetupFname GetSetupFname;
@@ -79,8 +81,10 @@
 extern PTTFILESetFileSendFilter TTFILESetFileSendFilter;
 #endif
 
+#if 0
 BOOL LoadTTFILE(void);
 BOOL FreeTTFILE(void);
+#endif
 //BOOL NewFileVar(PFileVar *FV);
 //void FreeFileVar(PFileVar *FV);
 BOOL IsSendVarNULL();

Modified: trunk/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.cpp	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/teraterm/teraterm/filesys_proto.cpp	2020-12-20 12:06:51 UTC (rev 9055)
@@ -738,13 +738,17 @@
 		return FALSE;
 	}
 
+#if 0
 	if (! LoadTTFILE())
 		return FALSE;
+#endif
 	NewFileVar_(&FileVar);
 
 	if (FileVar==NULL)
 	{
+#if 0
 		FreeTTFILE();
+#endif
 		return FALSE;
 	}
 	cv.ProtoFlag = TRUE;
@@ -768,7 +772,9 @@
 	else
 		EndDdeCmnd(0);
 
+#if 0
 	FreeTTFILE();
+#endif
 	FreeFileVar_(&FileVar);
 }
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/teraterm/teraterm/vtwin.cpp	2020-12-20 12:06:51 UTC (rev 9055)
@@ -1799,8 +1799,10 @@
 	while (FreeTTDLG());
 #endif
 
+#if 0
 	do { }
 	while (FreeTTFILE());
+#endif
 
 	if (HTEKWin != NULL) {
 		::DestroyWindow(HTEKWin);
@@ -5002,11 +5004,15 @@
 	BOOL Ok;
 
 	HelpId = HlpSetupRestore;
+#if 0
 	if (! LoadTTFILE()) {
 		return;
 	}
+#endif
 	Ok = _GetSetupFname(HVTWin,GSF_RESTORE,&ts);
+#if 0
 	FreeTTFILE();
+#endif
 	if (Ok) {
 		RestoreSetup();
 	}
@@ -5492,11 +5498,15 @@
 	BOOL Ok;
 
 	HelpId = HlpSetupLoadKeyMap;
+#if 0
 	if (! LoadTTFILE()) {
 		return;
 	}
+#endif
 	Ok = _GetSetupFname(HVTWin,GSF_LOADKEY,&ts);
+#if 0
 	FreeTTFILE();
+#endif
 	if (! Ok) {
 		return;
 	}

Modified: trunk/teraterm/ttermpro.v16.sln
===================================================================
--- trunk/teraterm/ttermpro.v16.sln	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/teraterm/ttermpro.v16.sln	2020-12-20 12:06:51 UTC (rev 9055)
@@ -8,8 +8,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpcmn", "ttpcmn\ttpcmn.v16.vcxproj", "{118E0D32-5553-4F73-9927-E873C1C500E4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v16.vcxproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v16.vcxproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpset", "ttpset\ttpset.v16.vcxproj", "{5CF58947-E861-4A5C-B0B1-E85486F149CD}"
@@ -46,12 +44,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|x64.ActiveCfg = Release|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|x64.ActiveCfg = Debug|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.Build.0 = Release|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|x64.ActiveCfg = Release|Win32
 		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.Build.0 = Debug|Win32
 		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|x64.ActiveCfg = Debug|Win32

Modified: trunk/teraterm/ttermpro.v8.sln
===================================================================
--- trunk/teraterm/ttermpro.v8.sln	2020-12-20 12:06:32 UTC (rev 9054)
+++ trunk/teraterm/ttermpro.v8.sln	2020-12-20 12:06:51 UTC (rev 9055)
@@ -3,7 +3,6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttermpro", "teraterm\ttermpro.v8.vcproj", "{BC4CDBE3-6269-47A8-BD74-EEB3A6160E06}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1D9096FC-EC94-4913-B14A-9D97AAB88E7F} = {1D9096FC-EC94-4913-B14A-9D97AAB88E7F}
-		{311F2B21-AEC4-4384-8209-BB83B54749B4} = {311F2B21-AEC4-4384-8209-BB83B54749B4}
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
 		{6D08053B-1C68-4A7E-8766-3553F5AF010B} = {6D08053B-1C68-4A7E-8766-3553F5AF010B}
 		{5CF58947-E861-4A5C-B0B1-E85486F149CD} = {5CF58947-E861-4A5C-B0B1-E85486F149CD}
@@ -18,12 +17,6 @@
 		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32} = {DF4E3C36-A743-4FB4-8EE9-49899E69ED32}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpfile", "ttpfile\ttpfile.v8.vcproj", "{311F2B21-AEC4-4384-8209-BB83B54749B4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DF4E3C36-A743-4FB4-8EE9-49899E69ED32} = {DF4E3C36-A743-4FB4-8EE9-49899E69ED32}
-		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ttpmacro", "ttpmacro\ttpmacro.v8.vcproj", "{BA519362-A2C2-4B1A-905B-F00791F9038A}"
 	ProjectSection(ProjectDependencies) = postProject
 		{118E0D32-5553-4F73-9927-E873C1C500E4} = {118E0D32-5553-4F73-9927-E873C1C500E4}
@@ -63,10 +56,6 @@
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Debug|Win32.Build.0 = Debug|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.ActiveCfg = Release|Win32
 		{118E0D32-5553-4F73-9927-E873C1C500E4}.Release|Win32.Build.0 = Release|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Debug|Win32.Build.0 = Debug|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.ActiveCfg = Release|Win32
-		{311F2B21-AEC4-4384-8209-BB83B54749B4}.Release|Win32.Build.0 = Release|Win32
 		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Debug|Win32.Build.0 = Debug|Win32
 		{BA519362-A2C2-4B1A-905B-F00791F9038A}.Release|Win32.ActiveCfg = Release|Win32

Ttssh2-commit メーリングリストの案内
Back to archive index