ChangeLogTag:Sat Jul 31 00:22:46 1999 Nanbor Wang <nanbor@cs.wustl.edu>

10 files changed, 1350 insertions, 172 deletions

diff --git a/tests/Basic_Types_Test.dsp b/tests/Basic_Types_Test.dsp
index 3d74b532a57..80a2e6d585c 100644
--- a/tests/Basic_Types_Test.dsp
+++ b/tests/Basic_Types_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Basic_Types_Test - Win32 PharLap ETS Debug

+CFG=Basic_Types_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=Basic_Types_Test - Win32 PharLap ETS Debug
 !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 "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Basic_Types_Test.mak" CFG="Basic_Types_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Basic_Types_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Basic_Types_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Basic_Types_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,41 +27,68 @@ CFG=Basic_Types_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "Basic_Types_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Basic_Ty"

-# PROP BASE Intermediate_Dir "Basic_Ty"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Basic_Types_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Basic_Types_Test\Debug"

+# PROP BASE Target_Dir ".\Basic_Types_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 ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# PROP Target_Dir ".\Basic_Types_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 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# SUBTRACT LINK32 /pdb:none

+# 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)" == "Basic_Types_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Basic_Types_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Basic_Types_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Basic_Types_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 "Basic_Types_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 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Basic_Types_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Basic_Types_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -68,10 +97,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D ACE_HAS_DLL=0 /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -79,7 +110,6 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# SUBTRACT BASE LINK32 /pdb:none

 # ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Basic_Types_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

@@ -88,14 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "Basic_Types_Test - Win32 Debug"

+# Name "Basic_Types_Test - Win32 Alpha Debug"

 # Name "Basic_Types_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Basic_Types_Test.cpp

+

+!IF  "$(CFG)" == "Basic_Types_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # Begin Source File

 

-SOURCE=.\tests_pharlap_msvc.lnk

+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

diff --git a/tests/Collection_Test.dsp b/tests/Collection_Test.dsp
index ed0a0a09d86..d65be2dfb73 100644
--- a/tests/Collection_Test.dsp
+++ b/tests/Collection_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Collection_Test - Win32 PharLap ETS Debug

+CFG=Collection_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=Collection_Test - Win32 PharLap ETS Debug
 !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 "Collection_Test.mak" CFG="Collection_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Collection_Test.mak" CFG="Collection_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Collection_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Collection_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Collection_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,40 +27,68 @@ CFG=Collection_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "Collection_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 BASE Output_Dir ".\Collection_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Collection_Test\Debug"

+# PROP BASE Target_Dir ".\Collection_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 ""

-# 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" /D "_MBCS" /FD /c

+# PROP Target_Dir ".\Collection_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)" == "Collection_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Collection_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Collection_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Collection_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 "Collection_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 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"

+# ADD BASE LINK32 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "Collection_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Collection_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Collection_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -67,10 +97,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -78,7 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Collection_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Collection_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -86,10 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "Collection_Test - Win32 Debug"

+# Name "Collection_Test - Win32 Alpha Debug"

 # Name "Collection_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Collection_Test.cpp

+

+!IF  "$(CFG)" == "Collection_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Collection_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Collection_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# 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

diff --git a/tests/Dynamic_Priority_Test.dsp b/tests/Dynamic_Priority_Test.dsp
index 30a53be7dd7..9639391e8a4 100644
--- a/tests/Dynamic_Priority_Test.dsp
+++ b/tests/Dynamic_Priority_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Dynamic_Priority_Test - Win32 PharLap ETS Debug

+CFG=Dynamic_Priority_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=Dynamic_Priority_Test - Win32 PharLap ETS Debug
 !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 "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Dynamic_Priority_Test.mak" CFG="Dynamic_Priority_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Dynamic_Priority_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Dynamic_Priority_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Dynamic_Priority_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,40 +27,68 @@ CFG=Dynamic_Priority_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "Dynamic_Priority_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 BASE Output_Dir ".\Dynamic_Priority_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Dynamic_Priority_Test\Debug"

+# PROP BASE Target_Dir ".\Dynamic_Priority_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 ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# PROP Target_Dir ".\Dynamic_Priority_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 /pdbtype:sept

+# 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)" == "Dynamic_Priority_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Dynamic_Priority_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Dynamic_Priority_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Dynamic_Priority_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 "Dynamic_Priority_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 wsock32.lib 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"

+

 !ELSEIF  "$(CFG)" == "Dynamic_Priority_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Dynamic_Priority_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Dynamic_Priority_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -67,18 +97,20 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /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 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Dynamic_Priority_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Dynamic_Priority_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -86,22 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "Dynamic_Priority_Test - Win32 Debug"

+# Name "Dynamic_Priority_Test - Win32 Alpha Debug"

 # Name "Dynamic_Priority_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

-# PROP Default_Filter ".cpp .i"

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Dynamic_Priority_Test.cpp

+

+!IF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Dynamic_Priority_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Dynamic_Priority_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

 

-# PROP Default_Filter ".h"

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # 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

diff --git a/tests/New_Fail_Test.dsp b/tests/New_Fail_Test.dsp
index 6df059c43e5..96a0e700d65 100644
--- a/tests/New_Fail_Test.dsp
+++ b/tests/New_Fail_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=New_Fail_Test - Win32 PharLap ETS Debug

+CFG=New_Fail_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=New_Fail_Test - Win32 PharLap ETS Debug
 !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 "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "New_Fail_Test.mak" CFG="New_Fail_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "New_Fail_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "New_Fail_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "New_Fail_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,40 +27,68 @@ CFG=New_Fail_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "New_Fail_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 BASE Output_Dir ".\New_Fail_Test\Debug"

+# PROP BASE Intermediate_Dir ".\New_Fail_Test\Debug"

+# PROP BASE Target_Dir ".\New_Fail_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 ""

-# 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" /D "_MBCS" /FD /c

+# PROP Target_Dir ".\New_Fail_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)" == "New_Fail_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "New_Fail_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "New_Fail_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "New_Fail_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 "New_Fail_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 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"

+# ADD BASE LINK32 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "New_Fail_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "New_Fail_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -67,10 +97,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -78,7 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./New_Fail_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"New_Fail_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -86,10 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "New_Fail_Test - Win32 Debug"

+# Name "New_Fail_Test - Win32 Alpha Debug"

 # Name "New_Fail_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\New_Fail_Test.cpp

+

+!IF  "$(CFG)" == "New_Fail_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "New_Fail_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# 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

diff --git a/tests/Reverse_Lock_Test.dsp b/tests/Reverse_Lock_Test.dsp
index 671cb750973..3a9157c7cc2 100644
--- a/tests/Reverse_Lock_Test.dsp
+++ b/tests/Reverse_Lock_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Reverse_Lock_Test - Win32 PharLap ETS Debug

+CFG=Reverse_Lock_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=Reverse_Lock_Test - Win32 PharLap ETS Debug
 !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 "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Reverse_Lock_Test.mak" CFG="Reverse_Lock_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Reverse_Lock_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Reverse_Lock_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Reverse_Lock_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,39 +27,68 @@ CFG=Reverse_Lock_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "Reverse_Lock_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_M"

-# PROP BASE Intermediate_Dir "Thread_M"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Reverse_Lock_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Reverse_Lock_Test\Debug"

+# PROP BASE Target_Dir ".\Reverse_Lock_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 ""

-# 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" /YX /FD /c

+# PROP Target_Dir ".\Reverse_Lock_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 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# 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)" == "Reverse_Lock_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Reverse_Lock_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Reverse_Lock_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Reverse_Lock_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 "Reverse_Lock_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 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Reverse_Lock_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Reverse_Lock_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -66,9 +97,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -76,7 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Reverse_Lock_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Reverse_Lock_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -84,10 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "Reverse_Lock_Test - Win32 Debug"

+# Name "Reverse_Lock_Test - Win32 Alpha Debug"

 # Name "Reverse_Lock_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Reverse_Lock_Test.cpp

+

+!IF  "$(CFG)" == "Reverse_Lock_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Reverse_Lock_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# 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

diff --git a/tests/SOCK_Connector_Test.dsp b/tests/SOCK_Connector_Test.dsp
index c8b21ce7018..24b041ef1e9 100644
--- a/tests/SOCK_Connector_Test.dsp
+++ b/tests/SOCK_Connector_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SOCK_Connector_Test - Win32 PharLap ETS Debug

+CFG=SOCK_Connector_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=SOCK_Connector_Test - Win32 PharLap ETS Debug
 !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 "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SOCK_Connector_Test.mak" CFG="SOCK_Connector_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "SOCK_Connector_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Connector_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "SOCK_Connector_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,62 +27,90 @@ CFG=SOCK_Connector_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "SOCK_Connector_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SOCK_Connector_Test\Debug"

-# PROP BASE Intermediate_Dir "SOCK_Connector_Test\Debug"

-# PROP BASE Ignore_Export_Lib 0

-# PROP BASE Target_Dir "SOCK_Connector_Test"

+# PROP BASE Output_Dir ".\SOCK_Connector_Test\Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Connector_Test\Debug"

+# PROP BASE Target_Dir ".\SOCK_Connector_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 "SOCK_Connector_Test"

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=1 /FD /c

-# SUBTRACT BASE CPP /YX

+# PROP Target_Dir ".\SOCK_Connector_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 aced.lib 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 /libpath:"..\..\ace"

+# 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)" == "SOCK_Connector_Test - Win32 PharLap ETS Debug"

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 Alpha Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SOCK_Connector_Test\PharLap ETS Debug"

-# PROP BASE Intermediate_Dir "SOCK_Connector_Test\PharLap ETS Debug"

+# PROP BASE Output_Dir "SOCK_Connector_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SOCK_Connector_Test\Alpha Debug"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir "SOCK_Connector_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 "SOCK_Connector_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 wsock32.lib 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"

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 PharLap ETS Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

-# PROP Target_Dir "SOCK_Connector_Test"

+# PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /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 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Connector_Test_ETS.exe" /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"SOCK_Connector_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -88,6 +118,7 @@ LINK32=link.exe
 # Begin Target

 

 # Name "SOCK_Connector_Test - Win32 Debug"

+# Name "SOCK_Connector_Test - Win32 Alpha Debug"

 # Name "SOCK_Connector_Test - Win32 PharLap ETS Debug"

 # Begin Group "Source Files"

 

@@ -95,6 +126,79 @@ LINK32=link.exe
 # Begin Source File

 

 SOURCE=.\SOCK_Connector_Test.cpp

+

+!IF  "$(CFG)" == "SOCK_Connector_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -102,7 +206,7 @@ SOURCE=.\SOCK_Connector_Test.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # Begin Source File

 

-SOURCE=..\test_config.h

+SOURCE=.\test_config.h

 # End Source File

 # End Group

 # Begin Group "Resource Files"

diff --git a/tests/SOCK_Send_Recv_Test.dsp b/tests/SOCK_Send_Recv_Test.dsp
index 69063cf3034..f96dc01e98a 100644
--- a/tests/SOCK_Send_Recv_Test.dsp
+++ b/tests/SOCK_Send_Recv_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=SOCK_Send_Recv_Test - Win32 PharLap ETS Debug

+CFG=SOCK_Send_Recv_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=SOCK_Send_Recv_Test - Win32 PharLap ETS Debug
 !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 "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "SOCK_Send_Recv_Test.mak" CFG="SOCK_Send_Recv_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "SOCK_Send_Recv_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "SOCK_Send_Recv_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,40 +27,68 @@ CFG=SOCK_Send_Recv_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "SOCK_Send_Recv_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 BASE Output_Dir ".\SOCK_Send_Recv_Test\Debug"

+# PROP BASE Intermediate_Dir ".\SOCK_Send_Recv_Test\Debug"

+# PROP BASE Target_Dir ".\SOCK_Send_Recv_Test"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir ""

+# PROP Output_Dir "."

 # PROP Intermediate_Dir ".\DLL\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

+# PROP Target_Dir ".\SOCK_Send_Recv_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 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test.exe" /pdbtype:sept /libpath:"..\ace"

+# 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)" == "SOCK_Send_Recv_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "SOCK_Send_Recv_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "SOCK_Send_Recv_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "SOCK_Send_Recv_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 "SOCK_Send_Recv_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 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "SOCK_Send_Recv_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "SOCK_Send_Recv_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -67,18 +97,20 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

+CPP=cl.exe

 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

 # SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /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 aced.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test.exe" /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./SOCK_Send_Recv_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"SOCK_Send_Recv_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -86,10 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "SOCK_Send_Recv_Test - Win32 Debug"

+# Name "SOCK_Send_Recv_Test - Win32 Alpha Debug"

 # Name "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\SOCK_Send_Recv_Test.cpp

+

+!IF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "SOCK_Send_Recv_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# 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

diff --git a/tests/Thread_Mutex_Test.dsp b/tests/Thread_Mutex_Test.dsp
index 4e3631aca14..922995f8a28 100644
--- a/tests/Thread_Mutex_Test.dsp
+++ b/tests/Thread_Mutex_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Thread_Mutex_Test - Win32 PharLap ETS Debug

+CFG=Thread_Mutex_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=Thread_Mutex_Test - Win32 PharLap ETS Debug
 !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 "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Thread_Mutex_Test.mak" CFG="Thread_Mutex_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Thread_Mutex_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Thread_Mutex_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Thread_Mutex_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,39 +27,68 @@ CFG=Thread_Mutex_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_M"

-# PROP BASE Intermediate_Dir "Thread_M"

-# PROP BASE Target_Dir ""

+# PROP BASE Output_Dir ".\Thread_Mutex_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Thread_Mutex_Test\Debug"

+# PROP BASE Target_Dir ".\Thread_Mutex_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 ""

-# 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" /YX /FD /c

+# PROP Target_Dir ".\Thread_Mutex_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 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# 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)" == "Thread_Mutex_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Thread_Mutex_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Thread_Mutex_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Thread_Mutex_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 "Thread_Mutex_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 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Thread_Mutex_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Thread_Mutex_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -66,9 +97,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -76,7 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Thread_Mutex_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Thread_Mutex_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -84,10 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "Thread_Mutex_Test - Win32 Debug"

+# Name "Thread_Mutex_Test - Win32 Alpha Debug"

 # Name "Thread_Mutex_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Thread_Mutex_Test.cpp

+

+!IF  "$(CFG)" == "Thread_Mutex_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# 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

diff --git a/tests/Timeprobe_Test.dsp b/tests/Timeprobe_Test.dsp
index 0371ce07940..8d0012886cd 100644
--- a/tests/Timeprobe_Test.dsp
+++ b/tests/Timeprobe_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Timeprobe_Test - Win32 PharLap ETS Debug

+CFG=Timeprobe_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=Timeprobe_Test - Win32 PharLap ETS Debug
 !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 "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Timeprobe_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Timeprobe_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Timeprobe_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,40 +27,68 @@ CFG=Timeprobe_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "Timeprobe_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 BASE Output_Dir ".\Timeprobe_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\Debug"

+# PROP BASE Target_Dir ".\Timeprobe_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 ""

-# 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" /YX /FD /c

+# PROP Target_Dir ".\Timeprobe_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 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# SUBTRACT LINK32 /pdb:none

+# 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)" == "Timeprobe_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Timeprobe_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Timeprobe_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Timeprobe_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 "Timeprobe_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 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Timeprobe_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Timeprobe_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -67,9 +97,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -77,8 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Timeprobe_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Timeprobe_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -86,10 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "Timeprobe_Test - Win32 Debug"

+# Name "Timeprobe_Test - Win32 Alpha Debug"

 # Name "Timeprobe_Test - Win32 PharLap ETS Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Timeprobe_Test.cpp

+

+!IF  "$(CFG)" == "Timeprobe_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

+# 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

diff --git a/tests/Upgradable_RW_Test.dsp b/tests/Upgradable_RW_Test.dsp
index a993d5e5519..53338485a8a 100644
--- a/tests/Upgradable_RW_Test.dsp
+++ b/tests/Upgradable_RW_Test.dsp
@@ -3,8 +3,9 @@
 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

+# TARGTYPE "Win32 (ALPHA) Console Application" 0x0603

 

-CFG=Upgradable_RW_Test - Win32 PharLap ETS Debug

+CFG=Upgradable_RW_Test - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,11 +14,12 @@ CFG=Upgradable_RW_Test - Win32 PharLap ETS Debug
 !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 "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 PharLap ETS Debug"

+!MESSAGE NMAKE /f "Upgradable_RW_Test.mak" CFG="Upgradable_RW_Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

 !MESSAGE "Upgradable_RW_Test - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Upgradable_RW_Test - Win32 Alpha Debug" (based on "Win32 (ALPHA) Console Application")

 !MESSAGE "Upgradable_RW_Test - Win32 PharLap ETS Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -25,39 +27,68 @@ CFG=Upgradable_RW_Test - Win32 PharLap ETS Debug
 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

 

 !IF  "$(CFG)" == "Upgradable_RW_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 BASE Output_Dir ".\Upgradable_RW_Test\Debug"

+# PROP BASE Intermediate_Dir ".\Upgradable_RW_Test\Debug"

+# PROP BASE Target_Dir ".\Upgradable_RW_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 ""

-# 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" /YX /FD /c

+# PROP Target_Dir ".\Upgradable_RW_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 /pdbtype:sept

-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

+# 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)" == "Upgradable_RW_Test - Win32 Alpha Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Upgradable_RW_Test\Alpha Debug"

+# PROP BASE Intermediate_Dir "Upgradable_RW_Test\Alpha Debug"

+# PROP BASE Ignore_Export_Lib 0

+# PROP BASE Target_Dir "Upgradable_RW_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 "Upgradable_RW_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 wsock32.lib 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"

 

 !ELSEIF  "$(CFG)" == "Upgradable_RW_Test - Win32 PharLap ETS Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

-# PROP BASE Output_Dir "Upgradable_RW_Test___Win32_PharLap_ETS_Debug"

-# PROP BASE Intermediate_Dir "Upgradable_RW_Test___Win32_PharLap_ETS_Debug"

+# PROP BASE Output_Dir "Barrier"

+# PROP BASE Intermediate_Dir "Barrier"

 # PROP BASE Ignore_Export_Lib 0

 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

@@ -66,9 +97,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir ".\ETS_LIB\Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /FD /c

+CPP=cl.exe

+# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT BASE CPP /YX

 # ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c

 # SUBTRACT CPP /YX

+RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

@@ -76,7 +110,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\ace"

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./Upgradable_RW_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

+# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:"Upgradable_RW_Test_ETS.exe" /pdbtype:sept /libpath:"..\ace" /ETS:tests_pharlap_msvc.lnk

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -84,22 +118,100 @@ LINK32=link.exe
 # Begin Target

 

 # Name "Upgradable_RW_Test - Win32 Debug"

+# Name "Upgradable_RW_Test - Win32 Alpha Debug"

 # Name "Upgradable_RW_Test - Win32 PharLap ETS Debug"

-# Begin Group "Source files"

+# Begin Group "Source Files"

 

-# PROP Default_Filter "*.cpp"

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

 # Begin Source File

 

 SOURCE=.\Upgradable_RW_Test.cpp

+

+!IF  "$(CFG)" == "Upgradable_RW_Test - Win32 Debug"

+

+!ELSEIF  "$(CFG)" == "Upgradable_RW_Test - Win32 Alpha Debug"

+

+DEP_CPP_BARRI=\

+	"..\ace\ACE.h"\

+	"..\ace\ACE.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\Containers.cpp"\

+	"..\ace\Containers.h"\

+	"..\ace\Containers.i"\

+	"..\ace\Event_Handler.h"\

+	"..\ace\Event_Handler.i"\

+	"..\ace\Free_List.cpp"\

+	"..\ace\Free_List.h"\

+	"..\ace\Free_List.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\Mem_Map.h"\

+	"..\ace\Mem_Map.i"\

+	"..\ace\Memory_Pool.h"\

+	"..\ace\Memory_Pool.i"\

+	"..\ace\Object_Manager.h"\

+	"..\ace\Object_Manager.i"\

+	"..\ace\OS.h"\

+	"..\ace\OS.i"\

+	"..\ace\Signal.h"\

+	"..\ace\Signal.i"\

+	"..\ace\SString.h"\

+	"..\ace\SString.i"\

+	"..\ace\SV_Semaphore_Complex.h"\

+	"..\ace\SV_Semaphore_Complex.i"\

+	"..\ace\SV_Semaphore_Simple.h"\

+	"..\ace\SV_Semaphore_Simple.i"\

+	"..\ace\Synch.h"\

+	"..\ace\Synch.i"\

+	"..\ace\Synch_T.cpp"\

+	"..\ace\Synch_T.h"\

+	"..\ace\Synch_T.i"\

+	"..\ace\Thread.h"\

+	"..\ace\Thread.i"\

+	"..\ace\Thread_Manager.h"\

+	"..\ace\Thread_Manager.i"\

+	"..\ace\Trace.h"\

+	"..\ace\Version.h"\

+	"..\ace\ws2tcpip.h"\

+	".\test_config.h"\

+	

+NODEP_CPP_BARRI=\

+	"..\ace\stdcpp.h"\

+	

+

+!ELSEIF  "$(CFG)" == "Upgradable_RW_Test - Win32 PharLap ETS Debug"

+

+!ENDIF 

+

 # End Source File

 # End Group

-# Begin Group "Header files"

+# Begin Group "Header Files"

 

-# PROP Default_Filter "*.h"

+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"

 # 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