54 files changed, 168 insertions, 91 deletions
diff --git a/tests/version_tests/Barrier_Test.dsp b/tests/version_tests/Barrier_Test.dsp
index 8c74afe8750..0c066e71512 100644
--- a/tests/version_tests/Barrier_Test.dsp
+++ b/tests/version_tests/Barrier_Test.dsp
@@ -38,6 +38,7 @@ CFG=Barrier_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Basic_Types_Test.dsp b/tests/version_tests/Basic_Types_Test.dsp
index dfbdd53a18b..7460bba2071 100644
--- a/tests/version_tests/Basic_Types_Test.dsp
+++ b/tests/version_tests/Basic_Types_Test.dsp
@@ -39,6 +39,7 @@ CFG=Basic_Types_Test - Win32 static Unicode Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Buffer_Stream_Test.dsp b/tests/version_tests/Buffer_Stream_Test.dsp
index fb3b15fb94c..a0454ce4677 100644
--- a/tests/version_tests/Buffer_Stream_Test.dsp
+++ b/tests/version_tests/Buffer_Stream_Test.dsp
@@ -39,6 +39,7 @@ CFG=Buffer_Stream_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Conn_Test.dsp b/tests/version_tests/Conn_Test.dsp
index c007bb7ab34..2b18f931362 100644
--- a/tests/version_tests/Conn_Test.dsp
+++ b/tests/version_tests/Conn_Test.dsp
@@ -38,6 +38,7 @@ CFG=Conn_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Enum_Interfaces_Test.dsp b/tests/version_tests/Enum_Interfaces_Test.dsp
index 88a825b2b7a..b704840d242 100644
--- a/tests/version_tests/Enum_Interfaces_Test.dsp
+++ b/tests/version_tests/Enum_Interfaces_Test.dsp
@@ -39,6 +39,7 @@ CFG=Enum_Interfaces_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Env_Value_Test.dsp b/tests/version_tests/Env_Value_Test.dsp
index 1402746173e..18f2de3bb59 100644
--- a/tests/version_tests/Env_Value_Test.dsp
+++ b/tests/version_tests/Env_Value_Test.dsp
@@ -39,6 +39,7 @@ CFG=Env_Value_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Future_Test.dsp b/tests/version_tests/Future_Test.dsp
index 389c0bc4185..2129c5145cf 100644
--- a/tests/version_tests/Future_Test.dsp
+++ b/tests/version_tests/Future_Test.dsp
@@ -39,6 +39,7 @@ CFG=Future_Test - Win32 static Unicode Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Handle_Set_Test.dsp b/tests/version_tests/Handle_Set_Test.dsp
index 0032a8125dd..0a469f9cc61 100644
--- a/tests/version_tests/Handle_Set_Test.dsp
+++ b/tests/version_tests/Handle_Set_Test.dsp
@@ -38,6 +38,7 @@ CFG=Handle_Set_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Hash_Map_Manager_Test.dsp b/tests/version_tests/Hash_Map_Manager_Test.dsp
index 1a5e232b76e..27ec9710df6 100644
--- a/tests/version_tests/Hash_Map_Manager_Test.dsp
+++ b/tests/version_tests/Hash_Map_Manager_Test.dsp
@@ -39,6 +39,7 @@ CFG=Hash_Map_Manager_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/IOStream_Test.dsp b/tests/version_tests/IOStream_Test.dsp
index f3e3b3929a9..3473e5f08e0 100644
--- a/tests/version_tests/IOStream_Test.dsp
+++ b/tests/version_tests/IOStream_Test.dsp
@@ -38,6 +38,7 @@ CFG=IOStream_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/MM_Shared_Memory_Test.dsp b/tests/version_tests/MM_Shared_Memory_Test.dsp
index d29cddb775e..30ccf324dad 100644
--- a/tests/version_tests/MM_Shared_Memory_Test.dsp
+++ b/tests/version_tests/MM_Shared_Memory_Test.dsp
@@ -39,6 +39,7 @@ CFG=MM_Shared_Memory_Test - Win32 DLL Unicode Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/MT_SOCK_Test.dsp b/tests/version_tests/MT_SOCK_Test.dsp
index d399fffe988..331a3c24935 100644
--- a/tests/version_tests/MT_SOCK_Test.dsp
+++ b/tests/version_tests/MT_SOCK_Test.dsp
@@ -38,6 +38,7 @@ CFG=MT_SOCK_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Map_Manager_Test.dsp b/tests/version_tests/Map_Manager_Test.dsp
index 3aa197184c4..2e53b7ca419 100644
--- a/tests/version_tests/Map_Manager_Test.dsp
+++ b/tests/version_tests/Map_Manager_Test.dsp
@@ -39,6 +39,7 @@ CFG=Map_Manager_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Mem_Map_Test.dsp b/tests/version_tests/Mem_Map_Test.dsp
index 2ff5760bba7..6fc53d66587 100644
--- a/tests/version_tests/Mem_Map_Test.dsp
+++ b/tests/version_tests/Mem_Map_Test.dsp
@@ -38,6 +38,7 @@ CFG=Mem_Map_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Message_Block_Test.dsp b/tests/version_tests/Message_Block_Test.dsp
index 3dc91601192..799c8a52643 100644
--- a/tests/version_tests/Message_Block_Test.dsp
+++ b/tests/version_tests/Message_Block_Test.dsp
@@ -39,6 +39,7 @@ CFG=Message_Block_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Message_Queue_Notification_Test.dsp b/tests/version_tests/Message_Queue_Notification_Test.dsp
index dc497affee6..33beafc9e01 100644
--- a/tests/version_tests/Message_Queue_Notification_Test.dsp
+++ b/tests/version_tests/Message_Queue_Notification_Test.dsp
@@ -39,6 +39,7 @@ CFG=Message_Queue_Notification_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Message_Queue_Test.dsp b/tests/version_tests/Message_Queue_Test.dsp
index 90afe04d132..61e7e4d6355 100644
--- a/tests/version_tests/Message_Queue_Test.dsp
+++ b/tests/version_tests/Message_Queue_Test.dsp
@@ -39,6 +39,7 @@ CFG=Message_Queue_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Naming_Test.dsp b/tests/version_tests/Naming_Test.dsp
index c39ba54c830..351a785cf5a 100644
--- a/tests/version_tests/Naming_Test.dsp
+++ b/tests/version_tests/Naming_Test.dsp
@@ -38,6 +38,7 @@ CFG=Naming_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Notify_Performance_Test.dsp b/tests/version_tests/Notify_Performance_Test.dsp
index e1f03577edd..c808a5a0839 100644
--- a/tests/version_tests/Notify_Performance_Test.dsp
+++ b/tests/version_tests/Notify_Performance_Test.dsp
@@ -39,6 +39,7 @@ CFG=Notify_Performance_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/OrdMultiSet_Test.dsp b/tests/version_tests/OrdMultiSet_Test.dsp
index 93eeb1acde8..508c2dbd799 100644
--- a/tests/version_tests/OrdMultiSet_Test.dsp
+++ b/tests/version_tests/OrdMultiSet_Test.dsp
@@ -39,6 +39,7 @@ CFG=OrdMultiSet_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Pipe_Test.dsp b/tests/version_tests/Pipe_Test.dsp
index 54f23325272..b3890ad36fd 100644
--- a/tests/version_tests/Pipe_Test.dsp
+++ b/tests/version_tests/Pipe_Test.dsp
@@ -38,6 +38,7 @@ CFG=Pipe_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Priority_Buffer_Test.dsp b/tests/version_tests/Priority_Buffer_Test.dsp
index 193d7d69584..ac5a755071e 100644
--- a/tests/version_tests/Priority_Buffer_Test.dsp
+++ b/tests/version_tests/Priority_Buffer_Test.dsp
@@ -39,6 +39,7 @@ CFG=Priority_Buffer_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Priority_Reactor_Test.dsp b/tests/version_tests/Priority_Reactor_Test.dsp
index 720fa923679..d185274e0eb 100644
--- a/tests/version_tests/Priority_Reactor_Test.dsp
+++ b/tests/version_tests/Priority_Reactor_Test.dsp
@@ -39,6 +39,7 @@ CFG=Priority_Reactor_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Priority_Task_Test.dsp b/tests/version_tests/Priority_Task_Test.dsp
index db22f5c726e..6f6964ed828 100644
--- a/tests/version_tests/Priority_Task_Test.dsp
+++ b/tests/version_tests/Priority_Task_Test.dsp
@@ -39,6 +39,7 @@ CFG=Priority_Task_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Process_Mutex_Test.dsp b/tests/version_tests/Process_Mutex_Test.dsp
index da27a69e9b9..022d0453680 100644
--- a/tests/version_tests/Process_Mutex_Test.dsp
+++ b/tests/version_tests/Process_Mutex_Test.dsp
@@ -39,6 +39,7 @@ CFG=Process_Mutex_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Process_Strategy_Test.dsp b/tests/version_tests/Process_Strategy_Test.dsp
index 21bd7cd00c9..c4bc864e533 100644
--- a/tests/version_tests/Process_Strategy_Test.dsp
+++ b/tests/version_tests/Process_Strategy_Test.dsp
@@ -39,6 +39,7 @@ CFG=Process_Strategy_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Reactor_Exception_Test.dsp b/tests/version_tests/Reactor_Exception_Test.dsp
index a21a180d1eb..6134cc00cdb 100644
--- a/tests/version_tests/Reactor_Exception_Test.dsp
+++ b/tests/version_tests/Reactor_Exception_Test.dsp
@@ -39,6 +39,7 @@ CFG=Reactor_Exception_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Reactor_Notify_Test.dsp b/tests/version_tests/Reactor_Notify_Test.dsp
index f028a662b04..3fdfc639b99 100644
--- a/tests/version_tests/Reactor_Notify_Test.dsp
+++ b/tests/version_tests/Reactor_Notify_Test.dsp
@@ -39,6 +39,7 @@ CFG=Reactor_Notify_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Reactor_Performance_Test.dsp b/tests/version_tests/Reactor_Performance_Test.dsp
index 7a8e53182df..3e80b2899a1 100644
--- a/tests/version_tests/Reactor_Performance_Test.dsp
+++ b/tests/version_tests/Reactor_Performance_Test.dsp
@@ -39,6 +39,7 @@ CFG=Reactor_Performance_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Reactor_Timer_Test.dsp b/tests/version_tests/Reactor_Timer_Test.dsp
index 71819f28dcb..5bbf6f578c6 100644
--- a/tests/version_tests/Reactor_Timer_Test.dsp
+++ b/tests/version_tests/Reactor_Timer_Test.dsp
@@ -39,6 +39,7 @@ CFG=Reactor_Timer_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Reactors_Test.dsp b/tests/version_tests/Reactors_Test.dsp
index 504d8f5cd17..c2ed50099af 100644
--- a/tests/version_tests/Reactors_Test.dsp
+++ b/tests/version_tests/Reactors_Test.dsp
@@ -38,6 +38,7 @@ CFG=Reactors_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Reader_Writer_Test.dsp b/tests/version_tests/Reader_Writer_Test.dsp
index 4c029a2ea46..0bf5a0e82e3 100644
--- a/tests/version_tests/Reader_Writer_Test.dsp
+++ b/tests/version_tests/Reader_Writer_Test.dsp
@@ -39,6 +39,7 @@ CFG=Reader_Writer_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Recursive_Mutex_Test.dsp b/tests/version_tests/Recursive_Mutex_Test.dsp
index 28ac9276e2d..dedf5825ec6 100644
--- a/tests/version_tests/Recursive_Mutex_Test.dsp
+++ b/tests/version_tests/Recursive_Mutex_Test.dsp
@@ -39,6 +39,7 @@ CFG=Recursive_Mutex_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/SOCK_Connector_Test.dsp b/tests/version_tests/SOCK_Connector_Test.dsp
index 86ad4246a8c..083879a452e 100644
--- a/tests/version_tests/SOCK_Connector_Test.dsp
+++ b/tests/version_tests/SOCK_Connector_Test.dsp
@@ -39,6 +39,7 @@ CFG=SOCK_Connector_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/SOCK_Test.dsp b/tests/version_tests/SOCK_Test.dsp
index 7db1741415f..6076967f314 100644
--- a/tests/version_tests/SOCK_Test.dsp
+++ b/tests/version_tests/SOCK_Test.dsp
@@ -38,6 +38,7 @@ CFG=SOCK_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/SPIPE_Test.dsp b/tests/version_tests/SPIPE_Test.dsp
index 6a9788c94f1..6fb1b615085 100644
--- a/tests/version_tests/SPIPE_Test.dsp
+++ b/tests/version_tests/SPIPE_Test.dsp
@@ -38,6 +38,7 @@ CFG=SPIPE_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/SString_Test.dsp b/tests/version_tests/SString_Test.dsp
index 9ad098afa03..516a9bdd889 100644
--- a/tests/version_tests/SString_Test.dsp
+++ b/tests/version_tests/SString_Test.dsp
@@ -38,6 +38,7 @@ CFG=SString_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/SV_Shared_Memory_Test.dsp b/tests/version_tests/SV_Shared_Memory_Test.dsp
index a35f59b30db..bdb2edaf8d0 100644
--- a/tests/version_tests/SV_Shared_Memory_Test.dsp
+++ b/tests/version_tests/SV_Shared_Memory_Test.dsp
@@ -39,6 +39,7 @@ CFG=SV_Shared_Memory_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Semaphore_Test.dsp b/tests/version_tests/Semaphore_Test.dsp
index 2a20afd3d50..970492b92fa 100644
--- a/tests/version_tests/Semaphore_Test.dsp
+++ b/tests/version_tests/Semaphore_Test.dsp
@@ -38,6 +38,7 @@ CFG=Semaphore_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Service_Config_Test.dsp b/tests/version_tests/Service_Config_Test.dsp
index 1a8bb891b10..3fefaf25d1f 100644
--- a/tests/version_tests/Service_Config_Test.dsp
+++ b/tests/version_tests/Service_Config_Test.dsp
@@ -39,6 +39,7 @@ CFG=Service_Config_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Sigset_Op_Test.dsp b/tests/version_tests/Sigset_Op_Test.dsp
index 3e3160184c1..117745d87d1 100644
--- a/tests/version_tests/Sigset_Op_Test.dsp
+++ b/tests/version_tests/Sigset_Op_Test.dsp
@@ -39,6 +39,7 @@ CFG=Sigset_Op_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Simple_Message_Block_Test.dsp b/tests/version_tests/Simple_Message_Block_Test.dsp
index 4e7fc17f5f0..f33fbec1239 100644
--- a/tests/version_tests/Simple_Message_Block_Test.dsp
+++ b/tests/version_tests/Simple_Message_Block_Test.dsp
@@ -39,6 +39,7 @@ CFG=Simple_Message_Block_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/TSS_Test.dsp b/tests/version_tests/TSS_Test.dsp
index 66232ed345a..0945a572052 100644
--- a/tests/version_tests/TSS_Test.dsp
+++ b/tests/version_tests/TSS_Test.dsp
@@ -38,6 +38,7 @@ CFG=TSS_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Task_Test.dsp b/tests/version_tests/Task_Test.dsp
index 83fc7e69ad0..89b1ba1738f 100644
--- a/tests/version_tests/Task_Test.dsp
+++ b/tests/version_tests/Task_Test.dsp
@@ -38,6 +38,7 @@ CFG=Task_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Thread_Manager_Test.dsp b/tests/version_tests/Thread_Manager_Test.dsp
index b37fc7f2f6d..7f265bc12a7 100644
--- a/tests/version_tests/Thread_Manager_Test.dsp
+++ b/tests/version_tests/Thread_Manager_Test.dsp
@@ -39,6 +39,7 @@ CFG=Thread_Manager_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Thread_Mutex_Test.dsp b/tests/version_tests/Thread_Mutex_Test.dsp
index 0f3d27fa1d2..28f1e569e97 100644
--- a/tests/version_tests/Thread_Mutex_Test.dsp
+++ b/tests/version_tests/Thread_Mutex_Test.dsp
@@ -39,6 +39,7 @@ CFG=Thread_Mutex_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Thread_Pool_Test.dsp b/tests/version_tests/Thread_Pool_Test.dsp
index 2a5c531ea6a..dd3bcff5990 100644
--- a/tests/version_tests/Thread_Pool_Test.dsp
+++ b/tests/version_tests/Thread_Pool_Test.dsp
@@ -39,6 +39,7 @@ CFG=Thread_Pool_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Time_Service_Test.dsp b/tests/version_tests/Time_Service_Test.dsp
index 248940d1bbe..c30ebdf169b 100644
--- a/tests/version_tests/Time_Service_Test.dsp
+++ b/tests/version_tests/Time_Service_Test.dsp
@@ -39,6 +39,7 @@ CFG=Time_Service_Test - Win32 DLL Unicode Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Time_Value_Test.dsp b/tests/version_tests/Time_Value_Test.dsp
index 28bedcc72e8..142e592f6ba 100644
--- a/tests/version_tests/Time_Value_Test.dsp
+++ b/tests/version_tests/Time_Value_Test.dsp
@@ -38,6 +38,7 @@ CFG=Time_Value_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Timeprobe_Test.dsp b/tests/version_tests/Timeprobe_Test.dsp
index a2156dbdaf2..25dd6f2893c 100644
--- a/tests/version_tests/Timeprobe_Test.dsp
+++ b/tests/version_tests/Timeprobe_Test.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Console Application" 0x0103
 
-CFG=Timeprobe_Test - Win32 DLL Unicode Debug
+CFG=Timeprobe_Test - Win32 DLL Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,146 +13,151 @@ CFG=Timeprobe_Test - Win32 DLL Unicode Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "Timeprobe_Test.mak"\
- CFG="Timeprobe_Test - Win32 DLL Unicode Debug"
+!MESSAGE NMAKE /f "Timeprobe_Test.mak" CFG="Timeprobe_Test - Win32 DLL Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "Timeprobe_Test - Win32 static Debug" (based on\
- "Win32 (x86) Console Application")
 !MESSAGE "Timeprobe_Test - Win32 DLL Debug" (based on\
  "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 static Unicode Debug" (based on\
+!MESSAGE "Timeprobe_Test - Win32 static Debug" (based on\
  "Win32 (x86) Console Application")
 !MESSAGE "Timeprobe_Test - Win32 DLL Unicode Debug" (based on\
  "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 DLL Release" (based on\
+!MESSAGE "Timeprobe_Test - Win32 static Unicode Debug" (based on\
+ "Win32 (x86) Console Application")
+!MESSAGE "Timeprobe_Test - Win32 static Unicode Release" (based on\
  "Win32 (x86) Console Application")
 !MESSAGE "Timeprobe_Test - Win32 static Release" (based on\
  "Win32 (x86) Console Application")
 !MESSAGE "Timeprobe_Test - Win32 DLL Unicode Release" (based on\
  "Win32 (x86) Console Application")
-!MESSAGE "Timeprobe_Test - Win32 static Unicode Release" (based on\
+!MESSAGE "Timeprobe_Test - Win32 DLL Release" (based on\
  "Win32 (x86) Console Application")
 !MESSAGE 
 
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
-!IF  "$(CFG)" == "Timeprobe_Test - Win32 static Debug"
+!IF  "$(CFG)" == "Timeprobe_Test - Win32 DLL Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "static Debug"
-# PROP BASE Intermediate_Dir "static Debug"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Debug"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Debug"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Debug"
-# PROP Intermediate_Dir ".\static Debug"
+# PROP Output_Dir ".\DLL Debug"
+# PROP Intermediate_Dir ".\DLL Debug"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# 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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /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 /pdbtype:sept
-# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
 
-!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 DLL Debug"
+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 static Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DLL Debug"
-# PROP BASE Intermediate_Dir "DLL Debug"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\static Debug"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Debug"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Debug"
-# PROP Intermediate_Dir ".\DLL Debug"
+# PROP Output_Dir ".\static Debug"
+# PROP Intermediate_Dir ".\static Debug"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# 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 __ACE_INLINE__=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 /pdbtype:sept
-# ADD LINK32 aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
 
-!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 static Unicode Debug"
+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 DLL Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "static Unicode Debug"
-# PROP BASE Intermediate_Dir "static Unicode Debug"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Unicode Debug"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Unicode Debug"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\static Unicode Debug"
-# PROP Intermediate_Dir ".\static Unicode Debug"
+# PROP Output_Dir ".\DLL Unicode Debug"
+# PROP Intermediate_Dir ".\DLL Unicode Debug"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# 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 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /D "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /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 /pdbtype:sept
-# ADD LINK32 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 aceud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
 
-!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 DLL Unicode Debug"
+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 static Unicode Debug"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DLL Unicode Debug"
-# PROP BASE Intermediate_Dir "DLL Unicode Debug"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\static Unicode Debug"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Unicode Debug"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\DLL Unicode Debug"
-# PROP Intermediate_Dir ".\DLL Unicode Debug"
+# PROP Output_Dir ".\static Unicode Debug"
+# PROP Intermediate_Dir ".\static Unicode Debug"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# 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 __ACE_INLINE__=0 /D "UNICODE" /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 /pdbtype:sept
-# ADD LINK32 aceud.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 acesud.lib user32.lib advapi32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"
 
-!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 DLL Release"
+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 static Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "DLL Release"
-# PROP BASE Intermediate_Dir "DLL Release"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\static Unicode Release"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Unicode Release"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\DLL Release"
-# PROP Intermediate_Dir ".\DLL Release"
+# PROP Output_Dir ".\static Unicode Release"
+# PROP Intermediate_Dir ".\static Unicode Release"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D ACE_HAS_DLL=1 /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# 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 __ACE_INLINE__=0 /D "UNICODE" /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
@@ -160,23 +165,24 @@ BSC32=bscmake.exe
 # 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
+# ADD LINK32 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 static Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "static Release"
-# PROP BASE Intermediate_Dir "static Release"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\static Release"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\static Release"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ".\static Release"
 # PROP Intermediate_Dir ".\static Release"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# 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 __ACE_INLINE__=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
@@ -184,23 +190,24 @@ BSC32=bscmake.exe
 # 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
+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 DLL Unicode Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "DLL Unicode Release"
-# PROP BASE Intermediate_Dir "DLL Unicode Release"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Unicode Release"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Unicode Release"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
 # PROP Output_Dir ".\DLL Unicode Release"
 # PROP Intermediate_Dir ".\DLL Unicode Release"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /D "NDEBUG" /D ACE_HAS_DLL=1 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# PROP Target_Dir ".\Timeprobe_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=1 /D "UNICODE" /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
@@ -208,23 +215,24 @@ BSC32=bscmake.exe
 # 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 aceu.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 aceu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
 
-!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 static Unicode Release"
+!ELSEIF  "$(CFG)" == "Timeprobe_Test - Win32 DLL Release"
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "static Unicode Release"
-# PROP BASE Intermediate_Dir "static Unicode Release"
-# PROP BASE Target_Dir ""
+# PROP BASE Output_Dir ".\Timeprobe_Test\DLL Release"
+# PROP BASE Intermediate_Dir ".\Timeprobe_Test\DLL Release"
+# PROP BASE Target_Dir ".\Timeprobe_Test"
 # PROP Use_MFC 0
 # PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\static Unicode Release"
-# PROP Intermediate_Dir ".\static Unicode Release"
+# PROP Output_Dir ".\DLL Release"
+# PROP Intermediate_Dir ".\DLL Release"
 # PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /D "NDEBUG" /D ACE_HAS_DLL=0 /D __ACE_INLINE__=0 /D "UNICODE" /D "WIN32" /D "_CONSOLE" /YX /FD /c
+# PROP Target_Dir ".\Timeprobe_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=1 /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
@@ -232,23 +240,39 @@ BSC32=bscmake.exe
 # 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 acesu.lib user32.lib advapi32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ace.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
 
 !ENDIF 
 
 # Begin Target
 
-# Name "Timeprobe_Test - Win32 static Debug"
 # Name "Timeprobe_Test - Win32 DLL Debug"
-# Name "Timeprobe_Test - Win32 static Unicode Debug"
+# Name "Timeprobe_Test - Win32 static Debug"
 # Name "Timeprobe_Test - Win32 DLL Unicode Debug"
-# Name "Timeprobe_Test - Win32 DLL Release"
+# Name "Timeprobe_Test - Win32 static Unicode Debug"
+# Name "Timeprobe_Test - Win32 static Unicode Release"
 # Name "Timeprobe_Test - Win32 static Release"
 # Name "Timeprobe_Test - Win32 DLL Unicode Release"
-# Name "Timeprobe_Test - Win32 static Unicode Release"
+# Name "Timeprobe_Test - Win32 DLL Release"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
 
 SOURCE=..\Timeprobe_Test.cpp
 # End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd"
+# Begin Source File
+
+SOURCE=..\test_config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+# End Group
 # End Target
 # End Project
diff --git a/tests/version_tests/Timer_Queue_Test.dsp b/tests/version_tests/Timer_Queue_Test.dsp
index 7a9ce5e4577..e873103896d 100644
--- a/tests/version_tests/Timer_Queue_Test.dsp
+++ b/tests/version_tests/Timer_Queue_Test.dsp
@@ -39,6 +39,7 @@ CFG=Timer_Queue_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/Tokens_Test.dsp b/tests/version_tests/Tokens_Test.dsp
index 3b32d6fd983..74a7568078e 100644
--- a/tests/version_tests/Tokens_Test.dsp
+++ b/tests/version_tests/Tokens_Test.dsp
@@ -38,6 +38,7 @@ CFG=Tokens_Test - Win32 static Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/UPIPE_SAP_Test.dsp b/tests/version_tests/UPIPE_SAP_Test.dsp
index 916ad2c9ffd..b03506dc1d1 100644
--- a/tests/version_tests/UPIPE_SAP_Test.dsp
+++ b/tests/version_tests/UPIPE_SAP_Test.dsp
@@ -38,6 +38,7 @@ CFG=UPIPE_SAP_Test - Win32 DLL Release
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
diff --git a/tests/version_tests/version_tests.dsp b/tests/version_tests/version_tests.dsp
index 043c3b29bf1..f1e9ff69bf7 100644
--- a/tests/version_tests/version_tests.dsp
+++ b/tests/version_tests/version_tests.dsp
@@ -38,6 +38,7 @@ CFG=Atomic_Op_Test - Win32 DLL Debug
 # Begin Project
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
+# PROP WCE_Configuration "H/PC Ver. 2.00"
 CPP=cl.exe
 RSC=rc.exe
 
@@ -164,7 +165,7 @@ BSC32=bscmake.exe
 # 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"
+# ADD LINK32 aces.lib advapi32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"
 
 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 static Unicode Debug"