OSDN -- Develop and Download Open Source Software
From 18 Jan, 2021 0:00 UTC: All services will be temporary unavailable for maintenance
  • R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision9055 (tree)
Time2020-12-20 21:06:51
Authorzmatsuo

Log Message

ttpfile.dll を使用しないようにした

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

Change Summary

Incremental Difference

--- trunk/installer/teraterm_cmake.iss.in (revision 9054)
+++ trunk/installer/teraterm_cmake.iss.in (revision 9055)
@@ -64,7 +64,6 @@
6464 [Files]
6565 Source: @CMAKE_INSTALL_PREFIX@/ttermpro.exe; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
6666 Source: @CMAKE_INSTALL_PREFIX@/ttpcmn.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
67-Source: @CMAKE_INSTALL_PREFIX@/ttpfile.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
6867 Source: @CMAKE_INSTALL_PREFIX@/ttpset.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
6968 Source: @CMAKE_INSTALL_PREFIX@/ttptek.dll; DestDir: {app}; Components: TeraTerm; Flags: ignoreversion
7069 Source: @PROJECT_SOURCE_DIR@/installer\release\TERATERM.INI; DestDir: {app}; Components: TeraTerm; Flags: onlyifdoesntexist uninsneveruninstall; Permissions: authusers-modify
--- trunk/teraterm/CMakeLists.txt (revision 9054)
+++ trunk/teraterm/CMakeLists.txt (revision 9055)
@@ -4,11 +4,6 @@
44 ttpcmn
55 PROPERTIES FOLDER teraterm)
66
7-add_subdirectory(ttpfile)
8-set_target_properties(
9- ttpfile
10- PROPERTIES FOLDER teraterm)
11-
127 add_subdirectory(ttpset)
138 set_target_properties(
149 ttpset
--- trunk/teraterm/teraterm/filesys.cpp (revision 9054)
+++ trunk/teraterm/teraterm/filesys.cpp (revision 9055)
@@ -98,6 +98,7 @@
9898 PSetFileVar SetFileVar;
9999 PGetXFname GetXFname;
100100 #endif
101+#if 0
101102 PProtoInit ProtoInit;
102103 PProtoParse ProtoParse;
103104 PProtoTimeOutProc ProtoTimeOutProc;
@@ -104,6 +105,7 @@
104105 PProtoCancel ProtoCancel;
105106 PTTFILESetUILanguageFile TTFILESetUILanguageFile;
106107 PTTFILESetFileSendFilter TTFILESetFileSendFilter;
108+#endif
107109
108110 #if 0
109111 #define IdGetSetupFname 1
@@ -122,6 +124,7 @@
122124 #define IdTTFILESetUILanguageFile 11
123125 #define IdTTFILESetFileSendFilter 12
124126
127+#if 0
125128 BOOL LoadTTFILE(void)
126129 {
127130 BOOL Err;
@@ -236,6 +239,7 @@
236239 }
237240 return TRUE;
238241 }
242+#endif
239243
240244 static PFileTransDlg SendDlg = NULL;
241245 //static PProtoDlg PtDlg = NULL;
@@ -564,11 +568,15 @@
564568 return;
565569 }
566570
571+#if 0
567572 if (! LoadTTFILE())
568573 return;
574+#endif
569575 if (! NewFileVar(&SendVar))
570576 {
577+#if 0
571578 FreeTTFILE();
579+#endif
572580 return;
573581 }
574582 SendVar->OpId = OpSendFile;
@@ -663,7 +671,9 @@
663671 SendDlg = NULL;
664672 }
665673 FreeFileVar(&SendVar);
674+#if 0
666675 FreeTTFILE();
676+#endif
667677 }
668678
669679 EndDdeCmnd(0);
--- trunk/teraterm/teraterm/filesys.h (revision 9054)
+++ trunk/teraterm/teraterm/filesys.h (revision 9055)
@@ -47,6 +47,7 @@
4747 typedef BOOL (PASCAL *PGetXFname)
4848 (HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir);
4949 #endif
50+#if 0
5051 typedef void (PASCAL *PProtoInit)
5152 (int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts);
5253 typedef BOOL (PASCAL *PProtoParse)
@@ -59,6 +60,7 @@
5960 (char *file);
6061 typedef BOOL (PASCAL *PTTFILESetFileSendFilter)
6162 (char *file);
63+#endif
6264
6365 #if 0
6466 extern PGetSetupFname GetSetupFname;
@@ -79,8 +81,10 @@
7981 extern PTTFILESetFileSendFilter TTFILESetFileSendFilter;
8082 #endif
8183
84+#if 0
8285 BOOL LoadTTFILE(void);
8386 BOOL FreeTTFILE(void);
87+#endif
8488 //BOOL NewFileVar(PFileVar *FV);
8589 //void FreeFileVar(PFileVar *FV);
8690 BOOL IsSendVarNULL();
--- trunk/teraterm/teraterm/filesys_proto.cpp (revision 9054)
+++ trunk/teraterm/teraterm/filesys_proto.cpp (revision 9055)
@@ -738,13 +738,17 @@
738738 return FALSE;
739739 }
740740
741+#if 0
741742 if (! LoadTTFILE())
742743 return FALSE;
744+#endif
743745 NewFileVar_(&FileVar);
744746
745747 if (FileVar==NULL)
746748 {
749+#if 0
747750 FreeTTFILE();
751+#endif
748752 return FALSE;
749753 }
750754 cv.ProtoFlag = TRUE;
@@ -768,7 +772,9 @@
768772 else
769773 EndDdeCmnd(0);
770774
775+#if 0
771776 FreeTTFILE();
777+#endif
772778 FreeFileVar_(&FileVar);
773779 }
774780
--- trunk/teraterm/teraterm/vtwin.cpp (revision 9054)
+++ trunk/teraterm/teraterm/vtwin.cpp (revision 9055)
@@ -1799,8 +1799,10 @@
17991799 while (FreeTTDLG());
18001800 #endif
18011801
1802+#if 0
18021803 do { }
18031804 while (FreeTTFILE());
1805+#endif
18041806
18051807 if (HTEKWin != NULL) {
18061808 ::DestroyWindow(HTEKWin);
@@ -5002,11 +5004,15 @@
50025004 BOOL Ok;
50035005
50045006 HelpId = HlpSetupRestore;
5007+#if 0
50055008 if (! LoadTTFILE()) {
50065009 return;
50075010 }
5011+#endif
50085012 Ok = _GetSetupFname(HVTWin,GSF_RESTORE,&ts);
5013+#if 0
50095014 FreeTTFILE();
5015+#endif
50105016 if (Ok) {
50115017 RestoreSetup();
50125018 }
@@ -5492,11 +5498,15 @@
54925498 BOOL Ok;
54935499
54945500 HelpId = HlpSetupLoadKeyMap;
5501+#if 0
54955502 if (! LoadTTFILE()) {
54965503 return;
54975504 }
5505+#endif
54985506 Ok = _GetSetupFname(HVTWin,GSF_LOADKEY,&ts);
5507+#if 0
54995508 FreeTTFILE();
5509+#endif
55005510 if (! Ok) {
55015511 return;
55025512 }
Show on old repository browser