svnno****@sourc*****
svnno****@sourc*****
2017年 6月 5日 (月) 17:37:56 JST
Tera TermRevision: 6769
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6769
Author: maya
Date: 2017-06-05 17:37:56 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
FileVarWin16 マクロを削除
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/ttdde.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2017-06-04 13:06:21 UTC (rev 6768)
+++ trunk/teraterm/teraterm/filesys.cpp 2017-06-05 08:37:56 UTC (rev 6769)
@@ -416,11 +416,7 @@
CloseHandle(ptr->LogThread);
ptr->LogThread = (HANDLE)-1;
}
-#ifdef FileVarWin16
- _lclose(ptr->FileHandle);
-#else
CloseHandle((HANDLE)ptr->FileHandle);
-#endif
}
// \x92x\x89\x84\x8F\x91\x82\xAB\x8D\x9E\x82ݗp\x83X\x83\x8C\x83b\x83h
@@ -444,11 +440,7 @@
case WM_DPC_LOGTHREAD_SEND:
buf = (PCHAR)msg.wParam;
buflen = (DWORD)msg.lParam;
-#ifdef FileVarWin16
- _lwrite(fv->FileHandle, buf, buflen );
-#else
WriteFile((HANDLE)LogVar->FileHandle, buf, buflen, &wrote, NULL);
-#endif
free(buf); // \x82\xB1\x82\xB1\x82Ń\x81\x83\x82\x83\x8A\x89\xF0\x95\xFA
break;
@@ -617,11 +609,7 @@
LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (LogVar->FileHandle>0){
-#ifdef FileVarWin16
- _llseek(LogVar->FileHandle,0,2);
-#else
SetFilePointer((HANDLE)LogVar->FileHandle, 0, NULL, FILE_END);
-#endif
/* 2007.05.24 Gentaro
If log file already exists,
a newline is inserted before the first timestamp.
@@ -1020,21 +1008,11 @@
#endif
/* 2007.05.24 Gentaro */
if( eLineEnd == Line_FileHead ){
-#ifdef FileVarWin16
- _lwrite(LogVar->FileHandle,"\r\n",2);
-#else
WriteFile((HANDLE)LogVar->FileHandle, "\r\n", 2, &wrote, NULL);
-#endif
}
-#ifdef FileVarWin16
- _lwrite(LogVar->FileHandle,"[",1);
- _lwrite(LogVar->FileHandle, strtime, strlen(strtime));
- _lwrite(LogVar->FileHandle,"] ",2);
-#else
WriteFile((HANDLE)LogVar->FileHandle, "[", 1, &wrote, NULL);
WriteFile((HANDLE)LogVar->FileHandle, strtime, strlen(strtime), &wrote, NULL);
WriteFile((HANDLE)LogVar->FileHandle, "] ", 2, &wrote, NULL);
-#endif
}
/* 2007.05.24 Gentaro */
@@ -1045,11 +1023,7 @@
eLineEnd = Line_Other; /* clear endmark*/
}
-#ifdef FileVarWin16
- _lwrite(LogVar->FileHandle,(PCHAR)&b,1);
-#else
WriteFile((HANDLE)LogVar->FileHandle, (PCHAR)&b, 1, &wrote, NULL);
-#endif
(LogVar->ByteCount)++;
}
}
@@ -1171,12 +1145,8 @@
else
(*SetFileVar)(SendVar);
-#ifdef FileVarWin16
- SendVar->FileHandle = _lopen(SendVar->FullName,OF_READ);
-#else
SendVar->FileHandle = (int)CreateFile(SendVar->FullName, GENERIC_READ, FILE_SHARE_READ, NULL,
OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
-#endif
SendVar->FileOpen = (SendVar->FileHandle>0);
if (! SendVar->FileOpen)
{
@@ -1295,12 +1265,8 @@
do {
if (FileSendHandler.pos == FileSendHandler.end) {
-#ifdef FileVarWin16
- fc = _lread(SendVar->FileHandle, &(FileSendHandler.buf[0]), sizeof(FileSendHandler.buf));
-#else
ReadFile((HANDLE)SendVar->FileHandle, &(FileSendHandler.buf[0]), sizeof(FileSendHandler.buf), &read_bytes, NULL);
fc = LOWORD(read_bytes);
-#endif
FileSendHandler.pos = 0;
FileSendHandler.end = fc;
} else {
@@ -1380,21 +1346,13 @@
}
}
else if (! FileReadEOF) {
-#ifdef FileVarWin16
- fc = _lread(SendVar->FileHandle,&FileByte,1);
-#else
ReadFile((HANDLE)SendVar->FileHandle, &FileByte, 1, &read_bytes, NULL);
fc = LOWORD(read_bytes);
-#endif
SendVar->ByteCount = SendVar->ByteCount + fc;
if (FileCRSend && (fc==1) && (FileByte==0x0A)) {
-#ifdef FileVarWin16
- fc = _lread(SendVar->FileHandle,&FileByte,1);
-#else
ReadFile((HANDLE)SendVar->FileHandle, &FileByte, 1, &read_bytes, NULL);
fc = LOWORD(read_bytes);
-#endif
SendVar->ByteCount = SendVar->ByteCount + fc;
}
}
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2017-06-04 13:06:21 UTC (rev 6768)
+++ trunk/teraterm/teraterm/ttdde.c 2017-06-05 08:37:56 UTC (rev 6769)
@@ -601,12 +601,7 @@
if (LogVar != NULL)
{
DWORD wrote;
-#ifdef FileVarWin16
- _lwrite(LogVar->FileHandle,
- ParamFileName,strlen(ParamFileName));
-#else
WriteFile((HANDLE)LogVar->FileHandle, ParamFileName, strlen(ParamFileName), &wrote, NULL);
-#endif
LogVar->ByteCount =
LogVar->ByteCount + strlen(ParamFileName);
FLogRefreshNum();