• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision7184 (tree)
Time2018-08-20 23:22:15
Authorzmatsuo

Log Message

merge trunk 7178

Change Summary

Incremental Difference

--- branches/cmake/teraterm/ttpdlg/ttdlg.h (revision 7183)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.h (revision 7184)
@@ -1,29 +0,0 @@
1-/*
2- * Copyright (C) 2008-2017 TeraTerm Project
3- * All rights reserved.
4- *
5- * Redistribution and use in source and binary forms, with or without
6- * modification, are permitted provided that the following conditions
7- * are met:
8- *
9- * 1. Redistributions of source code must retain the above copyright
10- * notice, this list of conditions and the following disclaimer.
11- * 2. Redistributions in binary form must reproduce the above copyright
12- * notice, this list of conditions and the following disclaimer in the
13- * documentation and/or other materials provided with the distribution.
14- * 3. The name of the author may not be used to endorse or promote products
15- * derived from this software without specific prior written permission.
16- *
17- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
18- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
21- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27- */
28-
29-void PASCAL TTDLGSetUILanguageFile(char *file);
--- branches/cmake/teraterm/ttpfile/ftlib.h (revision 7183)
+++ branches/cmake/teraterm/ttpfile/ftlib.h (revision 7184)
@@ -40,12 +40,3 @@
4040 void FTSetTimeOut(PFileVar fv, int T);
4141 BOOL FTCreateFile(PFileVar fv);
4242 void GetFileSendFilter(PCHAR dest, PCHAR src, int size);
43-
44-#ifdef __cplusplus
45-extern "C" {
46-#endif
47-void PASCAL TTFILESetUILanguageFile(char *file);
48-void PASCAL TTFILESetFileSendFilter(char *file);
49-#ifdef __cplusplus
50-}
51-#endif
--- branches/cmake/teraterm/teraterm/ttdialog.c (revision 7183)
+++ branches/cmake/teraterm/teraterm/ttdialog.c (revision 7184)
@@ -49,6 +49,7 @@
4949 PChooseFontDlg ChooseFontDlg;
5050 PSetupGeneral SetupGeneral;
5151 PWindowWindow WindowWindow;
52+PTTDLGSetUILanguageFile TTDLGSetUILanguageFile;
5253
5354 #define IdSetupTerminal 1
5455 #define IdSetupWin 2
@@ -60,7 +61,8 @@
6061 #define IdAboutDialog 8
6162 #define IdChooseFontDlg 9
6263 #define IdSetupGeneral 10
63-#define IdWindowWindow 11
64+#define IdWindowWindow 11
65+#define IdTTDLGSetUILanguageFile 12
6466
6567 BOOL LoadTTDLG()
6668 {
@@ -72,9 +74,8 @@
7274 HTTDLG = LoadHomeDLL("TTPDLG.DLL");
7375 if (HTTDLG==NULL) return FALSE;
7476
75- TTDLGSetUILanguageFile(ts.UILanguageFile);
77+ Err = FALSE;
7678
77- Err = FALSE;
7879 SetupTerminal = (PSetupTerminal)GetProcAddress(HTTDLG,
7980 MAKEINTRESOURCE(IdSetupTerminal));
8081 if (SetupTerminal==NULL) {
@@ -141,6 +142,15 @@
141142 Err = TRUE;
142143 }
143144
145+ TTDLGSetUILanguageFile = (PTTDLGSetUILanguageFile)GetProcAddress(HTTDLG,
146+ MAKEINTRESOURCE(IdTTDLGSetUILanguageFile));
147+ if (TTDLGSetUILanguageFile==NULL) {
148+ Err = TRUE;
149+ }
150+ else {
151+ TTDLGSetUILanguageFile(ts.UILanguageFile);
152+ }
153+
144154 if (Err) {
145155 FreeLibrary(HTTDLG);
146156 HTTDLG = NULL;
--- branches/cmake/teraterm/teraterm/ttdialog.h (revision 7183)
+++ branches/cmake/teraterm/teraterm/ttdialog.h (revision 7184)
@@ -54,6 +54,8 @@
5454 (HWND WndParent, PTTSet ts);
5555 typedef BOOL (PASCAL *PWindowWindow)
5656 (HWND WndParent, PBOOL Close);
57+typedef BOOL (PASCAL *PTTDLGSetUILanguageFile)
58+ (char *file);
5759
5860 extern PSetupTerminal SetupTerminal;
5961 extern PSetupWin SetupWin;
@@ -66,6 +68,7 @@
6668 extern PChooseFontDlg ChooseFontDlg;
6769 extern PSetupGeneral SetupGeneral;
6870 extern PWindowWindow WindowWindow;
71+extern PTTDLGSetUILanguageFile TTDLGSetUILanguageFile;
6972
7073 /* proto types */
7174 BOOL LoadTTDLG();
--- branches/cmake/teraterm/teraterm/filesys.cpp (revision 7183)
+++ branches/cmake/teraterm/teraterm/filesys.cpp (revision 7184)
@@ -100,6 +100,8 @@
100100 PProtoParse ProtoParse;
101101 PProtoTimeOutProc ProtoTimeOutProc;
102102 PProtoCancel ProtoCancel;
103+PTTFILESetUILanguageFile TTFILESetUILanguageFile;
104+PTTFILESetFileSendFilter TTFILESetFileSendFilter;
103105
104106 #define IdGetSetupFname 1
105107 #define IdGetTransFname 2
@@ -113,6 +115,9 @@
113115 #define IdProtoTimeOutProc 9
114116 #define IdProtoCancel 10
115117
118+#define IdTTFILESetUILanguageFile 11
119+#define IdTTFILESetFileSendFilter 12
120+
116121 /*
117122 Line Head flag for timestamping
118123 2007.05.24 Gentaro
@@ -148,10 +153,8 @@
148153 if (HTTFILE == NULL)
149154 return FALSE;
150155
151- TTFILESetUILanguageFile(ts.UILanguageFile);
152- TTFILESetFileSendFilter(ts.FileSendFilter);
156+ Err = FALSE;
153157
154- Err = FALSE;
155158 GetSetupFname = (PGetSetupFname)GetProcAddress(HTTFILE,
156159 MAKEINTRESOURCE(IdGetSetupFname));
157160 if (GetSetupFname==NULL)
@@ -202,6 +205,24 @@
202205 if (ProtoCancel==NULL)
203206 Err = TRUE;
204207
208+ TTFILESetUILanguageFile = (PTTFILESetUILanguageFile)GetProcAddress(HTTFILE,
209+ MAKEINTRESOURCE(IdTTFILESetUILanguageFile));
210+ if (TTFILESetUILanguageFile==NULL) {
211+ Err = TRUE;
212+ }
213+ else {
214+ TTFILESetUILanguageFile(ts.UILanguageFile);
215+ }
216+
217+ TTFILESetFileSendFilter = (PTTFILESetFileSendFilter)GetProcAddress(HTTFILE,
218+ MAKEINTRESOURCE(IdTTFILESetFileSendFilter));
219+ if (TTFILESetFileSendFilter==NULL) {
220+ Err = TRUE;
221+ }
222+ else {
223+ TTFILESetFileSendFilter(ts.FileSendFilter);
224+ }
225+
205226 if (Err)
206227 {
207228 FreeLibrary(HTTFILE);
--- branches/cmake/teraterm/teraterm/filesys.h (revision 7183)
+++ branches/cmake/teraterm/teraterm/filesys.h (revision 7184)
@@ -50,6 +50,10 @@
5050 (int Proto, PFileVar fv, PCHAR pv, PComVar cv);
5151 typedef BOOL (PASCAL *PProtoCancel)
5252 (int Proto, PFileVar fv, PCHAR pv, PComVar cv);
53+typedef BOOL (PASCAL *PTTFILESetUILanguageFile)
54+ (char *file);
55+typedef BOOL (PASCAL *PTTFILESetFileSendFilter)
56+ (char *file);
5357
5458 extern PGetSetupFname GetSetupFname;
5559 extern PGetTransFname GetTransFname;
@@ -61,6 +65,8 @@
6165 extern PProtoParse ProtoParse;
6266 extern PProtoTimeOutProc ProtoTimeOutProc;
6367 extern PProtoCancel ProtoCancel;
68+extern PTTFILESetUILanguageFile TTFILESetUILanguageFile;
69+extern PTTFILESetFileSendFilter TTFILESetFileSendFilter;
6470
6571 BOOL LoadTTFILE();
6672 BOOL FreeTTFILE();
--- branches/cmake/teraterm/common/dlglib.c (revision 7183)
+++ branches/cmake/teraterm/common/dlglib.c (revision 7184)
@@ -376,7 +376,7 @@
376376 }
377377
378378 HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
379- const char *UILanguageFile, PCHAR key)
379+ const char *UILanguageFile, PCHAR key)
380380 {
381381 HFONT hPrevFont = (HFONT)SendMessage(hDlg, WM_GETFONT, 0, 0);
382382 LOGFONT logfont;
--- branches/cmake/doc/en/html/about/history.html (revision 7183)
+++ branches/cmake/doc/en/html/about/history.html (revision 7184)
@@ -3031,6 +3031,12 @@
30313031 <li>SSH Forwarding dialog shows incorrect setting after the connection is closed.</li>
30323032 </ul>
30333033 </li>
3034+
3035+ <li>Misc
3036+ <ul>
3037+ <li>upgraded OpenSSL to 1.0.2p.</li>
3038+ </ul>
3039+ </li>
30343040 </ul>
30353041
30363042 <h3><a name="ttssh_2.85">2018.05.31 (Ver 2.85)</a></h3>
--- branches/cmake/doc/en/html/reference/develop.txt (revision 7183)
+++ branches/cmake/doc/en/html/reference/develop.txt (revision 7184)
@@ -45,7 +45,7 @@
4545
4646 * Libraries
4747 - Oniguruma 6.8.2 (https://github.com/kkos/oniguruma)
48-- OpenSSL 1.0.2o (http://www.openssl.org/)
48+- OpenSSL 1.0.2p (http://www.openssl.org/)
4949 - zlib 1.2.11 (http://www.zlib.net/)
5050 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
5151 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)
--- branches/cmake/doc/ja/html/about/history.html (revision 7183)
+++ branches/cmake/doc/ja/html/about/history.html (revision 7184)
@@ -3037,6 +3037,12 @@
30373037 <li>コネクションの切断後、SSH Forwarding ダイアログで間違った設定が表示される問題を修正した。</li>
30383038 </ul>
30393039 </li>
3040+
3041+ <li>その他
3042+ <ul>
3043+ <li>OpenSSL 1.0.2pへ差し替えた。</li>
3044+ </ul>
3045+ </li>
30403046 </ul>
30413047
30423048 <h3><a name="ttssh_2.85">2018.05.31 (Ver 2.85)</a></h3>
--- branches/cmake/doc/ja/html/reference/develop.txt (revision 7183)
+++ branches/cmake/doc/ja/html/reference/develop.txt (revision 7184)
@@ -49,7 +49,7 @@
4949
5050 ■ ライブラリ
5151 - Oniguruma 6.8.2 (https://github.com/kkos/oniguruma)
52-- OpenSSL 1.0.2o (http://www.openssl.org/)
52+- OpenSSL 1.0.2p (http://www.openssl.org/)
5353 - zlib 1.2.11 (http://www.zlib.net/)
5454 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
5555 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)
Show on old repository browser