svnno****@sourc*****
svnno****@sourc*****
2011年 2月 20日 (日) 14:38:34 JST
Tera TermRevision: 4328
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4328
Author: maya
Date: 2011-02-20 14:38:34 +0900 (Sun, 20 Feb 2011)
Log Message:
-----------
ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ã„ãŸã¨ãã€æ›¸ãè¾¼ã¿ä¸ã®åŒåファイルを開ã‘ã‚‹å•é¡Œã‚’ä¿®æ£
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=24365
ãƒã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã®ã« _lopen 㨠_lcreat を使ã£ã¦ã„ãŸãŒã€CreateFile を使ㄠdwShareMode ã§å…±æœ‰ãƒ¢ãƒ¼ãƒ‰ã‚’渡ã™ã‚ˆã†ã«ã—ãŸã€‚
書ãè¾¼ã¿ç”¨ã«é–‹ãã€èªã¿è¾¼ã¿ã®ã¿è¨±ã™ã‚ˆã†ã«ãªã‚‹ã€‚
LogVar->FileHandle ㌠int ãªã®ã¯ãŠãらã Win16 関数を使ã£ã¦ã„ã‚‹ãŸã‚ã§ã€HANDLE ã«ã‚ャストã—㦠Win32 API を使ã£ã¦ã„る箇所もã‚る。
_lopen, _lcreat, _lclose, _llseek, _lread, _lwrite ãªã©ãŒä½¿ã‚ã‚Œã¦ã„ã‚‹ãŒã€Win32 API ã«åˆ‡ã‚Šæ›¿ãˆã‚‹ã®ãŒæœ›ã¾ã—ã„。
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/ttpmacro/ttmbuff.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2011-02-20 03:29:43 UTC (rev 4327)
+++ trunk/doc/en/html/about/history.html 2011-02-20 05:38:34 UTC (rev 4328)
@@ -64,6 +64,7 @@
<!--li>ƒlƒbƒgƒ[ƒN‹¤—L‚ðƒ}ƒbƒv‚µ‚½ƒ[ƒJƒ‹ƒfƒoƒCƒX‚ð<a href="../setup/teraterm-prn.html#direct">PassThruPort</a>‚ÉŽw’肵‚½ê‡Aˆóü‚ª‚Å‚«‚È‚¢–â‘è‚ðC³‚µ‚½B</li-->
<!-- li>‘Ήž‚µ‚Ä‚¢‚È‚¢ OSC §Œä•¶Žš—ñ‚𳂵‚–³Ž‹o—ˆ‚È‚¢ê‡‚ª‚ ‚Á‚½–â‘è‚ðC³‚µ‚½B</li -->
<!-- li>DCS, SOS, APC and PM Control string ‚Ì’¼Œã‚Ì•¶Žš‚𳂵‚ˆµ‚¦‚Ä‚¢‚È‚©‚Á‚½–â‘è‚ðC³‚µ‚½B</li -->
+ <!--li>ƒƒOƒtƒ@ƒCƒ‹‚ð‘‚«ž‚Þ‚½‚ß‚ÉŠJ‚‚Æ‚«A‘¶Ý‚µ‚Ä‚¢‚Ä‘‚«ž‚Ý’†‚̃tƒ@ƒCƒ‹‚ðŠJ‚©‚È‚¢‚悤‚É‚µ‚½B</li-->
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2011-02-20 03:29:43 UTC (rev 4327)
+++ trunk/doc/ja/html/about/history.html 2011-02-20 05:38:34 UTC (rev 4328)
@@ -63,6 +63,7 @@
<li>ƒlƒbƒgƒ[ƒN‹¤—L‚ðƒ}ƒbƒv‚µ‚½ƒ[ƒJƒ‹ƒfƒoƒCƒX‚ð<a href="../setup/teraterm-prn.html#direct">PassThruPort</a>‚ÉŽw’肵‚½ê‡Aˆóü‚ª‚Å‚«‚È‚¢–â‘è‚ðC³‚µ‚½B</li>
<li>‘Ήž‚µ‚Ä‚¢‚È‚¢ OSC §Œä•¶Žš—ñ‚𳂵‚–³Ž‹o—ˆ‚È‚¢ê‡‚ª‚ ‚Á‚½–â‘è‚ðC³‚µ‚½B</li>
<li>DCS, SOS, APC, PM §Œä•¶Žš—ñ‚Ì’¼Œã‚Ì•¶Žš‚𳂵‚ˆµ‚¦‚Ä‚¢‚È‚©‚Á‚½–â‘è‚ðC³‚µ‚½B</li>
+ <li>ƒƒOƒtƒ@ƒCƒ‹‚ð‘‚«ž‚Þ‚½‚ß‚ÉŠJ‚‚Æ‚«A‘¶Ý‚µ‚Ä‚¢‚Ä‘‚«ž‚Ý’†‚̃tƒ@ƒCƒ‹‚ðŠJ‚©‚È‚¢‚悤‚É‚µ‚½B</li>
</ul>
</li>
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2011-02-20 03:29:43 UTC (rev 4327)
+++ trunk/teraterm/teraterm/filesys.cpp 2011-02-20 05:38:34 UTC (rev 4328)
@@ -479,7 +479,8 @@
if (ts.Append > 0)
{
- LogVar->FileHandle = _lopen(LogVar->FullName,OF_WRITE);
+ LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, FILE_SHARE_READ, NULL,
+ OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (LogVar->FileHandle>0){
_llseek(LogVar->FileHandle,0,2);
/* 2007.05.24 Gentaro
@@ -488,11 +489,11 @@
*/
eLineEnd = Line_FileHead;
}
- else
- LogVar->FileHandle = _lcreat(LogVar->FullName,0);
}
- else
- LogVar->FileHandle = _lcreat(LogVar->FullName,0);
+ else {
+ LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, FILE_SHARE_READ, NULL,
+ CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ }
LogVar->FileOpen = (LogVar->FileHandle>0);
if (! LogVar->FileOpen)
{
Modified: trunk/teraterm/ttpmacro/ttmbuff.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmbuff.c 2011-02-20 03:29:43 UTC (rev 4327)
+++ trunk/teraterm/ttpmacro/ttmbuff.c 2011-02-20 05:38:34 UTC (rev 4328)
@@ -110,7 +110,7 @@
return FALSE;
}
- F = _lopen(FileName,0);
+ F = _lopen(FileName,OF_READ);
if (F<=0) {
return FALSE;
}