Fixed problem with write timeout detection under CE.

3 files changed, 434 insertions, 11 deletions

diff --git a/cppe/test/Common/TestCommon.cpp b/cppe/test/Common/TestCommon.cpp
index 681e597b5fb..9355f900619 100755
--- a/cppe/test/Common/TestCommon.cpp
+++ b/cppe/test/Common/TestCommon.cpp
@@ -20,7 +20,7 @@ using namespace std;
 class LoggerI : public Ice::Logger
 {
 public:
-
+

     virtual void

     print(const string& message)
     {
@@ -29,8 +29,13 @@ public:
     
     virtual void
     trace(const string& category, const string& message)
-    {
-	string s = "[ ";
+    {

+	char buf[1024];

+	sprintf(buf, "%ld", GetTickCount());
+	string s = "[ ";

+	s += buf;

+	s += ' ';

+	
 	if(!category.empty())
 	{
 	    s += category + ": ";
@@ -70,7 +75,8 @@ class TestSuiteFailed
 {
 public:
 };
-
+

+static FILE* _tprintfp = 0;
 static HWND hEdit;
 static HWND mainWnd;
 static IceUtil::ThreadControl mainThread;
@@ -78,13 +84,20 @@ static IceUtil::ThreadControl mainThread;
 void
 tprintf(const char* fmt, ...)
 {

-
     va_list va;
     va_start(va, fmt);
     char buf[1024];
     _vsnprintf(buf, sizeof(buf)-1, fmt, va);
     buf[sizeof(buf)-1] = '\0';
-    va_end(va);
+    va_end(va);

+

+    if(_tprintfp)

+    {

+	fwrite(buf, strlen(buf), 1, _tprintfp);

+	fflush(_tprintfp);

+	return;

+    }

+
     char* start = buf;
     const char* end = start + strlen(start);
     char* curr = start;
@@ -226,8 +239,19 @@ TestApplication::main(HINSTANCE hInstance)
 		   MB_ICONEXCLAMATION | MB_OK);
 	return 0;
     }
-
-    mainWnd = CreateWindow(windowClassName, L"Test", WS_VISIBLE|WS_OVERLAPPED|WS_SYSMENU|WS_SIZEBOX,
+

+    wchar_t wName[1024] = L"Test";

+    if(_name.size() > 0)

+    {

+	int len = _name.size();

+	if(len > 1023)

+	{

+	    len = 1023;

+	}

+        mbstowcs(wName, _name.c_str(), len);

+	wName[len] = L'\0';

+    }
+    mainWnd = CreateWindow(windowClassName, wName, WS_VISIBLE|WS_OVERLAPPED|WS_SYSMENU|WS_SIZEBOX,
 			CW_USEDEFAULT, CW_USEDEFAULT, 320, 200,
 			NULL, NULL, hInstance, NULL);
     if(mainWnd == NULL)
@@ -367,12 +391,20 @@ TestApplication::main(int ac, char* av[])
     return status;
 }
 #endif
+

+TestApplication::TestApplication(const std::string& name)

+    : _name(name)

+{

+

+}

 
 void
 TestApplication::setCommunicator(const Ice::CommunicatorPtr& communicator)
 {
     _communicator = communicator;
-    _communicator->setLogger(new LoggerI);
+    _communicator->setLogger(new LoggerI);

+

+    //_tprintfp = fopen(("log-" + _name + ".txt").c_str(), "w");

 }
 
 Ice::CommunicatorPtr
diff --git a/cppe/test/Common/testCommon.vcp b/cppe/test/Common/testCommon.vcp
index cd7ebf7a79b..f7e7166bf33 100755
--- a/cppe/test/Common/testCommon.vcp
+++ b/cppe/test/Common/testCommon.vcp
@@ -792,50 +792,435 @@ SOURCE=.\TestCommon.cpp
 

 !IF  "$(CFG)" == "testCommon - Win32 (WCE MIPSII_FP) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE MIPSII_FP) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE MIPSII) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE MIPSII) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE SH4) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE SH4) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE SH3) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE SH3) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE MIPSIV) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE MIPSIV) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE emulator) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	{$(INCLUDE)}"config\_epilog.h"\

+	{$(INCLUDE)}"config\_msvc_warnings_off.h"\

+	{$(INCLUDE)}"config\_prolog.h"\

+	{$(INCLUDE)}"config\stl_apcc.h"\

+	{$(INCLUDE)}"config\stl_apple.h"\

+	{$(INCLUDE)}"config\stl_as400.h"\

+	{$(INCLUDE)}"config\stl_bc.h"\

+	{$(INCLUDE)}"config\stl_como.h"\

+	{$(INCLUDE)}"config\stl_confix.h"\

+	{$(INCLUDE)}"config\stl_cray.h"\

+	{$(INCLUDE)}"config\stl_dec.h"\

+	{$(INCLUDE)}"config\stl_dec_vms.h"\

+	{$(INCLUDE)}"config\stl_dm.h"\

+	{$(INCLUDE)}"config\stl_fujitsu.h"\

+	{$(INCLUDE)}"config\stl_gcc.h"\

+	{$(INCLUDE)}"config\stl_hpacc.h"\

+	{$(INCLUDE)}"config\stl_ibm.h"\

+	{$(INCLUDE)}"config\stl_icc.h"\

+	{$(INCLUDE)}"config\stl_intel.h"\

+	{$(INCLUDE)}"config\stl_kai.h"\

+	{$(INCLUDE)}"config\stl_msvc.h"\

+	{$(INCLUDE)}"config\stl_mwerks.h"\

+	{$(INCLUDE)}"config\stl_mycomp.h"\

+	{$(INCLUDE)}"config\stl_sco.h"\

+	{$(INCLUDE)}"config\stl_select_lib.h"\

+	{$(INCLUDE)}"config\stl_sgi.h"\

+	{$(INCLUDE)}"config\stl_solaris.h"\

+	{$(INCLUDE)}"config\stl_sunpro.h"\

+	{$(INCLUDE)}"config\stl_symantec.h"\

+	{$(INCLUDE)}"config\stl_watcom.h"\

+	{$(INCLUDE)}"config\stl_wince.h"\

+	{$(INCLUDE)}"config\stlcomp.h"\

+	{$(INCLUDE)}"config\vc_select_lib.h"\

+	{$(INCLUDE)}"pthread.h"\

+	{$(INCLUDE)}"stl\_abbrevs.h"\

+	{$(INCLUDE)}"stl\_config.h"\

+	{$(INCLUDE)}"stl\_config_compat.h"\

+	{$(INCLUDE)}"stl\_config_compat_post.h"\

+	{$(INCLUDE)}"stl\_epilog.h"\

+	{$(INCLUDE)}"stl\_prolog.h"\

+	{$(INCLUDE)}"stl\_site_config.h"\

+	{$(INCLUDE)}"stl_user_config.h"\

+	

+NODEP_CPP_TESTC=\

+	"..\..\..\..\usr\include\pthread.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE emulator) Debug"

 

 DEP_CPP_TESTC=\

+	"..\..\include\Ice\BuiltinSequences.h"\

+	"..\..\include\Ice\Communicator.h"\

+	"..\..\include\Ice\CommunicatorF.h"\

+	"..\..\include\Ice\Config.h"\

+	"..\..\include\Ice\Connection.h"\

+	"..\..\include\Ice\ConnectionF.h"\

+	"..\..\include\Ice\ConnectionIF.h"\

+	"..\..\include\Ice\Current.h"\

+	"..\..\include\Ice\EndpointF.h"\

+	"..\..\include\Ice\Exception.h"\

+	"..\..\include\Ice\FacetMap.h"\

+	"..\..\include\Ice\Functional.h"\

+	"..\..\include\Ice\Handle.h"\

+	"..\..\include\Ice\Ice.h"\

+	"..\..\include\Ice\IceEConfig.h"\

+	"..\..\include\Ice\Identity.h"\

+	"..\..\include\Ice\IdentityUtil.h"\

+	"..\..\include\Ice\Initialize.h"\

+	"..\..\include\Ice\InstanceF.h"\

+	"..\..\include\Ice\LocalException.h"\

+	"..\..\include\Ice\LocalObject.h"\

+	"..\..\include\Ice\LocalObjectF.h"\

+	"..\..\include\Ice\LocatorF.h"\

+	"..\..\include\Ice\Logger.h"\

+	"..\..\include\Ice\LoggerF.h"\

+	"..\..\include\Ice\LoggerUtil.h"\

+	"..\..\include\Ice\Object.h"\

+	"..\..\include\Ice\ObjectAdapter.h"\

+	"..\..\include\Ice\ObjectAdapterF.h"\

+	"..\..\include\Ice\ObjectF.h"\

+	"..\..\include\Ice\Properties.h"\

+	"..\..\include\Ice\PropertiesF.h"\

+	"..\..\include\Ice\Proxy.h"\

+	"..\..\include\Ice\ProxyF.h"\

+	"..\..\include\Ice\ProxyFactoryF.h"\

+	"..\..\include\Ice\ProxyHandle.h"\

+	"..\..\include\Ice\ReferenceF.h"\

+	"..\..\include\Ice\RouterF.h"\

 	"..\..\include\Ice\UserConfig.h"\

 	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Functional.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	"..\include\TestApplication.h"\

 	"..\include\TestCommon.h"\

+	{$(INCLUDE)}"config\_epilog.h"\

+	{$(INCLUDE)}"config\_msvc_warnings_off.h"\

+	{$(INCLUDE)}"config\_prolog.h"\

+	{$(INCLUDE)}"config\stl_apcc.h"\

+	{$(INCLUDE)}"config\stl_apple.h"\

+	{$(INCLUDE)}"config\stl_as400.h"\

+	{$(INCLUDE)}"config\stl_bc.h"\

+	{$(INCLUDE)}"config\stl_como.h"\

+	{$(INCLUDE)}"config\stl_confix.h"\

+	{$(INCLUDE)}"config\stl_cray.h"\

+	{$(INCLUDE)}"config\stl_dec.h"\

+	{$(INCLUDE)}"config\stl_dec_vms.h"\

+	{$(INCLUDE)}"config\stl_dm.h"\

+	{$(INCLUDE)}"config\stl_fujitsu.h"\

+	{$(INCLUDE)}"config\stl_gcc.h"\

+	{$(INCLUDE)}"config\stl_hpacc.h"\

+	{$(INCLUDE)}"config\stl_ibm.h"\

+	{$(INCLUDE)}"config\stl_icc.h"\

+	{$(INCLUDE)}"config\stl_intel.h"\

+	{$(INCLUDE)}"config\stl_kai.h"\

+	{$(INCLUDE)}"config\stl_msvc.h"\

+	{$(INCLUDE)}"config\stl_mwerks.h"\

+	{$(INCLUDE)}"config\stl_mycomp.h"\

+	{$(INCLUDE)}"config\stl_sco.h"\

+	{$(INCLUDE)}"config\stl_select_lib.h"\

+	{$(INCLUDE)}"config\stl_sgi.h"\

+	{$(INCLUDE)}"config\stl_solaris.h"\

+	{$(INCLUDE)}"config\stl_sunpro.h"\

+	{$(INCLUDE)}"config\stl_symantec.h"\

+	{$(INCLUDE)}"config\stl_watcom.h"\

+	{$(INCLUDE)}"config\stl_wince.h"\

+	{$(INCLUDE)}"config\stlcomp.h"\

+	{$(INCLUDE)}"config\vc_select_lib.h"\

+	{$(INCLUDE)}"pthread.h"\

+	{$(INCLUDE)}"stl\_abbrevs.h"\

+	{$(INCLUDE)}"stl\_config.h"\

+	{$(INCLUDE)}"stl\_config_compat.h"\

+	{$(INCLUDE)}"stl\_config_compat_post.h"\

+	{$(INCLUDE)}"stl\_epilog.h"\

+	{$(INCLUDE)}"stl\_prolog.h"\

+	{$(INCLUDE)}"stl\_site_config.h"\

+	{$(INCLUDE)}"stl_user_config.h"\

+	

+NODEP_CPP_TESTC=\

+	"..\..\..\..\usr\include\pthread.h"\

 	

 

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE ARMV4I) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE ARMV4I) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE MIPSIV_FP) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE MIPSIV_FP) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE ARMV4) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE ARMV4) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE x86) Release"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ELSEIF  "$(CFG)" == "testCommon - Win32 (WCE x86) Debug"

 

+DEP_CPP_TESTC=\

+	"..\..\include\Ice\UserConfig.h"\

+	"..\..\include\IceUtil\Config.h"\

+	"..\..\include\IceUtil\Exception.h"\

+	"..\..\include\IceUtil\Handle.h"\

+	"..\..\include\IceUtil\Lock.h"\

+	"..\..\include\IceUtil\Mutex.h"\

+	"..\..\include\IceUtil\Shared.h"\

+	"..\..\include\IceUtil\StaticMutex.h"\

+	"..\..\include\IceUtil\Thread.h"\

+	"..\..\include\IceUtil\ThreadException.h"\

+	

+

 !ENDIF 

 

 # End Source File

@@ -845,6 +1230,10 @@ DEP_CPP_TESTC=\
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

+SOURCE=..\include\TestApplication.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\include\TestCommon.h

 # End Source File

 # End Group

diff --git a/cppe/test/include/TestApplication.h b/cppe/test/include/TestApplication.h
index dbdec004cfc..5eba89b3e6d 100644
--- a/cppe/test/include/TestApplication.h
+++ b/cppe/test/include/TestApplication.h
@@ -21,7 +21,8 @@
 class ICE_TEST_COMMON_API TestApplication
 {
 public:
-
+

+    TestApplication(const std::string& = "");
 #ifdef _WIN32_WCE
     int main(HINSTANCE);
 #else
@@ -34,7 +35,8 @@ public:
     Ice::CommunicatorPtr communicator();
 
 private:
-
+

+    const std::string _name;
     Ice::CommunicatorPtr _communicator;
 };