*** empty log message ***

52 files changed, 208 insertions, 208 deletions

diff --git a/tests/version_tests/Barrier_Test.dsp b/tests/version_tests/Barrier_Test.dsp
index 6a8ba5d54f5..cead538627a 100644
--- a/tests/version_tests/Barrier_Test.dsp
+++ b/tests/version_tests/Barrier_Test.dsp
@@ -89,7 +89,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 DLL Unicode Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 static Unicode Release"

 

@@ -164,7 +164,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 static Release"

 

@@ -189,7 +189,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Barrier_Test - Win32 DLL Unicode Release"

 

diff --git a/tests/version_tests/Basic_Types_Test.dsp b/tests/version_tests/Basic_Types_Test.dsp
index e85e8693308..6d9d9b402a6 100644
--- a/tests/version_tests/Basic_Types_Test.dsp
+++ b/tests/version_tests/Basic_Types_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386 /pdbtype:sept

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

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

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 static Unicode Debug"

@@ -139,7 +139,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 /debug /machine:I386 /pdbtype:sept

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

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

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 DLL Release"

@@ -214,7 +214,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 acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "Basic_Types_Test - Win32 static Release"

@@ -239,7 +239,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

diff --git a/tests/version_tests/Buffer_Stream_Test.dsp b/tests/version_tests/Buffer_Stream_Test.dsp
index 5a55ef0ebaf..6b4d1c90aaf 100644
--- a/tests/version_tests/Buffer_Stream_Test.dsp
+++ b/tests/version_tests/Buffer_Stream_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 DLL Unicode Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Buffer_Stream_Test - Win32 static Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Conn_Test.dsp b/tests/version_tests/Conn_Test.dsp
index 5dac1e4d684..fa36284c55c 100644
--- a/tests/version_tests/Conn_Test.dsp
+++ b/tests/version_tests/Conn_Test.dsp
@@ -89,7 +89,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 static Release"

 

@@ -114,7 +114,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 DLL Release"

 

@@ -214,7 +214,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Conn_Test - Win32 static Debug"

 

@@ -239,7 +239,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Enum_Interfaces_Test.dsp b/tests/version_tests/Enum_Interfaces_Test.dsp
index 987ef13cb37..e421154bafa 100644
--- a/tests/version_tests/Enum_Interfaces_Test.dsp
+++ b/tests/version_tests/Enum_Interfaces_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 DLL Unicode Release"

 

@@ -215,7 +215,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Enum_Interfaces_Test - Win32 static Unicode Release"

 

@@ -240,7 +240,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Env_Value_Test.dsp b/tests/version_tests/Env_Value_Test.dsp
index ffe9bcc3ce7..100cce84c6b 100644
--- a/tests/version_tests/Env_Value_Test.dsp
+++ b/tests/version_tests/Env_Value_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /out:".\static Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 DLL Debug"

 

@@ -190,7 +190,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 /debug /machine:I386

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 static Unicode Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Env_Value_Test - Win32 DLL Unicode Debug"

 

diff --git a/tests/version_tests/Future_Test.dsp b/tests/version_tests/Future_Test.dsp
index 69b96f8a0ea..28013ee3699 100644
--- a/tests/version_tests/Future_Test.dsp
+++ b/tests/version_tests/Future_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 DLL Release"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 acesu.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-# ADD LINK32 acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Future_Test - Win32 static Release"

 

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

 LINK32=link.exe

 # ADD BASE LINK32 aces.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

-# ADD LINK32 aces.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Handle_Set_Test.dsp b/tests/version_tests/Handle_Set_Test.dsp
index cbb393c1565..f3cc94459e5 100644
--- a/tests/version_tests/Handle_Set_Test.dsp
+++ b/tests/version_tests/Handle_Set_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 static Unicode Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 DLL Unicode Release"

 

@@ -214,7 +214,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Handle_Set_Test - Win32 static Unicode Release"

 

@@ -239,7 +239,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Hash_Map_Manager_Test.dsp b/tests/version_tests/Hash_Map_Manager_Test.dsp
index bf374ea5dcd..a5579f1e945 100644
--- a/tests/version_tests/Hash_Map_Manager_Test.dsp
+++ b/tests/version_tests/Hash_Map_Manager_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 static Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 DLL Release"

 

@@ -215,7 +215,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Hash_Map_Manager_Test - Win32 static Unicode Release"

 

@@ -240,7 +240,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/IOStream_Test.dsp b/tests/version_tests/IOStream_Test.dsp
index e3f3de668f8..6b9cee6ecff 100644
--- a/tests/version_tests/IOStream_Test.dsp
+++ b/tests/version_tests/IOStream_Test.dsp
@@ -114,7 +114,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "IOStream_Test - Win32 static Release"

 

@@ -139,7 +139,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "IOStream_Test - Win32 DLL Debug"

 

@@ -214,7 +214,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "IOStream_Test - Win32 static Debug"

 

@@ -239,7 +239,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/MM_Shared_Memory_Test.dsp b/tests/version_tests/MM_Shared_Memory_Test.dsp
index 914636fb940..70b88d3b89e 100644
--- a/tests/version_tests/MM_Shared_Memory_Test.dsp
+++ b/tests/version_tests/MM_Shared_Memory_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 DLL Unicode Release"

 

@@ -215,7 +215,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MM_Shared_Memory_Test - Win32 static Unicode Release"

 

@@ -240,7 +240,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/MT_SOCK_Test.dsp b/tests/version_tests/MT_SOCK_Test.dsp
index 36b68bf33b3..c21cb7f42ff 100644
--- a/tests/version_tests/MT_SOCK_Test.dsp
+++ b/tests/version_tests/MT_SOCK_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 static Unicode Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 DLL Release"

 

@@ -214,7 +214,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "MT_SOCK_Test - Win32 static Unicode Release"

 

@@ -239,7 +239,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Map_Manager_Test.dsp b/tests/version_tests/Map_Manager_Test.dsp
index f5bd479fc04..b5b746296cb 100644
--- a/tests/version_tests/Map_Manager_Test.dsp
+++ b/tests/version_tests/Map_Manager_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 DLL Unicode Release"

 

@@ -215,7 +215,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Map_Manager_Test - Win32 static Release"

 

@@ -240,7 +240,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Mem_Map_Test.dsp b/tests/version_tests/Mem_Map_Test.dsp
index 68ff5e24904..74faa5dc15f 100644
--- a/tests/version_tests/Mem_Map_Test.dsp
+++ b/tests/version_tests/Mem_Map_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 static Unicode Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 DLL Release"

 

@@ -214,7 +214,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Mem_Map_Test - Win32 static Release"

 

@@ -239,7 +239,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Message_Block_Test.dsp b/tests/version_tests/Message_Block_Test.dsp
index 4cd452df8ab..69e16e7fff9 100644
--- a/tests/version_tests/Message_Block_Test.dsp
+++ b/tests/version_tests/Message_Block_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 static Unicode Debug"

 

@@ -165,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 static Debug"

 

@@ -190,7 +190,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Block_Test - Win32 DLL Unicode Debug"

 

diff --git a/tests/version_tests/Message_Queue_Notification_Test.dsp b/tests/version_tests/Message_Queue_Notification_Test.dsp
index 2fadddad572..1b20a9895fe 100644
--- a/tests/version_tests/Message_Queue_Notification_Test.dsp
+++ b/tests/version_tests/Message_Queue_Notification_Test.dsp
@@ -117,7 +117,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notification_Test - Win32 static Release"

 

@@ -142,7 +142,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 /nologo /subsystem:console /machine:I386 /out:".\static Release\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Release\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Notification_Test - Win32 DLL Debug"

 

@@ -218,7 +218,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 /debug /machine:I386

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" ==\

  "Message_Queue_Notification_Test - Win32 static Unicode Debug"

@@ -244,7 +244,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Message_Queue_Notifications_Test.exe" /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Message_Queue_Test.dsp b/tests/version_tests/Message_Queue_Test.dsp
index e8ea90ef2a1..6bee3e95428 100644
--- a/tests/version_tests/Message_Queue_Test.dsp
+++ b/tests/version_tests/Message_Queue_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 static Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 DLL Unicode Release"

 

@@ -215,7 +215,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Message_Queue_Test - Win32 static Release"

 

@@ -240,7 +240,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Naming_Test.dsp b/tests/version_tests/Naming_Test.dsp
index 64f8613bf2f..02be9ebbaaa 100644
--- a/tests/version_tests/Naming_Test.dsp
+++ b/tests/version_tests/Naming_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Naming_Test - Win32 static Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Naming_Test - Win32 DLL Release"

 

@@ -214,7 +214,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Naming_Test - Win32 static Unicode Release"

 

@@ -239,7 +239,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Notify_Performance_Test.dsp b/tests/version_tests/Notify_Performance_Test.dsp
index 05748281973..b8a34403644 100644
--- a/tests/version_tests/Notify_Performance_Test.dsp
+++ b/tests/version_tests/Notify_Performance_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 DLL Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Notify_Performance_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Pipe_Test.dsp b/tests/version_tests/Pipe_Test.dsp
index 9067edf579f..c69dc320bfb 100644
--- a/tests/version_tests/Pipe_Test.dsp
+++ b/tests/version_tests/Pipe_Test.dsp
@@ -114,7 +114,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Pipe_Test - Win32 static Release"

 

@@ -139,7 +139,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Pipe_Test - Win32 DLL Unicode Debug"

 

@@ -214,7 +214,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Pipe_Test - Win32 static Unicode Debug"

 

@@ -239,7 +239,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Priority_Buffer_Test.dsp b/tests/version_tests/Priority_Buffer_Test.dsp
index 1682cf7ac73..be4d3b006c5 100644
--- a/tests/version_tests/Priority_Buffer_Test.dsp
+++ b/tests/version_tests/Priority_Buffer_Test.dsp
@@ -115,7 +115,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 static Unicode Release"

 

@@ -140,7 +140,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 DLL Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Buffer_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Priority_Reactor_Test.dsp b/tests/version_tests/Priority_Reactor_Test.dsp
index 674ccab1d20..07f5160870f 100644
--- a/tests/version_tests/Priority_Reactor_Test.dsp
+++ b/tests/version_tests/Priority_Reactor_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 DLL Unicode Release"

 

@@ -215,7 +215,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Reactor_Test - Win32 static Unicode Release"

 

@@ -240,7 +240,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Priority_Task_Test.dsp b/tests/version_tests/Priority_Task_Test.dsp
index eba3699786a..a6240fa0ac2 100644
--- a/tests/version_tests/Priority_Task_Test.dsp
+++ b/tests/version_tests/Priority_Task_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 static Release"

 

@@ -165,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 static Unicode Release"

 

@@ -190,7 +190,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Priority_Task_Test - Win32 DLL Unicode Release"

 

diff --git a/tests/version_tests/Process_Mutex_Test.dsp b/tests/version_tests/Process_Mutex_Test.dsp
index ef66a47845a..67ce694f9c2 100644
--- a/tests/version_tests/Process_Mutex_Test.dsp
+++ b/tests/version_tests/Process_Mutex_Test.dsp
@@ -115,7 +115,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 static Unicode Release"

 

@@ -140,7 +140,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 DLL Unicode Debug"

 

@@ -190,7 +190,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 static Unicode Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Process_Mutex_Test - Win32 DLL Debug"

 

diff --git a/tests/version_tests/Process_Strategy_Test.dsp b/tests/version_tests/Process_Strategy_Test.dsp
index ad7f20e3c0a..48fd58c2085 100644
--- a/tests/version_tests/Process_Strategy_Test.dsp
+++ b/tests/version_tests/Process_Strategy_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 DLL Unicode Release"

 

@@ -215,7 +215,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Process_Strategy_Test - Win32 static Unicode Release"

 

@@ -240,7 +240,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Reactor_Exception_Test.dsp b/tests/version_tests/Reactor_Exception_Test.dsp
index acf327dc73a..6d4bb739764 100644
--- a/tests/version_tests/Reactor_Exception_Test.dsp
+++ b/tests/version_tests/Reactor_Exception_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Exception_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Exception_Test - Win32 DLL Release"

 

@@ -215,7 +215,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 /nologo /subsystem:console /machine:I386 /out:".\static Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Exception_Test - Win32 static Unicode Release"

 

@@ -240,7 +240,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Reactor_Exceptions_Test.exe" /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Reactor_Notify_Test.dsp b/tests/version_tests/Reactor_Notify_Test.dsp
index 0c8ae4d1597..ffad0eb8f9e 100644
--- a/tests/version_tests/Reactor_Notify_Test.dsp
+++ b/tests/version_tests/Reactor_Notify_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 DLL Unicode Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Notify_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Reactor_Performance_Test.dsp b/tests/version_tests/Reactor_Performance_Test.dsp
index 1119a41a677..694623b1290 100644
--- a/tests/version_tests/Reactor_Performance_Test.dsp
+++ b/tests/version_tests/Reactor_Performance_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 DLL Unicode Release"

 

@@ -190,7 +190,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Performance_Test - Win32 DLL Release"

 

@@ -240,7 +240,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Reactor_Timer_Test.dsp b/tests/version_tests/Reactor_Timer_Test.dsp
index 90272e5b336..c458912dce9 100644
--- a/tests/version_tests/Reactor_Timer_Test.dsp
+++ b/tests/version_tests/Reactor_Timer_Test.dsp
@@ -115,7 +115,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 static Unicode Release"

 

@@ -140,7 +140,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 DLL Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactor_Timer_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Reactors_Test.dsp b/tests/version_tests/Reactors_Test.dsp
index 536cab895a9..96133d4336e 100644
--- a/tests/version_tests/Reactors_Test.dsp
+++ b/tests/version_tests/Reactors_Test.dsp
@@ -114,7 +114,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 static Unicode Release"

 

@@ -139,7 +139,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 DLL Debug"

 

@@ -214,7 +214,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reactors_Test - Win32 static Unicode Debug"

 

@@ -239,7 +239,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Reader_Writer_Test.dsp b/tests/version_tests/Reader_Writer_Test.dsp
index 68df8caecc6..9ee53b09035 100644
--- a/tests/version_tests/Reader_Writer_Test.dsp
+++ b/tests/version_tests/Reader_Writer_Test.dsp
@@ -115,7 +115,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 static Unicode Release"

 

@@ -140,7 +140,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 DLL Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Reader_Writer_Test - Win32 static Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Recursive_Mutex_Test.dsp b/tests/version_tests/Recursive_Mutex_Test.dsp
index cfe2281c3a1..e58c547f22f 100644
--- a/tests/version_tests/Recursive_Mutex_Test.dsp
+++ b/tests/version_tests/Recursive_Mutex_Test.dsp
@@ -115,7 +115,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 static Unicode Release"

 

@@ -140,7 +140,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 DLL Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Recursive_Mutex_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/SOCK_Connector_Test.dsp b/tests/version_tests/SOCK_Connector_Test.dsp
index 56fdd1e6371..56071999520 100644
--- a/tests/version_tests/SOCK_Connector_Test.dsp
+++ b/tests/version_tests/SOCK_Connector_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 DLL Unicode Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SOCK_Connector_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/SOCK_Test.dsp b/tests/version_tests/SOCK_Test.dsp
index e7b6524d304..3951924e89e 100644
--- a/tests/version_tests/SOCK_Test.dsp
+++ b/tests/version_tests/SOCK_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 static Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 DLL Unicode Release"

 

@@ -214,7 +214,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SOCK_Test - Win32 static Release"

 

@@ -239,7 +239,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/SPIPE_Test.dsp b/tests/version_tests/SPIPE_Test.dsp
index 69f6b314738..1ddf7e838ea 100644
--- a/tests/version_tests/SPIPE_Test.dsp
+++ b/tests/version_tests/SPIPE_Test.dsp
@@ -114,7 +114,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 static Unicode Release"

 

@@ -139,7 +139,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 DLL Unicode Debug"

 

@@ -214,7 +214,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SPIPE_Test - Win32 static Debug"

 

@@ -239,7 +239,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/SString_Test.dsp b/tests/version_tests/SString_Test.dsp
index 9beddd817d0..9467de412e8 100644
--- a/tests/version_tests/SString_Test.dsp
+++ b/tests/version_tests/SString_Test.dsp
@@ -114,7 +114,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 static Unicode Release"

 

@@ -139,7 +139,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 static Unicode Debug"

 

@@ -164,7 +164,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 static Debug"

 

@@ -189,7 +189,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SString_Test - Win32 DLL Debug"

 

diff --git a/tests/version_tests/SV_Shared_Memory_Test.dsp b/tests/version_tests/SV_Shared_Memory_Test.dsp
index 283a95c7664..c07e8fa0a60 100644
--- a/tests/version_tests/SV_Shared_Memory_Test.dsp
+++ b/tests/version_tests/SV_Shared_Memory_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 DLL Unicode Release"

 

@@ -215,7 +215,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "SV_Shared_Memory_Test - Win32 static Release"

 

@@ -240,7 +240,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Semaphore_Test.dsp b/tests/version_tests/Semaphore_Test.dsp
index 9271cbff3c8..cfe145b1de3 100644
--- a/tests/version_tests/Semaphore_Test.dsp
+++ b/tests/version_tests/Semaphore_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 static Unicode Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 DLL Release"

 

@@ -214,7 +214,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Semaphore_Test - Win32 static Unicode Release"

 

@@ -239,7 +239,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Service_Config_Test.dsp b/tests/version_tests/Service_Config_Test.dsp
index 169fb17a151..8a0fb6b8e73 100644
--- a/tests/version_tests/Service_Config_Test.dsp
+++ b/tests/version_tests/Service_Config_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 DLL Release"

 

@@ -215,7 +215,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Service_Config_Test - Win32 static Release"

 

@@ -240,7 +240,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Sigset_Op_Test.dsp b/tests/version_tests/Sigset_Op_Test.dsp
index 1201711fe78..fdab72f81fb 100644
--- a/tests/version_tests/Sigset_Op_Test.dsp
+++ b/tests/version_tests/Sigset_Op_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Unicode Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Sigset_Op_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /out:".\static Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /out:".\static Release\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Sigset_Op_Test - Win32 DLL Debug"

 

@@ -190,7 +190,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 /debug /machine:I386

-# ADD LINK32 acesd.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Sigset_Op_Test - Win32 static Unicode Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /out:".\static Unicode Debug\Sigset_Ops_Test.exe" /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Sigset_Op_Test - Win32 DLL Unicode Debug"

 

diff --git a/tests/version_tests/Simple_Message_Block_Test.dsp b/tests/version_tests/Simple_Message_Block_Test.dsp
index e8e244d13b3..926ff930fbf 100644
--- a/tests/version_tests/Simple_Message_Block_Test.dsp
+++ b/tests/version_tests/Simple_Message_Block_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 DLL Release"

 

@@ -215,7 +215,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Simple_Message_Block_Test - Win32 static Release"

 

@@ -240,7 +240,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/TSS_Test.dsp b/tests/version_tests/TSS_Test.dsp
index 248e732daa8..bc68920c245 100644
--- a/tests/version_tests/TSS_Test.dsp
+++ b/tests/version_tests/TSS_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 static Unicode Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 DLL Unicode Release"

 

@@ -214,7 +214,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "TSS_Test - Win32 static Release"

 

@@ -239,7 +239,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Task_Test.dsp b/tests/version_tests/Task_Test.dsp
index 4bac7d4649e..13809192397 100644
--- a/tests/version_tests/Task_Test.dsp
+++ b/tests/version_tests/Task_Test.dsp
@@ -114,7 +114,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 static Unicode Release"

 

@@ -139,7 +139,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 static Unicode Debug"

 

@@ -164,7 +164,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 static Debug"

 

@@ -189,7 +189,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Task_Test - Win32 DLL Unicode Debug"

 

diff --git a/tests/version_tests/Thread_Manager_Test.dsp b/tests/version_tests/Thread_Manager_Test.dsp
index 191dbf1a91b..b648af80cde 100644
--- a/tests/version_tests/Thread_Manager_Test.dsp
+++ b/tests/version_tests/Thread_Manager_Test.dsp
@@ -115,7 +115,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 static Unicode Debug"

 

@@ -140,7 +140,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 DLL Release"

 

@@ -190,7 +190,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 static Unicode Release"

 

@@ -215,7 +215,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Manager_Test - Win32 DLL Unicode Release"

 

diff --git a/tests/version_tests/Thread_Mutex_Test.dsp b/tests/version_tests/Thread_Mutex_Test.dsp
index 0e9fcedbff8..b7988c2f18c 100644
--- a/tests/version_tests/Thread_Mutex_Test.dsp
+++ b/tests/version_tests/Thread_Mutex_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

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

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Mutex_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Thread_Pool_Test.dsp b/tests/version_tests/Thread_Pool_Test.dsp
index 2ae61624621..2a002a72b54 100644
--- a/tests/version_tests/Thread_Pool_Test.dsp
+++ b/tests/version_tests/Thread_Pool_Test.dsp
@@ -115,7 +115,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 static Unicode Release"

 

@@ -140,7 +140,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 DLL Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Thread_Pool_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Time_Service_Test.dsp b/tests/version_tests/Time_Service_Test.dsp
index 01ae545c55b..9b53974d2e8 100644
--- a/tests/version_tests/Time_Service_Test.dsp
+++ b/tests/version_tests/Time_Service_Test.dsp
@@ -115,7 +115,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 static Release"

 

@@ -140,7 +140,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 DLL Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Service_Test - Win32 static Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Time_Value_Test.dsp b/tests/version_tests/Time_Value_Test.dsp
index 26717aa6ae8..a2679a79527 100644
--- a/tests/version_tests/Time_Value_Test.dsp
+++ b/tests/version_tests/Time_Value_Test.dsp
@@ -114,7 +114,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 static Unicode Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 DLL Unicode Release"

 

@@ -214,7 +214,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Time_Value_Test - Win32 static Release"

 

@@ -239,7 +239,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Timer_Queue_Test.dsp b/tests/version_tests/Timer_Queue_Test.dsp
index 6bfc405fdd9..6bb1bf983b0 100644
--- a/tests/version_tests/Timer_Queue_Test.dsp
+++ b/tests/version_tests/Timer_Queue_Test.dsp
@@ -140,7 +140,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 static Release"

 

@@ -165,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 DLL Unicode Debug"

 

@@ -215,7 +215,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Timer_Queue_Test - Win32 static Unicode Debug"

 

@@ -240,7 +240,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ENDIF 

 

diff --git a/tests/version_tests/Tokens_Test.dsp b/tests/version_tests/Tokens_Test.dsp
index 32aa1c4e4bc..6d2c0be2d26 100644
--- a/tests/version_tests/Tokens_Test.dsp
+++ b/tests/version_tests/Tokens_Test.dsp
@@ -64,7 +64,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Tokens_Test - Win32 DLL Debug"

 

@@ -139,7 +139,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Tokens_Test - Win32 DLL Release"

 

@@ -189,7 +189,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Tokens_Test - Win32 static Release"

 

@@ -214,7 +214,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Tokens_Test - Win32 DLL Unicode Release"

 

diff --git a/tests/version_tests/UPIPE_SAP_Test.dsp b/tests/version_tests/UPIPE_SAP_Test.dsp
index df7ffd45041..2c39b4db51c 100644
--- a/tests/version_tests/UPIPE_SAP_Test.dsp
+++ b/tests/version_tests/UPIPE_SAP_Test.dsp
@@ -114,7 +114,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 static Release"

 

@@ -139,7 +139,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 DLL Unicode Debug"

 

@@ -189,7 +189,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 static Debug"

 

@@ -214,7 +214,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "UPIPE_SAP_Test - Win32 DLL Debug"

 

diff --git a/tests/version_tests/version_tests.dsp b/tests/version_tests/version_tests.dsp
index a18664ada67..fc897b5bd2b 100644
--- a/tests/version_tests/version_tests.dsp
+++ b/tests/version_tests/version_tests.dsp
@@ -139,7 +139,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 /debug /machine:I386

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

+# ADD LINK32 acesd.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 static Release"

 

@@ -164,7 +164,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 /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aces.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 static Unicode Debug"

 

@@ -189,7 +189,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 /debug /machine:I386

-# ADD LINK32 aceusd.lib acesud.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceusd.lib acesud.lib advapi32.lib user32.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 static Unicode Release"

 

@@ -214,7 +214,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 aceus.lib acesu.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

+# ADD LINK32 aceus.lib acesu.lib advapi32.lib user32.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\ace"

 

 !ELSEIF  "$(CFG)" == "Atomic_Op_Test - Win32 DLL Unicode Release"