1 files changed, 264 insertions, 166 deletions
diff --git a/tests/Config_Test.dsp b/tests/Config_Test.dsp
index a02b9ef6cb2..ae0cd65d337 100644
--- a/tests/Config_Test.dsp
+++ b/tests/Config_Test.dsp
@@ -1,166 +1,264 @@
-# Microsoft Developer Studio Project File - Name="Config_Test" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=Config_Test - Win32 Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "Config_Test.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Config_Test.mak" CFG="Config_Test - Win32 Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Config_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE "Config_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Config_Test - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "Config_Test - Win32 Static Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Static_Debug"
-# PROP BASE Intermediate_Dir "Static_Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Static_Debug"
-# PROP Intermediate_Dir "Static_Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "_DEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /subsystem:console /debug /machine:I386
-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
-
-!ELSEIF  "$(CFG)" == "Config_Test - Win32 Static Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Static_Release"
-# PROP BASE Intermediate_Dir "Static_Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Static_Release"
-# PROP Intermediate_Dir "Static_Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D ACE_AS_STATIC_LIBS /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /subsystem:console /machine:I386
-# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\ace"
-
-!ELSEIF  "$(CFG)" == "Config_Test - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /subsystem:console /machine:I386
-# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\ace"
-
-!ELSEIF  "$(CFG)" == "Config_Test - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
-# SUBTRACT CPP /YX
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"
-
-!ENDIF 
-
-# Begin Target
-
-# Name "Config_Test - Win32 Static Debug"
-# Name "Config_Test - Win32 Static Release"
-# Name "Config_Test - Win32 Release"
-# Name "Config_Test - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-# Begin Source File
-
-SOURCE=.\Config_Test.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
-# Begin Source File
-
-SOURCE=.\Config_Test.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\test_config.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
-# End Group
-# End Target
-# End Project
+# Microsoft Developer Studio Project File - Name="Config_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603
+
+CFG=Config_Test - Win32 PharLap ETS Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "Config_Test.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "Config_Test.mak" CFG="Config_Test - Win32 PharLap ETS Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "Config_Test - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "Config_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "Config_Test - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\Config_Test\Debug"
+# PROP BASE Intermediate_Dir ".\Config_Test\Debug"
+# PROP BASE Target_Dir ".\Config_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "."
+# PROP Intermediate_Dir ".\DLL\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\Config_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 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 /subsystem:console /debug /machine:I386
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"
+
+!ELSEIF  "$(CFG)" == "Config_Test - Win32 Alpha Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Config_Test\Alpha Debug"
+# PROP BASE Intermediate_Dir "Config_Test\Alpha Debug"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir "Config_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir "Config_Test"
+CPP=cl.exe
+# ADD BASE CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /MTd /c
+# ADD CPP /nologo /Gt0 /W3 /GX /Zi /Od /I"..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /MDd /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"..\ace"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "Config_Test - Win32 Debug"
+# Name "Config_Test - Win32 Alpha Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=.\Config_Test.cpp
+
+!IF  "$(CFG)" == "Config_Test - Win32 Debug"
+
+!ELSEIF  "$(CFG)" == "Config_Test - Win32 Alpha Debug"
+
+DEP_CPP_CONFIG_=\
+	"..\ace\Acceptor.cpp"\
+	"..\ace\Acceptor.h"\
+	"..\ace\Acceptor.i"\
+	"..\ace\ACE.h"\
+	"..\ace\ACE.i"\
+	"..\ace\Addr.h"\
+	"..\ace\Addr.i"\
+	"..\ace\Atomic_Op.i"\
+	"..\ace\Auto_Ptr.cpp"\
+	"..\ace\Auto_Ptr.h"\
+	"..\ace\Auto_Ptr.i"\
+	"..\ace\config-win32-common.h"\
+	"..\ace\config-win32.h"\
+	"..\ace\config.h"\
+	"..\ace\Connector.cpp"\
+	"..\ace\Connector.h"\
+	"..\ace\Connector.i"\
+	"..\ace\Containers.cpp"\
+	"..\ace\Containers.h"\
+	"..\ace\Containers.i"\
+	"..\ace\Dynamic.h"\
+	"..\ace\Dynamic.i"\
+	"..\ace\Event_Handler.h"\
+	"..\ace\Event_Handler.i"\
+	"..\ace\Free_List.cpp"\
+	"..\ace\Free_List.h"\
+	"..\ace\Free_List.i"\
+	"..\ace\Get_Opt.h"\
+	"..\ace\Get_Opt.i"\
+	"..\ace\Handle_Set.h"\
+	"..\ace\Handle_Set.i"\
+	"..\ace\Hash_Map_Manager.cpp"\
+	"..\ace\Hash_Map_Manager.h"\
+	"..\ace\INET_Addr.h"\
+	"..\ace\INET_Addr.i"\
+	"..\ace\IO_Cntl_Msg.h"\
+	"..\ace\IPC_SAP.h"\
+	"..\ace\IPC_SAP.i"\
+	"..\ace\Log_Msg.h"\
+	"..\ace\Log_Priority.h"\
+	"..\ace\Log_Record.h"\
+	"..\ace\Log_Record.i"\
+	"..\ace\Malloc.h"\
+	"..\ace\Malloc.i"\
+	"..\ace\Malloc_T.cpp"\
+	"..\ace\Malloc_T.h"\
+	"..\ace\Malloc_T.i"\
+	"..\ace\Managed_Object.cpp"\
+	"..\ace\Managed_Object.h"\
+	"..\ace\Managed_Object.i"\
+	"..\ace\Map_Manager.cpp"\
+	"..\ace\Map_Manager.h"\
+	"..\ace\Map_Manager.i"\
+	"..\ace\Mem_Map.h"\
+	"..\ace\Mem_Map.i"\
+	"..\ace\Memory_Pool.h"\
+	"..\ace\Memory_Pool.i"\
+	"..\ace\Message_Block.h"\
+	"..\ace\Message_Block.i"\
+	"..\ace\Message_Queue.cpp"\
+	"..\ace\Message_Queue.h"\
+	"..\ace\Message_Queue.i"\
+	"..\ace\Module.cpp"\
+	"..\ace\Module.h"\
+	"..\ace\Module.i"\
+	"..\ace\Object_Manager.h"\
+	"..\ace\Object_Manager.i"\
+	"..\ace\OS.h"\
+	"..\ace\OS.i"\
+	"..\ace\Reactor.h"\
+	"..\ace\Reactor.i"\
+	"..\ace\Reactor_Impl.h"\
+	"..\ace\Service_Config.h"\
+	"..\ace\Service_Config.i"\
+	"..\ace\Service_Object.h"\
+	"..\ace\Service_Object.i"\
+	"..\ace\Service_Types.h"\
+	"..\ace\Service_Types.i"\
+	"..\ace\Shared_Object.h"\
+	"..\ace\Shared_Object.i"\
+	"..\ace\Signal.h"\
+	"..\ace\Signal.i"\
+	"..\ace\SOCK.h"\
+	"..\ace\SOCK.i"\
+	"..\ace\SOCK_Acceptor.h"\
+	"..\ace\SOCK_Acceptor.i"\
+	"..\ace\SOCK_Connector.h"\
+	"..\ace\SOCK_Connector.i"\
+	"..\ace\SOCK_IO.h"\
+	"..\ace\SOCK_IO.i"\
+	"..\ace\SOCK_Stream.h"\
+	"..\ace\SOCK_Stream.i"\
+	"..\ace\SString.h"\
+	"..\ace\SString.i"\
+	"..\ace\Strategies.h"\
+	"..\ace\Strategies_T.cpp"\
+	"..\ace\Strategies_T.h"\
+	"..\ace\Stream_Modules.cpp"\
+	"..\ace\Stream_Modules.h"\
+	"..\ace\Stream_Modules.i"\
+	"..\ace\SV_Semaphore_Complex.h"\
+	"..\ace\SV_Semaphore_Complex.i"\
+	"..\ace\SV_Semaphore_Simple.h"\
+	"..\ace\SV_Semaphore_Simple.i"\
+	"..\ace\Svc_Conf_Tokens.h"\
+	"..\ace\Svc_Handler.cpp"\
+	"..\ace\Svc_Handler.h"\
+	"..\ace\Svc_Handler.i"\
+	"..\ace\Synch.h"\
+	"..\ace\Synch.i"\
+	"..\ace\Synch_Options.h"\
+	"..\ace\Synch_T.cpp"\
+	"..\ace\Synch_T.h"\
+	"..\ace\Synch_T.i"\
+	"..\ace\Task.h"\
+	"..\ace\Task.i"\
+	"..\ace\Task_T.cpp"\
+	"..\ace\Task_T.h"\
+	"..\ace\Task_T.i"\
+	"..\ace\Thread.h"\
+	"..\ace\Thread.i"\
+	"..\ace\Thread_Manager.h"\
+	"..\ace\Thread_Manager.i"\
+	"..\ace\Time_Value.h"\
+	"..\ace\Timer_Queue.h"\
+	"..\ace\Timer_Queue_T.cpp"\
+	"..\ace\Timer_Queue_T.h"\
+	"..\ace\Timer_Queue_T.i"\
+	"..\ace\Trace.h"\
+	"..\ace\Version.h"\
+	"..\ace\WFMO_Reactor.h"\
+	"..\ace\WFMO_Reactor.i"\
+	"..\ace\ws2tcpip.h"\
+	".\Config_Test.h"\
+	".\test_config.h"\
+	
+NODEP_CPP_CONFIG_=\
+	"..\ace\stdcpp.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=.\Config_Test.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\test_config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project