svnno****@sourc*****
svnno****@sourc*****
2013年 3月 27日 (水) 21:32:04 JST
Tera TermRevision: 5178
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5178
Author: maya
Date: 2013-03-27 21:32:03 +0900 (Wed, 27 Mar 2013)
Log Message:
-----------
LogLockExclusive が正しく動作しない問題を修正
http://sourceforge.jp/ticket/browse.php?group_id=1412&tid=31051
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/filesys.cpp
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2013-03-26 16:25:36 UTC (rev 5177)
+++ trunk/doc/en/html/about/history.html 2013-03-27 12:32:03 UTC (rev 5178)
@@ -59,6 +59,7 @@
<li>Bug fixes
<ul>
<li>Can not open a file including the IPv6 address in the &h of the log file.</li>
+ <!--li><a href="../setup/teraterm-misc.html#LogLockExclusive">LogLockExclusive</a>\x82\xF0off\x82ɂ\xB5\x82Ă\xE0\x94r\x91\xBC\x83\x8D\x83b\x83N\x82\xAA\x82\xA9\x82\xA9\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li-->
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2013-03-26 16:25:36 UTC (rev 5177)
+++ trunk/doc/ja/html/about/history.html 2013-03-27 12:32:03 UTC (rev 5178)
@@ -58,6 +58,7 @@
<li>\x83o\x83O\x8FC\x90\xB3
<ul>
<li>\x83f\x83t\x83H\x83\x8B\x83g\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xCC&h\x82\xC9IPv6\x83A\x83h\x83\x8C\x83X\x82\xF0\x8A܂߂\xE9\x82ƁA\x83t\x83@\x83C\x83\x8B\x82\xAA\x83I\x81[\x83v\x83\x93\x82ł\xAB\x82Ȃ\xA2\x81B</li>
+ <li><a href="../setup/teraterm-misc.html#LogLockExclusive">LogLockExclusive</a>\x82\xF0off\x82ɂ\xB5\x82Ă\xE0\x94r\x91\xBC\x83\x8D\x83b\x83N\x82\xAA\x82\xA9\x82\xA9\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2013-03-26 16:25:36 UTC (rev 5177)
+++ trunk/teraterm/teraterm/filesys.cpp 2013-03-27 12:32:03 UTC (rev 5178)
@@ -494,8 +494,8 @@
if (ts.Append > 0)
{
int dwShareMode = 0;
- if (ts.LogLockExclusive) {
- dwShareMode = FILE_SHARE_READ;
+ if (!ts.LogLockExclusive) {
+ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
}
LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -510,8 +510,8 @@
}
else {
int dwShareMode = 0;
- if (ts.LogLockExclusive) {
- dwShareMode = FILE_SHARE_READ;
+ if (!ts.LogLockExclusive) {
+ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
}
LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -712,8 +712,8 @@
}
// \x8DăI\x81[\x83v\x83\x93
- if (ts.LogLockExclusive) {
- dwShareMode = FILE_SHARE_READ;
+ if (!ts.LogLockExclusive) {
+ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
}
LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);