svnno****@sourc*****
svnno****@sourc*****
2010年 4月 7日 (水) 00:54:45 JST
Tera TermRevision: 3844
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=3844
Author: yutakapon
Date: 2010-04-07 00:54:45 +0900 (Wed, 07 Apr 2010)
Log Message:
-----------
crc32fileマクãƒã‚³ãƒžãƒ³ãƒ‰ã«ãŠã„ã¦ã€ãƒ•ã‚¡ã‚¤ãƒ«ã‚ªãƒ¼ãƒ—ンエラーãŒæ£ã—ã判定ã§ãã¦ã„ãªã‹ã£ãŸå•é¡Œã‚’ä¿®æ£ã—ãŸã€‚
ã¾ãŸã€èªã¿è¾¼ã¿å°‚用ファイルã«å¯¾ã—ã¦ã‚¨ãƒ©ãƒ¼ã¨ãªã‚‰ãªã„よã†ã«ã—ãŸã€‚
cf.
http://logmett.com/forum/viewtopic.php?f=8&t=1356
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/ttpmacro/ttl.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2010-04-05 06:34:24 UTC (rev 3843)
+++ trunk/doc/en/html/about/history.html 2010-04-06 15:54:45 UTC (rev 3844)
@@ -30,7 +30,7 @@
<h2><a name="teraterm">Tera Term</a></h2>
-<h3><a name="teraterm_4.66">2010.4.2 (Ver 4.66 unreleased)</a></h3>
+<h3><a name="teraterm_4.66">2010.4.7 (Ver 4.66 unreleased)</a></h3>
<ul class="history">
<li>Changes
<ul>
@@ -54,6 +54,7 @@
<li>If ClearOnResize setting is on, DECCOLM (Change Column Mode) control sequence does not clear screen.</li>
<!--li>ƒL[ƒ{[ƒhÝ’èƒtƒ@ƒCƒ‹‚Å Alt+ƒL[ ‚É‹@”\‚ðŠ„‚è“–‚Ä‚½ŽžA—]Œv‚È•¶Žš—ñ‚ª’ljÁ‚Åo—Í‚³‚ê‚é‚Ì‚ðC³‚µ‚½B</li-->
<li>VPR control sequence does not work correctly.</li>
+ <li>The crc32file macro command does not work correctly for handling the file opening error. And also, the command supports the read-only file.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2010-04-05 06:34:24 UTC (rev 3843)
+++ trunk/doc/ja/html/about/history.html 2010-04-06 15:54:45 UTC (rev 3844)
@@ -30,7 +30,7 @@
<h2><a name="teraterm">Tera Term</a></h2>
-<h3><a name="teraterm_4.66">2010.4.2 (Ver 4.66 unreleased)</a></h3>
+<h3><a name="teraterm_4.66">2010.4.7 (Ver 4.66 unreleased)</a></h3>
<ul class="history">
<li>•ÏX
<ul>
@@ -53,6 +53,7 @@
<li>ClearOnResize ‚ª on ‚ÌŽžADECCOLM(Œ…”ƒ‚[ƒh•ÏX)§ŒäƒV[ƒPƒ“ƒX‚ʼnæ–Ê‚ªƒNƒŠƒA‚³‚ê‚È‚¢‚Ì‚ðC³‚µ‚½B</li>
<li>ƒL[ƒ{[ƒhÝ’èƒtƒ@ƒCƒ‹‚Å Alt+ƒL[ ‚É‹@”\‚ðŠ„‚è“–‚Ä‚½ŽžA—]Œv‚È•¶Žš—ñ‚ª’ljÁ‚Åo—Í‚³‚ê‚é‚Ì‚ðC³‚µ‚½B</li>
<li>VPR §ŒäƒV[ƒPƒ“ƒX‚Ì“®ì‚ª³‚µ‚‚È‚¢‚Ì‚ðC³‚µ‚½B</li>
+ <li>crc32file ƒ}ƒNƒƒRƒ}ƒ“ƒh‚É‚¨‚¢‚ÄAƒtƒ@ƒCƒ‹ƒI[ƒvƒ“ƒGƒ‰[‚ª³‚µ‚”»’è‚Å‚«‚Ä‚¢‚È‚©‚Á‚½–â‘è‚ðC³‚µ‚½B‚Ü‚½A“Ç‚Ýž‚Ýê—pƒtƒ@ƒCƒ‹‚ɑ΂µ‚ăGƒ‰[‚Æ‚È‚ç‚È‚¢‚悤‚É‚µ‚½B</li>
</ul>
</li>
Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c 2010-04-05 06:34:24 UTC (rev 3843)
+++ trunk/teraterm/ttpmacro/ttl.c 2010-04-06 15:54:45 UTC (rev 3844)
@@ -588,7 +588,8 @@
WORD TTLCrc32File()
{
TStrVal Str;
- WORD Err, CRC, result=0;
+ int result = 0;
+ WORD Err, CRC;
HANDLE fh = INVALID_HANDLE_VALUE, hMap = NULL;
LPBYTE lpBuf = NULL;
DWORD fsize;
@@ -601,21 +602,21 @@
if (Err!=0) return Err;
if (Str[0]==0) return Err;
- fh = CreateFile(Str,GENERIC_READ|GENERIC_WRITE,0,NULL,OPEN_EXISTING,
+ fh = CreateFile(Str,GENERIC_READ,0,NULL,OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,NULL); /* ƒtƒ@ƒCƒ‹ƒI[ƒvƒ“ */
if (fh == INVALID_HANDLE_VALUE) {
result = -1;
goto error;
}
/* ƒtƒ@ƒCƒ‹ƒ}ƒbƒsƒ“ƒOƒIƒuƒWƒFƒNƒgì¬ */
- hMap = CreateFileMapping(fh,NULL,PAGE_READWRITE,0,0,NULL);
+ hMap = CreateFileMapping(fh,NULL,PAGE_READONLY,0,0,NULL);
if (hMap == NULL) {
result = -1;
goto error;
}
/* ƒtƒ@ƒCƒ‹‚ðƒ}ƒbƒv‚µA擪ƒAƒhƒŒƒX‚ðlpBuf‚Ɏ擾 */
- lpBuf = (LPBYTE)MapViewOfFile(hMap,FILE_MAP_WRITE,0,0,0);
+ lpBuf = (LPBYTE)MapViewOfFile(hMap,FILE_MAP_READ,0,0,0);
if (lpBuf == NULL) {
result = -1;
goto error;