ChangeLogTag:Mon Jun 12 20:45:18 2000 Darrell Brunsch <brunsch@uci.edu>

author: brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-06-13 04:29:49 +0000
committer: brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2000-06-13 04:29:49 +0000
commit: a505c82302417a6bad5730ceb888b5bd631f02a6 (patch)
tree: 4892c58d763e8bcf500785cb91bd55e42db10f5c
parent: f726dbd4b5b3153bead4b87c84d046a4001fba43 (diff)
download: ATCD-a505c82302417a6bad5730ceb888b5bd631f02a6.tar.gz
94 files changed, 816 insertions, 260 deletions
diff --git a/ChangeLog b/ChangeLog
index 501f31f78df..0ac8cea249f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,117 @@
+Mon Jun 12 20:45:18 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/Process_Win32.pm:
+
+          Changed the $newwindow check to check to see if the variable
+          was defined before comparing it to "yes".  This removes a 
+          perl warning.
+
+        * bin/msvc_auto_compile.pl:
+
+          The TAOACE[_static].dsw files were changed, so I altered the
+          CORE option to use the TAOACE.dsw file with -DLL, and added 
+          some missing dsp files for the -LIB build.  
+          
+        * bin/create_vt_dsps.pl:
+
+          Changed the runtime library type used in the static versions 
+          and added ACE_OS_HAS_DLL=0.
+
+        * ace/ace_lib.dsp:
+        * apps/gperf/src/gperf.dsp:
+        * apps/gperf/src/gperf_lib.dsp:
+        * examples/IPC_SAP/ATM_SAP/CPP_client.dsp:
+        * examples/IPC_SAP/ATM_SAP/CPP_server.dsp:
+
+          Miscellaneous fixes to get the static versions working again.
+          Mainly just adding ACE_OS_HAS_DLL=0.
+
+        * tests/version_tests/CDR_Array_Test.dsp: (added)
+        * tests/version_tests/Atomic_Op_Test.dsp:
+        * tests/version_tests/Auto_IncDec_Test.dsp:
+        * tests/version_tests/Barrier_Test.dsp:
+        * tests/version_tests/Basic_Types_Test.dsp:
+        * tests/version_tests/Buffer_Stream_Test.dsp:
+        * tests/version_tests/CDR_File_Test.dsp:
+        * tests/version_tests/CDR_Test.dsp:
+        * tests/version_tests/Cache_Map_Manager_Test.dsp:
+        * tests/version_tests/Cached_Accept_Conn_Test.dsp:
+        * tests/version_tests/Cached_Conn_Test.dsp:
+        * tests/version_tests/Capabilities_Test.dsp:
+        * tests/version_tests/Collection_Test.dsp:
+        * tests/version_tests/Conn_Test.dsp:
+        * tests/version_tests/DLL_Test.dsp:
+        * tests/version_tests/DLList_Test.dsp:
+        * tests/version_tests/Dynamic_Priority_Test.dsp:
+        * tests/version_tests/Enum_Interfaces_Test.dsp:
+        * tests/version_tests/Env_Value_Test.dsp:
+        * tests/version_tests/Future_Set_Test.dsp:
+        * tests/version_tests/Future_Test.dsp:
+        * tests/version_tests/Handle_Set_Test.dsp:
+        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/version_tests/Hash_Map_Manager_Test.dsp:
+        * tests/version_tests/High_Res_Timer_Test.dsp:
+        * tests/version_tests/IOStream_Test.dsp:
+        * tests/version_tests/Lazy_Map_Manager_Test.dsp:
+        * tests/version_tests/MM_Shared_Memory_Test.dsp:
+        * tests/version_tests/MT_Reactor_Timer_Test.dsp:
+        * tests/version_tests/MT_SOCK_Test.dsp:
+        * tests/version_tests/Malloc_Test.dsp:
+        * tests/version_tests/Map_Manager_Test.dsp:
+        * tests/version_tests/Map_Test.dsp:
+        * tests/version_tests/Mem_Map_Test.dsp:
+        * tests/version_tests/Message_Block_Test.dsp:
+        * tests/version_tests/Message_Queue_Notifications_Test.dsp:
+        * tests/version_tests/Message_Queue_Test.dsp:
+        * tests/version_tests/Naming_Test.dsp:
+        * tests/version_tests/New_Fail_Test.dsp:
+        * tests/version_tests/Notify_Performance_Test.dsp:
+        * tests/version_tests/Object_Manager_Test.dsp:
+        * tests/version_tests/OrdMultiSet_Test.dsp:
+        * tests/version_tests/Pipe_Test.dsp:
+        * tests/version_tests/Priority_Buffer_Test.dsp:
+        * tests/version_tests/Priority_Reactor_Test.dsp:
+        * tests/version_tests/Priority_Task_Test.dsp:
+        * tests/version_tests/Process_Manager_Test.dsp:
+        * tests/version_tests/Process_Mutex_Test.dsp:
+        * tests/version_tests/Process_Strategy_Test.dsp:
+        * tests/version_tests/RB_Tree_Test.dsp:
+        * tests/version_tests/Reactor_Exceptions_Test.dsp:
+        * tests/version_tests/Reactor_Notify_Test.dsp:
+        * tests/version_tests/Reactor_Performance_Test.dsp:
+        * tests/version_tests/Reactor_Timer_Test.dsp:
+        * tests/version_tests/Reactors_Test.dsp:
+        * tests/version_tests/Reader_Writer_Test.dsp:
+        * tests/version_tests/Recursive_Mutex_Test.dsp:
+        * tests/version_tests/Reverse_Lock_Test.dsp:
+        * tests/version_tests/SOCK_Connector_Test.dsp:
+        * tests/version_tests/SOCK_Send_Recv_Test.dsp:
+        * tests/version_tests/SOCK_Test.dsp:
+        * tests/version_tests/SPIPE_Test.dsp:
+        * tests/version_tests/SString_Test.dsp:
+        * tests/version_tests/SV_Shared_Memory_Test.dsp:
+        * tests/version_tests/Semaphore_Test.dsp:
+        * tests/version_tests/Service_Config_Test.dsp:
+        * tests/version_tests/Sigset_Ops_Test.dsp:
+        * tests/version_tests/Simple_Message_Block_Test.dsp:
+        * tests/version_tests/Svc_Handler_Test.dsp:
+        * tests/version_tests/TSS_Test.dsp:
+        * tests/version_tests/Task_Test.dsp:
+        * tests/version_tests/Thread_Manager_Test.dsp:
+        * tests/version_tests/Thread_Mutex_Test.dsp:
+        * tests/version_tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/version_tests/Thread_Pool_Test.dsp:
+        * tests/version_tests/Time_Service_Test.dsp:
+        * tests/version_tests/Time_Value_Test.dsp:
+        * tests/version_tests/Timeprobe_Test.dsp:
+        * tests/version_tests/Timer_Queue_Test.dsp:
+        * tests/version_tests/Tokens_Test.dsp:
+        * tests/version_tests/UPIPE_SAP_Test.dsp:
+        * tests/version_tests/Upgradable_RW_Test.dsp:
+        * tests/version_tests/version_tests.dsw:
+
+          Regenerated.
+
 Mon Jun 12 18:17:42 2000  Darrell Brunsch <brunsch@cs.wustl.edu>
 
         * bin/auto_run_tests.lst: (added)
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 501f31f78df..0ac8cea249f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,117 @@
+Mon Jun 12 20:45:18 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/Process_Win32.pm:
+
+          Changed the $newwindow check to check to see if the variable
+          was defined before comparing it to "yes".  This removes a 
+          perl warning.
+
+        * bin/msvc_auto_compile.pl:
+
+          The TAOACE[_static].dsw files were changed, so I altered the
+          CORE option to use the TAOACE.dsw file with -DLL, and added 
+          some missing dsp files for the -LIB build.  
+          
+        * bin/create_vt_dsps.pl:
+
+          Changed the runtime library type used in the static versions 
+          and added ACE_OS_HAS_DLL=0.
+
+        * ace/ace_lib.dsp:
+        * apps/gperf/src/gperf.dsp:
+        * apps/gperf/src/gperf_lib.dsp:
+        * examples/IPC_SAP/ATM_SAP/CPP_client.dsp:
+        * examples/IPC_SAP/ATM_SAP/CPP_server.dsp:
+
+          Miscellaneous fixes to get the static versions working again.
+          Mainly just adding ACE_OS_HAS_DLL=0.
+
+        * tests/version_tests/CDR_Array_Test.dsp: (added)
+        * tests/version_tests/Atomic_Op_Test.dsp:
+        * tests/version_tests/Auto_IncDec_Test.dsp:
+        * tests/version_tests/Barrier_Test.dsp:
+        * tests/version_tests/Basic_Types_Test.dsp:
+        * tests/version_tests/Buffer_Stream_Test.dsp:
+        * tests/version_tests/CDR_File_Test.dsp:
+        * tests/version_tests/CDR_Test.dsp:
+        * tests/version_tests/Cache_Map_Manager_Test.dsp:
+        * tests/version_tests/Cached_Accept_Conn_Test.dsp:
+        * tests/version_tests/Cached_Conn_Test.dsp:
+        * tests/version_tests/Capabilities_Test.dsp:
+        * tests/version_tests/Collection_Test.dsp:
+        * tests/version_tests/Conn_Test.dsp:
+        * tests/version_tests/DLL_Test.dsp:
+        * tests/version_tests/DLList_Test.dsp:
+        * tests/version_tests/Dynamic_Priority_Test.dsp:
+        * tests/version_tests/Enum_Interfaces_Test.dsp:
+        * tests/version_tests/Env_Value_Test.dsp:
+        * tests/version_tests/Future_Set_Test.dsp:
+        * tests/version_tests/Future_Test.dsp:
+        * tests/version_tests/Handle_Set_Test.dsp:
+        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/version_tests/Hash_Map_Manager_Test.dsp:
+        * tests/version_tests/High_Res_Timer_Test.dsp:
+        * tests/version_tests/IOStream_Test.dsp:
+        * tests/version_tests/Lazy_Map_Manager_Test.dsp:
+        * tests/version_tests/MM_Shared_Memory_Test.dsp:
+        * tests/version_tests/MT_Reactor_Timer_Test.dsp:
+        * tests/version_tests/MT_SOCK_Test.dsp:
+        * tests/version_tests/Malloc_Test.dsp:
+        * tests/version_tests/Map_Manager_Test.dsp:
+        * tests/version_tests/Map_Test.dsp:
+        * tests/version_tests/Mem_Map_Test.dsp:
+        * tests/version_tests/Message_Block_Test.dsp:
+        * tests/version_tests/Message_Queue_Notifications_Test.dsp:
+        * tests/version_tests/Message_Queue_Test.dsp:
+        * tests/version_tests/Naming_Test.dsp:
+        * tests/version_tests/New_Fail_Test.dsp:
+        * tests/version_tests/Notify_Performance_Test.dsp:
+        * tests/version_tests/Object_Manager_Test.dsp:
+        * tests/version_tests/OrdMultiSet_Test.dsp:
+        * tests/version_tests/Pipe_Test.dsp:
+        * tests/version_tests/Priority_Buffer_Test.dsp:
+        * tests/version_tests/Priority_Reactor_Test.dsp:
+        * tests/version_tests/Priority_Task_Test.dsp:
+        * tests/version_tests/Process_Manager_Test.dsp:
+        * tests/version_tests/Process_Mutex_Test.dsp:
+        * tests/version_tests/Process_Strategy_Test.dsp:
+        * tests/version_tests/RB_Tree_Test.dsp:
+        * tests/version_tests/Reactor_Exceptions_Test.dsp:
+        * tests/version_tests/Reactor_Notify_Test.dsp:
+        * tests/version_tests/Reactor_Performance_Test.dsp:
+        * tests/version_tests/Reactor_Timer_Test.dsp:
+        * tests/version_tests/Reactors_Test.dsp:
+        * tests/version_tests/Reader_Writer_Test.dsp:
+        * tests/version_tests/Recursive_Mutex_Test.dsp:
+        * tests/version_tests/Reverse_Lock_Test.dsp:
+        * tests/version_tests/SOCK_Connector_Test.dsp:
+        * tests/version_tests/SOCK_Send_Recv_Test.dsp:
+        * tests/version_tests/SOCK_Test.dsp:
+        * tests/version_tests/SPIPE_Test.dsp:
+        * tests/version_tests/SString_Test.dsp:
+        * tests/version_tests/SV_Shared_Memory_Test.dsp:
+        * tests/version_tests/Semaphore_Test.dsp:
+        * tests/version_tests/Service_Config_Test.dsp:
+        * tests/version_tests/Sigset_Ops_Test.dsp:
+        * tests/version_tests/Simple_Message_Block_Test.dsp:
+        * tests/version_tests/Svc_Handler_Test.dsp:
+        * tests/version_tests/TSS_Test.dsp:
+        * tests/version_tests/Task_Test.dsp:
+        * tests/version_tests/Thread_Manager_Test.dsp:
+        * tests/version_tests/Thread_Mutex_Test.dsp:
+        * tests/version_tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/version_tests/Thread_Pool_Test.dsp:
+        * tests/version_tests/Time_Service_Test.dsp:
+        * tests/version_tests/Time_Value_Test.dsp:
+        * tests/version_tests/Timeprobe_Test.dsp:
+        * tests/version_tests/Timer_Queue_Test.dsp:
+        * tests/version_tests/Tokens_Test.dsp:
+        * tests/version_tests/UPIPE_SAP_Test.dsp:
+        * tests/version_tests/Upgradable_RW_Test.dsp:
+        * tests/version_tests/version_tests.dsw:
+
+          Regenerated.
+
 Mon Jun 12 18:17:42 2000  Darrell Brunsch <brunsch@cs.wustl.edu>
 
         * bin/auto_run_tests.lst: (added)
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 501f31f78df..0ac8cea249f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,117 @@
+Mon Jun 12 20:45:18 2000  Darrell Brunsch <brunsch@uci.edu>
+
+        * bin/Process_Win32.pm:
+
+          Changed the $newwindow check to check to see if the variable
+          was defined before comparing it to "yes".  This removes a 
+          perl warning.
+
+        * bin/msvc_auto_compile.pl:
+
+          The TAOACE[_static].dsw files were changed, so I altered the
+          CORE option to use the TAOACE.dsw file with -DLL, and added 
+          some missing dsp files for the -LIB build.  
+          
+        * bin/create_vt_dsps.pl:
+
+          Changed the runtime library type used in the static versions 
+          and added ACE_OS_HAS_DLL=0.
+
+        * ace/ace_lib.dsp:
+        * apps/gperf/src/gperf.dsp:
+        * apps/gperf/src/gperf_lib.dsp:
+        * examples/IPC_SAP/ATM_SAP/CPP_client.dsp:
+        * examples/IPC_SAP/ATM_SAP/CPP_server.dsp:
+
+          Miscellaneous fixes to get the static versions working again.
+          Mainly just adding ACE_OS_HAS_DLL=0.
+
+        * tests/version_tests/CDR_Array_Test.dsp: (added)
+        * tests/version_tests/Atomic_Op_Test.dsp:
+        * tests/version_tests/Auto_IncDec_Test.dsp:
+        * tests/version_tests/Barrier_Test.dsp:
+        * tests/version_tests/Basic_Types_Test.dsp:
+        * tests/version_tests/Buffer_Stream_Test.dsp:
+        * tests/version_tests/CDR_File_Test.dsp:
+        * tests/version_tests/CDR_Test.dsp:
+        * tests/version_tests/Cache_Map_Manager_Test.dsp:
+        * tests/version_tests/Cached_Accept_Conn_Test.dsp:
+        * tests/version_tests/Cached_Conn_Test.dsp:
+        * tests/version_tests/Capabilities_Test.dsp:
+        * tests/version_tests/Collection_Test.dsp:
+        * tests/version_tests/Conn_Test.dsp:
+        * tests/version_tests/DLL_Test.dsp:
+        * tests/version_tests/DLList_Test.dsp:
+        * tests/version_tests/Dynamic_Priority_Test.dsp:
+        * tests/version_tests/Enum_Interfaces_Test.dsp:
+        * tests/version_tests/Env_Value_Test.dsp:
+        * tests/version_tests/Future_Set_Test.dsp:
+        * tests/version_tests/Future_Test.dsp:
+        * tests/version_tests/Handle_Set_Test.dsp:
+        * tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp:
+        * tests/version_tests/Hash_Map_Manager_Test.dsp:
+        * tests/version_tests/High_Res_Timer_Test.dsp:
+        * tests/version_tests/IOStream_Test.dsp:
+        * tests/version_tests/Lazy_Map_Manager_Test.dsp:
+        * tests/version_tests/MM_Shared_Memory_Test.dsp:
+        * tests/version_tests/MT_Reactor_Timer_Test.dsp:
+        * tests/version_tests/MT_SOCK_Test.dsp:
+        * tests/version_tests/Malloc_Test.dsp:
+        * tests/version_tests/Map_Manager_Test.dsp:
+        * tests/version_tests/Map_Test.dsp:
+        * tests/version_tests/Mem_Map_Test.dsp:
+        * tests/version_tests/Message_Block_Test.dsp:
+        * tests/version_tests/Message_Queue_Notifications_Test.dsp:
+        * tests/version_tests/Message_Queue_Test.dsp:
+        * tests/version_tests/Naming_Test.dsp:
+        * tests/version_tests/New_Fail_Test.dsp:
+        * tests/version_tests/Notify_Performance_Test.dsp:
+        * tests/version_tests/Object_Manager_Test.dsp:
+        * tests/version_tests/OrdMultiSet_Test.dsp:
+        * tests/version_tests/Pipe_Test.dsp:
+        * tests/version_tests/Priority_Buffer_Test.dsp:
+        * tests/version_tests/Priority_Reactor_Test.dsp:
+        * tests/version_tests/Priority_Task_Test.dsp:
+        * tests/version_tests/Process_Manager_Test.dsp:
+        * tests/version_tests/Process_Mutex_Test.dsp:
+        * tests/version_tests/Process_Strategy_Test.dsp:
+        * tests/version_tests/RB_Tree_Test.dsp:
+        * tests/version_tests/Reactor_Exceptions_Test.dsp:
+        * tests/version_tests/Reactor_Notify_Test.dsp:
+        * tests/version_tests/Reactor_Performance_Test.dsp:
+        * tests/version_tests/Reactor_Timer_Test.dsp:
+        * tests/version_tests/Reactors_Test.dsp:
+        * tests/version_tests/Reader_Writer_Test.dsp:
+        * tests/version_tests/Recursive_Mutex_Test.dsp:
+        * tests/version_tests/Reverse_Lock_Test.dsp:
+        * tests/version_tests/SOCK_Connector_Test.dsp:
+        * tests/version_tests/SOCK_Send_Recv_Test.dsp:
+        * tests/version_tests/SOCK_Test.dsp:
+        * tests/version_tests/SPIPE_Test.dsp:
+        * tests/version_tests/SString_Test.dsp:
+        * tests/version_tests/SV_Shared_Memory_Test.dsp:
+        * tests/version_tests/Semaphore_Test.dsp:
+        * tests/version_tests/Service_Config_Test.dsp:
+        * tests/version_tests/Sigset_Ops_Test.dsp:
+        * tests/version_tests/Simple_Message_Block_Test.dsp:
+        * tests/version_tests/Svc_Handler_Test.dsp:
+        * tests/version_tests/TSS_Test.dsp:
+        * tests/version_tests/Task_Test.dsp:
+        * tests/version_tests/Thread_Manager_Test.dsp:
+        * tests/version_tests/Thread_Mutex_Test.dsp:
+        * tests/version_tests/Thread_Pool_Reactor_Test.dsp:
+        * tests/version_tests/Thread_Pool_Test.dsp:
+        * tests/version_tests/Time_Service_Test.dsp:
+        * tests/version_tests/Time_Value_Test.dsp:
+        * tests/version_tests/Timeprobe_Test.dsp:
+        * tests/version_tests/Timer_Queue_Test.dsp:
+        * tests/version_tests/Tokens_Test.dsp:
+        * tests/version_tests/UPIPE_SAP_Test.dsp:
+        * tests/version_tests/Upgradable_RW_Test.dsp:
+        * tests/version_tests/version_tests.dsw:
+
+          Regenerated.
+
 Mon Jun 12 18:17:42 2000  Darrell Brunsch <brunsch@cs.wustl.edu>
 
         * bin/auto_run_tests.lst: (added)
diff --git a/ace/ace_lib.dsp b/ace/ace_lib.dsp
index ff101425a3f..6e20f07d674 100644
--- a/ace/ace_lib.dsp
+++ b/ace/ace_lib.dsp
@@ -169,7 +169,7 @@ LIB32=link.exe -lib
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /G5 /MTd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D "ACE_NO_INLINE" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /Gy /I "../" /D "_WINDOWS" /D ACE_OS_HAS_DLL=0 /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /FD /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
diff --git a/apps/gperf/src/gperf.dsp b/apps/gperf/src/gperf.dsp
index de93110510d..b3ee09e8c41 100644
--- a/apps/gperf/src/gperf.dsp
+++ b/apps/gperf/src/gperf.dsp
@@ -197,7 +197,7 @@ LINK32=link.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "_DEBUG" /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/apps/gperf/src/gperf_lib.dsp b/apps/gperf/src/gperf_lib.dsp
index 72cd22f6579..fe086f69baa 100644
--- a/apps/gperf/src/gperf_lib.dsp
+++ b/apps/gperf/src/gperf_lib.dsp
@@ -173,7 +173,7 @@ LIB32=link.exe -lib
 CPP=cl.exe
 # ADD BASE CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
 # SUBTRACT BASE CPP /YX
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\\" /D "_WINDOWS" /D "WIN32" /D "_DEBUG" /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\..\..\\" /D "_WINDOWS" /D "_DEBUG" /D "WIN32" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x409
diff --git a/bin/Process_Win32.pm b/bin/Process_Win32.pm
index b7b1171228d..ac5497d858b 100644
--- a/bin/Process_Win32.pm
+++ b/bin/Process_Win32.pm
@@ -11,7 +11,7 @@ sub Create
 
   my $console = 0;
 
-  if ($newwindow eq "yes")
+  if ($newwindow && $newwindow eq "yes")
   {
     $console = CREATE_NEW_CONSOLE;
   }
diff --git a/bin/create_vt_dsps.pl b/bin/create_vt_dsps.pl
index 2a707039a89..bbe68ed9546 100755
--- a/bin/create_vt_dsps.pl
+++ b/bin/create_vt_dsps.pl
@@ -110,7 +110,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\XXXXXXXX"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -135,7 +135,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\XXXXXXXX"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
diff --git a/bin/msvc_auto_compile.pl b/bin/msvc_auto_compile.pl
index ee4d8e97c56..8f4a904facf 100755
--- a/bin/msvc_auto_compile.pl
+++ b/bin/msvc_auto_compile.pl
@@ -126,12 +126,7 @@ sub Build_Core ()
     my @core_list = ();
 
     if ($Build_DLL) {
-        @core_list = ($ACE_ROOT."\\ace\\ace_dll.dsp",
-                      $ACE_ROOT."\\apps\\gperf\\src\\gperf_lib.dsp",
-                      $ACE_ROOT."\\apps\\gperf\\src\\gperf.dsp",
-                      $ACE_ROOT."\\TAO\\TAO_IDL\\tao_idl.dsp",
-                      $ACE_ROOT."\\TAO\\tao\\TAO.dsp",
-                      $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\orbsvcs.dsw");
+        @core_list = ($ACE_ROOT."\\TAO\\TAOACE.dsw");
 
         foreach $c (@core_list) {
             if ($Build_Debug) {
@@ -163,7 +158,10 @@ sub Build_Core ()
                       $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\CosConcurrency_Static.dsp",
                       $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\CosLifeCycle_Static.dsp",
                       $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\CosTime_Static.dsp",
-                      $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\DsLogAdmin_Static.dsp");
+                      $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\DsLogAdmin_Static.dsp",
+                      $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\CosNotification_Static.dsp",
+                      $ACE_ROOT."\\TAO\\orbsvcs\\orbsvcs\\LoadBalancing_Static.dsp",
+                      $ACE_ROOT."\\TAO\\orbsvcs\\Naming_Service\\Naming_Servcie.dsp");
 
         foreach $c (@core_list) {
             if ($Build_Debug) {
diff --git a/examples/IPC_SAP/ATM_SAP/CPP_client.dsp b/examples/IPC_SAP/ATM_SAP/CPP_client.dsp
index f3fc5ab8315..b5847edfbdd 100644
--- a/examples/IPC_SAP/ATM_SAP/CPP_client.dsp
+++ b/examples/IPC_SAP/ATM_SAP/CPP_client.dsp
@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D _CONSOLE.ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 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 /pdbtype:sept /libpath:"..\..\..\ace"
+# ADD LINK32 acesd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/examples/IPC_SAP/ATM_SAP/CPP_server.dsp b/examples/IPC_SAP/ATM_SAP/CPP_server.dsp
index ab6ad4ff057..550cfd568a5 100644
--- a/examples/IPC_SAP/ATM_SAP/CPP_server.dsp
+++ b/examples/IPC_SAP/ATM_SAP/CPP_server.dsp
@@ -69,7 +69,7 @@ LINK32=link.exe
 # 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
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 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 /pdbtype:sept /libpath:"..\..\..\ace"
+# ADD LINK32 acesd.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"
 # SUBTRACT LINK32 /pdb:none
 
 !ENDIF 
diff --git a/tests/version_tests/Atomic_Op_Test.dsp b/tests/version_tests/Atomic_Op_Test.dsp
index 7ae7257e2ae..85706836eb7 100644
--- a/tests/version_tests/Atomic_Op_Test.dsp
+++ b/tests/version_tests/Atomic_Op_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Atomic_Op_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Atomic_Op_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Atomic_Op_Test - Win32 Static Debug"
 # Name "Atomic_Op_Test - Win32 Static Release"
-# Name "Atomic_Op_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Atomic_Op_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter ".cpp"
 # Begin Source File
diff --git a/tests/version_tests/Auto_IncDec_Test.dsp b/tests/version_tests/Auto_IncDec_Test.dsp
index c62d8a93e4d..562c9092abc 100644
--- a/tests/version_tests/Auto_IncDec_Test.dsp
+++ b/tests/version_tests/Auto_IncDec_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Auto_IncDec_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Auto_IncDec_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Auto_IncDec_Test - Win32 Static Debug"
 # Name "Auto_IncDec_Test - Win32 Static Release"
-# Name "Auto_IncDec_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Auto_IncDec_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter ".cpp"
 # Begin Source File
diff --git a/tests/version_tests/Barrier_Test.dsp b/tests/version_tests/Barrier_Test.dsp
index ed5ad6bf6bb..cf29a32f87f 100644
--- a/tests/version_tests/Barrier_Test.dsp
+++ b/tests/version_tests/Barrier_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Barrier_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Barrier_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Barrier_Test - Win32 Static Debug"
 # Name "Barrier_Test - Win32 Static Release"
-# Name "Barrier_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Barrier_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Basic_Types_Test.dsp b/tests/version_tests/Basic_Types_Test.dsp
index b1686031189..46c34e1c2b6 100644
--- a/tests/version_tests/Basic_Types_Test.dsp
+++ b/tests/version_tests/Basic_Types_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Basic_Types_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Basic_Types_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Basic_Types_Test - Win32 Static Debug"
 # Name "Basic_Types_Test - Win32 Static Release"
-# Name "Basic_Types_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Basic_Types_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Buffer_Stream_Test.dsp b/tests/version_tests/Buffer_Stream_Test.dsp
index 0c35ebd5515..0261f927de1 100644
--- a/tests/version_tests/Buffer_Stream_Test.dsp
+++ b/tests/version_tests/Buffer_Stream_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Buffer_Stream_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Buffer_Stream_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Buffer_Stream_Test - Win32 Static Debug"
 # Name "Buffer_Stream_Test - Win32 Static Release"
-# Name "Buffer_Stream_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Buffer_Stream_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/CDR_Array_Test.dsp b/tests/version_tests/CDR_Array_Test.dsp
new file mode 100644
index 00000000000..fd7979f7b04
--- /dev/null
+++ b/tests/version_tests/CDR_Array_Test.dsp
@@ -0,0 +1,123 @@
+# Microsoft Developer Studio Project File - Name="CDR_Array_Test" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=CDR_Array_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 "CDR_Array_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 "CDR_Array_Test.mak" CFG="CDR_Array_Test - Win32 Release"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "CDR_Array_Test - Win32 Static Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_Array_Test - Win32 Static Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "CDR_Array_Test - Win32 Release" (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)" == "CDR_Array_Test - Win32 Static Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir ".\CDR_Array_Test\Static Debug"
+# PROP BASE Intermediate_Dir ".\CDR_Array_Test\Static Debug"
+# PROP BASE Target_Dir ".\CDR_Array_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ".\LIB\Debug"
+# PROP Intermediate_Dir ".\LIB\Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\CDR_Array_Test"
+# 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_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /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)" == "CDR_Array_Test - Win32 Static Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\CDR_Array_Test\Static Release"
+# PROP BASE Intermediate_Dir ".\CDR_Array_Test\Static Release"
+# PROP BASE Target_Dir ".\CDR_Array_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\LIB\Release"
+# PROP Intermediate_Dir ".\LIB\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\CDR_Array_Test"
+# 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_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /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)" == "CDR_Array_Test - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir ".\CDR_Array_Test\Release"
+# PROP BASE Intermediate_Dir ".\CDR_Array_Test\Release"
+# PROP BASE Target_Dir ".\CDR_Array_Test"
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ".\DLL\Release"
+# PROP Intermediate_Dir ".\DLL\Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ".\CDR_Array_Test"
+# 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"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "CDR_Array_Test - Win32 Static Debug"
+# Name "CDR_Array_Test - Win32 Static Release"
+# Name "CDR_Array_Test - Win32 Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+# Begin Source File
+
+SOURCE=..\CDR_Array_Test.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/tests/version_tests/CDR_File_Test.dsp b/tests/version_tests/CDR_File_Test.dsp
index 0e6517f8c03..5183ea208ad 100644
--- a/tests/version_tests/CDR_File_Test.dsp
+++ b/tests/version_tests/CDR_File_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\CDR_File_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\CDR_File_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "CDR_File_Test - Win32 Static Debug"
 # Name "CDR_File_Test - Win32 Static Release"
-# Name "CDR_File_Test - Win32 Release"# Begin Group "Source Files"
+# Name "CDR_File_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/CDR_Test.dsp b/tests/version_tests/CDR_Test.dsp
index cb87958a6ce..3f565c6976b 100644
--- a/tests/version_tests/CDR_Test.dsp
+++ b/tests/version_tests/CDR_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\CDR_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\CDR_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "CDR_Test - Win32 Static Debug"
 # Name "CDR_Test - Win32 Static Release"
-# Name "CDR_Test - Win32 Release"# Begin Group "Source Files"
+# Name "CDR_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Cache_Map_Manager_Test.dsp b/tests/version_tests/Cache_Map_Manager_Test.dsp
index 9c8e061b074..c488e628419 100644
--- a/tests/version_tests/Cache_Map_Manager_Test.dsp
+++ b/tests/version_tests/Cache_Map_Manager_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Cache_Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Cache_Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Cache_Map_Manager_Test - Win32 Static Debug"
 # Name "Cache_Map_Manager_Test - Win32 Static Release"
-# Name "Cache_Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Cache_Map_Manager_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter ".cpp"
 # Begin Source File
diff --git a/tests/version_tests/Cached_Accept_Conn_Test.dsp b/tests/version_tests/Cached_Accept_Conn_Test.dsp
index 1499efc6ebc..ed554df19a0 100644
--- a/tests/version_tests/Cached_Accept_Conn_Test.dsp
+++ b/tests/version_tests/Cached_Accept_Conn_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Cached_Accept_Conn_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Cached_Accept_Conn_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Cached_Accept_Conn_Test - Win32 Static Debug"
 # Name "Cached_Accept_Conn_Test - Win32 Static Release"
-# Name "Cached_Accept_Conn_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Cached_Accept_Conn_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Cached_Conn_Test.dsp b/tests/version_tests/Cached_Conn_Test.dsp
index 4e4cf9bc247..e0bcfb1b814 100644
--- a/tests/version_tests/Cached_Conn_Test.dsp
+++ b/tests/version_tests/Cached_Conn_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Cached_Conn_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Cached_Conn_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Cached_Conn_Test - Win32 Static Debug"
 # Name "Cached_Conn_Test - Win32 Static Release"
-# Name "Cached_Conn_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Cached_Conn_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter ".cpp"
 # Begin Source File
diff --git a/tests/version_tests/Capabilities_Test.dsp b/tests/version_tests/Capabilities_Test.dsp
index 3edd54e3915..838366f6f6d 100644
--- a/tests/version_tests/Capabilities_Test.dsp
+++ b/tests/version_tests/Capabilities_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Capabilities_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Capabilities_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Capabilities_Test - Win32 Static Debug"
 # Name "Capabilities_Test - Win32 Static Release"
-# Name "Capabilities_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Capabilities_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Collection_Test.dsp b/tests/version_tests/Collection_Test.dsp
index 5d2725f8a14..bc0c05399ab 100644
--- a/tests/version_tests/Collection_Test.dsp
+++ b/tests/version_tests/Collection_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Collection_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Collection_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Collection_Test - Win32 Static Debug"
 # Name "Collection_Test - Win32 Static Release"
-# Name "Collection_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Collection_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Conn_Test.dsp b/tests/version_tests/Conn_Test.dsp
index c9b50eaf111..84f89f6b5b6 100644
--- a/tests/version_tests/Conn_Test.dsp
+++ b/tests/version_tests/Conn_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Conn_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Conn_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Conn_Test - Win32 Static Debug"
 # Name "Conn_Test - Win32 Static Release"
-# Name "Conn_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Conn_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/DLL_Test.dsp b/tests/version_tests/DLL_Test.dsp
index 1d000612e80..c57783bafc6 100644
--- a/tests/version_tests/DLL_Test.dsp
+++ b/tests/version_tests/DLL_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\DLL_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\DLL_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "DLL_Test - Win32 Static Debug"
 # Name "DLL_Test - Win32 Static Release"
-# Name "DLL_Test - Win32 Release"# Begin Group "Source Files"
+# Name "DLL_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/DLList_Test.dsp b/tests/version_tests/DLList_Test.dsp
index 647c0642599..6b8638ec106 100644
--- a/tests/version_tests/DLList_Test.dsp
+++ b/tests/version_tests/DLList_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\DLList_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\DLList_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "DLList_Test - Win32 Static Debug"
 # Name "DLList_Test - Win32 Static Release"
-# Name "DLList_Test - Win32 Release"# Begin Group "Source Files"
+# Name "DLList_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Dynamic_Priority_Test.dsp b/tests/version_tests/Dynamic_Priority_Test.dsp
index 9d7838a1a3e..77c7e6a84f9 100644
--- a/tests/version_tests/Dynamic_Priority_Test.dsp
+++ b/tests/version_tests/Dynamic_Priority_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Dynamic_Priority_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Dynamic_Priority_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Dynamic_Priority_Test - Win32 Static Debug"
 # Name "Dynamic_Priority_Test - Win32 Static Release"
-# Name "Dynamic_Priority_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Dynamic_Priority_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Enum_Interfaces_Test.dsp b/tests/version_tests/Enum_Interfaces_Test.dsp
index f001fe66e30..efd7221a45d 100644
--- a/tests/version_tests/Enum_Interfaces_Test.dsp
+++ b/tests/version_tests/Enum_Interfaces_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Enum_Interfaces_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Enum_Interfaces_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Enum_Interfaces_Test - Win32 Static Debug"
 # Name "Enum_Interfaces_Test - Win32 Static Release"
-# Name "Enum_Interfaces_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Enum_Interfaces_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Env_Value_Test.dsp b/tests/version_tests/Env_Value_Test.dsp
index 33d9a8a1bf6..c35cca84dbf 100644
--- a/tests/version_tests/Env_Value_Test.dsp
+++ b/tests/version_tests/Env_Value_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Env_Value_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Env_Value_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Env_Value_Test - Win32 Static Debug"
 # Name "Env_Value_Test - Win32 Static Release"
-# Name "Env_Value_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Env_Value_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Future_Set_Test.dsp b/tests/version_tests/Future_Set_Test.dsp
index c84e4ec91ae..a6dbac64ba1 100644
--- a/tests/version_tests/Future_Set_Test.dsp
+++ b/tests/version_tests/Future_Set_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Future_Set_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Future_Set_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Future_Set_Test - Win32 Static Debug"
 # Name "Future_Set_Test - Win32 Static Release"
-# Name "Future_Set_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Future_Set_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Future_Test.dsp b/tests/version_tests/Future_Test.dsp
index 99c67c8ca11..06cb62a3493 100644
--- a/tests/version_tests/Future_Test.dsp
+++ b/tests/version_tests/Future_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Future_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Future_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Future_Test - Win32 Static Debug"
 # Name "Future_Test - Win32 Static Release"
-# Name "Future_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Future_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Handle_Set_Test.dsp b/tests/version_tests/Handle_Set_Test.dsp
index 454605385ee..9312f3a146b 100644
--- a/tests/version_tests/Handle_Set_Test.dsp
+++ b/tests/version_tests/Handle_Set_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Handle_Set_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Handle_Set_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Handle_Set_Test - Win32 Static Debug"
 # Name "Handle_Set_Test - Win32 Static Release"
-# Name "Handle_Set_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Handle_Set_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp b/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp
index 5afddaa7ffb..fcfc4532126 100644
--- a/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp
+++ b/tests/version_tests/Hash_Map_Bucket_Iterator_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Hash_Map_Bucket_Iterator_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Debug"
 # Name "Hash_Map_Bucket_Iterator_Test - Win32 Static Release"
-# Name "Hash_Map_Bucket_Iterator_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Hash_Map_Bucket_Iterator_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Hash_Map_Manager_Test.dsp b/tests/version_tests/Hash_Map_Manager_Test.dsp
index 27b28a530be..d02f136abff 100644
--- a/tests/version_tests/Hash_Map_Manager_Test.dsp
+++ b/tests/version_tests/Hash_Map_Manager_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Hash_Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Hash_Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Hash_Map_Manager_Test - Win32 Static Debug"
 # Name "Hash_Map_Manager_Test - Win32 Static Release"
-# Name "Hash_Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Hash_Map_Manager_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/High_Res_Timer_Test.dsp b/tests/version_tests/High_Res_Timer_Test.dsp
index f8441eac5f5..c47042944c5 100644
--- a/tests/version_tests/High_Res_Timer_Test.dsp
+++ b/tests/version_tests/High_Res_Timer_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\High_Res_Timer_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\High_Res_Timer_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "High_Res_Timer_Test - Win32 Static Debug"
 # Name "High_Res_Timer_Test - Win32 Static Release"
-# Name "High_Res_Timer_Test - Win32 Release"# Begin Group "Source Files"
+# Name "High_Res_Timer_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/IOStream_Test.dsp b/tests/version_tests/IOStream_Test.dsp
index 38d9f6b01c6..028bab4671b 100644
--- a/tests/version_tests/IOStream_Test.dsp
+++ b/tests/version_tests/IOStream_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\IOStream_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\IOStream_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "IOStream_Test - Win32 Static Debug"
 # Name "IOStream_Test - Win32 Static Release"
-# Name "IOStream_Test - Win32 Release"# Begin Group "Source Files"
+# Name "IOStream_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Lazy_Map_Manager_Test.dsp b/tests/version_tests/Lazy_Map_Manager_Test.dsp
index 95f3d0e297a..8b3b9613e61 100644
--- a/tests/version_tests/Lazy_Map_Manager_Test.dsp
+++ b/tests/version_tests/Lazy_Map_Manager_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Lazy_Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Lazy_Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Lazy_Map_Manager_Test - Win32 Static Debug"
 # Name "Lazy_Map_Manager_Test - Win32 Static Release"
-# Name "Lazy_Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Lazy_Map_Manager_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter ".cpp"
 # Begin Source File
diff --git a/tests/version_tests/MM_Shared_Memory_Test.dsp b/tests/version_tests/MM_Shared_Memory_Test.dsp
index c4eb058bdd2..48479f88a12 100644
--- a/tests/version_tests/MM_Shared_Memory_Test.dsp
+++ b/tests/version_tests/MM_Shared_Memory_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\MM_Shared_Memory_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\MM_Shared_Memory_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "MM_Shared_Memory_Test - Win32 Static Debug"
 # Name "MM_Shared_Memory_Test - Win32 Static Release"
-# Name "MM_Shared_Memory_Test - Win32 Release"# Begin Group "Source Files"
+# Name "MM_Shared_Memory_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/MT_Reactor_Timer_Test.dsp b/tests/version_tests/MT_Reactor_Timer_Test.dsp
index e10e49e2c5d..35aebf3574d 100644
--- a/tests/version_tests/MT_Reactor_Timer_Test.dsp
+++ b/tests/version_tests/MT_Reactor_Timer_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\MT_Reactor_Timer_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\MT_Reactor_Timer_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "MT_Reactor_Timer_Test - Win32 Static Debug"
 # Name "MT_Reactor_Timer_Test - Win32 Static Release"
-# Name "MT_Reactor_Timer_Test - Win32 Release"# Begin Group "Source Files"
+# Name "MT_Reactor_Timer_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/MT_SOCK_Test.dsp b/tests/version_tests/MT_SOCK_Test.dsp
index 50918352e5f..9f3fb1084e0 100644
--- a/tests/version_tests/MT_SOCK_Test.dsp
+++ b/tests/version_tests/MT_SOCK_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\MT_SOCK_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\MT_SOCK_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "MT_SOCK_Test - Win32 Static Debug"
 # Name "MT_SOCK_Test - Win32 Static Release"
-# Name "MT_SOCK_Test - Win32 Release"# Begin Source File
+# Name "MT_SOCK_Test - Win32 Release"
+# Begin Source File
 
 SOURCE=..\MT_SOCK_Test.cpp
 # End Source File
diff --git a/tests/version_tests/Malloc_Test.dsp b/tests/version_tests/Malloc_Test.dsp
index c572b40e023..a99de32cc95 100644
--- a/tests/version_tests/Malloc_Test.dsp
+++ b/tests/version_tests/Malloc_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Malloc_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Malloc_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Malloc_Test - Win32 Static Debug"
 # Name "Malloc_Test - Win32 Static Release"
-# Name "Malloc_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Malloc_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Map_Manager_Test.dsp b/tests/version_tests/Map_Manager_Test.dsp
index 21d3fc58fd8..e3a165b8cf3 100644
--- a/tests/version_tests/Map_Manager_Test.dsp
+++ b/tests/version_tests/Map_Manager_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Map_Manager_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Map_Manager_Test - Win32 Static Debug"
 # Name "Map_Manager_Test - Win32 Static Release"
-# Name "Map_Manager_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Map_Manager_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Map_Test.dsp b/tests/version_tests/Map_Test.dsp
index 2d0c6dad81f..32133a2e491 100644
--- a/tests/version_tests/Map_Test.dsp
+++ b/tests/version_tests/Map_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Map_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Map_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Map_Test - Win32 Static Debug"
 # Name "Map_Test - Win32 Static Release"
-# Name "Map_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Map_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Mem_Map_Test.dsp b/tests/version_tests/Mem_Map_Test.dsp
index 6777e24296c..f5661e8e1c6 100644
--- a/tests/version_tests/Mem_Map_Test.dsp
+++ b/tests/version_tests/Mem_Map_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Mem_Map_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Mem_Map_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Mem_Map_Test - Win32 Static Debug"
 # Name "Mem_Map_Test - Win32 Static Release"
-# Name "Mem_Map_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Mem_Map_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Message_Block_Test.dsp b/tests/version_tests/Message_Block_Test.dsp
index 1c30c18f247..ddcfae0413d 100644
--- a/tests/version_tests/Message_Block_Test.dsp
+++ b/tests/version_tests/Message_Block_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Message_Block_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Message_Block_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Message_Block_Test - Win32 Static Debug"
 # Name "Message_Block_Test - Win32 Static Release"
-# Name "Message_Block_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Message_Block_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Message_Queue_Notifications_Test.dsp b/tests/version_tests/Message_Queue_Notifications_Test.dsp
index 7c5a8653762..39eb98fbd01 100644
--- a/tests/version_tests/Message_Queue_Notifications_Test.dsp
+++ b/tests/version_tests/Message_Queue_Notifications_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Message_Queue_Notifications_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Message_Queue_Notifications_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Message_Queue_Notifications_Test - Win32 Static Debug"
 # Name "Message_Queue_Notifications_Test - Win32 Static Release"
-# Name "Message_Queue_Notifications_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Message_Queue_Notifications_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Message_Queue_Test.dsp b/tests/version_tests/Message_Queue_Test.dsp
index 10f9b2634fe..50632dd3414 100644
--- a/tests/version_tests/Message_Queue_Test.dsp
+++ b/tests/version_tests/Message_Queue_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Message_Queue_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Message_Queue_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Message_Queue_Test - Win32 Static Debug"
 # Name "Message_Queue_Test - Win32 Static Release"
-# Name "Message_Queue_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Message_Queue_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Naming_Test.dsp b/tests/version_tests/Naming_Test.dsp
index d69d76c301a..095b42fcba4 100644
--- a/tests/version_tests/Naming_Test.dsp
+++ b/tests/version_tests/Naming_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Naming_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Naming_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Naming_Test - Win32 Static Debug"
 # Name "Naming_Test - Win32 Static Release"
-# Name "Naming_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Naming_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/New_Fail_Test.dsp b/tests/version_tests/New_Fail_Test.dsp
index ef64d656f2b..dbbad978469 100644
--- a/tests/version_tests/New_Fail_Test.dsp
+++ b/tests/version_tests/New_Fail_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\New_Fail_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\New_Fail_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "New_Fail_Test - Win32 Static Debug"
 # Name "New_Fail_Test - Win32 Static Release"
-# Name "New_Fail_Test - Win32 Release"# Begin Group "Source Files"
+# Name "New_Fail_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Notify_Performance_Test.dsp b/tests/version_tests/Notify_Performance_Test.dsp
index da6fcf210ab..256e77c9087 100644
--- a/tests/version_tests/Notify_Performance_Test.dsp
+++ b/tests/version_tests/Notify_Performance_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Notify_Performance_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Notify_Performance_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Notify_Performance_Test - Win32 Static Debug"
 # Name "Notify_Performance_Test - Win32 Static Release"
-# Name "Notify_Performance_Test - Win32 Release"# Begin Source File
+# Name "Notify_Performance_Test - Win32 Release"
+# Begin Source File
 
 SOURCE=..\Notify_Performance_Test.cpp
 # End Source File
diff --git a/tests/version_tests/Object_Manager_Test.dsp b/tests/version_tests/Object_Manager_Test.dsp
index 9f83569a7c3..a0b546d1a13 100644
--- a/tests/version_tests/Object_Manager_Test.dsp
+++ b/tests/version_tests/Object_Manager_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Object_Manager_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Object_Manager_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Object_Manager_Test - Win32 Static Debug"
 # Name "Object_Manager_Test - Win32 Static Release"
-# Name "Object_Manager_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Object_Manager_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/OrdMultiSet_Test.dsp b/tests/version_tests/OrdMultiSet_Test.dsp
index 5fdb882b306..566543a2abc 100644
--- a/tests/version_tests/OrdMultiSet_Test.dsp
+++ b/tests/version_tests/OrdMultiSet_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\OrdMultiSet_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\OrdMultiSet_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "OrdMultiSet_Test - Win32 Static Debug"
 # Name "OrdMultiSet_Test - Win32 Static Release"
-# Name "OrdMultiSet_Test - Win32 Release"# Begin Group "Source Files"
+# Name "OrdMultiSet_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Pipe_Test.dsp b/tests/version_tests/Pipe_Test.dsp
index a76871f082a..84b8bc475f2 100644
--- a/tests/version_tests/Pipe_Test.dsp
+++ b/tests/version_tests/Pipe_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Pipe_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Pipe_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Pipe_Test - Win32 Static Debug"
 # Name "Pipe_Test - Win32 Static Release"
-# Name "Pipe_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Pipe_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Priority_Buffer_Test.dsp b/tests/version_tests/Priority_Buffer_Test.dsp
index a04338c3b9b..1c511758ed6 100644
--- a/tests/version_tests/Priority_Buffer_Test.dsp
+++ b/tests/version_tests/Priority_Buffer_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Priority_Buffer_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Priority_Buffer_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Priority_Buffer_Test - Win32 Static Debug"
 # Name "Priority_Buffer_Test - Win32 Static Release"
-# Name "Priority_Buffer_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Priority_Buffer_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Priority_Reactor_Test.dsp b/tests/version_tests/Priority_Reactor_Test.dsp
index 1f917c5c69d..1008dbe6f53 100644
--- a/tests/version_tests/Priority_Reactor_Test.dsp
+++ b/tests/version_tests/Priority_Reactor_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Priority_Reactor_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Priority_Reactor_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Priority_Reactor_Test - Win32 Static Debug"
 # Name "Priority_Reactor_Test - Win32 Static Release"
-# Name "Priority_Reactor_Test - Win32 Release"# Begin Source File
+# Name "Priority_Reactor_Test - Win32 Release"
+# Begin Source File
 
 SOURCE=..\Priority_Reactor_Test.cpp
 # End Source File
diff --git a/tests/version_tests/Priority_Task_Test.dsp b/tests/version_tests/Priority_Task_Test.dsp
index 9c3252247aa..58032cc6041 100644
--- a/tests/version_tests/Priority_Task_Test.dsp
+++ b/tests/version_tests/Priority_Task_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Priority_Task_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Priority_Task_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Priority_Task_Test - Win32 Static Debug"
 # Name "Priority_Task_Test - Win32 Static Release"
-# Name "Priority_Task_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Priority_Task_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Process_Manager_Test.dsp b/tests/version_tests/Process_Manager_Test.dsp
index a2d1ba4fc51..a8f9c6f30ec 100644
--- a/tests/version_tests/Process_Manager_Test.dsp
+++ b/tests/version_tests/Process_Manager_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Process_Manager_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Process_Manager_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Process_Manager_Test - Win32 Static Debug"
 # Name "Process_Manager_Test - Win32 Static Release"
-# Name "Process_Manager_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Process_Manager_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Process_Mutex_Test.dsp b/tests/version_tests/Process_Mutex_Test.dsp
index 79eb98958f9..0fbce131e07 100644
--- a/tests/version_tests/Process_Mutex_Test.dsp
+++ b/tests/version_tests/Process_Mutex_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Process_Mutex_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Process_Mutex_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Process_Mutex_Test - Win32 Static Debug"
 # Name "Process_Mutex_Test - Win32 Static Release"
-# Name "Process_Mutex_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Process_Mutex_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Process_Strategy_Test.dsp b/tests/version_tests/Process_Strategy_Test.dsp
index 057de6c4c6a..9d55fe3b63b 100644
--- a/tests/version_tests/Process_Strategy_Test.dsp
+++ b/tests/version_tests/Process_Strategy_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Process_Strategy_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Process_Strategy_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Process_Strategy_Test - Win32 Static Debug"
 # Name "Process_Strategy_Test - Win32 Static Release"
-# Name "Process_Strategy_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Process_Strategy_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/RB_Tree_Test.dsp b/tests/version_tests/RB_Tree_Test.dsp
index 7c212155bb7..d588763ad39 100644
--- a/tests/version_tests/RB_Tree_Test.dsp
+++ b/tests/version_tests/RB_Tree_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\RB_Tree_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\RB_Tree_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "RB_Tree_Test - Win32 Static Debug"
 # Name "RB_Tree_Test - Win32 Static Release"
-# Name "RB_Tree_Test - Win32 Release"# Begin Group "Source Files"
+# Name "RB_Tree_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter ".cpp"
 # Begin Source File
diff --git a/tests/version_tests/Reactor_Exceptions_Test.dsp b/tests/version_tests/Reactor_Exceptions_Test.dsp
index 5dae7d33ccd..76fe149b940 100644
--- a/tests/version_tests/Reactor_Exceptions_Test.dsp
+++ b/tests/version_tests/Reactor_Exceptions_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Exceptions_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Exceptions_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Reactor_Exceptions_Test - Win32 Static Debug"
 # Name "Reactor_Exceptions_Test - Win32 Static Release"
-# Name "Reactor_Exceptions_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Reactor_Exceptions_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Reactor_Notify_Test.dsp b/tests/version_tests/Reactor_Notify_Test.dsp
index 102674d315b..9f96b69e213 100644
--- a/tests/version_tests/Reactor_Notify_Test.dsp
+++ b/tests/version_tests/Reactor_Notify_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Notify_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Notify_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Reactor_Notify_Test - Win32 Static Debug"
 # Name "Reactor_Notify_Test - Win32 Static Release"
-# Name "Reactor_Notify_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Reactor_Notify_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Reactor_Performance_Test.dsp b/tests/version_tests/Reactor_Performance_Test.dsp
index 90fba9c2158..4f85cab7806 100644
--- a/tests/version_tests/Reactor_Performance_Test.dsp
+++ b/tests/version_tests/Reactor_Performance_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Performance_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Performance_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Reactor_Performance_Test - Win32 Static Debug"
 # Name "Reactor_Performance_Test - Win32 Static Release"
-# Name "Reactor_Performance_Test - Win32 Release"# Begin Source File
+# Name "Reactor_Performance_Test - Win32 Release"
+# Begin Source File
 
 SOURCE=..\Reactor_Performance_Test.cpp
 # End Source File
diff --git a/tests/version_tests/Reactor_Timer_Test.dsp b/tests/version_tests/Reactor_Timer_Test.dsp
index c9a27aed925..21e9ea5fed0 100644
--- a/tests/version_tests/Reactor_Timer_Test.dsp
+++ b/tests/version_tests/Reactor_Timer_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Timer_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactor_Timer_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Reactor_Timer_Test - Win32 Static Debug"
 # Name "Reactor_Timer_Test - Win32 Static Release"
-# Name "Reactor_Timer_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Reactor_Timer_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Reactors_Test.dsp b/tests/version_tests/Reactors_Test.dsp
index 1ce0ab06dc9..da3c7c4b9d2 100644
--- a/tests/version_tests/Reactors_Test.dsp
+++ b/tests/version_tests/Reactors_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactors_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reactors_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Reactors_Test - Win32 Static Debug"
 # Name "Reactors_Test - Win32 Static Release"
-# Name "Reactors_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Reactors_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Reader_Writer_Test.dsp b/tests/version_tests/Reader_Writer_Test.dsp
index 1c313b51e90..96e665254fd 100644
--- a/tests/version_tests/Reader_Writer_Test.dsp
+++ b/tests/version_tests/Reader_Writer_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reader_Writer_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reader_Writer_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Reader_Writer_Test - Win32 Static Debug"
 # Name "Reader_Writer_Test - Win32 Static Release"
-# Name "Reader_Writer_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Reader_Writer_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Recursive_Mutex_Test.dsp b/tests/version_tests/Recursive_Mutex_Test.dsp
index 29261849648..6d32c98d154 100644
--- a/tests/version_tests/Recursive_Mutex_Test.dsp
+++ b/tests/version_tests/Recursive_Mutex_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Recursive_Mutex_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Recursive_Mutex_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Recursive_Mutex_Test - Win32 Static Debug"
 # Name "Recursive_Mutex_Test - Win32 Static Release"
-# Name "Recursive_Mutex_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Recursive_Mutex_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Reverse_Lock_Test.dsp b/tests/version_tests/Reverse_Lock_Test.dsp
index 647c332d3ed..9d4674ea2c4 100644
--- a/tests/version_tests/Reverse_Lock_Test.dsp
+++ b/tests/version_tests/Reverse_Lock_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reverse_Lock_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Reverse_Lock_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Reverse_Lock_Test - Win32 Static Debug"
 # Name "Reverse_Lock_Test - Win32 Static Release"
-# Name "Reverse_Lock_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Reverse_Lock_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/SOCK_Connector_Test.dsp b/tests/version_tests/SOCK_Connector_Test.dsp
index 37a2f36f93d..ac8e2fd9e4e 100644
--- a/tests/version_tests/SOCK_Connector_Test.dsp
+++ b/tests/version_tests/SOCK_Connector_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SOCK_Connector_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SOCK_Connector_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "SOCK_Connector_Test - Win32 Static Debug"
 # Name "SOCK_Connector_Test - Win32 Static Release"
-# Name "SOCK_Connector_Test - Win32 Release"# Begin Group "Source Files"
+# Name "SOCK_Connector_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/SOCK_Send_Recv_Test.dsp b/tests/version_tests/SOCK_Send_Recv_Test.dsp
index 0dc91d6b0c7..7c3e20a10fa 100644
--- a/tests/version_tests/SOCK_Send_Recv_Test.dsp
+++ b/tests/version_tests/SOCK_Send_Recv_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SOCK_Send_Recv_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SOCK_Send_Recv_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "SOCK_Send_Recv_Test - Win32 Static Debug"
 # Name "SOCK_Send_Recv_Test - Win32 Static Release"
-# Name "SOCK_Send_Recv_Test - Win32 Release"# Begin Group "Source Files"
+# Name "SOCK_Send_Recv_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/SOCK_Test.dsp b/tests/version_tests/SOCK_Test.dsp
index 157678207ad..3ba19c50180 100644
--- a/tests/version_tests/SOCK_Test.dsp
+++ b/tests/version_tests/SOCK_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SOCK_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SOCK_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "SOCK_Test - Win32 Static Debug"
 # Name "SOCK_Test - Win32 Static Release"
-# Name "SOCK_Test - Win32 Release"# Begin Group "Source Files"
+# Name "SOCK_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/SPIPE_Test.dsp b/tests/version_tests/SPIPE_Test.dsp
index 337c67b3d7d..623d21984bf 100644
--- a/tests/version_tests/SPIPE_Test.dsp
+++ b/tests/version_tests/SPIPE_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SPIPE_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SPIPE_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "SPIPE_Test - Win32 Static Debug"
 # Name "SPIPE_Test - Win32 Static Release"
-# Name "SPIPE_Test - Win32 Release"# Begin Group "Source Files"
+# Name "SPIPE_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/SString_Test.dsp b/tests/version_tests/SString_Test.dsp
index d78ee62ffb5..07b0c4c082f 100644
--- a/tests/version_tests/SString_Test.dsp
+++ b/tests/version_tests/SString_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SString_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SString_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "SString_Test - Win32 Static Debug"
 # Name "SString_Test - Win32 Static Release"
-# Name "SString_Test - Win32 Release"# Begin Group "Source Files"
+# Name "SString_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/SV_Shared_Memory_Test.dsp b/tests/version_tests/SV_Shared_Memory_Test.dsp
index 879f30e8720..e67f4c89801 100644
--- a/tests/version_tests/SV_Shared_Memory_Test.dsp
+++ b/tests/version_tests/SV_Shared_Memory_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SV_Shared_Memory_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\SV_Shared_Memory_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "SV_Shared_Memory_Test - Win32 Static Debug"
 # Name "SV_Shared_Memory_Test - Win32 Static Release"
-# Name "SV_Shared_Memory_Test - Win32 Release"# Begin Group "Source Files"
+# Name "SV_Shared_Memory_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Semaphore_Test.dsp b/tests/version_tests/Semaphore_Test.dsp
index 1a3d8778cae..cc0c26a0e43 100644
--- a/tests/version_tests/Semaphore_Test.dsp
+++ b/tests/version_tests/Semaphore_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Semaphore_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Semaphore_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Semaphore_Test - Win32 Static Debug"
 # Name "Semaphore_Test - Win32 Static Release"
-# Name "Semaphore_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Semaphore_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp"
 # Begin Source File
diff --git a/tests/version_tests/Service_Config_Test.dsp b/tests/version_tests/Service_Config_Test.dsp
index 0a3e0f50fc6..c458501d9a7 100644
--- a/tests/version_tests/Service_Config_Test.dsp
+++ b/tests/version_tests/Service_Config_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Service_Config_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Service_Config_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Service_Config_Test - Win32 Static Debug"
 # Name "Service_Config_Test - Win32 Static Release"
-# Name "Service_Config_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Service_Config_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Sigset_Ops_Test.dsp b/tests/version_tests/Sigset_Ops_Test.dsp
index 7267d9f3f40..bcd1540cf21 100644
--- a/tests/version_tests/Sigset_Ops_Test.dsp
+++ b/tests/version_tests/Sigset_Ops_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Sigset_Ops_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Sigset_Ops_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Sigset_Ops_Test - Win32 Static Debug"
 # Name "Sigset_Ops_Test - Win32 Static Release"
-# Name "Sigset_Ops_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Sigset_Ops_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Simple_Message_Block_Test.dsp b/tests/version_tests/Simple_Message_Block_Test.dsp
index 89581d9f1be..1f208fd2373 100644
--- a/tests/version_tests/Simple_Message_Block_Test.dsp
+++ b/tests/version_tests/Simple_Message_Block_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Simple_Message_Block_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Simple_Message_Block_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Simple_Message_Block_Test - Win32 Static Debug"
 # Name "Simple_Message_Block_Test - Win32 Static Release"
-# Name "Simple_Message_Block_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Simple_Message_Block_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Svc_Handler_Test.dsp b/tests/version_tests/Svc_Handler_Test.dsp
index b77412e49ae..aa1fa3c044f 100644
--- a/tests/version_tests/Svc_Handler_Test.dsp
+++ b/tests/version_tests/Svc_Handler_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Svc_Handler_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Svc_Handler_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Svc_Handler_Test - Win32 Static Debug"
 # Name "Svc_Handler_Test - Win32 Static Release"
-# Name "Svc_Handler_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Svc_Handler_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/TSS_Test.dsp b/tests/version_tests/TSS_Test.dsp
index 69d82990e6f..1ccd8aa77b9 100644
--- a/tests/version_tests/TSS_Test.dsp
+++ b/tests/version_tests/TSS_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\TSS_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\TSS_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "TSS_Test - Win32 Static Debug"
 # Name "TSS_Test - Win32 Static Release"
-# Name "TSS_Test - Win32 Release"# Begin Group "Source Files"
+# Name "TSS_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Task_Test.dsp b/tests/version_tests/Task_Test.dsp
index af009ad4aa2..0bd22d9394f 100644
--- a/tests/version_tests/Task_Test.dsp
+++ b/tests/version_tests/Task_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Task_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Task_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Task_Test - Win32 Static Debug"
 # Name "Task_Test - Win32 Static Release"
-# Name "Task_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Task_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Thread_Manager_Test.dsp b/tests/version_tests/Thread_Manager_Test.dsp
index a3bd635b443..9854fbdf8d6 100644
--- a/tests/version_tests/Thread_Manager_Test.dsp
+++ b/tests/version_tests/Thread_Manager_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Manager_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Manager_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Thread_Manager_Test - Win32 Static Debug"
 # Name "Thread_Manager_Test - Win32 Static Release"
-# Name "Thread_Manager_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Thread_Manager_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Thread_Mutex_Test.dsp b/tests/version_tests/Thread_Mutex_Test.dsp
index 3511baab428..b6f7352a508 100644
--- a/tests/version_tests/Thread_Mutex_Test.dsp
+++ b/tests/version_tests/Thread_Mutex_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Mutex_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Mutex_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Thread_Mutex_Test - Win32 Static Debug"
 # Name "Thread_Mutex_Test - Win32 Static Release"
-# Name "Thread_Mutex_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Thread_Mutex_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Thread_Pool_Reactor_Test.dsp b/tests/version_tests/Thread_Pool_Reactor_Test.dsp
index b95a6757c85..b35afb5cc93 100644
--- a/tests/version_tests/Thread_Pool_Reactor_Test.dsp
+++ b/tests/version_tests/Thread_Pool_Reactor_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Pool_Reactor_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Pool_Reactor_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Thread_Pool_Reactor_Test - Win32 Static Debug"
 # Name "Thread_Pool_Reactor_Test - Win32 Static Release"
-# Name "Thread_Pool_Reactor_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Thread_Pool_Reactor_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter ".cpp"
 # Begin Source File
diff --git a/tests/version_tests/Thread_Pool_Test.dsp b/tests/version_tests/Thread_Pool_Test.dsp
index be8be022276..83dae1d8005 100644
--- a/tests/version_tests/Thread_Pool_Test.dsp
+++ b/tests/version_tests/Thread_Pool_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Pool_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Thread_Pool_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Thread_Pool_Test - Win32 Static Debug"
 # Name "Thread_Pool_Test - Win32 Static Release"
-# Name "Thread_Pool_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Thread_Pool_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Time_Service_Test.dsp b/tests/version_tests/Time_Service_Test.dsp
index fd62929a899..6f96651f222 100644
--- a/tests/version_tests/Time_Service_Test.dsp
+++ b/tests/version_tests/Time_Service_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Time_Service_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Time_Service_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Time_Service_Test - Win32 Static Debug"
 # Name "Time_Service_Test - Win32 Static Release"
-# Name "Time_Service_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Time_Service_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Time_Value_Test.dsp b/tests/version_tests/Time_Value_Test.dsp
index 3a6cd636eb5..df07f90431a 100644
--- a/tests/version_tests/Time_Value_Test.dsp
+++ b/tests/version_tests/Time_Value_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Time_Value_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Time_Value_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Time_Value_Test - Win32 Static Debug"
 # Name "Time_Value_Test - Win32 Static Release"
-# Name "Time_Value_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Time_Value_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Timeprobe_Test.dsp b/tests/version_tests/Timeprobe_Test.dsp
index d791f4e3d67..ce095788150 100644
--- a/tests/version_tests/Timeprobe_Test.dsp
+++ b/tests/version_tests/Timeprobe_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Timeprobe_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Timeprobe_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Timeprobe_Test - Win32 Static Debug"
 # Name "Timeprobe_Test - Win32 Static Release"
-# Name "Timeprobe_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Timeprobe_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Timer_Queue_Test.dsp b/tests/version_tests/Timer_Queue_Test.dsp
index 13bca056c05..a05e0b5f61d 100644
--- a/tests/version_tests/Timer_Queue_Test.dsp
+++ b/tests/version_tests/Timer_Queue_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Timer_Queue_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Timer_Queue_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Timer_Queue_Test - Win32 Static Debug"
 # Name "Timer_Queue_Test - Win32 Static Release"
-# Name "Timer_Queue_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Timer_Queue_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Tokens_Test.dsp b/tests/version_tests/Tokens_Test.dsp
index fc34a4098de..77f2600b3db 100644
--- a/tests/version_tests/Tokens_Test.dsp
+++ b/tests/version_tests/Tokens_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Tokens_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Tokens_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Tokens_Test - Win32 Static Debug"
 # Name "Tokens_Test - Win32 Static Release"
-# Name "Tokens_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Tokens_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/UPIPE_SAP_Test.dsp b/tests/version_tests/UPIPE_SAP_Test.dsp
index 390715b857c..98979c15fba 100644
--- a/tests/version_tests/UPIPE_SAP_Test.dsp
+++ b/tests/version_tests/UPIPE_SAP_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\UPIPE_SAP_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\UPIPE_SAP_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "UPIPE_SAP_Test - Win32 Static Debug"
 # Name "UPIPE_SAP_Test - Win32 Static Release"
-# Name "UPIPE_SAP_Test - Win32 Release"# Begin Group "Source Files"
+# Name "UPIPE_SAP_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/Upgradable_RW_Test.dsp b/tests/version_tests/Upgradable_RW_Test.dsp
index 19b569577ea..a65211d6a02 100644
--- a/tests/version_tests/Upgradable_RW_Test.dsp
+++ b/tests/version_tests/Upgradable_RW_Test.dsp
@@ -43,7 +43,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Upgradable_RW_Test"
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../../" /D "_DEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
@@ -68,7 +68,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ".\Upgradable_RW_Test"
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../" /D "NDEBUG" /D ACE_HAS_DLL=0 /D ACE_OS_HAS_DLL=0 /D "WIN32" /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
@@ -110,7 +110,8 @@ LINK32=link.exe
 
 # Name "Upgradable_RW_Test - Win32 Static Debug"
 # Name "Upgradable_RW_Test - Win32 Static Release"
-# Name "Upgradable_RW_Test - Win32 Release"# Begin Group "Source Files"
+# Name "Upgradable_RW_Test - Win32 Release"
+# Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
diff --git a/tests/version_tests/version_tests.dsw b/tests/version_tests/version_tests.dsw
index b62357f75d2..f326b79841b 100644
--- a/tests/version_tests/version_tests.dsw
+++ b/tests/version_tests/version_tests.dsw
@@ -111,6 +111,18 @@ Package=<4>
 
 ###############################################################################
 
+Project: "CDR_Array_Test.dsp"=.\CDR_Array_Test.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
 Project: "CDR_File_Test.dsp"=.\CDR_File_Test.dsp - Package Owner=<4>
 
 Package=<5>
author	brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-06-13 04:29:49 +0000
committer	brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2000-06-13 04:29:49 +0000
commit	a505c82302417a6bad5730ceb888b5bd631f02a6 (patch)
tree	4892c58d763e8bcf500785cb91bd55e42db10f5c
parent	f726dbd4b5b3153bead4b87c84d046a4001fba43 (diff)
download	ATCD-a505c82302417a6bad5730ceb888b5bd631f02a6.tar.gz