svnno****@sourc*****
svnno****@sourc*****
2012年 1月 5日 (木) 01:15:03 JST
Tera TermRevision: 4791
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4791
Author: maya
Date: 2012-01-05 01:15:03 +0900 (Thu, 05 Jan 2012)
Log Message:
-----------
XMODEM, YMODEM で送信中に表示されるパケット番号が 256 で割り切れる場合に 256 少なくなる問題を修正
http://logmett.com/forum/viewtopic.php?f=8&t=1882
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/ttpfile/xmodem.c
trunk/teraterm/ttpfile/ymodem.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2012-01-03 10:37:26 UTC (rev 4790)
+++ trunk/doc/en/html/about/history.html 2012-01-04 16:15:03 UTC (rev 4791)
@@ -50,6 +50,7 @@
<ul>
<li>added the <a href="../setup/teraterm-misc.html#LogLockExclusive">LogLockExclusive</a> entry in the teraterm.ini file. The default value is on.
</ul></li>
+ <!--li>XMODEM, YMODEM \x82ő\x97\x90M\x92\x86\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83p\x83P\x83b\x83g\x94ԍ\x86\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3</li-->
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2012-01-03 10:37:26 UTC (rev 4790)
+++ trunk/doc/ja/html/about/history.html 2012-01-04 16:15:03 UTC (rev 4791)
@@ -50,6 +50,7 @@
<ul>
<li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogLockExclusive">LogLockExclusive</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD on\x81B</li>
</ul></li>
+ <li>XMODEM, YMODEM \x82ő\x97\x90M\x92\x86\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83p\x83P\x83b\x83g\x94ԍ\x86\x82\xAA\x90\xB3\x82\xB5\x82\xAD\x82Ȃ\xA2\x8Fꍇ\x82\xAA\x82\xA0\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3</li>
</ul>
</li>
Modified: trunk/teraterm/ttpfile/xmodem.c
===================================================================
--- trunk/teraterm/ttpfile/xmodem.c 2012-01-03 10:37:26 UTC (rev 4790)
+++ trunk/teraterm/ttpfile/xmodem.c 2012-01-04 16:15:03 UTC (rev 4791)
@@ -499,11 +499,15 @@
}
if (xv->PktBufCount == 0) {
- SetDlgNum(fv->HWin, IDC_PROTOPKTNUM,
- xv->PktNumOffset + xv->PktNumSent);
+ if (xv->PktNumSent == 0) {
+ SetDlgNum(fv->HWin, IDC_PROTOPKTNUM, xv->PktNumOffset + 256);
+ }
+ else {
+ SetDlgNum(fv->HWin, IDC_PROTOPKTNUM, xv->PktNumOffset + xv->PktNumSent);
+ }
SetDlgNum(fv->HWin, IDC_PROTOBYTECOUNT, fv->ByteCount);
SetDlgPercent(fv->HWin, IDC_PROTOPERCENT, IDC_PROTOPROGRESS,
- fv->ByteCount, fv->FileSize, &fv->ProgStat);
+ fv->ByteCount, fv->FileSize, &fv->ProgStat);
SetDlgTime(fv->HWin, IDC_PROTOELAPSEDTIME, fv->StartTime, fv->ByteCount);
}
Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c 2012-01-03 10:37:26 UTC (rev 4790)
+++ trunk/teraterm/ttpfile/ymodem.c 2012-01-04 16:15:03 UTC (rev 4791)
@@ -822,11 +822,15 @@
if (yv->PktBufCount==0)
{
- SetDlgNum(fv->HWin, IDC_PROTOPKTNUM,
- yv->PktNumOffset+yv->PktNumSent);
+ if (yv->PktNumSent == 0) {
+ SetDlgNum(fv->HWin, IDC_PROTOPKTNUM, yv->PktNumOffset + 256);
+ }
+ else {
+ SetDlgNum(fv->HWin, IDC_PROTOPKTNUM, yv->PktNumOffset + yv->PktNumSent);
+ }
SetDlgNum(fv->HWin, IDC_PROTOBYTECOUNT, fv->ByteCount);
SetDlgPercent(fv->HWin, IDC_PROTOPERCENT, IDC_PROTOPROGRESS,
- fv->ByteCount, fv->FileSize, &fv->ProgStat);
+ fv->ByteCount, fv->FileSize, &fv->ProgStat);
SetDlgTime(fv->HWin, IDC_PROTOELAPSEDTIME, fv->StartTime, fv->ByteCount);
}