Develop and Download Open Source Software

Tera Term

Browse Subversion Repository

/[ttssh2]/branches/ttcomtester/teraterm/teraterm/commlib.c

Diff of /branches/ttcomtester/teraterm/teraterm/commlib.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2476 by maya, Mon Apr 14 17:35:50 2008 UTC revision 2577 by doda, Fri Aug 15 14:35:43 2008 UTC
# Line 12  Line 12 
12  #include "ttcommon.h"  #include "ttcommon.h"
13  #include "ttwsk.h"  #include "ttwsk.h"
14  #include "ttlib.h"  #include "ttlib.h"
15    #include "ttfileio.h"
16  #include "ttplug.h" /* TTPLUG */  #include "ttplug.h" /* TTPLUG */
17    
18  #include "commlib.h"  #include "commlib.h"
# Line 484  void CommOpen(HWND HW, PTTSet ts, PComVa Line 485  void CommOpen(HWND HW, PTTSet ts, PComVa
485  #endif /* NO_INET6 */  #endif /* NO_INET6 */
486    
487      case IdSerial:      case IdSerial:
488          InitFileIO();  /* TTPLUG */
489          TTXOpenFile(); /* TTPLUG */
490        _snprintf_s(P, sizeof(P), _TRUNCATE, "COM%d", ts->ComPort);        _snprintf_s(P, sizeof(P), _TRUNCATE, "COM%d", ts->ComPort);
491        strncpy_s(ErrMsg, sizeof(ErrMsg),P, _TRUNCATE);        strncpy_s(ErrMsg, sizeof(ErrMsg),P, _TRUNCATE);
492        strncpy_s(P, sizeof(P),"\\\\.\\", _TRUNCATE);        strncpy_s(P, sizeof(P),"\\\\.\\", _TRUNCATE);
493        strncat_s(P, sizeof(P),ErrMsg, _TRUNCATE);        strncat_s(P, sizeof(P),ErrMsg, _TRUNCATE);
494        cv->ComID =        cv->ComID =
495          CreateFile(P,GENERIC_READ | GENERIC_WRITE,          PCreateFile(P,GENERIC_READ | GENERIC_WRITE,
496                     0,NULL,OPEN_EXISTING,                     0,NULL,OPEN_EXISTING,
497                     FILE_FLAG_OVERLAPPED,NULL);                     FILE_FLAG_OVERLAPPED,NULL);
498        if (cv->ComID == INVALID_HANDLE_VALUE )        if (cv->ComID == INVALID_HANDLE_VALUE )
# Line 521  void CommOpen(HWND HW, PTTSet ts, PComVa Line 524  void CommOpen(HWND HW, PTTSet ts, PComVa
524        break; /* end of "case IdSerial:" */        break; /* end of "case IdSerial:" */
525    
526      case IdFile:      case IdFile:
527        cv->ComID = CreateFile(ts->HostName,GENERIC_READ,0,NULL,        InitFileIO();  /* TTPLUG */
528          TTXOpenFile(); /* TTPLUG */
529          cv->ComID = PCreateFile(ts->HostName,GENERIC_READ,0,NULL,
530                               OPEN_EXISTING,0,NULL);                               OPEN_EXISTING,0,NULL);
531        InvalidHost = (cv->ComID == INVALID_HANDLE_VALUE);        InvalidHost = (cv->ComID == INVALID_HANDLE_VALUE);
532        if (InvalidHost)        if (InvalidHost)
# Line 734  void CommClose(PComVar cv) Line 739  void CommClose(PComVar cv)
739                    PURGE_TXCLEAR | PURGE_RXCLEAR);                    PURGE_TXCLEAR | PURGE_RXCLEAR);
740          EscapeCommFunction(cv->ComID,CLRDTR);          EscapeCommFunction(cv->ComID,CLRDTR);
741          SetCommMask(cv->ComID,0);          SetCommMask(cv->ComID,0);
742          CloseHandle(cv->ComID);          PCloseFile(cv->ComID);
743          ClearCOMFlag(cv->ComPort);          ClearCOMFlag(cv->ComPort);
744        }        }
745          TTXCloseFile(); /* TTPLUG */
746        break;        break;
747      case IdFile:      case IdFile:
748        if (cv->ComID != INVALID_HANDLE_VALUE)        if (cv->ComID != INVALID_HANDLE_VALUE)
749          CloseHandle(cv->ComID);          PCloseFile(cv->ComID);
750          TTXCloseFile(); /* TTPLUG */
751        break;        break;
752    }    }
753    cv->ComID = INVALID_HANDLE_VALUE;    cv->ComID = INVALID_HANDLE_VALUE;
# Line 794  void CommReceive(PComVar cv) Line 801  void CommReceive(PComVar cv)
801        case IdSerial:        case IdSerial:
802          do {          do {
803            ClearCommError(cv->ComID,&DErr,NULL);            ClearCommError(cv->ComID,&DErr,NULL);
804            if (! ReadFile(cv->ComID,&(cv->InBuff[cv->InBuffCount]),            if (! PReadFile(cv->ComID,&(cv->InBuff[cv->InBuffCount]),
805              InBuffSize-cv->InBuffCount,&C,&rol))              InBuffSize-cv->InBuffCount,&C,&rol))
806            {            {
807              if (GetLastError() == ERROR_IO_PENDING)              if (GetLastError() == ERROR_IO_PENDING)
# Line 813  void CommReceive(PComVar cv) Line 820  void CommReceive(PComVar cv)
820          ClearCommError(cv->ComID,&DErr,NULL);          ClearCommError(cv->ComID,&DErr,NULL);
821          break;          break;
822        case IdFile:        case IdFile:
823          ReadFile(cv->ComID,&(cv->InBuff[cv->InBuffCount]),          PReadFile(cv->ComID,&(cv->InBuff[cv->InBuffCount]),
824                   InBuffSize-cv->InBuffCount,&C,NULL);                   InBuffSize-cv->InBuffCount,&C,NULL);
825          cv->InBuffCount = cv->InBuffCount + C;          cv->InBuffCount = cv->InBuffCount + C;
826          break;          break;
# Line 914  void CommSend(PComVar cv) Line 921  void CommSend(PComVar cv)
921        break;        break;
922    
923      case IdSerial:      case IdSerial:
924        if (! WriteFile(cv->ComID,&(cv->OutBuff[cv->OutPtr]),C,(LPDWORD)&D,&wol))        if (! PWriteFile(cv->ComID,&(cv->OutBuff[cv->OutPtr]),C,(LPDWORD)&D,&wol))
925        {        {
926          if (GetLastError() == ERROR_IO_PENDING)          if (GetLastError() == ERROR_IO_PENDING)
927          {          {
Legend:
Removed from v.2476  
changed lines
  Added in v.2577
Back to OSDN">Back to OSDN
 ViewVC Help
Powered by ViewVC 1.1.26  
About OSDN
Find Software
Develop Software
Help