# HG changeset patch
# User Chad Peckham <chad.peckham@nokia.com>
# Date 1276727261 18000
# Node ID c7f22cc57d44e94bf2a50b4682d472e6ae715c4d
# Parent  fb0e02cb252b651d9c3f3c3243b6498859686ec3
Commit some changes from Ed, also for USB, return different error for h/w comm error as opposed to where there is no error reported by windows, but the bytes did not get sent to the device (not responding)

diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/InputStream.h
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/InputStream.h	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/InputStream.h	Wed Jun 16 17:27:41 2010 -0500
@@ -103,7 +103,7 @@
 	void SetClientId(long id);
 	BOOL Open(DWORD dwSize, CHAR *filePath);
 	BOOL Init();
-	Close();
+	void Close();
 
 	long m_ClientID;
 	HANDLE m_hFile; // handle from CreateFile
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCConstants.h
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCConstants.h	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCConstants.h	Wed Jun 16 17:27:41 2010 -0500
@@ -19,23 +19,29 @@
 
 #include <stdio.h>
 
+#ifdef _MSC_VER
+#define LL(x) x##i64
+#else
+#define LL(x) x##LL
+#endif
+
 // com.nokia.tcf.api.ITCConnection.java
-#define DEFAULT_COMM_ERROR_RETRY_INTERVAL 1i64
-#define DEFAULT_COMM_ERROR_RETRY_TIMEOUT 300i64
+#define DEFAULT_COMM_ERROR_RETRY_INTERVAL LL(1)
+#define DEFAULT_COMM_ERROR_RETRY_TIMEOUT LL(300)
 
 // com.nokia.tcf.api.ITCMessageOptions.java
 
-#define DESTINATION_INPUTSTREAM 0i64
-#define DESTINATION_CLIENTFILE 1i64
-#define DEFAULT_DESTINATION 0i64
-#define DEFAULT_INPUTSTREAM_OVERFLOW 1i64
-#define UNWRAP_LEAVE_HEADERS 0i64
-#define UNWRAP_DELETE_HEADERS 1i64
-#define DEFAULT_UNWRAP_OPTION 0i64
-#define ENCODE_NO_FORMAT 0i64
-#define ENCODE_FORMAT 1i64
-#define ENCODE_TRK_FORMAT 2i64
-#define DEFAULT_ENCODE_FORMAT 0i64
+#define DESTINATION_INPUTSTREAM LL(0)
+#define DESTINATION_CLIENTFILE LL(1)
+#define DEFAULT_DESTINATION LL(0)
+#define DEFAULT_INPUTSTREAM_OVERFLOW LL(1)
+#define UNWRAP_LEAVE_HEADERS LL(0)
+#define UNWRAP_DELETE_HEADERS LL(1)
+#define DEFAULT_UNWRAP_OPTION LL(0)
+#define ENCODE_NO_FORMAT LL(0)
+#define ENCODE_FORMAT LL(1)
+#define ENCODE_TRK_FORMAT LL(2)
+#define DEFAULT_ENCODE_FORMAT LL(0)
 #define DEFAULT_OST_VERSION 1L
 
 #endif //__TCCONSTANTS_H__
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCErrorConstants.h
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCErrorConstants.h	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/TCErrorConstants.h	Wed Jun 16 17:27:41 2010 -0500
@@ -44,7 +44,7 @@
 	#define TCAPI_ERR_MEDIA_IS_BUSY						20	// used for Trace bpx when someone else is connected
 	#define TCAPI_ERR_PROTOCOL_NOT_SUPPORTED_BY_MEDIA	21	// TraceBox does not support protocol
 	#define TCAPI_ERR_FEATURE_NOT_IMPLEMENTED			22	// API feature not implemented yet
-	#define TCAPI_ERR_COMM_ERROR						23	// error while polling/reading COMM port
+	#define TCAPI_ERR_COMM_ERROR						23	// error while writing/polling/reading COMM port (h/w)
 	#define TCAPI_ERR_COMM_TIMEOUT						24	// comm error retry timeout
 	#define TCAPI_ERR_COMM_MULTIPLE_OPEN				25	// there are multiple connections open - cannot attach
 	#define TCAPI_ERR_NO_COMM_OPEN						26	// there are no connections open - cannot attach
@@ -82,5 +82,6 @@
 	#define TCAPI_INFO_TRACEBOX_MEMORY_IS_NORMAL		58	// TRACEBOX buffer overflowed and is now closed
 	#define TCAPI_ERR_TRACEBOX_DATA_CORRUPTED			59	// TRACEBOX received corrupted trace data from phone
 	#define TCAPI_ERR_TRACEBOX_PROTOCOL_MEMORY_OVERFLOW	60	// TRACEBOX protocol processing buffer overflowed - fatal
+	#define TCAPI_ERR_COMM_ERROR_DEVICE_NOT_READING		61	// target device not reading output from TCF (USB)
 
 #endif //__TCERRORCONSTANTS_H__
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/mutex.h
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/mutex.h	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/mutex.h	Wed Jun 16 17:27:41 2010 -0500
@@ -38,4 +38,4 @@
 	DWORD m_waitTimeout;
 	BOOL m_mutexOpen;
 };
-#endif __MUTEX_H__
+#endif //__MUTEX_H__
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/shareddata.h
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/shareddata.h	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Headers/shareddata.h	Wed Jun 16 17:27:41 2010 -0500
@@ -25,7 +25,7 @@
 
 	BOOL Open(DWORD dwSize, CHAR *sharedName);
 	BOOL Open(HANDLE hFile, DWORD dwSize, CHAR *sharedName);
-	Close();
+	void Close();
 	virtual BOOL Init();
 	LPVOID GetDataPtr();
 	BOOL IsCreator();
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/Common/Source/InputStream.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/InputStream.cpp	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/InputStream.cpp	Wed Jun 16 17:27:41 2010 -0500
@@ -982,7 +982,7 @@
 	return fOk;
 }
 
-CInputStreamFile::Close()
+void CInputStreamFile::Close()
 {
 	// close all mapping handles
 	CSharedData::Close();
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/Common/Source/shareddata.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/shareddata.cpp	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/Common/Source/shareddata.cpp	Wed Jun 16 17:27:41 2010 -0500
@@ -107,7 +107,7 @@
 	}
 	return fOK;
 }
-CSharedData::Close()
+void CSharedData::Close()
 {
 	BOOL fIgnore = FALSE;
 
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.cpp	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.cpp	Wed Jun 16 17:27:41 2010 -0500
@@ -23,6 +23,9 @@
 #include "TCErrorConstants.h"
 #include "resource.h"
 #include <stdio.h>
+#ifdef _PSAPI_PRESENT
+	#include <psapi.h>
+#endif
 
 #ifdef _DEBUG
 extern BOOL gDoLogging;
@@ -201,6 +204,99 @@
 		m_DebugLog = NULL;
 	}
 }
+
+#ifdef _PSAPI_PRESENT
+void
+CClientManager::FindOrCreateRunningServer()
+{
+	TCDEBUGOPEN();
+	TCDEBUGLOGS("CClientManager::FindOrCreateRunningServer: searching for existing TCFServer.exe\n");
+
+	// Directory where TCFServer.exe lives
+	char exeDirectory[MAX_DLLPATHNAME] = {0};
+
+	BOOL foundRunningServer = FALSE;
+
+	// Get the list of process identifiers.
+
+	DWORD aProcesses[1024], cbNeeded, cProcesses;
+	unsigned int i;
+
+	if ( EnumProcesses( aProcesses, sizeof(aProcesses), &cbNeeded ) )
+	{
+		// Calculate how many process identifiers were returned.
+
+		cProcesses = cbNeeded / sizeof(DWORD);
+
+		// Find existing TCFServer
+		for ( i = 0; i < cProcesses; i++ )
+		{
+			if( aProcesses[i] != 0 )
+			{
+				TCHAR szProcessName[MAX_PATH] = TEXT("<unknown>");
+
+				// Get a handle to the process.
+				HANDLE hProcess = OpenProcess( PROCESS_QUERY_INFORMATION |
+											   PROCESS_VM_READ,
+											   FALSE, aProcesses[i] );
+
+				// Get the process name.
+				if (NULL != hProcess )
+				{
+					HMODULE hMod;
+					DWORD cbNeeded;
+
+					if ( EnumProcessModules( hProcess, &hMod, sizeof(hMod),
+						 &cbNeeded) )
+					{
+						if (GetModuleBaseNameA( hProcess, hMod, szProcessName,
+										   sizeof(szProcessName)/sizeof(char) ))
+						{
+							if (strcmp(SERVER_PROCESS_NAME, szProcessName) == 0)
+							{
+								// get the full path
+								GetModuleFileNameExA(hProcess, hMod, exeDirectory,
+											sizeof(exeDirectory)/sizeof(char) );
+
+								TCDEBUGLOGA1("Found TCFServer at %s\n", exeDirectory);
+								CloseHandle( hProcess );
+								foundRunningServer = TRUE;
+								break;
+							}
+						}
+					}
+				}
+
+				CloseHandle( hProcess );
+			}
+		}
+	}
+
+	if (!foundRunningServer)
+	{
+		// start the one next to the DLL
+		strncpy(exeDirectory, m_DllLocation, strlen(m_DllLocation) + 1);
+		size_t len = strlen(exeDirectory);
+		// remove file
+		for (int i = len-1; i > 0; i--)
+		{
+			if (exeDirectory[i] == PATH_DELIMITER)
+				break;
+		}
+		exeDirectory[i] = NULL;
+	}
+
+	m_ServerExeFile = new char[MAX_DLLPATHNAME];
+	sprintf(m_ServerExeFile, "\"%s%c%s\"", exeDirectory, PATH_DELIMITER, SERVER_PROCESS_NAME);
+
+	m_ServerLockFile = new char[MAX_DLLPATHNAME];
+	sprintf(m_ServerLockFile, "%s%c%s", exeDirectory, PATH_DELIMITER, SERVER_LOCKFILE_NAME);
+
+	TCDEBUGCLOSE();
+
+}
+#endif
+
 CErrorMonitor*
 CClientManager::FindErrorMonitor(long inClientId)
 {
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.h
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.h	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/ClientManager.h	Wed Jun 16 17:27:41 2010 -0500
@@ -59,6 +59,9 @@
 	virtual ~CClientManager();
 
 	// starting/stopping server
+#ifdef _PSAPI_PRESENT
+	void FindOrCreateRunningServer();
+#endif
 	BOOL StartServer(pServerProcessData pData);
 	BOOL StopServer(pServerProcessData pData);
 	long StartServer();
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.plg
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.plg	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFClient/TCFClient.plg	Wed Jun 16 17:27:41 2010 -0500
@@ -3,13 +3,13 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: TCFClient - Win32 Release--------------------
+--------------------Configuration: TCFClient - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating command line "rc.exe /l 0x409 /fo"Release/resource.res" /d "NDEBUG" "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\resource.rc"" 
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP91E.tmp" with contents
+Creating command line "rc.exe /l 0x409 /fo"Debug/resource.res" /d "_DEBUG" "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\resource.rc"" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7C.tmp" with contents
 [
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /Fp"Release/TCFClient.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /FR"Debug/" /Fp"Debug/TCFClient.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\ClientManager.cpp"
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ErrorMonitorData.cpp"
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\InputStream.cpp"
@@ -21,30 +21,30 @@
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCFClient.cpp"
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCFCppApi.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP91E.tmp" 
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP91F.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7C.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7D.tmp" with contents
 [
-/nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /Fp"Release/TCFClient.pch" /Yc"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /FR"Debug/" /Fp"Debug/TCFClient.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\StdAfx.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP91F.tmp" 
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP920.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7D.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7E.tmp" with contents
 [
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib shlwapi.lib /nologo /dll /incremental:no /pdb:"Release/TCFClient.pdb" /map:"Release/TCFClient.map" /machine:I386 /out:"Release/TCFClient.dll" /implib:"Release/TCFClient.lib" 
-.\Release\ClientManager.obj
-.\Release\ErrorMonitorData.obj
-.\Release\InputStream.obj
-.\Release\mutex.obj
-.\Release\ServerClient.obj
-.\Release\shareddata.obj
-.\Release\StdAfx.obj
-.\Release\TCAPIConnectionJni.obj
-.\Release\TCDebugLog.obj
-.\Release\TCFClient.obj
-.\Release\TCFCppApi.obj
-.\Release\resource.res
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib shlwapi.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFClient.pdb" /map:"Debug/TCFClient.map" /debug /machine:I386 /out:"Debug/TCFClient.dll" /implib:"Debug/TCFClient.lib" /pdbtype:sept 
+.\Debug\ClientManager.obj
+.\Debug\ErrorMonitorData.obj
+.\Debug\InputStream.obj
+.\Debug\mutex.obj
+.\Debug\ServerClient.obj
+.\Debug\shareddata.obj
+.\Debug\StdAfx.obj
+.\Debug\TCAPIConnectionJni.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFClient.obj
+.\Debug\TCFCppApi.obj
+.\Debug\resource.res
 ]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP920.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC7E.tmp"
 <h3>Output Window</h3>
 Compiling resources...
 Compiling...
@@ -62,13 +62,30 @@
 TCFCppApi.cpp
 Generating Code...
 Linking...
-   Creating library Release/TCFClient.lib and object Release/TCFClient.exp
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP924.bat" with contents
+   Creating library Debug/TCFClient.lib and object Debug/TCFClient.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC82.tmp" with contents
+[
+/nologo /o"Debug/TCFClient.bsc" 
+.\Debug\StdAfx.sbr
+.\Debug\ClientManager.sbr
+.\Debug\ErrorMonitorData.sbr
+.\Debug\InputStream.sbr
+.\Debug\mutex.sbr
+.\Debug\ServerClient.sbr
+.\Debug\shareddata.sbr
+.\Debug\TCAPIConnectionJni.sbr
+.\Debug\TCDebugLog.sbr
+.\Debug\TCFClient.sbr
+.\Debug\TCFCppApi.sbr]
+Creating command line "bscmake.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC82.tmp"
+Creating browse info file...
+<h3>Output Window</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC83.bat" with contents
 [
 @echo off
-copybinaries Release
+copybinaries Debug
 ]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP924.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC83.bat"
 copy libs
 Copy binaries to ..\..\..\os\win32\x86
 The system cannot find the path specified.
@@ -83,6 +100,372 @@
 
 <h3>Results</h3>
 TCFClient.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFCommSerial - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC84.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"Debug/TCFCommSerial.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\TCFCommSerial.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC84.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC85.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"Debug/TCFCommSerial.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\StdAfx.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC85.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC86.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommSerial.pdb" /map:"Debug/TCFCommSerial.map" /debug /machine:I386 /out:"Debug/TCFCommSerial.dll" /implib:"Debug/TCFCommSerial.lib" /pdbtype:sept 
+.\Debug\BaseCom.obj
+.\Debug\mutex.obj
+.\Debug\RealSerialComm.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFCommSerial.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC86.tmp"
+<h3>Output Window</h3>
+Compiling...
+StdAfx.cpp
+Compiling...
+BaseCom.cpp
+mutex.cpp
+RealSerialComm.cpp
+TCDebugLog.cpp
+TCFCommSerial.cpp
+Generating Code...
+Linking...
+   Creating library Debug/TCFCommSerial.lib and object Debug/TCFCommSerial.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8A.bat" with contents
+[
+@echo off
+copyBinaries Debug
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8A.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFCommSerial.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFCommTCP - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8B.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /FR"Debug/" /Fp"Debug/TCFCommTCP.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\TCFCommTCP.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\TcpComm.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8B.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8C.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /FR"Debug/" /Fp"Debug/TCFCommTCP.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\StdAfx.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8C.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8D.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommTCP.pdb" /map:"Debug/TCFCommTCP.map" /debug /machine:I386 /out:"Debug/TCFCommTCP.dll" /implib:"Debug/TCFCommTCP.lib" /pdbtype:sept 
+.\Debug\BaseCom.obj
+.\Debug\mutex.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFCommTCP.obj
+.\Debug\TcpComm.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC8D.tmp"
+<h3>Output Window</h3>
+Compiling...
+StdAfx.cpp
+Compiling...
+BaseCom.cpp
+mutex.cpp
+TCDebugLog.cpp
+TCFCommTCP.cpp
+TcpComm.cpp
+Generating Code...
+Linking...
+   Creating library Debug/TCFCommTCP.lib and object Debug/TCFCommTCP.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC91.bat" with contents
+[
+@echo off
+copybinaries Debug
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC91.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFCommTCP.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFCommVirtualSerial - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC92.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Debug/TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\TCFCommVirtualSerial.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\VirtualSerialComm.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC92.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC93.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Debug/TCFCommVirtualSerial.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\StdAfx.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC93.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC94.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommVirtualSerial.pdb" /map:"Debug/TCFCommVirtualSerial.map" /debug /machine:I386 /out:"Debug/TCFCommVirtualSerial.dll" /implib:"Debug/TCFCommVirtualSerial.lib" /pdbtype:sept 
+.\Debug\BaseCom.obj
+.\Debug\mutex.obj
+.\Debug\RealSerialComm.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFCommVirtualSerial.obj
+.\Debug\VirtualSerialComm.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC94.tmp"
+<h3>Output Window</h3>
+Compiling...
+StdAfx.cpp
+Compiling...
+BaseCom.cpp
+mutex.cpp
+RealSerialComm.cpp
+TCDebugLog.cpp
+TCFCommVirtualSerial.cpp
+VirtualSerialComm.cpp
+Generating Code...
+Linking...
+   Creating library Debug/TCFCommVirtualSerial.lib and object Debug/TCFCommVirtualSerial.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC98.bat" with contents
+[
+@echo off
+copyBinaries Debug
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC98.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFCommVirtualSerial.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFProtOST - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC99.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"Debug/TCFProtOST.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseProtocol.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFProtOST\OSTProtocol.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFProtOST\TCFProtOST.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC99.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9A.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFPROTOST_EXPORTS" /Fp"Debug/TCFProtOST.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFProtOST\StdAfx.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9A.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9B.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFProtOST.pdb" /map:"Debug/TCFProtOST.map" /debug /machine:I386 /out:"Debug/TCFProtOST.dll" /implib:"Debug/TCFProtOST.lib" /pdbtype:sept 
+.\Debug\BaseProtocol.obj
+.\Debug\OSTProtocol.obj
+.\Debug\StdAfx.obj
+.\Debug\TCFProtOST.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9B.tmp"
+<h3>Output Window</h3>
+Compiling...
+StdAfx.cpp
+Compiling...
+BaseProtocol.cpp
+OSTProtocol.cpp
+TCFProtOST.cpp
+Generating Code...
+Linking...
+   Creating library Debug/TCFProtOST.lib and object Debug/TCFProtOST.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9F.bat" with contents
+[
+@echo off
+copyBinaries Debug
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPC9F.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFProtOST.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFServer - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating command line "rc.exe /l 0x409 /fo"Debug/resource.res" /d "_DEBUG" "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\resource.rc"" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA0.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"Debug/" /Fp"Debug/TCFServer.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Client.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\CommRegistryItem.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Connection.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\ConnectionImpl.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ErrorMonitorData.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\InputStream.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\MessageFile.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\mutex.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\ProtocolRegistryItem.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Registry.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\RegistryImpl.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ServerClient.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\ServerManager.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\shareddata.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\TCDebugLog.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\TCFServer.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA0.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA1.tmp" with contents
+[
+/nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"Debug/" /Fp"Debug/TCFServer.pch" /Yc"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\StdAfx.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA1.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA2.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /subsystem:console /incremental:yes /pdb:"Debug/TCFServer.pdb" /debug /machine:I386 /out:"Debug/TCFServer.exe" /pdbtype:sept 
+.\Debug\Client.obj
+.\Debug\CommRegistryItem.obj
+.\Debug\Connection.obj
+.\Debug\ConnectionImpl.obj
+.\Debug\ErrorMonitorData.obj
+.\Debug\InputStream.obj
+.\Debug\MessageFile.obj
+.\Debug\mutex.obj
+.\Debug\ProtocolRegistryItem.obj
+.\Debug\Registry.obj
+.\Debug\RegistryImpl.obj
+.\Debug\ServerClient.obj
+.\Debug\ServerManager.obj
+.\Debug\shareddata.obj
+.\Debug\StdAfx.obj
+.\Debug\TCDebugLog.obj
+.\Debug\TCFServer.obj
+.\Debug\resource.res
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA2.tmp"
+<h3>Output Window</h3>
+Compiling resources...
+Compiling...
+StdAfx.cpp
+Compiling...
+Client.cpp
+CommRegistryItem.cpp
+Connection.cpp
+ConnectionImpl.cpp
+ErrorMonitorData.cpp
+InputStream.cpp
+MessageFile.cpp
+mutex.cpp
+ProtocolRegistryItem.cpp
+Registry.cpp
+RegistryImpl.cpp
+ServerClient.cpp
+ServerManager.cpp
+shareddata.cpp
+TCDebugLog.cpp
+TCFServer.cpp
+Generating Code...
+Linking...
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA4.tmp" with contents
+[
+/nologo /o"Debug/TCFServer.bsc" 
+.\Debug\StdAfx.sbr
+.\Debug\Client.sbr
+.\Debug\CommRegistryItem.sbr
+.\Debug\Connection.sbr
+.\Debug\ConnectionImpl.sbr
+.\Debug\ErrorMonitorData.sbr
+.\Debug\InputStream.sbr
+.\Debug\MessageFile.sbr
+.\Debug\mutex.sbr
+.\Debug\ProtocolRegistryItem.sbr
+.\Debug\Registry.sbr
+.\Debug\RegistryImpl.sbr
+.\Debug\ServerClient.sbr
+.\Debug\ServerManager.sbr
+.\Debug\shareddata.sbr
+.\Debug\TCDebugLog.sbr
+.\Debug\TCFServer.sbr]
+Creating command line "bscmake.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA4.tmp"
+Creating browse info file...
+<h3>Output Window</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA5.bat" with contents
+[
+@echo off
+copybinaries Debug
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPCA5.bat"
+copy binary
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFServer.exe - 1 error(s), 0 warning(s)
 </pre>
 </body>
 </html>
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommSerial/RealSerialComm.cpp	Wed Jun 16 17:27:41 2010 -0500
@@ -466,7 +466,6 @@
 				if (lclErrorFlags)
 				{
 					// there really was an error
-					m_lastCommError = lclErrorFlags;
 					err = TCAPI_ERR_COMM_ERROR;
 					COMMLOGOPEN();
 					COMMLOGA1("CRealSerialComm::SendDataToPort ClearCommError succeeded lclErrorFlags=%d\n", lclErrorFlags);
@@ -476,9 +475,18 @@
 				{
 					// No OS error returned, but WriteFile failed to write out all bytes
 					//  therefore, since we are not doing overlapped I/O, this is an error.
-					err = TCAPI_ERR_COMM_ERROR;
+//					DUMPCOMSTAT(&lclComStat);
+					BOOL flush = FlushFileBuffers(m_hSerial); // flush transmit buffer
+//					ClearCommError(m_hSerial, &lclErrorFlags, &lclComStat);
+//					if (WriteFile(m_hSerial, inData, inSize, &lclNumBytes, NULL))
+//					{
+//						COMMLOGOPEN();
+//						COMMLOGA1("CRealSerialComm::SendDataToPort WriteFile#2 succeeded lclNumBytes=%d\n", lclNumBytes);
+//						COMMLOGCLOSE();
+//					}
+					err = TCAPI_ERR_COMM_ERROR_DEVICE_NOT_READING;
 					COMMLOGOPEN();
-					COMMLOGA1("CRealSerialComm::SendDataToPort ClearCommError succeeded lclErrorFlags=0 err=%d\n", m_lastCommError);
+					COMMLOGA2("CRealSerialComm::SendDataToPort ClearCommError succeeded lclErrorFlags=0 err=%d flush=%d\n", m_lastCommError, flush);
 					COMMLOGCLOSE();
 //					DUMPCOMSTAT(&lclComStat);
 				}
@@ -493,7 +501,7 @@
 			COMMLOGS("CRealSerialComm::SendDataToPort WriteFile successful\n");
 			BYTE* ptr = (BYTE*)inData;
 			long numBytes = (inSize > 80) ? 80 : inSize;
-			char msg[200];
+			char msg[300];
 			sprintf(msg, "CRealSerialComm::SendDataToPort = ");
 			for (int i = 0; i < numBytes; i++)
 			{
@@ -525,13 +533,14 @@
 	COMSTAT lclComStat;
 	DWORD lclErrorFlags=0;
 
-	if (!IsConnected())
+	if (!IsConnected() || m_hSerial == INVALID_HANDLE_VALUE)
 		return TCAPI_ERR_MEDIA_NOT_OPEN;
 
+
 //	Sleep(1);
 	if (!ClearCommError( m_hSerial, &lclErrorFlags, &lclComStat ))
 	{
-		if (!IsConnected())
+		if (!IsConnected() || m_hSerial == INVALID_HANDLE_VALUE)
 			return TCAPI_ERR_MEDIA_NOT_OPEN;
 
 		m_lastCommError = GetLastError();
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.plg
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.plg	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommVirtualSerial/TCFCommVirtualSerial.plg	Wed Jun 16 17:27:41 2010 -0500
@@ -6,13 +6,13 @@
 --------------------Configuration: TCFCommVirtualSerial - Win32 Debug--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP90F.tmp" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAE0.tmp" with contents
 [
 /nologo /Zp2 /MTd /W3 /Gm /GX /ZI /Od /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Debug/TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP90F.tmp" 
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP910.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAE0.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAE1.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /pdb:"Debug/TCFCommVirtualSerial.pdb" /map:"Debug/TCFCommVirtualSerial.map" /debug /machine:I386 /out:"Debug/TCFCommVirtualSerial.dll" /implib:"Debug/TCFCommVirtualSerial.lib" /pdbtype:sept 
 .\Debug\BaseCom.obj
@@ -23,17 +23,17 @@
 .\Debug\TCFCommVirtualSerial.obj
 .\Debug\VirtualSerialComm.obj
 ]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP910.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAE1.tmp"
 <h3>Output Window</h3>
 Compiling...
 RealSerialComm.cpp
 Linking...
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP911.bat" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAE2.bat" with contents
 [
 @echo off
 copyBinaries Debug
 ]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP911.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPAE2.bat"
 copy libs
 Copy binaries to ..\..\..\os\win32\x86
 The system cannot find the path specified.
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFNative.ncb
Binary file connectivity/com.nokia.tcf/native/TCFNative/TCFNative.ncb has changed
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFNative.opt
Binary file connectivity/com.nokia.tcf/native/TCFNative/TCFNative.opt has changed
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFServer/BaseCom.h
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/BaseCom.h	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/BaseCom.h	Wed Jun 16 17:27:41 2010 -0500
@@ -124,4 +124,4 @@
 
 #define COMMDLL_BASENAME	"TCFComm"
 
-#endif __BASECOM_H__
+#endif //__BASECOM_H__
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFServer/ConnectionImpl.cpp
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/ConnectionImpl.cpp	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/ConnectionImpl.cpp	Wed Jun 16 17:27:41 2010 -0500
@@ -407,7 +407,7 @@
 		delete[] encodedMessage;
 
 		TCDEBUGLOGS("CConnectionImpl::DoSendMessage done\n");
-		if (err == TCAPI_ERR_COMM_ERROR)
+		if (err == TCAPI_ERR_COMM_ERROR_DEVICE_NOT_READING)
 		{
 //			EnterRetryPeriod(err, true, m_BaseComm->m_lastCommError);
 			HandleFatalPortError(err, true, m_BaseComm->m_lastCommError);
@@ -783,7 +783,8 @@
 				{
 					MPLOGA2("MessageProcessor  err = %d osError = %d\n", err, pThis->m_BaseComm->m_lastCommError);
 //					pThis->EnterRetryPeriod(err, true, pThis->m_BaseComm->m_lastCommError);
-					pThis->HandleFatalPortError(err, true, pThis->m_BaseComm->m_lastCommError);
+					if (err == TCAPI_ERR_COMM_ERROR)
+						pThis->HandleFatalPortError(err, true, pThis->m_BaseComm->m_lastCommError);
 				}
 				else
 				{
@@ -804,7 +805,8 @@
 							MPLOGA2("MessageProcessor  err = %d osError = %d\n", err, pThis->m_BaseComm->m_lastCommError);
 							// for this error we have os error, but we probably caught this in PollPort already
 //							pThis->EnterRetryPeriod(err, true, pThis->m_BaseComm->m_lastCommError);
-							pThis->HandleFatalPortError(err, true, pThis->m_BaseComm->m_lastCommError);
+							if (err == TCAPI_ERR_COMM_ERROR)
+								pThis->HandleFatalPortError(err, true, pThis->m_BaseComm->m_lastCommError);
 						}
 						else if (err != TCAPI_ERR_NONE)
 						{
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.plg
--- a/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.plg	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFServer/TCFServer.plg	Wed Jun 16 17:27:41 2010 -0500
@@ -3,16 +3,257 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
+--------------------Configuration: TCFClient - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB47.tmp" with contents
+[
+/nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I ".\jdk1.5.0_10\include" /I ".\jdk1.5.0_10\include\win32" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCLIENT_EXPORTS" /Fp"Release/TCFClient.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\ClientManager.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ErrorMonitorData.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\InputStream.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ServerClient.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCAPIConnectionJni.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCFClient.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFClient\TCFCppApi.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB47.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB48.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib shlwapi.lib /nologo /dll /incremental:no /pdb:"Release/TCFClient.pdb" /map:"Release/TCFClient.map" /machine:I386 /out:"Release/TCFClient.dll" /implib:"Release/TCFClient.lib" 
+.\Release\ClientManager.obj
+.\Release\ErrorMonitorData.obj
+.\Release\InputStream.obj
+.\Release\mutex.obj
+.\Release\ServerClient.obj
+.\Release\shareddata.obj
+.\Release\StdAfx.obj
+.\Release\TCAPIConnectionJni.obj
+.\Release\TCDebugLog.obj
+.\Release\TCFClient.obj
+.\Release\TCFCppApi.obj
+.\Release\resource.res
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB48.tmp"
+<h3>Output Window</h3>
+Compiling...
+ClientManager.cpp
+ErrorMonitorData.cpp
+InputStream.cpp
+ServerClient.cpp
+TCAPIConnectionJni.cpp
+TCFClient.cpp
+TCFCppApi.cpp
+Generating Code...
+Linking...
+   Creating library Release/TCFClient.lib and object Release/TCFClient.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB4C.bat" with contents
+[
+@echo off
+copybinaries Release
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB4C.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFClient.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFCommSerial - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB4D.tmp" with contents
+[
+/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMSERIAL_EXPORTS" /Fp"Release/TCFCommSerial.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\TCFCommSerial.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB4D.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB4E.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"Release/TCFCommSerial.pdb" /map:"Release/TCFCommSerial.map" /machine:I386 /out:"Release/TCFCommSerial.dll" /implib:"Release/TCFCommSerial.lib" 
+.\Release\BaseCom.obj
+.\Release\mutex.obj
+.\Release\RealSerialComm.obj
+.\Release\StdAfx.obj
+.\Release\TCDebugLog.obj
+.\Release\TCFCommSerial.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB4E.tmp"
+<h3>Output Window</h3>
+Compiling...
+BaseCom.cpp
+RealSerialComm.cpp
+TCFCommSerial.cpp
+Generating Code...
+Linking...
+   Creating library Release/TCFCommSerial.lib and object Release/TCFCommSerial.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB52.bat" with contents
+[
+@echo off
+copyBinaries Release
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB52.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFCommSerial.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFCommTCP - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB53.tmp" with contents
+[
+/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFServer" /I "..\Common\Headers" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMTCP_EXPORTS" /Fp"Release/TCFCommTCP.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\TCFCommTCP.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommTCP\TcpComm.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB53.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB54.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /dll /incremental:no /pdb:"Release/TCFCommTCP.pdb" /map:"Release/TCFCommTCP.map" /machine:I386 /out:"Release/TCFCommTCP.dll" /implib:"Release/TCFCommTCP.lib" 
+.\Release\BaseCom.obj
+.\Release\mutex.obj
+.\Release\StdAfx.obj
+.\Release\TCDebugLog.obj
+.\Release\TCFCommTCP.obj
+.\Release\TcpComm.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB54.tmp"
+<h3>Output Window</h3>
+Compiling...
+BaseCom.cpp
+TCFCommTCP.cpp
+TcpComm.cpp
+Generating Code...
+Linking...
+   Creating library Release/TCFCommTCP.lib and object Release/TCFCommTCP.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB58.bat" with contents
+[
+@echo off
+copybinaries Release
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB58.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFCommTCP.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFCommVirtualSerial - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB59.tmp" with contents
+[
+/nologo /Zp2 /MT /W3 /GX /O2 /I "..\TCFCommSerial" /I "..\Common\Headers" /I "..\TCFServer" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "TCFCOMMVIRTUALSERIAL_EXPORTS" /Fp"Release/TCFCommVirtualSerial.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\BaseCom.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommSerial\RealSerialComm.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\TCFCommVirtualSerial.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFCommVirtualSerial\VirtualSerialComm.cpp"
+]
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB59.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB5A.tmp" with contents
+[
+kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /pdb:"Release/TCFCommVirtualSerial.pdb" /map:"Release/TCFCommVirtualSerial.map" /machine:I386 /out:"Release/TCFCommVirtualSerial.dll" /implib:"Release/TCFCommVirtualSerial.lib" 
+.\Release\BaseCom.obj
+.\Release\mutex.obj
+.\Release\RealSerialComm.obj
+.\Release\StdAfx.obj
+.\Release\TCDebugLog.obj
+.\Release\TCFCommVirtualSerial.obj
+.\Release\VirtualSerialComm.obj
+]
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB5A.tmp"
+<h3>Output Window</h3>
+Compiling...
+BaseCom.cpp
+RealSerialComm.cpp
+TCFCommVirtualSerial.cpp
+VirtualSerialComm.cpp
+Generating Code...
+Linking...
+   Creating library Release/TCFCommVirtualSerial.lib and object Release/TCFCommVirtualSerial.exp
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB5E.bat" with contents
+[
+@echo off
+copyBinaries Release
+]
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB5E.bat"
+copy libs
+Copy binaries to ..\..\..\os\win32\x86
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+The system cannot find the path specified.
+        0 file(s) copied.
+Error executing c:\winnt\system32\cmd.exe.
+
+
+
+<h3>Results</h3>
+TCFCommVirtualSerial.dll - 1 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: TCFProtOST - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+TCFProtOST.dll - 0 error(s), 0 warning(s)
+<h3>
 --------------------Configuration: TCFServer - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP918.tmp" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB5F.tmp" with contents
 [
 /nologo /Zp2 /MT /W3 /GX /O2 /I "..\Common\Headers" /I "..\Common\Source" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Fp"Release/TCFServer.pch" /Yu"stdafx.h" /Fo"Release/" /Fd"Release/" /FD /c 
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Client.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\CommRegistryItem.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Connection.cpp"
 "C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\ConnectionImpl.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ErrorMonitorData.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\InputStream.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\MessageFile.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\Registry.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\RegistryImpl.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\Common\Source\ServerClient.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\ServerManager.cpp"
+"C:\dev22clone2\carbidecpp\connectivity\com.nokia.tcf\native\TCFNative\TCFServer\TCFServer.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP918.tmp" 
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP919.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB5F.tmp" 
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB62.tmp" with contents
 [
 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib shlwapi.lib /nologo /subsystem:console /incremental:no /pdb:"Release/TCFServer.pdb" /machine:I386 /out:"Release/TCFServer.exe" 
 .\Release\Client.obj
@@ -34,17 +275,29 @@
 .\Release\TCFServer.obj
 .\Release\resource.res
 ]
-Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP919.tmp"
+Creating command line "link.exe @C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB62.tmp"
 <h3>Output Window</h3>
 Compiling...
+Client.cpp
+CommRegistryItem.cpp
+Connection.cpp
 ConnectionImpl.cpp
+ErrorMonitorData.cpp
+InputStream.cpp
+MessageFile.cpp
+Registry.cpp
+RegistryImpl.cpp
+ServerClient.cpp
+ServerManager.cpp
+TCFServer.cpp
+Generating Code...
 Linking...
-Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP91B.bat" with contents
+Creating temporary file "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB64.bat" with contents
 [
 @echo off
 copybinaries Release
 ]
-Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSP91B.bat"
+Creating command line "C:\DOCUME~1\chpeckha\LOCALS~1\Temp\RSPB64.bat"
 copy binary
 Copy binaries to ..\..\..\os\win32\x86
 The system cannot find the path specified.
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/src/com/nokia/tcf/api/TCErrorConstants.java
--- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/TCErrorConstants.java	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/TCErrorConstants.java	Wed Jun 16 17:27:41 2010 -0500
@@ -48,7 +48,7 @@
 	public static final long TCAPI_ERR_MEDIA_IS_BUSY = 20;			// used for Trace bpx when someone else is connected
 	public static final long TCAPI_ERR_PROTOCOL_NOT_SUPPORTED_BY_MEDIA = 21; // TraceBox does not support protocol
 	public static final long TCAPI_ERR_FEATURE_NOT_IMPLEMENTED = 22;	// API feature not implemented yet
-	public static final long TCAPI_ERR_COMM_ERROR = 23;				// error while polling/reading COMM port
+	public static final long TCAPI_ERR_COMM_ERROR = 23;				// error while writing/polling/reading COMM port (h/w error)
 	public static final long TCAPI_ERR_COMM_TIMEOUT = 24;			// comm error retry timeout
 	public static final long TCAPI_ERR_COMM_MULTIPLE_OPEN = 25;		// there are multiple connections open - cannot attach
 	public static final long TCAPI_ERR_NO_COMM_OPEN = 26;			// there are no connections open - cannot attach
@@ -86,6 +86,7 @@
 	public static final long TCAPI_INFO_TRACEBOX_MEMORY_IS_NORMAL = 58; // TRACEBOX buffer overflowed and is now closed
 	public static final long TCAPI_ERR_TRACEBOX_DATA_CORRUPTED = 59; // TRACEBOX received corrupted trace data from phone
 	public static final long TCAPI_ERR_TRACEBOX_PROTOCOL_MEMORY_OVERFLOW = 60; // TRACEBOX protocol processing buffer overflowed - fatal
+	public static final long TCAPI_ERR_COMM_ERROR_DEVICE_NOT_READING = 61; // target device not reading output from TCF (USB)
 	
 	
 	/**
diff -r fb0e02cb252b -r c7f22cc57d44 connectivity/com.nokia.tcf/src/com/nokia/tcf/api/messages.properties
--- a/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/messages.properties	Wed Jun 16 11:39:35 2010 -0500
+++ b/connectivity/com.nokia.tcf/src/com/nokia/tcf/api/messages.properties	Wed Jun 16 17:27:41 2010 -0500
@@ -1,61 +1,62 @@
-TCErrorConstants.1=TCFError: Error opening communication port. OS Error: %d
-TCErrorConstants.2=TCFError: This connection is already open.
-TCErrorConstants.3=TCFError: Invalid client.
-TCErrorConstants.4=TCFError: Timeout occurred on attempting to open connection.
-TCErrorConstants.5=TCFError: Message file is open. This operation is not allowed.
-TCErrorConstants.8=TCFError: Message processing is stopped. This operation is not allowed.
-TCErrorConstants.9=TCFError: Message processing is in progress. This operation is not allowed.
-TCErrorConstants.10=TCFError: Error writing to message file.
-TCErrorConstants.11=TCFError: No message IDs have been specified in ITCMessageOptions.
-TCErrorConstants.12=TCFError: Connection is not open.
-TCErrorConstants.13=TCFError: This connection is not supported.
-TCErrorConstants.14=TCFError: This is an unknown connection type.
-TCErrorConstants.15=TCFError: Connection type is supported, but is missing some settings.
-TCErrorConstants.16=TCFError: Connection type is supported, but has some invalid settings.
-TCErrorConstants.17=TCFError: The communication port could not be opened. Either it is in use by another application or it does not exist on the system.
-TCErrorConstants.18=TCFError: Could not locate the TCF Server.
-TCErrorConstants.19=TCFError: Could not create the TCF Server process.
-TCErrorConstants.20=TCFError: Connection is in use by another process.
-TCErrorConstants.21=TCFError: Protocol not supported by connection type. 
-TCErrorConstants.22=TCFError: Feature not yet supported.
-TCErrorConstants.23=TCFError: An error occurred while reading from or writing to the opened communication port. It is possible the connected device is not listening to this port.
-TCErrorConstants.24=TCFError: Timeout occurred in attempting to reconnect to communication port.
-TCErrorConstants.25=TCFError: Multiple connections are open. Attaching cannot proceed.
-TCErrorConstants.26=TCFError: No connections are open. Attaching cannot proceed.
-TCErrorConstants.27=TCFError: Client already connected.
-TCErrorConstants.28=TCFError: Invalid protocol decode format specified. Refer to ITCConnection.
-TCErrorConstants.29=TCFError: Invalid retry interval or retry timeout specified.
-TCErrorConstants.30=TCFError: Invalid input stream overflow option specified. Refer to ITCMessageOptions.
-TCErrorConstants.31=TCFError: Invalid output message encode format specified. Refer to ITCMessageOptions.
-TCErrorConstants.32=TCFError: Invalid protocol unwrapping option specified. Refer to ITCMessageOptions.
-TCErrorConstants.33=TCFError: Input stream size must be > 0.
-TCErrorConstants.34=TCFError: ITCMessageOptions missing.
-TCErrorConstants.35=TCFError: ITCConnection missing.
-TCErrorConstants.36=TCFError: ITCMessage missing.
-TCErrorConstants.37=TCFError: ITCMessage options conflict with ITCMessageOptions encoding options.
-TCErrorConstants.38=TCFError: Message IDs specified exceeded maximum (> 256)
-TCErrorConstants.39=TCFError: Error creating input stream overflow file
-TCErrorConstants.40=TCFError: Operation not allowed. Input stream is closed.
-TCErrorConstants.41=TCFError: Platform configuration location not found.
-TCErrorConstants.42=TCFError: Invalid Error Listener.
-TCErrorConstants.43=TCFError: Error occurred while accessing communication port. Retry in progress.
-TCErrorConstants.44=TCFInfo: Connection to communication port has been re-established.
-TCErrorConstants.45=TCFError: Invalid baud rate specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.46=TCFError: Invalid data bits specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.47=TCFError: Invalid parity checking specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.48=TCFError: Invalid stop bits specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.49=TCFError: Invalid flow control specified. Refer to ITCRealSerialConnection.
-TCErrorConstants.50=TCFError: TCFServer did not respond.
-TCErrorConstants.51=TCFError: Input stream buffer overflowed. Messages have been lost.
-TCErrorConstants.52=TCFInfo: Input stream buffer overflowed to file.
-TCErrorConstants.53=TCFError: Input stream file overflowed. Messages have been lost.
-TCErrorConstants.54=TCFError: Message file not specified.
-TCErrorConstants.55=TCFError: Message file could not be created.
-TCErrorConstants.56=TCFInfo: Trace box memory is close to overflowing.
-TCErrorConstants.57=TCFError: Trace box memory has overflowed and is now closed.
-TCErrorConstants.58=TCFInfo: Trace box memory was overflowed and is now available.
-TCErrorConstants.59=TCFError: Trace box received corrupted trace data from the device.
-TCErrorConstants.60=TCFError: Trace box protocol memory has overflowed. You must disconnect and reset the Trace box.
+TCErrorConstants.1=Error opening communication port. OS Error: %d
+TCErrorConstants.2=This connection is already open.
+TCErrorConstants.3=Invalid client.
+TCErrorConstants.4=Timeout occurred on attempting to open connection.
+TCErrorConstants.5=Message file is open. This operation is not allowed.
+TCErrorConstants.8=Message processing is stopped. This operation is not allowed.
+TCErrorConstants.9=Message processing is in progress. This operation is not allowed.
+TCErrorConstants.10=Error writing to message file.
+TCErrorConstants.11=No message IDs have been specified in ITCMessageOptions.
+TCErrorConstants.12=Connection is not open.
+TCErrorConstants.13=This connection is not supported.
+TCErrorConstants.14=This is an unknown connection type.
+TCErrorConstants.15=Connection type is supported, but is missing some settings.
+TCErrorConstants.16=Connection type is supported, but has some invalid settings.
+TCErrorConstants.17=The communication port could not be opened. Either it is in use by another application or it does not exist on the system.
+TCErrorConstants.18=Could not locate the TCF Server.
+TCErrorConstants.19=Could not create the TCF Server process.
+TCErrorConstants.20=Connection is in use by another process.
+TCErrorConstants.21=Protocol not supported by connection type. 
+TCErrorConstants.22=Feature not yet supported.
+TCErrorConstants.23=An error occurred while reading from or writing to the opened communication port. It is possible the connected device is not listening to this port.
+TCErrorConstants.24=Timeout occurred in attempting to reconnect to communication port.
+TCErrorConstants.25=Multiple connections are open. Attaching cannot proceed.
+TCErrorConstants.26=No connections are open. Attaching cannot proceed.
+TCErrorConstants.27=Client already connected.
+TCErrorConstants.28=Invalid protocol decode format specified. Refer to ITCConnection.
+TCErrorConstants.29=Invalid retry interval or retry timeout specified.
+TCErrorConstants.30=Invalid input stream overflow option specified. Refer to ITCMessageOptions.
+TCErrorConstants.31=Invalid output message encode format specified. Refer to ITCMessageOptions.
+TCErrorConstants.32=Invalid protocol unwrapping option specified. Refer to ITCMessageOptions.
+TCErrorConstants.33=Input stream size must be > 0.
+TCErrorConstants.34=ITCMessageOptions missing.
+TCErrorConstants.35=ITCConnection missing.
+TCErrorConstants.36=ITCMessage missing.
+TCErrorConstants.37=ITCMessage options conflict with ITCMessageOptions encoding options.
+TCErrorConstants.38=Message IDs specified exceeded maximum (> 256)
+TCErrorConstants.39=Error creating input stream overflow file
+TCErrorConstants.40=Operation not allowed. Input stream is closed.
+TCErrorConstants.41=Platform configuration location not found.
+TCErrorConstants.42=Invalid Error Listener.
+TCErrorConstants.43=Error occurred while accessing communication port. Retry in progress.
+TCErrorConstants.44=Connection to communication port has been re-established.
+TCErrorConstants.45=Invalid baud rate specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.46=Invalid data bits specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.47=Invalid parity checking specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.48=Invalid stop bits specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.49=Invalid flow control specified. Refer to ITCRealSerialConnection.
+TCErrorConstants.50=TCFServer did not respond.
+TCErrorConstants.51=Input stream buffer overflowed. Messages have been lost.
+TCErrorConstants.52=Input stream buffer overflowed to file.
+TCErrorConstants.53=Input stream file overflowed. Messages have been lost.
+TCErrorConstants.54=Message file not specified.
+TCErrorConstants.55=Message file could not be created.
+TCErrorConstants.56=Trace box memory is close to overflowing.
+TCErrorConstants.57=Trace box memory has overflowed and is now closed.
+TCErrorConstants.58=Trace box memory was overflowed and is now available.
+TCErrorConstants.59=Trace box received corrupted trace data from the device.
+TCErrorConstants.60=Trace box protocol memory has overflowed. You must disconnect and reset the Trace box.
+TCErrorConstants.61=Data was sent to the open communication port, but the device is not listening to this port.
 ITCRealSerialConnection.15=none
 ITCRealSerialConnection.16=even
 ITCRealSerialConnection.17=odd