From svnnotify ＠ sourceforge.jp  Tue Jun  1 13:45:44 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 01 Jun 2010 13:45:44 +0900
Subject: [Ttssh2-commit] [3924] year++
Message-ID: <1275367544.705474.639.nullmailer@users.sourceforge.jp>

Revision: 3924
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3924
Author:   doda
Date:     2010-06-01 13:45:44 +0900 (Tue, 01 Jun 2010)

Log Message:
-----------
year++

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.rc


-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2010-05-31 12:57:21 UTC (rev 3923)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2010-06-01 04:45:44 UTC (rev 3924)
@@ -59,7 +59,7 @@
 BEGIN
     LTEXT           "This extension uses OpenSSH code by OpenBSD Project. Thanks also to Ian Goldberg for his Pilot SSH code, which was a very handy reference. Special thanks to Takashi Teranishi for his cooperation.",IDC_CREDIT,6,132,248,27
     DEFPUSHBUTTON   "OK",IDOK,106,254,50,14
-    LTEXT           "Includes:\r\nTTSSH 1.5.4 (Robert O'Callahan roc+tt ＠ cs.cmu.edu), 1998-1999\r\nIPv6 extention version 0.81 (kato ＠ win6.jp), 2000-2003\r\nSSH2 support (Tera Term Project), 2004-2009",IDC_INCLUDES,6,36,248,34
+    LTEXT           "Includes:\r\nTTSSH 1.5.4 (Robert O'Callahan roc+tt ＠ cs.cmu.edu), 1998-1999\r\nIPv6 extention version 0.81 (kato ＠ win6.jp), 2000-2003\r\nSSH2 support (Tera Term Project), 2004-2010",IDC_INCLUDES,6,36,248,34
     LTEXT           "THIS EXTENSION INCORPORATES STRONG CRYPTOGRAPHY. POSESSION, USE, AND/OR EXPORT OF THIS EXTENSION MAY BE ILLEGAL IN YOUR COUNTRY.",IDC_CRYPTOGRAPHY,6,106,248,26
     ICON            "",IDC_TTSSH_ICON,234,7,21,20
     EDITTEXT        IDC_ABOUTTEXT,6,161,248,87,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY
@@ -487,7 +487,7 @@
             VALUE "FileDescription", "TTXSSH"
             VALUE "FileVersion", "2, 53, 0, 0"
             VALUE "InternalName", "TTXSSH"
-            VALUE "LegalCopyright", "(C)2004-2009 TeraTerm Project, (C)1998-1999 Robert O'Callahan"
+            VALUE "LegalCopyright", "(C)2004-2010 TeraTerm Project, (C)1998-1999 Robert O'Callahan"
             VALUE "OriginalFilename", "TTXSSH.dll"
             VALUE "ProductName", "TTSSH"
             VALUE "ProductVersion", "2, 53, 0, 0"

From svnnotify ＠ sourceforge.jp  Thu Jun  3 12:55:26 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 03 Jun 2010 12:55:26 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MjVdIE9wZW5TU0wgMS4wLiAwYSDjgas=?=
	=?utf-8?b?5pu05paw?=
Message-ID: <1275537326.951085.17494.nullmailer@users.sourceforge.jp>

Revision: 3925
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3925
Author:   maya
Date:     2010-06-03 12:55:26 +0900 (Thu, 03 Jun 2010)

Log Message:
-----------
OpenSSL 1.0.0a ?????TTL Editor 1.2.1 ?????  gdiplus.dll ???荀????? Windows 95 ?с???????

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/about/requirements.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/about/requirements.html
    trunk/installer/teraterm.iss


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-06-01 04:45:44 UTC (rev 3924)
+++ trunk/doc/en/html/about/history.html	2010-06-03 03:55:26 UTC (rev 3925)
@@ -30,6 +30,27 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.67">2010.x.x (Ver 4.67 unreleased)</a></h3>
+<ul class="history">
+  <!--li>??
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>????+    <ul>
+    </ul>
+  </li-->
+
+  <li>???
+    <ul>
+      <li>upgraded TTSSH version supporting SSH2 to <a href="#ttssh_2.54">2.54</a></li>
+      <li>upgraded TTLEditor to 1.2.1</a></li>
+    </ul>
+  </li>
+
+</ul>
+
 <h3><a name="teraterm_4.66">2010.5.31 (Ver 4.66)</a></h3>
 <ul class="history">
   <li>Changes
@@ -1481,8 +1502,27 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
-<h3><a name="ttssh_2.53">2010.3.10 (Ver 2.53)</a></h3>
+<h3><a name="ttssh_2.54">2010.x.x (Ver 2.54 unreleased)</a></h3>
 <ul class="history">
+  <!--li>Changes
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>Bug fixes
+    <ul>
+    </ul>
+  </li-->
+
+  <li>Misc
+    <ul>
+      <li>upgraded OpenSSL to 1.0.0a</li>
+    </ul>
+  </li>
+</ul>
+
+<h3><a name="ttssh_2.53">2010.5.31 (Ver 2.53)</a></h3>
+<ul class="history">
   <li>Changes
     <ul>
       <li>Specifying the listen address in the port forwarding.

Modified: trunk/doc/en/html/about/requirements.html
===================================================================
--- trunk/doc/en/html/about/requirements.html	2010-06-01 04:45:44 UTC (rev 3924)
+++ trunk/doc/en/html/about/requirements.html	2010-06-03 03:55:26 UTC (rev 3925)
@@ -29,7 +29,7 @@
 NOTE: Not supporting Microsoft Windows3.1.<br>
 (*1) <a href="http://support.microsoft.com/kb/182108">Windows Sockets2.0</a> requirement<br>
 (*2) Internet Explorer 5 later requirement<br>
-(*3) LogMeTT can not work.
+(*3) LogMeTT and TTL Editor can not work.
 </p>
 
 </body>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-06-01 04:45:44 UTC (rev 3924)
+++ trunk/doc/ja/html/about/history.html	2010-06-03 03:55:26 UTC (rev 3925)
@@ -30,6 +30,27 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.67">2010.x.x (Ver 4.67 unreleased)</a></h3>
+<ul class="history">
+  <!--li>??
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>????+    <ul>
+    </ul>
+  </li-->
+
+  <li>???
+    <ul>
+      <li><a href="#ttssh_2.54">SSH2??TTSSH(2.54)</a>???????</li>
+      <li>TTLEditor 1.2.1 ???????</li>
+    </ul>
+  </li>
+
+</ul>
+
 <h3><a name="teraterm_4.66">2010.5.31 (Ver 4.66)</a></h3>
 <ul class="history">
   <li>??
@@ -1483,8 +1504,27 @@
 
 <h2><a name="ttssh">TTSSH</a></h2>
 
-<h3><a name="ttssh_2.53">2010.3.10 (Ver 2.53)</a></h3>
+<h3><a name="ttssh_2.54">2010.x.x (Ver 2.54 unreleased)</a></h3>
 <ul class="history">
+  <!--li>??
+    <ul>
+    </ul>
+  </li-->
+
+  <!--li>????+    <ul>
+    </ul>
+  </li-->
+
+  <li>???
+    <ul>
+      <li>OpenSSL 1.0.0a??????</li>
+    </ul>
+  </li>
+</ul>
+
+<h3><a name="ttssh_2.53">2010.5.31 (Ver 2.53)</a></h3>
+<ul class="history">
   <li>??
     <ul>
       <li>????????????????????????????

Modified: trunk/doc/ja/html/about/requirements.html
===================================================================
--- trunk/doc/ja/html/about/requirements.html	2010-06-01 04:45:44 UTC (rev 3924)
+++ trunk/doc/ja/html/about/requirements.html	2010-06-03 03:55:26 UTC (rev 3925)
@@ -29,7 +29,7 @@
 ?: Windows 3.1 ?????????????<br>
 (*1) <a href="http://support.microsoft.com/kb/182108">Windows Sockets2.0</a> ??????<br>
 (*2) Internet Explorer 5 ???K????<br>
-(*3) LogMeTT ???????
+(*3) LogMeTT, TTL Editor ???????
 </p>
 
 </body>

Modified: trunk/installer/teraterm.iss
===================================================================
--- trunk/installer/teraterm.iss	2010-06-01 04:45:44 UTC (rev 3924)
+++ trunk/installer/teraterm.iss	2010-06-03 03:55:26 UTC (rev 3925)
@@ -73,7 +73,7 @@
 Source: ..\cygterm\cyglaunch.exe; DestDir: {app}; Components: cygterm
 Source: ..\cygterm\cygterm+.tar.gz; DestDir: {app}; Components: cygterm
 Source: ..\libs\logmett\Setup_LogMeTT_2_9_7.exe; DestDir: {tmp}; Components: LogMeTT; Flags: deleteafterinstall
-Source: ..\libs\logmett\Setup_TTLEdit_1_1_5.exe; DestDir: {tmp}; Components: TTLEdit; Flags: deleteafterinstall
+Source: ..\libs\logmett\Setup_TTLEditor_1_2_1.exe; DestDir: {tmp}; Components: TTLEdit; Flags: deleteafterinstall
 Source: ..\ttpmenu\Release\ttpmenu.exe; DestDir: {app}; Components: TeraTerm_Menu; Flags: ignoreversion
 Source: release\ttmenu_readme-j.txt; DestDir: {app}; Components: TeraTerm_Menu
 Source: ..\TTProxy\Release\TTXProxy.dll; DestDir: {app}; Components: TTProxy; Flags: ignoreversion
@@ -207,7 +207,7 @@
 [Run]
 Filename: {app}\ttermpro.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_teraterm}; Components: TeraTerm
 Filename: {tmp}\Setup_LogMeTT_2_9_7.exe; Components: LogMeTT
-Filename: {tmp}\Setup_TTLEdit_1_1_5.exe; Components: TTLEdit
+Filename: {tmp}\Setup_TTLEditor_1_2_1.exe; Components: TTLEdit
 Filename: {app}\ttpmenu.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_ttmenu}; Components: TeraTerm_Menu
 Filename: {app}\Collector\Collector.exe; Flags: nowait postinstall skipifsilent unchecked; Description: {cm:launch_collector}; Components: Collector
 

From svnnotify ＠ sourceforge.jp  Mon Jun  7 23:01:51 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 07 Jun 2010 23:01:51 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MjZdICDku6XkuIvjgavnpLrjgZkgVVRG?=
 =?utf-8?b?LTgg6YCB5L+h5Yem55CG44KS44CB57SU57KL44GqVW5pY29kZeOBqOOBlw==?=
 =?utf-8?b?44Gm5Yem55CG44GZ44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1275919311.880307.8059.nullmailer@users.sourceforge.jp>

Revision: 3926
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3926
Author:   yutakapon
Date:     2010-06-07 23:01:51 +0900 (Mon, 07 Jun 2010)

Log Message:
-----------
篁ヤ???ず??UTF-8 ??拭??????膣????nicode????????????????????
???IME?ュ?
???????????????莢若?篁??

teraterm.ini??PureUTF8 ????????申???綵???????on/off ????????????????????????障? off ??????

?????????SNOWMAN(U+2603)??????絖????拭??????罩ｃ???TF-8????潟?????潟???????
?泣??????拭??????
???????泣??蚊?????≪????絲上???
Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/clipboar.c
    trunk/teraterm/teraterm/commlib.c
    trunk/teraterm/teraterm/ttermpro.vcproj
    trunk/teraterm/teraterm/ttwinman.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpcmn/language.c
    trunk/teraterm/ttpcmn/language.h
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpcmn/ttpcmn.def
    trunk/teraterm/ttpcmn/ttpcmn.vcproj
    trunk/teraterm/ttpset/ttset.c


-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/installer/release/TERATERM.INI	2010-06-07 14:01:51 UTC (rev 3926)
@@ -100,6 +100,9 @@
 ; CodePage for Unicode
 CodePage=
 
+; Pure UTF-8 encoding
+PureUTF8=off
+
 ; Background color of text uses background color of screen (on/off)
 UseNormalBGColor=on
 

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/common/tttypes.h	2010-06-07 14:01:51 UTC (rev 3926)
@@ -495,6 +495,7 @@
 	char ConfirmChangePasteStringFile[MAX_PATH];
 	DWORD Baud;
 	WORD LogBinary;
+	int pureutf8;
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -874,6 +875,8 @@
 	BOOL Flush;
 
 	BOOL TelLineMode;
+
+	int *pureutf8;
 } TComVar;
 typedef TComVar far *PComVar;
 
@@ -917,6 +920,9 @@
  * Increment the number of this macro value
  * when you change TMap or member of TMap.
  *
+ * - At version 4.67, ttset_memfilemap was replaced with ttset_memfilemap_13.
+ *   added tttset.pureutf8.
+ *
  * - At version 4.66, ttset_memfilemap was replaced with ttset_memfilemap_12.
  *   renamed tttset.Baud to Baud_.
  *   added tttset.Baud.
@@ -995,4 +1001,4 @@
  *   added tttset.VTCompatTab.
  */
 
-#define TT_FILEMAPNAME "ttset_memfilemap_12"
+#define TT_FILEMAPNAME "ttset_memfilemap_13"

Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/teraterm/clipboar.c	2010-06-07 14:01:51 UTC (rev 3926)
@@ -16,6 +16,7 @@
 
 #include "clipboar.h"
 #include "tt_res.h"
+#include "language.h"
 
 // for clipboard copy
 static HGLOBAL CBCopyHandle = NULL;
@@ -109,7 +110,11 @@
 	}
 
 	if (BuffSize==0) { // for clipboar
-		if (IsClipboardFormatAvailable(CF_TEXT)) {
+		if (in_utf(ts) && 
+			IsClipboardFormatAvailable(CF_UNICODETEXT)) {
+			// UTF-8???AUnicode(wchar_t)????????
+			Cf = CF_UNICODETEXT;
+		} else if (IsClipboardFormatAvailable(CF_TEXT)) {
 			Cf = CF_TEXT;
 		}
 		else if (IsClipboardFormatAvailable(CF_OEMTEXT)) {
@@ -169,6 +174,10 @@
 	static char BracketEnd[] = "\033[201~";
 	static int BracketPtr = 0;
 	DWORD now;
+	char *ptr;
+	wchar_t *wptr;
+	char *mptr;
+	int mlen;
 
 	if (CBMemHandle==NULL) {
 		return;
@@ -196,11 +205,26 @@
 		}
 	}
 
-	CBMemPtr = GlobalLock(CBMemHandle);
-	if (CBMemPtr==NULL) {
+	ptr = GlobalLock(CBMemHandle);
+	if (ptr==NULL) {
 		return;
 	}
 
+	mptr = NULL;
+	if (in_utf(ts)) {
+		/* Unicode??UTF-8????????? null ?????????????
+		 * +1 ??????????
+		 */
+		wptr = (wchar_t *)ptr;
+		convert_wchar_to_utf8(wptr, wcslen(wptr) + 1, NULL, &mlen);
+		mptr = malloc(sizeof(char) * mlen);
+		convert_wchar_to_utf8(wptr, wcslen(wptr) + 1, mptr, &mlen);
+		CBMemPtr = mptr;
+
+	} else {
+		CBMemPtr = ptr;
+	}
+
 	do {
 		if (CBSendCR && (CBMemPtr[CBMemPtr2]==0x0a)) {
 			CBMemPtr2++;
@@ -251,6 +275,8 @@
 		}
 		else {
 			CBEndPaste();
+			if (mptr)
+				free(mptr);
 			return;
 		}
 
@@ -270,7 +296,10 @@
 	}
 	while (c>0);
 
-	if (CBMemPtr!=NULL) {
+	if (mptr)
+		free(mptr);
+
+	if (ptr !=NULL) {
 		GlobalUnlock(CBMemHandle);
 		CBMemPtr=NULL;
 	}

Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/teraterm/commlib.c	2010-06-07 14:01:51 UTC (rev 3926)
@@ -293,6 +293,7 @@
 	cv->Flush = FALSE;
 	cv->FlushLen = 0;
 	cv->TelLineMode = FALSE;
+	cv->pureutf8 = &ts->pureutf8;
 
 	if ((ts->PortType!=IdSerial) && (strlen(ts->HostName)==0))
 	{

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2010-06-07 14:01:51 UTC (rev 3926)
@@ -49,7 +49,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\common;..\ttpfile"
+				AdditionalIncludeDirectories="..\common;..\ttpfile;..\ttpcmn"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"
@@ -149,7 +149,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\common;..\ttpfile"
+				AdditionalIncludeDirectories="..\common;..\ttpfile;..\ttpcmn"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: trunk/teraterm/teraterm/ttwinman.h
===================================================================
--- trunk/teraterm/teraterm/ttwinman.h	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/teraterm/ttwinman.h	2010-06-07 14:01:51 UTC (rev 3926)
@@ -38,6 +38,9 @@
 
 extern int SerialNo;
 
+#define in_cv_utf(pure, lang) (pure && (lang == IdUtf8))
+#define in_utf(ts) in_cv_utf(ts.pureutf8, ts.Language)
+
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/teraterm/vtwin.cpp	2010-06-07 14:01:51 UTC (rev 3926)
@@ -53,6 +53,7 @@
 #include "tt_res.h"
 #include "vtwin.h"
 #include "addsetting.h"
+#include "language.h"
 
 #define VTClassName "VTWin32"
 
@@ -2864,15 +2865,25 @@
 		//lpstr = (LPSTR)GlobalLock(hstr);
 		lpstr = (wchar_t *)GlobalLock(hstr);
 		if (lpstr!=NULL) {
-			mlen = wcstombs(NULL, lpstr, 0);
+			if (in_utf(ts)) {
+				convert_wchar_to_utf8(lpstr, wcslen(lpstr), NULL, &mlen);
+			} else {
+				mlen = wcstombs(NULL, lpstr, 0);
+			}
 			mbstr = (char *)malloc(sizeof(char) * (mlen + 1));
 			if (mbstr == NULL) {
 				goto skip;
 			}
-			Len = wcstombs(mbstr, lpstr, mlen + 1);
 
-			// add this string into text buffer of application
-			Len = strlen(mbstr);
+			if (in_utf(ts)) {
+				convert_wchar_to_utf8(lpstr, wcslen(lpstr), mbstr, &mlen);
+				Len = mlen;
+			} else {
+				Len = wcstombs(mbstr, lpstr, mlen + 1);
+				// add this string into text buffer of application
+				Len = strlen(mbstr);
+			}
+
 			if (Len==1) {
 				switch (mbstr[0]) {
 				case 0x20:

Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/ttpcmn/language.c	2010-06-07 14:01:51 UTC (rev 3926)
@@ -8,9 +8,46 @@
 #include "tttypes.h"
 #include <mbstring.h>
 #include <locale.h>
+#include "language.h"
 
 #include "sjis2uni.map"
 
+// ???????UTF-16LE ?? UTF-8 ??????
+void PASCAL convert_wchar_to_utf8(wchar_t *wbuf, int wbuflen, char *linebuf, int *linesize)
+{
+	char *p;
+	int i;
+	wchar_t ch;
+	int ratio = 3;
+
+	if (linebuf == NULL) {
+		*linesize = wbuflen * ratio * sizeof(wchar_t);
+		return;
+	}
+
+	p = linebuf;
+	for (i = 0 ; i < wbuflen ; i++) {
+		ch = wbuf[i];
+		// TODO: ?????????????
+		if ((ch&0xF800) == 0xD800) 
+			ch = '.';
+
+		if (ch < 0x80) {
+			*p++ = (char)(ch);
+	    } else if (ch < 0x800) {
+			*p++ = (0xC0 | (ch >> 6));
+			*p++ = (0x80 | (ch & 0x3F));
+	    } else {
+			*p++ = (0xE0 | (ch >> 12));
+			*p++ = (0x80 | ((ch >> 6) & 0x3F));
+			*p++ = (0x80 | (ch & 0x3F));
+	    }
+	}
+
+	*linesize = p - linebuf;
+}
+
+
 unsigned short ConvertUnicode(unsigned short code, codemap_t *table, int tmax)
 {
 	int low, mid, high;

Modified: trunk/teraterm/ttpcmn/language.h
===================================================================
--- trunk/teraterm/ttpcmn/language.h	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/ttpcmn/language.h	2010-06-07 14:01:51 UTC (rev 3926)
@@ -9,6 +9,7 @@
 #endif
 
 /* proto types */
+void PASCAL convert_wchar_to_utf8(wchar_t *wbuf, int wbuflen, char *linebuf, int *linesize);
 unsigned int FAR PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale);
 WORD FAR PASCAL SJIS2JIS(WORD KCode);
 WORD FAR PASCAL SJIS2EUC(WORD KCode);

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2010-06-07 14:01:51 UTC (rev 3926)
@@ -17,6 +17,7 @@
 #include <locale.h>
 
 #include "compat_w95.h"
+#include "ttwinman.h"
 
 /* first instance flag */
 static BOOL FirstInstance = TRUE;
@@ -1445,12 +1446,17 @@
 		return C;
 	}
 
-	switch (cv->Language) {
-	  case IdUtf8:
-	  case IdJapanese:
-	  case IdKorean:
-		return TextOutMBCS(cv, B, C);
-		break;
+	if (in_cv_utf(cv->pureutf8, cv->Language)) {
+			// fall through
+
+	} else {
+		switch (cv->Language) {
+		  case IdUtf8:
+		  case IdJapanese:
+		  case IdKorean:
+			return TextOutMBCS(cv, B, C);
+			break;
+		}
 	}
 
 	Full = FALSE;

Modified: trunk/teraterm/ttpcmn/ttpcmn.def
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.def	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/ttpcmn/ttpcmn.def	2010-06-07 14:01:51 UTC (rev 3926)
@@ -43,3 +43,5 @@
   
   is_NT4 @50
   doSelectFolder @51
+  convert_wchar_to_utf8 @53
+  

Modified: trunk/teraterm/ttpcmn/ttpcmn.vcproj
===================================================================
--- trunk/teraterm/ttpcmn/ttpcmn.vcproj	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/ttpcmn/ttpcmn.vcproj	2010-06-07 14:01:51 UTC (rev 3926)
@@ -49,7 +49,7 @@
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\common"
+				AdditionalIncludeDirectories="..\common;..\teraterm"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -148,7 +148,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D&quot;_CRT_SECURE_NO_DEPRECATE&quot;"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\common"
+				AdditionalIncludeDirectories="..\common;..\teraterm"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				UsePrecompiledHeader="0"

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2010-06-03 03:55:26 UTC (rev 3925)
+++ trunk/teraterm/ttpset/ttset.c	2010-06-07 14:01:51 UTC (rev 3926)
@@ -1169,6 +1169,9 @@
 		GetPrivateProfileInt(Section, "CodePage ", DEFAULT_CODEPAGE,
 		                     FName);
 
+	ts->pureutf8 =
+		GetOnOff(Section, "PureUTF8", FName, FALSE);
+
 	// UI language message file
 	GetPrivateProfileString(Section, "UILanguageFile", "lang\\Default.lng",
 	                        Temp, sizeof(Temp), FName);
@@ -1564,6 +1567,9 @@
 	_snprintf_s(Temp, sizeof(Temp), _TRUNCATE, "%d", ts->CodePage);
 	WritePrivateProfileString(Section, "CodePage", Temp, FName);
 
+	WriteOnOff(Section, "PureUTF8", FName,
+	           ts->pureutf8);
+
 	// ANSI color(2004.9.5 yutaka)
 	Temp[0] = '\0';
 	for (i = 0; i < 15; i++) {

From svnnotify ＠ sourceforge.jp  Fri Jun 11 18:13:05 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 11 Jun 2010 18:13:05 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MjddICBhZXMxMjgtY2JjIOOBjOS9vw==?=
 =?utf-8?b?44GI44Gq44GE5ZWP6aGM44KS5L+u5q2j?=
Message-ID: <1276247585.606001.29765.nullmailer@users.sourceforge.jp>

Revision: 3927
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3927
Author:   maya
Date:     2010-06-11 18:13:05 +0900 (Fri, 11 Jun 2010)

Log Message:
-----------
aes128-cbc が使えない問題を修正

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c


-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2010-06-07 14:01:51 UTC (rev 3926)
+++ trunk/ttssh2/ttxssh/ssh.c	2010-06-11 09:13:05 UTC (rev 3927)
@@ -4067,7 +4067,7 @@
 				c_str = "blowfish-ctr,";
 				break;
 			case SSH2_CIPHER_AES128_CBC:
-				c_str = "aes128-cbc";
+				c_str = "aes128-cbc,";
 				break;
 			case SSH2_CIPHER_AES192_CBC:
 				c_str = "aes192-cbc,";

From svnnotify ＠ sourceforge.jp  Fri Jun 11 18:17:12 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 11 Jun 2010 18:17:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MjhdICBhZXMxMjgtY2JjIOOBjOS9vw==?=
 =?utf-8?b?44GI44Gq44GE5ZWP6aGM44KS5L+u5q2j?=
Message-ID: <1276247832.056867.3297.nullmailer@users.sourceforge.jp>

Revision: 3928
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3928
Author:   maya
Date:     2010-06-11 18:17:12 +0900 (Fri, 11 Jun 2010)

Log Message:
-----------
aes128-cbc ??戎??????蕁??篆??

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-06-11 09:13:05 UTC (rev 3927)
+++ trunk/doc/en/html/about/history.html	2010-06-11 09:17:12 UTC (rev 3928)
@@ -1509,10 +1509,11 @@
     </ul>
   </li-->
 
-  <!--li>Bug fixes
+  <li>Bug fixes
     <ul>
+      <!--li>SSH ?????ｮ??? aes128-cbc ????????????B</li-->
     </ul>
-  </li-->
+  </li>
 
   <li>Misc
     <ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-06-11 09:13:05 UTC (rev 3927)
+++ trunk/doc/ja/html/about/history.html	2010-06-11 09:17:12 UTC (rev 3928)
@@ -1511,10 +1511,11 @@
     </ul>
   </li-->
 
-  <!--li>????+  <li>????     <ul>
+      <li>SSH ?????ｮ??? aes128-cbc ????????????B</li>
     </ul>
-  </li-->
+  </li>
 
   <li>???
     <ul>

From svnnotify ＠ sourceforge.jp  Sun Jun 20 15:45:33 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 20 Jun 2010 15:45:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MjldICBZTU9ERU3pgIHkv6Hlh6bnkIY=?=
 =?utf-8?b?44Gr44GK44GE44Gm44CB44OP44Kk44OR44O844K/44O844Of44OK44Or5LuV?=
 =?utf-8?b?5qeY77yI5qiZ5rqW5LuV5qeY77yJ44Gr5rqW5oug44GZ44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1277016333.900944.6092.nullmailer@users.sourceforge.jp>

Revision: 3929
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3929
Author:   yutakapon
Date:     2010-06-20 15:45:33 +0900 (Sun, 20 Jun 2010)

Log Message:
-----------
YMODEM??拭?????????????ゃ??若??若????篁??鐚??羣??罕???????????????????cf.
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=22059
http://ja.wikipedia.org/wiki/YMODEM

Modified Paths:
--------------
    trunk/teraterm/ttpfile/ymodem.c


-------------- next part --------------
Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c	2010-06-11 09:17:12 UTC (rev 3928)
+++ trunk/teraterm/ttpfile/ymodem.c	2010-06-20 06:45:33 UTC (rev 3929)
@@ -552,6 +552,7 @@
 		do {
 			if (i==0) return TRUE;
 			firstch = b;
+
 			switch (b) {
 			case ACK:
 				// 1???EOT????ACK?????1??????????????B
@@ -574,6 +575,13 @@
 				}
 				else if (yv->PktNumSent==(BYTE)(yv->PktNum+1))  // ?????????
 				{
+					// ????0???????j?????ACK ? 'C' ????????????
+					// ??????????'C'????(2010.6.20 yutaka)
+					if ((yv->PktNum==0) && (yv->PktNumOffset==0)) {
+						SendFlag = FALSE;
+						break;
+					}
+
 					yv->PktNum = yv->PktNumSent;
 					if (yv->PktNum==0)
 						yv->PktNumOffset = yv->PktNumOffset + 256;
@@ -582,6 +590,13 @@
 				break;
 
 			case NAK:
+				// 1???EOT????NAK??????"EOT"????
+				if (yv->SendEot) {
+					yv->PktNum = yv->PktNumSent;
+					if (yv->PktNum==0)
+						yv->PktNumOffset = yv->PktNumOffset + 256;
+				}
+
 				SendFlag = TRUE;
 				break;
 
@@ -593,6 +608,13 @@
 				// 'C'????????????????????
 				if ((yv->PktNum==0) && (yv->PktNumOffset==0))
 				{
+					// ???????M??ACK -> 'C' ????????????????????
+					if (yv->SendFileInfo) {
+						yv->PktNum = yv->PktNumSent;
+						if (yv->PktNum==0)
+							yv->PktNumOffset = yv->PktNumOffset + 256;
+					}
+
 					SendFlag = TRUE;
 				}
 				else if (yv->LastSendEot) {

From svnnotify ＠ sourceforge.jp  Sun Jun 20 15:58:30 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 20 Jun 2010 15:58:30 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzBdICBZTU9ERU3pgIHkv6Hlh6bnkIY=?=
 =?utf-8?b?44Gr44GK44GE44Gm44CB44OP44Kk44OR44O844K/44O844Of44OK44Or5LuV?=
 =?utf-8?b?5qeY77yI5qiZ5rqW5LuV5qeY77yJ44Gr5rqW5oug44GZ44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1277017110.610638.26248.nullmailer@users.sourceforge.jp>

Revision: 3930
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3930
Author:   yutakapon
Date:     2010-06-20 15:58:30 +0900 (Sun, 20 Jun 2010)

Log Message:
-----------
YMODEM??拭?????????????ゃ??若??若????篁??鐚??羣??罕???????????????????cf.
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=22059
http://ja.wikipedia.org/wiki/YMODEM

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-06-20 06:45:33 UTC (rev 3929)
+++ trunk/doc/en/html/about/history.html	2010-06-20 06:58:30 UTC (rev 3930)
@@ -37,12 +37,13 @@
     </ul>
   </li-->
 
-  <!--li>????+  <li>Bug fixes
     <ul>
+      <li>The YMODEM sending procedure does not work for the HyperTerminal.</li>
     </ul>
-  </li-->
+  </li>
 
-  <li>???
+  <li>Misc
     <ul>
       <li>upgraded TTSSH version supporting SSH2 to <a href="#ttssh_2.54">2.54</a></li>
       <li>upgraded TTLEditor to 1.2.1</a></li>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-06-20 06:45:33 UTC (rev 3929)
+++ trunk/doc/ja/html/about/history.html	2010-06-20 06:58:30 UTC (rev 3930)
@@ -37,10 +37,11 @@
     </ul>
   </li-->
 
-  <!--li>????+  <li>????     <ul>
+      <li>YMODEM??????n?????????????????</li>
     </ul>
-  </li-->
+  </li>
 
   <li>???
     <ul>

From svnnotify ＠ sourceforge.jp  Wed Jun 23 01:28:47 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 23 Jun 2010 01:28:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzFdICBZTU9ERU3lj5fkv6Hlh6bnkIY=?=
 =?utf-8?b?44Gr44GK44GE44Gm44CB44OP44Kk44OR44O844K/44O844Of44OK44Or5LuV?=
 =?utf-8?b?5qeY77yI5qiZ5rqW5LuV5qeY77yJ44Gr5rqW5oug44GZ44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1277224127.736644.18665.nullmailer@users.sourceforge.jp>

Revision: 3931
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3931
Author:   yutakapon
Date:     2010-06-23 01:28:47 +0900 (Wed, 23 Jun 2010)

Log Message:
-----------
YMODEM??拭?????????????ゃ??若??若????篁??鐚??羣??罕???????????????????
Modified Paths:
--------------
    trunk/teraterm/ttpfile/ymodem.c


-------------- next part --------------
Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c	2010-06-20 06:58:30 UTC (rev 3930)
+++ trunk/teraterm/ttpfile/ymodem.c	2010-06-22 16:28:47 UTC (rev 3931)
@@ -359,6 +359,11 @@
 					  fv->FileOpen = 0;
 					  _lclose(fv->FileHandle);
 					  fv->FileHandle = -1;
+
+					  // 1???EOT????NAK???
+					  b = NAK;
+					  YWrite(fv,yv,cv,&b, 1);
+					  return TRUE;
 				  }
 
 				  initialize_file_info(fv, yv);
@@ -484,7 +489,7 @@
 		nameend = name + 1 + strlen(name);
 		if (*nameend) {
 			ret = sscanf(nameend, "%ld%lo%o", &bytes_total, &modtime, &mode);
-			if (ret == 3) {
+			if (ret >= 1) {
 				fv->FileSize = bytes_total;
 			}
 		}
@@ -496,6 +501,9 @@
 
 		yv->SendFileInfo = 1;
 
+		// ??????????????'C'????
+		YSendNAK(fv,yv,cv);
+
 		return TRUE;
 	}
 

From svnnotify ＠ sourceforge.jp  Wed Jun 23 12:00:38 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 23 Jun 2010 12:00:38 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzJdICDpgIHkv6Hlh6bnkIbjgYzph40=?=
 =?utf-8?b?44GP44Gq44Gj44Gm44GE44Gf44Gu44KS5L+u5q2j44CC?=
Message-ID: <1277262038.852073.24863.nullmailer@users.sourceforge.jp>

Revision: 3932
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3932
Author:   doda
Date:     2010-06-23 12:00:38 +0900 (Wed, 23 Jun 2010)

Log Message:
-----------
送信処理が重くなっていたのを修正。
http://sourceforge.jp/forum/message.php?msg_id=51234

Modified Paths:
--------------
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/commlib.c
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpcmn/ttcmn.c


-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2010-06-22 16:28:47 UTC (rev 3931)
+++ trunk/teraterm/common/tttypes.h	2010-06-23 03:00:38 UTC (rev 3932)
@@ -3,6 +3,7 @@
  All rights reserved. */
 
 /* Constants and types for Tera Term */
+#include <locale.h>
 
 #define IdBreakTimer         1
 #define IdDelayTimer         2
@@ -877,6 +878,7 @@
 	BOOL TelLineMode;
 
 	int *pureutf8;
+	_locale_t locale;
 } TComVar;
 typedef TComVar far *PComVar;
 

Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c	2010-06-22 16:28:47 UTC (rev 3931)
+++ trunk/teraterm/teraterm/commlib.c	2010-06-23 03:00:38 UTC (rev 3932)
@@ -23,6 +23,7 @@
 #include "WSAAsyncGetAddrInfo.h"
 #endif /* NO_INET6 */
 #include <time.h>
+#include <locale.h>
 
 static SOCKET OpenSocket(PComVar);
 static void AsyncConnect(PComVar);
@@ -286,6 +287,7 @@
 	cv->TelCRSendEcho = FALSE;
 	cv->TelAutoDetect = ts->TelAutoDetect; /* TTPLUG */
 	cv->Locale = ts->Locale;
+	cv->locale = _create_locale(LC_ALL, cv->Locale);
 	cv->CodePage = &ts->CodePage;
 	cv->ConnetingTimeout = &ts->ConnectingTimeout;
 	cv->LastSendTime = time(NULL);
@@ -766,6 +768,8 @@
 	}
 	cv->ComID = INVALID_HANDLE_VALUE;
 	cv->PortType = 0;
+
+	_free_locale(cv->locale);
 }
 
 void CommProcRRQ(PComVar cv)

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2010-06-22 16:28:47 UTC (rev 3931)
+++ trunk/teraterm/teraterm/vtwin.cpp	2010-06-23 03:00:38 UTC (rev 3932)
@@ -1496,8 +1496,12 @@
 	cv.RussHost = ts.RussHost;
 	cv.RussClient = ts.RussClient;
 
-	if (cv.Ready && cv.TelFlag && (ts.TelEcho>0)) {
-		TelChangeEcho();
+	if (cv.Ready) {
+		if (cv.TelFlag && (ts.TelEcho>0)) {
+			TelChangeEcho();
+		}
+		_free_locale(cv.locale);
+		cv.locale = _create_locale(LC_ALL, cv.Locale);
 	}
 
 	if ((ts.TerminalWidth!=NumOfColumns) ||

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2010-06-22 16:28:47 UTC (rev 3931)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2010-06-23 03:00:38 UTC (rev 3932)
@@ -1227,10 +1227,7 @@
 	int SendCodeNew;
 	BYTE d;
 	BOOL Full, KanjiFlagNew;
-	_locale_t locale;
 
-	locale = _create_locale(LC_ALL, cv->Locale);
-
 	Full = FALSE;
 	i = 0;
 	while (! Full && (i < C)) {
@@ -1274,7 +1271,7 @@
 				TempStr[TempLen++] = LOBYTE(K);
 			}
 		}
-		else if (_isleadbyte_l(d, locale)) {
+		else if (_isleadbyte_l(d, cv->locale)) {
 			KanjiFlagNew = TRUE;
 			cv->SendKanjiFirst = d;
 			SendCodeNew = IdKanji;
@@ -1430,8 +1427,6 @@
 
 	} // end of "while {}"
 
-	_free_locale(locale);
-
 	return i;
 }
 
@@ -1592,10 +1587,7 @@
 	int EchoCodeNew;
 	BYTE d;
 	BOOL Full, KanjiFlagNew;
-	_locale_t locale;
 
-	locale = _create_locale(LC_ALL, cv->Locale);
-
 	Full = FALSE;
 	i = 0;
 	while (! Full && (i < C)) {
@@ -1639,7 +1631,7 @@
 				TempStr[TempLen++] = LOBYTE(K);
 			}
 		}
-		else if (_isleadbyte_l(d, locale)) {
+		else if (_isleadbyte_l(d, cv->locale)) {
 			KanjiFlagNew = TRUE;
 			cv->EchoKanjiFirst = d;
 			EchoCodeNew = IdKanji;
@@ -1756,8 +1748,6 @@
 
 	} // end of "while {}"
 
-	_free_locale(locale);
-
 	return i;
 }
 

From svnnotify ＠ sourceforge.jp  Wed Jun 23 19:19:16 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 23 Jun 2010 19:19:16 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzNdICBZTU9ERU3lj5fkv6Hlh6bnkIY=?=
 =?utf-8?b?44Gr44GK44GE44Gm44CB44OP44Kk44OR44O844K/44O844Of44OK44Or5LuV?=
 =?utf-8?b?5qeY77yI5qiZ5rqW5LuV5qeY77yJ44Gr5rqW5oug44GZ44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1277288356.224326.15363.nullmailer@users.sourceforge.jp>

Revision: 3933
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3933
Author:   yutakapon
Date:     2010-06-23 19:19:15 +0900 (Wed, 23 Jun 2010)

Log Message:
-----------
YMODEM??拭?????????????ゃ??若??若????篁??鐚??羣??罕???????????????????
Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-06-23 03:00:38 UTC (rev 3932)
+++ trunk/doc/en/html/about/history.html	2010-06-23 10:19:15 UTC (rev 3933)
@@ -39,7 +39,7 @@
 
   <li>Bug fixes
     <ul>
-      <li>The YMODEM sending procedure does not work for the HyperTerminal.</li>
+      <li>The YMODEM sending and receiving procedure does not work for the HyperTerminal.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-06-23 03:00:38 UTC (rev 3932)
+++ trunk/doc/ja/html/about/history.html	2010-06-23 10:19:15 UTC (rev 3933)
@@ -39,7 +39,7 @@
 
   <li>????     <ul>
-      <li>YMODEM??????n?????????????????</li>
+      <li>YMODEM???????n?????????????????</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Thu Jun 24 20:49:38 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 24 Jun 2010 20:49:38 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzRdICDjgrPjg57jg7Pjg4njga7nlao=?=
 =?utf-8?b?5Y+344Gv5ryU566X5a2QIChSc3ZPcGVyYXRvcikg44KI44KK5bCP44GV44GE?=
 =?utf-8?b?5LqL44KS5Luu5a6a44GX44Gf44Kz44O844OJ44GM44GC44KL44Gf44KB44CB?=
 =?utf-8?b?44Gd44KM44Gr5ZCI44KP44Gb44Gm44Oq44OK44Oz44OQ44Oq44Oz44Kw44CC?=
Message-ID: <1277380178.021279.23395.nullmailer@users.sourceforge.jp>

Revision: 3934
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3934
Author:   doda
Date:     2010-06-24 20:49:37 +0900 (Thu, 24 Jun 2010)

Log Message:
-----------
コマンドの番号は演算子(RsvOperator)より小さい事を仮定したコードがあるため、それに合わせてリナンバリング。
# 多少効率が悪いだけで、実害は無かったと思うけど

Modified Paths:
--------------
    trunk/teraterm/ttpmacro/ttmparse.h


-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttmparse.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.h	2010-06-23 10:19:15 UTC (rev 3933)
+++ trunk/teraterm/ttpmacro/ttmparse.h	2010-06-24 11:49:37 UTC (rev 3934)
@@ -186,42 +186,41 @@
 #define RsvWaitN        143   // add 'waitn'  (2009.1.26 maya)
 #define RsvSendBroadcast    144
 #define RsvSendMulticast    145
-#define RsvSetMulticastName    146
-#define RsvSendlnBroadcast    147
-#define RsvWait4all         148
+#define RsvSetMulticastName 146
+#define RsvSendlnBroadcast  147
+#define RsvWait4all     148
+#define RsvWaitInt      149
+#define RsvSendInt      150
+#define RsvSetDebug     151
+#define RsvYmodemRecv   152
+#define RsvYmodemSend   153
+#define RsvFileStat     154
 
-#define RsvOperator     150
-#define RsvBNot         151
-#define RsvBAnd         152
-#define RsvBOr          153
-#define RsvBXor         154
-#define RsvMul          155
-#define RsvPlus         156
-#define RsvMinus        157
-#define RsvDiv          158
-#define RsvMod          159
-#define RsvLT           160
-#define RsvEQ           161
-#define RsvGT           162
-#define RsvLE           163
-#define RsvNE           164
-#define RsvGE           165
-#define RsvLNot         166
-#define RsvLAnd         167
-#define RsvLOr          168
-#define RsvLXor         169
-#define RsvARShift      170 // arithmetic right shift
-#define RsvALShift      171 // arithmetic left shift
-#define RsvLRShift      172 // logical right shift
+#define RsvOperator     200
+#define RsvBNot         201
+#define RsvBAnd         202
+#define RsvBOr          203
+#define RsvBXor         204
+#define RsvMul          205
+#define RsvPlus         206
+#define RsvMinus        207
+#define RsvDiv          208
+#define RsvMod          209
+#define RsvLT           210
+#define RsvEQ           211
+#define RsvGT           212
+#define RsvLE           213
+#define RsvNE           214
+#define RsvGE           215
+#define RsvLNot         216
+#define RsvLAnd         217
+#define RsvLOr          218
+#define RsvLXor         219
+#define RsvARShift      220 // arithmetic right shift
+#define RsvALShift      221 // arithmetic left shift
+#define RsvLRShift      222 // logical right shift
 
-#define RsvWaitInt		173
-#define RsvSendInt      174
-#define RsvSetDebug     175
 
-#define RsvYmodemRecv   176
-#define RsvYmodemSend   177
-#define RsvFileStat     178
-
 // integer type for buffer pointer
 typedef DWORD BINT;
 

From svnnotify ＠ sourceforge.jp  Thu Jun 24 20:53:59 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 24 Jun 2010 20:53:59 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzVdICDmoYHmj4PjgYg=?=
Message-ID: <1277380439.132972.28628.nullmailer@users.sourceforge.jp>

Revision: 3935
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3935
Author:   doda
Date:     2010-06-24 20:53:59 +0900 (Thu, 24 Jun 2010)

Log Message:
-----------
桁揃え

Modified Paths:
--------------
    trunk/teraterm/ttpmacro/ttmdde.h


-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttmdde.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdde.h	2010-06-24 11:49:37 UTC (rev 3934)
+++ trunk/teraterm/ttpmacro/ttmdde.h	2010-06-24 11:53:59 UTC (rev 3935)
@@ -52,10 +52,10 @@
 #define CmdSetRts       'L'
 #define CmdSetDtr       'M'
 #define CmdGetHostname  'N'
-#define CmdSendBroadcast  'O'
-#define CmdSendMulticast  'P'
-#define CmdSetMulticastName  'Q'
-#define CmdSetDebug  'R'
+#define CmdSendBroadcast 'O'
+#define CmdSendMulticast 'P'
+#define CmdSetMulticastName 'Q'
+#define CmdSetDebug     'R'
 #define CmdYmodemSend   'S'
 #define CmdYmodemRecv   'T'
 

From svnnotify ＠ sourceforge.jp  Thu Jun 24 20:59:39 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 24 Jun 2010 20:59:39 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzZdICDjg4njgq3jg6Xjg6Hjg7Pjg4g=?=
 =?utf-8?b?5pu05paw44CCcjM5MzI=?=
Message-ID: <1277380779.615271.4397.nullmailer@users.sourceforge.jp>

Revision: 3936
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3936
Author:   doda
Date:     2010-06-24 20:59:39 +0900 (Thu, 24 Jun 2010)

Log Message:
-----------
????ャ??潟??贋???3932

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-06-24 11:53:59 UTC (rev 3935)
+++ trunk/doc/en/html/about/history.html	2010-06-24 11:59:39 UTC (rev 3936)
@@ -32,7 +32,7 @@
 
 <h3><a name="teraterm_4.67">2010.x.x (Ver 4.67 unreleased)</a></h3>
 <ul class="history">
-  <!--li>??
+  <!--li>Changes
     <ul>
     </ul>
   </li-->
@@ -40,6 +40,7 @@
   <li>Bug fixes
     <ul>
       <li>The YMODEM sending and receiving procedure does not work for the HyperTerminal.</li>
+      <!-- li>?????x????????????B</li -->
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-06-24 11:53:59 UTC (rev 3935)
+++ trunk/doc/ja/html/about/history.html	2010-06-24 11:59:39 UTC (rev 3936)
@@ -40,6 +40,7 @@
   <li>????     <ul>
       <li>YMODEM???????n?????????????????</li>
+      <li>?????x????????????B</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Fri Jun 25 00:53:10 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 25 Jun 2010 00:53:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzddICDjg7tpZnRoZW5lbHNlaWYg44Gu?=
 =?utf-8?b?44K144Oz44OX44Or6Kqk6KiY5L+u5q2j?=
Message-ID: <1277394790.443523.17610.nullmailer@users.sourceforge.jp>

Revision: 3937
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3937
Author:   yutakapon
Date:     2010-06-25 00:53:10 +0900 (Fri, 25 Jun 2010)

Log Message:
-----------
??fthenelseif ????潟????荐?信罩???ilenamebox ????潟?????若???信罩?
Modified Paths:
--------------
    trunk/doc/en/html/macro/command/filenamebox.html
    trunk/doc/en/html/macro/command/ifthenelseif.html
    trunk/doc/ja/html/macro/command/filenamebox.html
    trunk/doc/ja/html/macro/command/ifthenelseif.html


-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/filenamebox.html
===================================================================
--- trunk/doc/en/html/macro/command/filenamebox.html	2010-06-24 11:59:39 UTC (rev 3936)
+++ trunk/doc/en/html/macro/command/filenamebox.html	2010-06-24 15:53:10 UTC (rev 3937)
@@ -47,8 +47,12 @@
 <h2>Example</h2>
 
 <pre class="macro-example">
-filenamebox 'title'
-messagebox inputstr 'title' 0
+connect '/C=11'
+filenamebox 'File selection' 0
+if result&lt;&gt;0 then
+	messagebox inputstr 'title' 0
+	sendfile inputstr 1
+endif
 </pre>
 
 </body>

Modified: trunk/doc/en/html/macro/command/ifthenelseif.html
===================================================================
--- trunk/doc/en/html/macro/command/ifthenelseif.html	2010-06-24 11:59:39 UTC (rev 3936)
+++ trunk/doc/en/html/macro/command/ifthenelseif.html	2010-06-24 15:53:10 UTC (rev 3937)
@@ -36,7 +36,7 @@
 if A&gt;1 goto label
 
 ; If result&lt;&gt;0, assign 0 to A.
-if result A=0
+if result&lt;&gt; A=0
 </pre>
 
 

Modified: trunk/doc/ja/html/macro/command/filenamebox.html
===================================================================
--- trunk/doc/ja/html/macro/command/filenamebox.html	2010-06-24 11:59:39 UTC (rev 3936)
+++ trunk/doc/ja/html/macro/command/filenamebox.html	2010-06-24 15:53:10 UTC (rev 3937)
@@ -47,8 +47,12 @@
 <h2>?</h2>
 
 <pre class="macro-example">
-filenamebox 'title'
-messagebox inputstr 'title' 0
+connect '/C=11'
+filenamebox 'File selection' 0
+if result&lt;&gt;0 then
+	messagebox inputstr 'title' 0
+	sendfile inputstr 1
+endif
 </pre>
 
 </body>

Modified: trunk/doc/ja/html/macro/command/ifthenelseif.html
===================================================================
--- trunk/doc/ja/html/macro/command/ifthenelseif.html	2010-06-24 11:59:39 UTC (rev 3936)
+++ trunk/doc/ja/html/macro/command/ifthenelseif.html	2010-06-24 15:53:10 UTC (rev 3937)
@@ -36,7 +36,7 @@
 if A&gt;1 goto label
 
 ; ?? result&lt;&gt;0 ????A ?0????
-if result A=0
+if result&lt;&gt; A=0
 </pre>
 
 

From svnnotify ＠ sourceforge.jp  Fri Jun 25 09:30:27 2010
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 25 Jun 2010 09:30:27 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzM5MzhdICDkv67mraPliY3jga7mlrnjgYw=?=
 =?utf-8?b?5q2j44GX44GE44Gu44Gn5YWD44Gr5oi744GZ44CC?=
Message-ID: <1277425827.579447.30832.nullmailer@users.sourceforge.jp>

Revision: 3938
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3938
Author:   doda
Date:     2010-06-25 09:30:27 +0900 (Fri, 25 Jun 2010)

Log Message:
-----------
篆??????鴻?罩ｃ?????у???????

if ?潟??潟????篁九????箴＜??????0 篁ュ????????潟??潟????茵?????
if result A=0 ???result ???篁九??с?A=0 ???茵????????
????翫???esult ?????0 篁ュ??????? A=0 ???茵?????

if result<> A=0 ?????esult<> A=0 ???篁九???????絎???潟??潟???????
????翫???esult ??A ???莠???????(膈???????0, ?????1) ??0 ???莠?????
# 絎?蟹??esult = A ???????????result ??A ???????ｃ??????????絎???????????????潟??潟????＜??冴??????????

Modified Paths:
--------------
    trunk/doc/en/html/macro/command/ifthenelseif.html
    trunk/doc/ja/html/macro/command/ifthenelseif.html


-------------- next part --------------
Modified: trunk/doc/en/html/macro/command/ifthenelseif.html
===================================================================
--- trunk/doc/en/html/macro/command/ifthenelseif.html	2010-06-24 15:53:10 UTC (rev 3937)
+++ trunk/doc/en/html/macro/command/ifthenelseif.html	2010-06-25 00:30:27 UTC (rev 3938)
@@ -36,7 +36,7 @@
 if A&gt;1 goto label
 
 ; If result&lt;&gt;0, assign 0 to A.
-if result&lt;&gt; A=0
+if result A=0
 </pre>
 
 

Modified: trunk/doc/ja/html/macro/command/ifthenelseif.html
===================================================================
--- trunk/doc/ja/html/macro/command/ifthenelseif.html	2010-06-24 15:53:10 UTC (rev 3937)
+++ trunk/doc/ja/html/macro/command/ifthenelseif.html	2010-06-25 00:30:27 UTC (rev 3938)
@@ -36,7 +36,7 @@
 if A&gt;1 goto label
 
 ; ?? result&lt;&gt;0 ????A ?0????
-if result&lt;&gt; A=0
+if result A=0
 </pre>