[Ttssh2-commit] [7184] merge trunk 7178

scmno****@osdn***** scmno****@osdn*****
2018年 8月 20日 (月) 23:22:15 JST


Revision: 7184
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7184
Author:   zmatsuo
Date:     2018-08-20 23:22:15 +0900 (Mon, 20 Aug 2018)
Log Message:
-----------
merge trunk 7178

Modified Paths:
--------------
    branches/cmake/doc/en/html/about/history.html
    branches/cmake/doc/en/html/reference/develop.txt
    branches/cmake/doc/ja/html/about/history.html
    branches/cmake/doc/ja/html/reference/develop.txt
    branches/cmake/teraterm/common/dlglib.c
    branches/cmake/teraterm/teraterm/filesys.cpp
    branches/cmake/teraterm/teraterm/filesys.h
    branches/cmake/teraterm/teraterm/ttdialog.c
    branches/cmake/teraterm/teraterm/ttdialog.h
    branches/cmake/teraterm/ttpfile/ftlib.h

Removed Paths:
-------------
    branches/cmake/teraterm/ttpdlg/ttdlg.h

Property Changed:
----------------
    branches/cmake/
    branches/cmake/teraterm/

-------------- next part --------------
Index: branches/cmake
===================================================================
--- branches/cmake	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake	2018-08-20 14:22:15 UTC (rev 7184)

Property changes on: branches/cmake
___________________________________________________________________
Modified: svn:mergeinfo
## -2,4 +2,4 ##
 /branches/ssh_ed25519:5495-5544
 /branches/vs2015_warn:6194-6285
 /tags/teraterm-4_89:6182
-/trunk:7164,7172,7174
\ No newline at end of property
+/trunk:7164,7172,7174,7179-7183
\ No newline at end of property
Modified: branches/cmake/doc/en/html/about/history.html
===================================================================
--- branches/cmake/doc/en/html/about/history.html	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/doc/en/html/about/history.html	2018-08-20 14:22:15 UTC (rev 7184)
@@ -3031,6 +3031,12 @@
       <li>SSH Forwarding dialog shows incorrect setting after the connection is closed.</li>
     </ul>
   </li>
+
+  <li>Misc
+    <ul>
+      <li>upgraded OpenSSL to 1.0.2p.</li>
+    </ul>
+  </li>
 </ul>
 
 <h3><a name="ttssh_2.85">2018.05.31 (Ver 2.85)</a></h3>

Modified: branches/cmake/doc/en/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/en/html/reference/develop.txt	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/doc/en/html/reference/develop.txt	2018-08-20 14:22:15 UTC (rev 7184)
@@ -45,7 +45,7 @@
 
 * Libraries
 - Oniguruma 6.8.2 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.0.2o (http://www.openssl.org/)
+- OpenSSL 1.0.2p (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index.html)

Modified: branches/cmake/doc/ja/html/about/history.html
===================================================================
--- branches/cmake/doc/ja/html/about/history.html	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/doc/ja/html/about/history.html	2018-08-20 14:22:15 UTC (rev 7184)
@@ -3037,6 +3037,12 @@
       <li>\x83R\x83l\x83N\x83V\x83\x87\x83\x93\x82̐ؒf\x8C\xE3\x81ASSH Forwarding \x83_\x83C\x83A\x83\x8D\x83O\x82ŊԈ\xE1\x82\xC1\x82\xBD\x90ݒ肪\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
+
+  <li>\x82\xBB\x82̑\xBC
+    <ul>
+      <li>OpenSSL 1.0.2p\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+    </ul>
+  </li>
 </ul>
 
 <h3><a name="ttssh_2.85">2018.05.31 (Ver 2.85)</a></h3>

Modified: branches/cmake/doc/ja/html/reference/develop.txt
===================================================================
--- branches/cmake/doc/ja/html/reference/develop.txt	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/doc/ja/html/reference/develop.txt	2018-08-20 14:22:15 UTC (rev 7184)
@@ -49,7 +49,7 @@
 
 \x81\xA1 \x83\x89\x83C\x83u\x83\x89\x83\x8A
 - Oniguruma 6.8.2 (https://github.com/kkos/oniguruma)
-- OpenSSL 1.0.2o (http://www.openssl.org/)
+- OpenSSL 1.0.2p (http://www.openssl.org/)
 - zlib 1.2.11 (http://www.zlib.net/)
 - PuTTY 0.70 (http://www.chiark.greenend.org.uk/~sgtatham/putty/)
 - SFMT 1.5.1 (http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/index-jp.html)

Index: branches/cmake/teraterm
===================================================================
--- branches/cmake/teraterm	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm	2018-08-20 14:22:15 UTC (rev 7184)

Property changes on: branches/cmake/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
 /branches/vs2015_warn/teraterm:6194-6285
-/trunk/teraterm:7164,7172,7174
\ No newline at end of property
+/trunk/teraterm:7164,7172,7174,7179-7183
\ No newline at end of property
Modified: branches/cmake/teraterm/common/dlglib.c
===================================================================
--- branches/cmake/teraterm/common/dlglib.c	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm/common/dlglib.c	2018-08-20 14:22:15 UTC (rev 7184)
@@ -376,7 +376,7 @@
 }
 
 HFONT SetDlgFonts(HWND hDlg, const int nIDDlgItems[], int nIDDlgItemCount,
-				  const char *UILanguageFile, PCHAR key)
+                  const char *UILanguageFile, PCHAR key)
 {
 	HFONT hPrevFont = (HFONT)SendMessage(hDlg, WM_GETFONT, 0, 0);
 	LOGFONT logfont;

Modified: branches/cmake/teraterm/teraterm/filesys.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/filesys.cpp	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm/teraterm/filesys.cpp	2018-08-20 14:22:15 UTC (rev 7184)
@@ -100,6 +100,8 @@
 PProtoParse ProtoParse;
 PProtoTimeOutProc ProtoTimeOutProc;
 PProtoCancel ProtoCancel;
+PTTFILESetUILanguageFile TTFILESetUILanguageFile;
+PTTFILESetFileSendFilter TTFILESetFileSendFilter;
 
 #define IdGetSetupFname  1
 #define IdGetTransFname  2
@@ -113,6 +115,9 @@
 #define IdProtoTimeOutProc 9
 #define IdProtoCancel	 10
 
+#define IdTTFILESetUILanguageFile 11
+#define IdTTFILESetFileSendFilter 12
+
 /*
    Line Head flag for timestamping
    2007.05.24 Gentaro
@@ -148,10 +153,8 @@
 	if (HTTFILE == NULL)
 		return FALSE;
 
-	TTFILESetUILanguageFile(ts.UILanguageFile);
-	TTFILESetFileSendFilter(ts.FileSendFilter);
+	Err = FALSE;
 
-	Err = FALSE;
 	GetSetupFname = (PGetSetupFname)GetProcAddress(HTTFILE,
 	                                               MAKEINTRESOURCE(IdGetSetupFname));
 	if (GetSetupFname==NULL)
@@ -202,6 +205,24 @@
 	if (ProtoCancel==NULL)
 		Err = TRUE;
 
+	TTFILESetUILanguageFile = (PTTFILESetUILanguageFile)GetProcAddress(HTTFILE,
+	                                                                   MAKEINTRESOURCE(IdTTFILESetUILanguageFile));
+	if (TTFILESetUILanguageFile==NULL) {
+		Err = TRUE;
+	}
+	else {
+		TTFILESetUILanguageFile(ts.UILanguageFile);
+	}
+
+	TTFILESetFileSendFilter = (PTTFILESetFileSendFilter)GetProcAddress(HTTFILE,
+	                                                                   MAKEINTRESOURCE(IdTTFILESetFileSendFilter));
+	if (TTFILESetFileSendFilter==NULL) {
+		Err = TRUE;
+	}
+	else {
+		TTFILESetFileSendFilter(ts.FileSendFilter);
+	}
+
 	if (Err)
 	{
 		FreeLibrary(HTTFILE);

Modified: branches/cmake/teraterm/teraterm/filesys.h
===================================================================
--- branches/cmake/teraterm/teraterm/filesys.h	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm/teraterm/filesys.h	2018-08-20 14:22:15 UTC (rev 7184)
@@ -50,6 +50,10 @@
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv);
 typedef BOOL (PASCAL *PProtoCancel)
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv);
+typedef BOOL (PASCAL *PTTFILESetUILanguageFile)
+  (char *file);
+typedef BOOL (PASCAL *PTTFILESetFileSendFilter)
+  (char *file);
 
 extern PGetSetupFname GetSetupFname;
 extern PGetTransFname GetTransFname;
@@ -61,6 +65,8 @@
 extern PProtoParse ProtoParse;
 extern PProtoTimeOutProc ProtoTimeOutProc;
 extern PProtoCancel ProtoCancel;
+extern PTTFILESetUILanguageFile TTFILESetUILanguageFile;
+extern PTTFILESetFileSendFilter TTFILESetFileSendFilter;
 
 BOOL LoadTTFILE();
 BOOL FreeTTFILE();

Modified: branches/cmake/teraterm/teraterm/ttdialog.c
===================================================================
--- branches/cmake/teraterm/teraterm/ttdialog.c	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm/teraterm/ttdialog.c	2018-08-20 14:22:15 UTC (rev 7184)
@@ -49,6 +49,7 @@
 PChooseFontDlg ChooseFontDlg;
 PSetupGeneral SetupGeneral;
 PWindowWindow WindowWindow;
+PTTDLGSetUILanguageFile TTDLGSetUILanguageFile;
 
 #define IdSetupTerminal   1
 #define IdSetupWin        2
@@ -60,7 +61,8 @@
 #define IdAboutDialog     8
 #define IdChooseFontDlg   9
 #define IdSetupGeneral    10
-#define IdWindowWindow	  11
+#define IdWindowWindow    11
+#define IdTTDLGSetUILanguageFile  12
 
 BOOL LoadTTDLG()
 {
@@ -72,9 +74,8 @@
 		HTTDLG = LoadHomeDLL("TTPDLG.DLL");
 		if (HTTDLG==NULL) return FALSE;
 
-		TTDLGSetUILanguageFile(ts.UILanguageFile);
+		Err = FALSE;
 
-		Err = FALSE;
 		SetupTerminal = (PSetupTerminal)GetProcAddress(HTTDLG,
 		  MAKEINTRESOURCE(IdSetupTerminal));
 		if (SetupTerminal==NULL) {
@@ -141,6 +142,15 @@
 			Err = TRUE;
 		}
 
+		TTDLGSetUILanguageFile = (PTTDLGSetUILanguageFile)GetProcAddress(HTTDLG,
+		  MAKEINTRESOURCE(IdTTDLGSetUILanguageFile));
+		if (TTDLGSetUILanguageFile==NULL) {
+			Err = TRUE;
+		}
+		else {
+			TTDLGSetUILanguageFile(ts.UILanguageFile);
+		}
+
 		if (Err) {
 			FreeLibrary(HTTDLG);
 			HTTDLG = NULL;

Modified: branches/cmake/teraterm/teraterm/ttdialog.h
===================================================================
--- branches/cmake/teraterm/teraterm/ttdialog.h	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm/teraterm/ttdialog.h	2018-08-20 14:22:15 UTC (rev 7184)
@@ -54,6 +54,8 @@
   (HWND WndParent, PTTSet ts);
 typedef BOOL (PASCAL *PWindowWindow)
   (HWND WndParent, PBOOL Close);
+typedef BOOL (PASCAL *PTTDLGSetUILanguageFile)
+  (char *file);
 
 extern PSetupTerminal SetupTerminal;
 extern PSetupWin SetupWin;
@@ -66,6 +68,7 @@
 extern PChooseFontDlg ChooseFontDlg;
 extern PSetupGeneral SetupGeneral;
 extern PWindowWindow WindowWindow;
+extern PTTDLGSetUILanguageFile TTDLGSetUILanguageFile;
 
 /* proto types */
 BOOL LoadTTDLG();

Deleted: branches/cmake/teraterm/ttpdlg/ttdlg.h
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttdlg.h	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm/ttpdlg/ttdlg.h	2018-08-20 14:22:15 UTC (rev 7184)
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2008-2017 TeraTerm Project
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-void PASCAL TTDLGSetUILanguageFile(char *file);

Modified: branches/cmake/teraterm/ttpfile/ftlib.h
===================================================================
--- branches/cmake/teraterm/ttpfile/ftlib.h	2018-08-18 09:15:02 UTC (rev 7183)
+++ branches/cmake/teraterm/ttpfile/ftlib.h	2018-08-20 14:22:15 UTC (rev 7184)
@@ -40,12 +40,3 @@
 void FTSetTimeOut(PFileVar fv, int T);
 BOOL FTCreateFile(PFileVar fv);
 void GetFileSendFilter(PCHAR dest, PCHAR src, int size);
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-void PASCAL TTFILESetUILanguageFile(char *file);
-void PASCAL TTFILESetFileSendFilter(char *file);
-#ifdef __cplusplus
-}
-#endif



Ttssh2-commit メーリングリストの案内