com0com-cvs Mailing List for Null-modem emulator (Page 6)
The virtual serial port driver for Windows.
Brought to you by:
vfrolov
Menu
▾
▴
com0com-cvs — Announcement of all changes to the CVS repository
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(7) |
Mar
|
Apr
|
May
(13) |
Jun
(18) |
Jul
(9) |
Aug
(10) |
Sep
(15) |
Oct
(6) |
Nov
(9) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(6) |
Feb
(4) |
Mar
(4) |
Apr
(2) |
May
(7) |
Jun
(11) |
Jul
(6) |
Aug
(9) |
Sep
(1) |
Oct
(27) |
Nov
(22) |
Dec
(3) |
| 2007 |
Jan
(13) |
Feb
(16) |
Mar
(2) |
Apr
(3) |
May
(7) |
Jun
(17) |
Jul
(9) |
Aug
(1) |
Sep
(13) |
Oct
(20) |
Nov
(18) |
Dec
(1) |
| 2008 |
Jan
|
Feb
(3) |
Mar
(46) |
Apr
(40) |
May
(4) |
Jun
(9) |
Jul
(7) |
Aug
(62) |
Sep
(25) |
Oct
(51) |
Nov
(67) |
Dec
(81) |
| 2009 |
Jan
(13) |
Feb
(31) |
Mar
(12) |
Apr
|
May
(10) |
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(10) |
Oct
|
Nov
(3) |
Dec
(1) |
| 2010 |
Jan
|
Feb
(1) |
Mar
(4) |
Apr
|
May
(12) |
Jun
(9) |
Jul
(12) |
Aug
(7) |
Sep
(6) |
Oct
|
Nov
|
Dec
(1) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(11) |
Jun
|
Jul
(26) |
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
(23) |
| 2012 |
Jan
(7) |
Feb
(3) |
Mar
|
Apr
|
May
(2) |
Jun
(9) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Vyacheslav F. <vf...@us...> - 2010-05-27 11:16:53
|
Update of /cvsroot/com0com/com0com/include In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4421/include Modified Files: com0com.h Log Message: Added ability to put the port to the Ports class Index: com0com.h =================================================================== RCS file: /cvsroot/com0com/com0com/include/com0com.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** com0com.h 17 Sep 2008 07:58:32 -0000 1.10 --- com0com.h 27 May 2010 11:16:46 -0000 1.11 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2006-2008 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2006-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 34,37 **** --- 34,38 ---- #define C0C_PREF_DEVICE_NAME_A C0C_PREF_NT_DEVICE_NAME C0C_SERVICE TEXT_PREF"1" #define C0C_PREF_DEVICE_NAME_B C0C_PREF_NT_DEVICE_NAME C0C_SERVICE TEXT_PREF"2" + #define C0C_PORT_NAME_COMCLASS TEXT_PREF"COM#" #define C0C_REGSTR_VAL_PORT_NUM TEXT_PREF"PortNum" |
|
From: Vyacheslav F. <vf...@us...> - 2010-05-27 11:08:28
|
Update of /cvsroot/com0com/com0com In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv2403 Added Files: comport.inf cncport.inf Log Message: Initial revision --- NEW FILE: comport.inf --- ;****************************************************************************** ; ; comport.inf ; ; Installation file for the Null-modem emulator driver. ; ; Copyright (c) 2010 Vyacheslav Frolov ; ;****************************************************************************** [Version] Signature = "$Windows NT$" Provider = %VF% Class = CNCPorts ClassGUID = {4D36E978-E325-11CE-BFC1-08002BE10318} CatalogFile = com0com.cat DriverVer = 05/22/2010,3.0.0.0 UninstallInfTag = {df799e12-3c56-421b-b298-b6d3642bc878} ;****************************************************************************** ; ; Driver information ; ;****************************************************************************** [Manufacturer] %VF% = com0com, NTx86, NTia64, NTamd64 [ControlFlags] ExcludeFromSelect = com0com\comport [com0com] %com0com.PortDesc% = com0com_inst_port, com0com\comport [com0com.NTx86] %com0com.PortDesc% = com0com_inst_port, com0com\comport [com0com.NTia64] %com0com.PortDesc% = com0com_inst_port, com0com\comport [com0com.NTamd64] %com0com.PortDesc% = com0com_inst_port, com0com\comport ;****************************************************************************** ; ; Port install section ; ;****************************************************************************** [com0com_inst_port] AddReg = com0com_AddReg [com0com_inst_port.Services] AddService = com0com, %SPSVCINST_ASSOCSERVICE%, com0com_Service_Inst, com0com_EventLog_Inst [com0com_AddReg] HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider" HKR,,PortDriver,,com0com.sys ;****************************************************************************** ; ; Common section ; ;****************************************************************************** [com0com_Service_Inst] DisplayName = %com0com.SrvDesc% ServiceType = %SERVICE_KERNEL_DRIVER% StartType = %SERVICE_DEMAND_START% ErrorControl = %SERVICE_ERROR_NORMAL% ServiceBinary = %12%\com0com.sys [com0com_EventLog_Inst] AddReg = com0com_EventLog_AddReg [com0com_EventLog_AddReg] HKR,,EventMessageFile,%REG_EXPAND_SZ%,"%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\drivers\com0com.sys" HKR,,TypesSupported,%REG_DWORD%,7 ;****************************************************************************** ; ; Strings ; ;****************************************************************************** [Strings] SPSVCINST_ASSOCSERVICE = 0x00000002 REG_EXPAND_SZ = 0x00020000 REG_DWORD = 0x00010001 SERVICE_KERNEL_DRIVER = 1 SERVICE_DEMAND_START = 3 SERVICE_ERROR_NORMAL = 1 VF = "Vyacheslav Frolov" com0com.PortDesc = "com0com - serial port emulator" com0com.SrvDesc = "com0com - emulates the serial ports interconnected via a null-modem cable" ;****************************************************************************** --- NEW FILE: cncport.inf --- ;****************************************************************************** ; ; cncport.inf ; ; Installation file for the Null-modem emulator driver. ; ; Copyright (c) 2010 Vyacheslav Frolov ; ;****************************************************************************** [Version] Signature = "$Windows NT$" Provider = %VF% Class = CNCPorts ClassGUID = {df799e12-3c56-421b-b298-b6d3642bc878} CatalogFile = com0com.cat DriverVer = 05/21/2010,3.0.0.0 UninstallInfTag = {df799e12-3c56-421b-b298-b6d3642bc878} ;****************************************************************************** ; ; Driver information ; ;****************************************************************************** [Manufacturer] %VF% = com0com, NTx86, NTia64, NTamd64 [ControlFlags] ExcludeFromSelect = com0com\cncport [com0com] %com0com.PortDesc% = com0com_inst_port, com0com\cncport [com0com.NTx86] %com0com.PortDesc% = com0com_inst_port, com0com\cncport [com0com.NTia64] %com0com.PortDesc% = com0com_inst_port, com0com\cncport [com0com.NTamd64] %com0com.PortDesc% = com0com_inst_port, com0com\cncport ;****************************************************************************** ; ; Port install section ; ;****************************************************************************** [com0com_inst_port] AddReg = com0com_AddReg [com0com_inst_port.Services] AddService = com0com, %SPSVCINST_ASSOCSERVICE%, com0com_Service_Inst, com0com_EventLog_Inst [com0com_AddReg] HKR,,PortDriver,,com0com.sys ;****************************************************************************** ; ; Common section ; ;****************************************************************************** [com0com_Service_Inst] DisplayName = %com0com.SrvDesc% ServiceType = %SERVICE_KERNEL_DRIVER% StartType = %SERVICE_DEMAND_START% ErrorControl = %SERVICE_ERROR_NORMAL% ServiceBinary = %12%\com0com.sys [com0com_EventLog_Inst] AddReg = com0com_EventLog_AddReg [com0com_EventLog_AddReg] HKR,,EventMessageFile,%REG_EXPAND_SZ%,"%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\drivers\com0com.sys" HKR,,TypesSupported,%REG_DWORD%,7 ;****************************************************************************** ; ; Strings ; ;****************************************************************************** [Strings] SPSVCINST_ASSOCSERVICE = 0x00000002 REG_EXPAND_SZ = 0x00020000 REG_DWORD = 0x00010001 SERVICE_KERNEL_DRIVER = 1 SERVICE_DEMAND_START = 3 SERVICE_ERROR_NORMAL = 1 VF = "Vyacheslav Frolov" com0com.PortDesc = "com0com - serial port emulator" com0com.SrvDesc = "com0com - emulates the serial ports interconnected via a null-modem cable" ;****************************************************************************** |
|
From: Vyacheslav F. <vf...@us...> - 2010-05-27 11:06:31
|
Update of /cvsroot/com0com/com0com/sys In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv1713 Modified Files: strutils.c strutils.h Log Message: Added StrAppendPortParametersRegistryPath() and StrAppendParameterPortName() Index: strutils.h =================================================================== RCS file: /cvsroot/com0com/com0com/sys/strutils.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** strutils.h 3 Nov 2006 13:13:26 -0000 1.4 --- strutils.h 27 May 2010 11:06:23 -0000 1.5 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2004-2006 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2004-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.5 2010/05/27 11:06:23 vfrolov + * Added StrAppendPortParametersRegistryPath() and StrAppendParameterPortName() + * * Revision 1.4 2006/11/03 13:13:26 vfrolov * CopyStrW() now gets size in characters (not in bytes) *************** *** 58,61 **** --- 61,72 ---- IN PDEVICE_OBJECT pDevObj, IN DEVICE_REGISTRY_PROPERTY deviceProperty); + VOID StrAppendPortParametersRegistryPath( + IN OUT PNTSTATUS pStatus, + IN OUT PUNICODE_STRING pDest, + IN PWCHAR pPhPortName); + VOID StrAppendParameterPortName( + IN OUT PNTSTATUS pStatus, + IN OUT PUNICODE_STRING pDest, + IN PWCHAR pPortParametersRegistryPath); #endif /* _C0C_STRUTILS_H_ */ Index: strutils.c =================================================================== RCS file: /cvsroot/com0com/com0com/sys/strutils.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** strutils.c 21 Sep 2009 08:26:12 -0000 1.5 --- strutils.c 27 May 2010 11:06:23 -0000 1.6 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2004-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2004-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.6 2010/05/27 11:06:23 vfrolov + * Added StrAppendPortParametersRegistryPath() and StrAppendParameterPortName() + * * Revision 1.5 2009/09/21 08:26:12 vfrolov * Fixed checking for overflow *************** *** 243,244 **** --- 246,296 ---- *pStatus = status; } + + VOID StrAppendPortParametersRegistryPath( + IN OUT PNTSTATUS pStatus, + IN OUT PUNICODE_STRING pDest, + IN PWCHAR pPhPortName) + { + StrAppendStr(pStatus, pDest, c0cGlobal.registryPath.Buffer, c0cGlobal.registryPath.Length); + StrAppendStr0(pStatus, pDest, L"\\Parameters\\"); + StrAppendStr0(pStatus, pDest, pPhPortName); + } + + VOID StrAppendParameterPortName( + IN OUT PNTSTATUS pStatus, + IN OUT PUNICODE_STRING pDest, + IN PWCHAR pPortParametersRegistryPath) + { + NTSTATUS status; + WCHAR portNameBuf[C0C_PORT_NAME_LEN + 1]; + UNICODE_STRING portNameTmp; + RTL_QUERY_REGISTRY_TABLE queryTable[2]; + + status = *pStatus; + + if (!NT_SUCCESS(status)) + return; + + RtlZeroMemory(queryTable, sizeof(queryTable)); + + portNameTmp.Length = 0; + portNameTmp.MaximumLength = sizeof(portNameBuf); + portNameTmp.Buffer = portNameBuf; + + queryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + queryTable[0].Name = L"PortName"; + queryTable[0].EntryContext = &portNameTmp; + + status = RtlQueryRegistryValues( + RTL_REGISTRY_ABSOLUTE, + pPortParametersRegistryPath, + queryTable, + NULL, + NULL); + + StrAppendStr(&status, pDest, portNameTmp.Buffer, portNameTmp.Length); + + StrFreeBad(status, pDest); + + *pStatus = status; + } |
|
From: Vyacheslav F. <vf...@us...> - 2010-05-27 11:02:20
|
Update of /cvsroot/com0com/com0com/sys In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv431 Modified Files: trace.c Log Message: Added multiline tracing for IRP_MN_QUERY_ID Index: trace.c =================================================================== RCS file: /cvsroot/com0com/com0com/sys/trace.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** trace.c 22 May 2009 14:25:39 -0000 1.34 --- trace.c 27 May 2010 11:02:11 -0000 1.35 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2004-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2004-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.35 2010/05/27 11:02:11 vfrolov + * Added multiline tracing for IRP_MN_QUERY_ID + * * Revision 1.34 2009/05/22 14:25:39 vfrolov * Optimized for trace disabled mode *************** *** 360,364 **** PCHAR pStrTmp; ! pStrTmp = pStr; while (*(pStrTmp++)) --- 363,367 ---- PCHAR pStrTmp; ! pStrTmp = (pStr != NULL ? pStr : "(null)"); while (*(pStrTmp++)) *************** *** 384,398 **** PCHAR pDestStr, PSIZE_T pSize, ! PWCHAR pStr) { SIZE_T len, size; PWCHAR pStrTmp; ! pStrTmp = pStr; ! while (*(pStrTmp++)) ! ; len = pStrTmp - pStr; size = *pSize; --- 387,414 ---- PCHAR pDestStr, PSIZE_T pSize, ! PWCHAR pStr, ! BOOLEAN multiStr) { SIZE_T len, size; PWCHAR pStrTmp; ! pStrTmp = (pStr != NULL ? pStr : L"(null)" L"\0"); ! if (multiStr) { ! do { ! while (*(pStrTmp++)) ! ; ! } while (*(pStrTmp++)); ! } ! else { ! while (*(pStrTmp++)) ! ; ! } len = pStrTmp - pStr; + + if (multiStr) + len--; + size = *pSize; *************** *** 404,407 **** --- 420,426 ---- for (i = 0 ; i < len - 1 ; i++) { + if (pStr[i] == 0) + pDestStr[i] = '"'; + else if ((pStr[i] & 0xFF00) == 0) pDestStr[i] = (CHAR)(pStr[i]); *************** *** 507,511 **** case 'S': { PWCHAR pStr = va_arg(va, PWCHAR); ! pDestStr = AnsiStrCopyStrW(pDestStr, &size, pStr); format = FALSE; break; --- 526,530 ---- case 'S': { PWCHAR pStr = va_arg(va, PWCHAR); ! pDestStr = AnsiStrCopyStrW(pDestStr, &size, pStr, FALSE); format = FALSE; break; *************** *** 1607,1613 **** codeNameTableBusQuery, "BusQuery", 10); if (flags & TRACE_FLAG_RESULTS && pIrp->IoStatus.Information) { ! pDestStr = AnsiStrFormat(pDestStr, &size, ! " Information: \"%S\"", ! (PWCHAR)pIrp->IoStatus.Information); } break; --- 1626,1646 ---- codeNameTableBusQuery, "BusQuery", 10); if (flags & TRACE_FLAG_RESULTS && pIrp->IoStatus.Information) { ! BOOLEAN multiStr; ! ! pDestStr = AnsiStrCopyStr(pDestStr, &size, " Information: '"); ! ! switch (pIrpStack->Parameters.QueryId.IdType) { ! case BusQueryHardwareIDs: ! case BusQueryCompatibleIDs: ! multiStr = TRUE; ! break; ! default: ! multiStr = FALSE; ! } ! pDestStr = AnsiStrCopyStrW(pDestStr, &size, ! (PWCHAR)pIrp->IoStatus.Information, ! multiStr); ! ! pDestStr = AnsiStrCopyStr(pDestStr, &size, "'"); } break; |
|
From: Vyacheslav F. <vf...@us...> - 2010-05-18 15:00:44
|
Update of /cvsroot/com0com/hub4com/plugins/pinmap In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv3156 Modified Files: filter.cpp Log Message: Added connection counter Index: filter.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/pinmap/filter.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** filter.cpp 2 Feb 2009 15:21:42 -0000 1.16 --- filter.cpp 18 May 2010 15:00:36 -0000 1.17 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2008-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2008-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.17 2010/05/18 15:00:36 vfrolov + * Added connection counter + * * Revision 1.16 2009/02/02 15:21:42 vfrolov * Optimized filter's API *************** *** 137,144 **** class State { public: ! State(HMASTERPORT hMasterPort) : pName(pPortName(hMasterPort)), lmInVal(0) {} const char *const pName; WORD lmInVal; }; /////////////////////////////////////////////////////////////// --- 140,152 ---- class State { public: ! State(HMASTERPORT hMasterPort) ! : pName(pPortName(hMasterPort)) ! , lmInVal(0) ! , connectionCounter(0) ! {} const char *const pName; WORD lmInVal; + int connectionCounter; }; /////////////////////////////////////////////////////////////// *************** *** 259,263 **** sizeof(PLUGIN_ABOUT_A), "pinmap", ! "Copyright (c) 2008 Vyacheslav Frolov", "GNU General Public License", "Pinouts mapping filter", --- 267,271 ---- sizeof(PLUGIN_ABOUT_A), "pinmap", ! "Copyright (c) 2008-2010 Vyacheslav Frolov", "GNU General Public License", "Pinouts mapping filter", *************** *** 294,298 **** << " SET_PIN_STATE(<set>) - pin settings controlled by this filter will be" << endl << " discarded from <set>." << endl ! << " CONNECT(<val>) - current state of connect." << endl << " BREAK_STATUS(<val>) - current state of break." << endl << " MODEM_STATUS(<val>) - current state of modem." << endl --- 302,311 ---- << " SET_PIN_STATE(<set>) - pin settings controlled by this filter will be" << endl << " discarded from <set>." << endl ! << " CONNECT(TRUE) - increment connection counter. The incrementing of the" << endl ! << " connection counter from 0 will raise wire input state" << endl ! << " of connect" << endl ! << " CONNECT(FALSE) - decrement connection counter. The decrementing of the" << endl ! << " connection counter to 0 will clear wire input state" << endl ! << " of connect" << endl << " BREAK_STATUS(<val>) - current state of break." << endl << " MODEM_STATUS(<val>) - current state of modem." << endl *************** *** 310,314 **** << " - transfer data and signals between COM1 and COM2." << endl << " " << pProgPath << " --load=,,_END_" << endl ! << " --create-filter=pinmap:\"--rts=cts\"" << endl << " --add-filters=0,1:pinmap" << endl << " --octs=off" << endl --- 323,327 ---- << " - transfer data and signals between COM1 and COM2." << endl << " " << pProgPath << " --load=,,_END_" << endl ! << " --create-filter=pinmap:--rts=cts" << endl << " --add-filters=0,1:pinmap" << endl << " --octs=off" << endl *************** *** 324,327 **** --- 337,355 ---- << " _END_" << endl << " - receive data and signals from COM2 and send it back to COM2." << endl + << " " << pProgPath << " --load=,,_END_" << endl + << " --route=all:0" << endl + << " --create-filter=pinmap:--rts=connect --dtr=connect" << endl + << " --add-filters=0:pinmap" << endl + << " --create-filter=pin2con:--connect=dsr" << endl + << " --add-filters=1,2:pin2con" << endl + << " --octs=off" << endl + << " COM1" << endl + << " \\\\.\\CNCB0" << endl + << " \\\\.\\CNCB1" << endl + << " _END_" << endl + << " - transfer data from CNCB0 and CNCB1 to COM1." << endl + << " If DSR is in raised state on CNCB0 or CNCB1" << endl + << " then RTS and DTR are in raised state on COM1" << endl + << " else RTS and DTR are in cleared state on COM1." << endl ; } *************** *** 482,486 **** case HUB_MSG_T2N(HUB_MSG_TYPE_CONNECT): { if (((Filter *)hFilter)->lmInMask & LM_CONNECT) { ! WORD lmInVal = ((pOutMsg->u.val ? LM_CONNECT : 0) | (((State *)hFilterInstance)->lmInVal & ~LM_CONNECT)); InsertPinState(*(Filter *)hFilter, ((State *)hFilterInstance)->lmInVal ^ lmInVal, lmInVal, &pOutMsg); --- 510,525 ---- case HUB_MSG_T2N(HUB_MSG_TYPE_CONNECT): { if (((Filter *)hFilter)->lmInMask & LM_CONNECT) { ! if (pOutMsg->u.val) { ! ((State *)hFilterInstance)->connectionCounter++; ! ! _ASSERTE(((State *)hFilterInstance)->connectionCounter > 0); ! ! } else { ! _ASSERTE(((State *)hFilterInstance)->connectionCounter > 0); ! ! ((State *)hFilterInstance)->connectionCounter--; ! } ! ! WORD lmInVal = ((((State *)hFilterInstance)->connectionCounter > 0 ? LM_CONNECT : 0) | (((State *)hFilterInstance)->lmInVal & ~LM_CONNECT)); InsertPinState(*(Filter *)hFilter, ((State *)hFilterInstance)->lmInVal ^ lmInVal, lmInVal, &pOutMsg); |
|
From: Vyacheslav F. <vf...@us...> - 2010-03-30 08:06:29
|
Update of /cvsroot/com0com/com0com/setupc In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29990 Modified Files: setup.cpp Log Message: Fixed bugs item #2979007 "setupc command line limited to 200 chars" Reported by Henrik Maier (hwmaier) Index: setup.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setupc/setup.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setup.cpp 25 Oct 2007 14:25:34 -0000 1.1 --- setup.cpp 30 Mar 2010 08:06:22 -0000 1.2 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2007 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2007-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,27 **** * * $Log$ * Revision 1.1 2007/10/25 14:25:34 vfrolov * Initial revision * - * */ --- 20,30 ---- * * $Log$ + * Revision 1.2 2010/03/30 08:06:22 vfrolov + * Fixed bugs item #2979007 "setupc command line limited to 200 chars" + * Reported by Henrik Maier (hwmaier) + * * Revision 1.1 2007/10/25 14:25:34 vfrolov * Initial revision * */ *************** *** 32,36 **** int _cdecl main(int argc, char *argv[]) { ! char cmd[200] = ""; for (int i = 1 ; i < argc ; i++) { --- 35,39 ---- int _cdecl main(int argc, char *argv[]) { ! char cmd[1024] = ""; for (int i = 1 ; i < argc ; i++) { |
|
From: Vyacheslav F. <vf...@us...> - 2010-03-30 08:05:23
|
Update of /cvsroot/com0com/com0com/setup In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29589 Modified Files: setup.cpp Log Message: Fixed bugs item #2979007 "setupc command line limited to 200 chars" Reported by Henrik Maier (hwmaier) Index: setup.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** setup.cpp 11 Mar 2010 13:40:57 -0000 1.34 --- setup.cpp 30 Mar 2010 08:05:15 -0000 1.35 *************** *** 20,23 **** --- 20,27 ---- * * $Log$ + * Revision 1.35 2010/03/30 08:05:15 vfrolov + * Fixed bugs item #2979007 "setupc command line limited to 200 chars" + * Reported by Henrik Maier (hwmaier) + * * Revision 1.34 2010/03/11 13:40:57 vfrolov * Fixed size typo, bug #2968585 *************** *** 1446,1450 **** SetTitle(C0C_SETUP_TITLE); ! char cmd[200]; SNPRINTF(cmd, sizeof(cmd)/sizeof(cmd[0]), "%s", pCmdLine); --- 1450,1454 ---- SetTitle(C0C_SETUP_TITLE); ! char cmd[1024]; SNPRINTF(cmd, sizeof(cmd)/sizeof(cmd[0]), "%s", pCmdLine); |
|
From: Vyacheslav F. <vf...@us...> - 2010-03-11 13:41:05
|
Update of /cvsroot/com0com/com0com/setup In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21926 Modified Files: setup.cpp Log Message: Fixed size typo, bug #2968585 Thanks Xlnt (xlnt9568) Index: setup.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** setup.cpp 16 Nov 2009 08:43:44 -0000 1.33 --- setup.cpp 11 Mar 2010 13:40:57 -0000 1.34 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2006-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2006-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,27 ---- * * $Log$ + * Revision 1.34 2010/03/11 13:40:57 vfrolov + * Fixed size typo, bug #2968585 + * Thanks Xlnt (xlnt9568) + * * Revision 1.33 2009/11/16 08:43:44 vfrolov * Fixed endless loop if no ports logged in ComDB *************** *** 1122,1126 **** if (!pNamesNew) { ! if (ShowError(MB_OKCANCEL, ERROR_NOT_ENOUGH_MEMORY, "LocalAlloc(%lu)", (unsigned long)size) == IDCANCEL) { if (pNames) LocalFree(pNames); --- 1126,1130 ---- if (!pNamesNew) { ! if (ShowError(MB_OKCANCEL, ERROR_NOT_ENOUGH_MEMORY, "LocalAlloc(%lu)", (unsigned long)sizeNamesNew) == IDCANCEL) { if (pNames) LocalFree(pNames); |
|
From: Vyacheslav F. <vf...@us...> - 2010-03-11 13:25:34
|
Update of /cvsroot/com0com/com0com/sys In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv19239 Modified Files: version.h Log Message: Post-tagging version change Index: version.h =================================================================== RCS file: /cvsroot/com0com/com0com/sys/version.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** version.h 15 Dec 2009 07:15:49 -0000 1.20 --- version.h 11 Mar 2010 13:25:25 -0000 1.21 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2005-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2005-2010 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 23,32 **** #define _C0C_VERSION_H_ ! #define C0C_COPYRIGHT_YEARS "2004-2009" #define C0C_V1 2 #define C0C_V2 2 #define C0C_V3 2 ! #define C0C_V4 0 #define MK_VERSION_STR1(V1, V2, V3, V4) #V1 "." #V2 "." #V3 "." #V4 --- 23,32 ---- #define _C0C_VERSION_H_ ! #define C0C_COPYRIGHT_YEARS "2004-2010" #define C0C_V1 2 #define C0C_V2 2 #define C0C_V3 2 ! #define C0C_V4 1 #define MK_VERSION_STR1(V1, V2, V3, V4) #V1 "." #V2 "." #V3 "." #V4 |
|
From: Vyacheslav F. <vf...@us...> - 2010-02-01 09:18:24
|
Update of /cvsroot/com0com/homepage In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24231 Modified Files: index.html Log Message: Added softpedia link Index: index.html =================================================================== RCS file: /cvsroot/com0com/homepage/index.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** index.html 12 Mar 2009 15:30:29 -0000 1.8 --- index.html 1 Feb 2010 09:18:16 -0000 1.9 *************** *** 7,16 **** </head> <body> - <a href="http://sourceforge.net/donate/index.php?group_id=129551"> - <img src="http://images.sourceforge.net/images/project-support.jpg" - width="88" height="32" border="0" alt="Support This Project" /> </a> <center> ! <h1> Null-modem emulator <br> ! (com0com) </h1> </center> <p> --- 7,15 ---- </head> <body> <center> ! <h1> ! Null-modem emulator <br> ! (com0com) ! </h1> </center> <p> *************** *** 73,81 **** page</a>. </p> - <br> <center> ! <a href="http://sourceforge.net"><img ! src="http://sourceforge.net/sflogo.php?group_id=129551&type=5" ! alt="SourceForge.net Logo" border="0" height="62" width="210"></a> </center> </body> --- 72,90 ---- page</a>. </p> <center> ! <br> ! <a href="http://sourceforge.net/projects/com0com"> ! <img src="http://sflogo.sourceforge.net/sflogo.php?group_id=129551&type=14" width="150" height="40" alt="Get Null-modem emulator at SourceForge.net. Fast, secure and Free Open Source software downloads"> ! </a> ! <br> ! <a href="http://www.softpedia.com/progClean/com0com-Clean-149459.html" title="100% FREE Certified by Softpedia"> ! <img src="http://www.softpedia.com/base_img/softpedia_free_award_f.gif" ! width="170" height="116" border="0"> ! </a> ! <br> ! <a href="http://sourceforge.net/donate/index.php?group_id=129551"> ! <img src="http://images.sourceforge.net/images/project-support.jpg" ! width="88" height="32" border="0" alt="Support This Project" /> ! </a> </center> </body> |
|
From: Vyacheslav F. <vf...@us...> - 2009-12-15 07:15:57
|
Update of /cvsroot/com0com/com0com/sys In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv30979 Modified Files: version.h Log Message: Pre-tagging version change Index: version.h =================================================================== RCS file: /cvsroot/com0com/com0com/sys/version.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** version.h 31 Jul 2009 12:33:20 -0000 1.19 --- version.h 15 Dec 2009 07:15:49 -0000 1.20 *************** *** 27,32 **** #define C0C_V1 2 #define C0C_V2 2 ! #define C0C_V3 1 ! #define C0C_V4 1 #define MK_VERSION_STR1(V1, V2, V3, V4) #V1 "." #V2 "." #V3 "." #V4 --- 27,32 ---- #define C0C_V1 2 #define C0C_V2 2 ! #define C0C_V3 2 ! #define C0C_V4 0 #define MK_VERSION_STR1(V1, V2, V3, V4) #V1 "." #V2 "." #V3 "." #V4 |
|
From: Vyacheslav F. <vf...@us...> - 2009-11-16 08:43:54
|
Update of /cvsroot/com0com/com0com/setup In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6122 Modified Files: setup.cpp Log Message: Fixed endless loop if no ports logged in ComDB Index: setup.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** setup.cpp 18 Sep 2009 11:21:31 -0000 1.32 --- setup.cpp 16 Nov 2009 08:43:44 -0000 1.33 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.33 2009/11/16 08:43:44 vfrolov + * Fixed endless loop if no ports logged in ComDB + * * Revision 1.32 2009/09/18 11:21:31 vfrolov * Added --wait option *************** *** 1063,1067 **** if (GetLastError() == ERROR_FILE_NOT_FOUND) ! continue; if (ShowLastError(MB_OKCANCEL, --- 1066,1070 ---- if (GetLastError() == ERROR_FILE_NOT_FOUND) ! break; if (ShowLastError(MB_OKCANCEL, |
|
From: Vyacheslav F. <vf...@us...> - 2009-11-09 11:20:26
|
Update of /cvsroot/com0com/com0com/sys In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31513 Modified Files: ioctl.c Log Message: Added missing Information field setting (thanks Van Rillaer Filip) Index: ioctl.c =================================================================== RCS file: /cvsroot/com0com/com0com/sys/ioctl.c,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** ioctl.c 20 May 2009 13:45:35 -0000 1.42 --- ioctl.c 9 Nov 2009 11:20:17 -0000 1.43 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.43 2009/11/09 11:20:17 vfrolov + * Added missing Information field setting (thanks Van Rillaer Filip) + * * Revision 1.42 2009/05/20 13:45:35 vfrolov * Added tracing the resulting event mask on nonpending successful *************** *** 314,317 **** --- 317,321 ---- if (code == IOCTL_SERIAL_GET_DTRRTS) { modemControl &= SERIAL_DTR_STATE | SERIAL_RTS_STATE; + pIrp->IoStatus.Information = sizeof(ULONG); } else { ULONG InputBufferLength; |
|
From: Vyacheslav F. <vf...@us...> - 2009-11-09 11:16:56
|
Update of /cvsroot/com0com/com0com/setup In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30752 Modified Files: msg.cpp Log Message: Added restoring last error Index: msg.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setup/msg.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** msg.cpp 16 Feb 2009 10:32:56 -0000 1.7 --- msg.cpp 9 Nov 2009 11:16:43 -0000 1.8 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.8 2009/11/09 11:16:43 vfrolov + * Added restoring last error + * * Revision 1.7 2009/02/16 10:32:56 vfrolov * Added Silent() and PromptReboot() *************** *** 220,224 **** --- 223,231 ---- va_end(va); + DWORD err = GetLastError(); + pTrace(buf); + + SetLastError(err); } /////////////////////////////////////////////////////////////// *************** *** 234,238 **** --- 241,249 ---- va_end(va); + DWORD err = GetLastError(); + pConsole(pReadBuf, lenReadBuf, buf); + + SetLastError(err); } /////////////////////////////////////////////////////////////// *************** *** 248,252 **** --- 259,267 ---- va_end(va); + DWORD err = GetLastError(); + pConsole(NULL, 0, buf); + + SetLastError(err); } /////////////////////////////////////////////////////////////// |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-21 08:54:18
|
Update of /cvsroot/com0com/com0com/setup In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30861 Modified Files: devutils.cpp Log Message: Added DI_NEEDRESTART check Index: devutils.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setup/devutils.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** devutils.cpp 16 Feb 2009 10:36:16 -0000 1.11 --- devutils.cpp 21 Sep 2009 08:54:05 -0000 1.12 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.12 2009/09/21 08:54:05 vfrolov + * Added DI_NEEDRESTART check + * * Revision 1.11 2009/02/16 10:36:16 vfrolov * Done --silent option more silent *************** *** 247,251 **** ULONG problem = 0; ! *pRebootRequired = CM_Get_DevNode_Status(&status, &problem, pDevInfoData->DevInst, 0) == CR_SUCCESS && (status & DN_NEED_RESTART) != 0; --- 250,254 ---- ULONG problem = 0; ! *pRebootRequired = CM_Get_DevNode_Status(&status, &problem, pDevInfoData->DevInst, 0) == CR_SUCCESS && (status & DN_NEED_RESTART) != 0; *************** *** 267,271 **** } ! *pRebootRequired = (installParams.Flags & DI_NEEDREBOOT) ? TRUE : FALSE; //if (*pRebootRequired) --- 270,274 ---- } ! *pRebootRequired = (installParams.Flags & (DI_NEEDREBOOT|DI_NEEDRESTART)) ? TRUE : FALSE; //if (*pRebootRequired) |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-21 08:50:06
|
Update of /cvsroot/com0com/com0com/sys In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30079 Modified Files: startirp.c Log Message: Added missing removing from queue (Thanks Kirill Bagrinovsky) Index: startirp.c =================================================================== RCS file: /cvsroot/com0com/com0com/sys/startirp.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** startirp.c 20 Jun 2007 10:37:47 -0000 1.18 --- startirp.c 21 Sep 2009 08:49:56 -0000 1.19 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2004-2007 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2004-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,27 ---- * * $Log$ + * Revision 1.19 2009/09/21 08:49:56 vfrolov + * Added missing removing from queue + * (Thanks Kirill Bagrinovsky) + * * Revision 1.18 2007/06/20 10:37:47 vfrolov * Fixed double decrementing of amountInWriteQueue on CANCEL *************** *** 426,429 **** --- 430,435 ---- { if (pIrpStack->MajorFunction == IRP_MJ_FLUSH_BUFFERS) { + RemoveEntryList(&pIrp->Tail.Overlay.ListEntry); + pState->flags &= ~C0C_IRP_FLAG_IN_QUEUE; status = NoPending(pIrp, STATUS_SUCCESS); } else { |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-21 08:41:46
|
Update of /cvsroot/com0com/com0com/sys In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28919 Modified Files: fileinfo.c Log Message: Added missing Information = 0 (Thanks Kirill Bagrinovsky) Index: fileinfo.c =================================================================== RCS file: /cvsroot/com0com/com0com/sys/fileinfo.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fileinfo.c 9 Nov 2007 15:51:18 -0000 1.3 --- fileinfo.c 21 Sep 2009 08:41:33 -0000 1.4 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2005-2007 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2005-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,27 ---- * * $Log$ + * Revision 1.4 2009/09/21 08:41:33 vfrolov + * Added missing Information = 0 + * (Thanks Kirill Bagrinovsky) + * * Revision 1.3 2007/11/09 15:51:18 vfrolov * Added OutputBufferLength check *************** *** 42,47 **** NTSTATUS status; if ((pIoPortLocal->handFlow.ControlHandShake & SERIAL_ERROR_ABORT) && pIoPortLocal->errors) { - pIrp->IoStatus.Information = 0; status = STATUS_CANCELLED; } else { --- 46,52 ---- NTSTATUS status; + pIrp->IoStatus.Information = 0; + if ((pIoPortLocal->handFlow.ControlHandShake & SERIAL_ERROR_ABORT) && pIoPortLocal->errors) { status = STATUS_CANCELLED; } else { *************** *** 70,74 **** break; default: - pIrp->IoStatus.Information = 0; status = STATUS_INVALID_PARAMETER; } --- 75,78 ---- |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-21 08:26:24
|
Update of /cvsroot/com0com/com0com/sys In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv27125 Modified Files: strutils.c Log Message: Fixed checking for overflow Index: strutils.c =================================================================== RCS file: /cvsroot/com0com/com0com/sys/strutils.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** strutils.c 11 Jan 2007 14:50:29 -0000 1.4 --- strutils.c 21 Sep 2009 08:26:12 -0000 1.5 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2004-2007 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2004-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.5 2009/09/21 08:26:12 vfrolov + * Fixed checking for overflow + * * Revision 1.4 2007/01/11 14:50:29 vfrolov * Pool functions replaced by *************** *** 112,116 **** } - VOID StrAppendStr( PNTSTATUS pStatus, --- 115,118 ---- *************** *** 121,124 **** --- 123,127 ---- UNICODE_STRING old; NTSTATUS status; + SIZE_T newLength; status = *pStatus; *************** *** 131,138 **** RtlZeroMemory(pDest, sizeof(*pDest)); ! pDest->MaximumLength = (USHORT)(old.Length + lenSrc); ! if (pDest->MaximumLength == (old.Length + lenSrc)) pDest->Buffer = C0C_ALLOCATE_POOL(PagedPool, pDest->MaximumLength + sizeof(WCHAR)); if (pDest->Buffer) { --- 134,143 ---- RtlZeroMemory(pDest, sizeof(*pDest)); ! newLength = (SIZE_T)old.Length + (SIZE_T)lenSrc; ! if ((USHORT)newLength == newLength) { /* checking for overflow */ ! pDest->MaximumLength = (USHORT)newLength; pDest->Buffer = C0C_ALLOCATE_POOL(PagedPool, pDest->MaximumLength + sizeof(WCHAR)); + } if (pDest->Buffer) { |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-18 11:21:47
|
Update of /cvsroot/com0com/com0com/setup In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21172 Modified Files: setup.cpp Log Message: Added --wait option Index: setup.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** setup.cpp 18 Sep 2009 07:48:11 -0000 1.31 --- setup.cpp 18 Sep 2009 11:21:31 -0000 1.32 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.32 2009/09/18 11:21:31 vfrolov + * Added --wait option + * * Revision 1.31 2009/09/18 07:48:11 vfrolov * Added missing argv[0] shift *************** *** 144,147 **** --- 147,151 ---- /////////////////////////////////////////////////////////////// + static int timeout = 0; static BOOL detailPrms = FALSE; static BOOL no_update = FALSE; *************** *** 258,261 **** --- 262,303 ---- } /////////////////////////////////////////////////////////////// + static int SleepTillPortNotFound( + const char *pPortName, + int timeLimit) + { + DWORD startTime = GetTickCount(); + char path[40]; + + SNPRINTF(path, sizeof(path)/sizeof(path[0]), "\\\\.\\%s", pPortName); + + Trace("Wating %s ", path); + + for (;;) { + HANDLE handle = CreateFile(path, GENERIC_READ|GENERIC_WRITE, 0, NULL, + OPEN_EXISTING, 0, NULL); + + if (handle == INVALID_HANDLE_VALUE) { + if (GetLastError() != ERROR_FILE_NOT_FOUND) + break; + } else { + CloseHandle(handle); + break; + } + + Trace("."); + + if (GetTickCount() - startTime >= DWORD(timeLimit * 1000)) { + Trace(" timeout\n"); + return -1; + } + + Sleep(1000); + } + + Trace(" OK\n"); + + return int((GetTickCount() - startTime) / 1000); + } + /////////////////////////////////////////////////////////////// static VOID CleanDevPropertiesStack(InfFile &infFile, Stack &stack, BOOL enable, BOOL *pRebootRequired) { *************** *** 712,715 **** --- 754,771 ---- ComDbSync(infFile); + if (!no_update && timeout > 0) { + for (int j = 0, timeLimit = timeout ; j < 2 ; j++) { + int timeElapsed = SleepTillPortNotFound(portName[j], timeLimit); + + if (timeElapsed < 0) + break; + + timeLimit -= timeElapsed; + + if (timeLimit < 0) + timeLimit = 0; + } + } + return 0; *************** *** 1112,1115 **** --- 1168,1173 ---- "Options:\n" " --output <file> - file for output, default is console\n" + " --wait <to> - wait <to> seconds for install completion\n" + " (by default <to> is 0 - no wait)\n" " --detail-prms - show detailed parameters\n" " --silent - suppress dialogs if possible\n" *************** *** 1217,1220 **** --- 1275,1289 ---- } else + if (!strcmp(argv[1], "--wait") && argc > 2) { + int num; + + if (StrToInt(argv[2], &num) && num >= 0) + timeout = num; + + argv[2] = argv[0]; + argv += 2; + argc -= 2; + } + else if (!strcmp(argv[1], "--detail-prms")) { detailPrms = TRUE; |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-18 07:48:22
|
Update of /cvsroot/com0com/com0com/setup In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29694 Modified Files: setup.cpp Log Message: Added missing argv[0] shift Index: setup.cpp =================================================================== RCS file: /cvsroot/com0com/com0com/setup/setup.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** setup.cpp 16 Feb 2009 10:32:56 -0000 1.30 --- setup.cpp 18 Sep 2009 07:48:11 -0000 1.31 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.31 2009/09/18 07:48:11 vfrolov + * Added missing argv[0] shift + * * Revision 1.30 2009/02/16 10:32:56 vfrolov * Added Silent() and PromptReboot() *************** *** 1216,1219 **** --- 1219,1223 ---- if (!strcmp(argv[1], "--detail-prms")) { detailPrms = TRUE; + argv[1] = argv[0]; argv++; argc--; *************** *** 1222,1225 **** --- 1226,1230 ---- if (!strcmp(argv[1], "--silent")) { Silent(TRUE); + argv[1] = argv[0]; argv++; argc--; *************** *** 1228,1231 **** --- 1233,1237 ---- if (!strcmp(argv[1], "--no-update")) { no_update = TRUE; + argv[1] = argv[0]; argv++; argc--; |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-14 11:22:57
|
Update of /cvsroot/com0com/hub4com/plugins/telnet In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14971 Modified Files: filter.cpp Log Message: Added discarding owned tick (for optimization) Index: filter.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/telnet/filter.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** filter.cpp 6 Mar 2009 07:56:28 -0000 1.19 --- filter.cpp 14 Sep 2009 11:22:46 -0000 1.20 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.20 2009/09/14 11:22:46 vfrolov + * Added discarding owned tick (for optimization) + * * Revision 1.19 2009/03/06 07:56:28 vfrolov * Fixed assertion with non ascii chars *************** *** 690,693 **** --- 693,700 ---- } + // discard owned tick + if (!pMsgReplaceNone(pInMsg, HUB_MSG_TYPE_EMPTY)) + return FALSE; + break; } |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-14 09:08:58
|
Update of /cvsroot/com0com/hub4com/plugins/tcp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31245 Modified Files: comport.cpp import.h port.cpp Log Message: Added discarding owned tick (for optimization) Index: comport.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/comport.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** comport.cpp 11 Aug 2009 06:12:45 -0000 1.18 --- comport.cpp 14 Sep 2009 09:08:48 -0000 1.19 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.19 2009/09/14 09:08:48 vfrolov + * Added discarding owned tick (for optimization) + * * Revision 1.18 2009/08/11 06:12:45 vfrolov * Added missing initialization of isValid *************** *** 360,363 **** --- 363,370 ---- } + // discard owned tick + if (!pMsgReplaceNone(pInMsg, HUB_MSG_TYPE_EMPTY)) + return FALSE; + break; } Index: import.h =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/import.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** import.h 23 Jan 2009 16:55:05 -0000 1.6 --- import.h 14 Sep 2009 09:08:48 -0000 1.7 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.7 2009/09/14 09:08:48 vfrolov + * Added discarding owned tick (for optimization) + * * Revision 1.6 2009/01/23 16:55:05 vfrolov * Utilized timer routines *************** *** 44,47 **** --- 47,51 ---- /////////////////////////////////////////////////////////////// + extern ROUTINE_MSG_REPLACE_NONE *pMsgReplaceNone; extern ROUTINE_BUF_ALLOC *pBufAlloc; extern ROUTINE_BUF_FREE *pBufFree; Index: port.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/port.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** port.cpp 4 Aug 2009 11:36:49 -0000 1.14 --- port.cpp 14 Sep 2009 09:08:48 -0000 1.15 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.15 2009/09/14 09:08:48 vfrolov + * Added discarding owned tick (for optimization) + * * Revision 1.14 2009/08/04 11:36:49 vfrolov * Implemented priority and reject modifiers for <listen port> *************** *** 361,364 **** --- 364,368 ---- }; /////////////////////////////////////////////////////////////// + ROUTINE_MSG_REPLACE_NONE *pMsgReplaceNone; ROUTINE_BUF_ALLOC *pBufAlloc; ROUTINE_BUF_FREE *pBufFree; *************** *** 372,376 **** const HUB_ROUTINES_A * pHubRoutines) { ! if (!ROUTINE_IS_VALID(pHubRoutines, pBufAlloc) || !ROUTINE_IS_VALID(pHubRoutines, pBufFree) || !ROUTINE_IS_VALID(pHubRoutines, pBufAppend) || --- 376,381 ---- const HUB_ROUTINES_A * pHubRoutines) { ! if (!ROUTINE_IS_VALID(pHubRoutines, pMsgReplaceNone) || ! !ROUTINE_IS_VALID(pHubRoutines, pBufAlloc) || !ROUTINE_IS_VALID(pHubRoutines, pBufFree) || !ROUTINE_IS_VALID(pHubRoutines, pBufAppend) || *************** *** 382,385 **** --- 387,391 ---- } + pMsgReplaceNone = pHubRoutines->pMsgReplaceNone; pBufAlloc = pHubRoutines->pBufAlloc; pBufFree = pHubRoutines->pBufFree; |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-14 09:05:43
|
Update of /cvsroot/com0com/hub4com/plugins/tcp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv30964 Modified Files: comio.cpp Log Message: Fixed data loss on disconnect. Index: comio.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/comio.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** comio.cpp 4 Aug 2009 11:36:49 -0000 1.9 --- comio.cpp 14 Sep 2009 09:05:28 -0000 1.10 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.10 2009/09/14 09:05:28 vfrolov + * Fixed data loss on disconnect. + * * Revision 1.9 2009/08/04 11:36:49 vfrolov * Implemented priority and reject modifiers for <listen port> *************** *** 255,259 **** void Disconnect(const char *pName, SOCKET hSock) { ! if (shutdown(hSock, SD_BOTH) != 0) TraceError(GetLastError(), "Disconnect(%x): shutdown() %s", hSock, pName); else --- 258,262 ---- void Disconnect(const char *pName, SOCKET hSock) { ! if (shutdown(hSock, SD_SEND) != 0) TraceError(GetLastError(), "Disconnect(%x): shutdown() %s", hSock, pName); else |
|
From: Vyacheslav F. <vf...@us...> - 2009-09-14 08:52:39
|
Update of /cvsroot/com0com/hub4com/plugins/serial In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29390 Modified Files: comio.cpp Log Message: Suppressed "IOCTL_SERIAL_GET_MODEM_CONTROL ERROR Unknown error (87)" Index: comio.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/serial/comio.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** comio.cpp 18 Dec 2008 16:50:52 -0000 1.15 --- comio.cpp 14 Sep 2009 08:52:27 -0000 1.16 *************** *** 2,6 **** * $Id$ * ! * Copyright (c) 2006-2008 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify --- 2,6 ---- * $Id$ * ! * Copyright (c) 2006-2009 Vyacheslav Frolov * * This program is free software; you can redistribute it and/or modify *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.16 2009/09/14 08:52:27 vfrolov + * Suppressed "IOCTL_SERIAL_GET_MODEM_CONTROL ERROR Unknown error (87)" + * * Revision 1.15 2008/12/18 16:50:52 vfrolov * Extended the number of possible IN options *************** *** 204,208 **** NULL)) { ! TraceError(GetLastError(), "IOCTL_SERIAL_GET_MODEM_CONTROL"); return FALSE; } --- 207,215 ---- NULL)) { ! DWORD err = GetLastError(); ! ! if (err != ERROR_INVALID_PARAMETER) // some drivers expect sizeof(outBuf)==sizeof(ULONG) ! TraceError(err, "IOCTL_SERIAL_GET_MODEM_CONTROL"); ! return FALSE; } |
|
From: Vyacheslav F. <vf...@us...> - 2009-08-11 06:12:59
|
Update of /cvsroot/com0com/hub4com/plugins/tcp In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29229 Modified Files: comport.cpp Log Message: Added missing initialization of isValid Index: comport.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/plugins/tcp/comport.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** comport.cpp 4 Aug 2009 11:36:49 -0000 1.17 --- comport.cpp 11 Aug 2009 06:12:45 -0000 1.18 *************** *** 20,23 **** --- 20,26 ---- * * $Log$ + * Revision 1.18 2009/08/11 06:12:45 vfrolov + * Added missing initialization of isValid + * * Revision 1.17 2009/08/04 11:36:49 vfrolov * Implemented priority and reject modifiers for <listen port> *************** *** 176,179 **** --- 179,183 ---- priority(0), hSock(INVALID_SOCKET), + isValid(TRUE), isConnected(FALSE), isDisconnected(FALSE), *************** *** 217,223 **** string portName = path.substr(iDelim + 1); ! isValid = ! SetAddr(snLocal, comParams.GetIF(), NULL) && ! SetAddr(snRemote, addrName.c_str(), portName.c_str()); if (comParams.GetReconnectTime() == comParams.rtDefault) { --- 221,230 ---- string portName = path.substr(iDelim + 1); ! if (!SetAddr(snLocal, comParams.GetIF(), NULL) || ! !SetAddr(snRemote, addrName.c_str(), portName.c_str())) ! { ! isValid = FALSE; ! return; ! } if (comParams.GetReconnectTime() == comParams.rtDefault) { *************** *** 247,277 **** isValid = FALSE; ! if (!isValid) cerr << "ERROR: Invalid priority in " << pPath << endl; } ! if (isValid) ! isValid = SetAddr(snLocal, comParams.GetIF(), path.c_str()); ! if (isValid) { ! for (vector<Listener *>::iterator i = listeners.begin() ; i != listeners.end() ; i++) { ! if ((*i)->IsEqual(snLocal)) { ! pListener = *i; ! break; ! } } ! if (!pListener) { ! pListener = new Listener(snLocal); ! if (pListener) ! listeners.push_back(pListener); } ! if (pListener) ! pListener->Push(this); ! else ! isValid = FALSE; } } --- 254,287 ---- isValid = FALSE; ! if (!isValid) { cerr << "ERROR: Invalid priority in " << pPath << endl; + return; + } } ! if (!SetAddr(snLocal, comParams.GetIF(), path.c_str())) { ! isValid = FALSE; ! return; ! } ! for (vector<Listener *>::iterator i = listeners.begin() ; i != listeners.end() ; i++) { ! if ((*i)->IsEqual(snLocal)) { ! pListener = *i; ! break; } + } ! if (!pListener) { ! pListener = new Listener(snLocal); ! if (!pListener) { ! cerr << "No enough memory." << endl; ! exit(2); } ! listeners.push_back(pListener); } + + pListener->Push(this); } *************** *** 279,286 **** WriteOverlapped *pOverlapped = new WriteOverlapped(*this); ! if (pOverlapped) ! writeOverlappedBuf.push(pOverlapped); ! else ! isValid = FALSE; } } --- 289,298 ---- WriteOverlapped *pOverlapped = new WriteOverlapped(*this); ! if (!pOverlapped) { ! cerr << "No enough memory." << endl; ! exit(2); ! } ! ! writeOverlappedBuf.push(pOverlapped); } } |
![http://images.sourceforge.net/images/project-support.jpg"](http://images.sourceforge.net/images/project-support.jpg"){kind=link}
![http://www.softpedia.com/base_img/softpedia_free_award_f.gif"](http://www.softpedia.com/base_img/softpedia_free_award_f.gif"){kind=link}