Added some submitted MSVC files and updated the rest of the files in

netsvcs.

19 files changed, 1105 insertions, 134 deletions

diff --git a/netsvcs/clients/Logger/direct_logging.dsp b/netsvcs/clients/Logger/direct_logging.dsp
index 3d4399a7f16..71c620c9418 100644
--- a/netsvcs/clients/Logger/direct_logging.dsp
+++ b/netsvcs/clients/Logger/direct_logging.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="direct_logging" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="NETSVCS Direct Logging Client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

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

 

-CFG=direct_logging - Win32 Debug

+CFG=NETSVCS Direct Logging Client - Win32 Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,13 +13,14 @@ CFG=direct_logging - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

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

+!MESSAGE NMAKE /f "direct_logging.mak"\

+ CFG="NETSVCS Direct Logging Client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "direct_logging - Win32 Release" (based on\

+!MESSAGE "NETSVCS Direct Logging Client - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "direct_logging - Win32 Debug" (based on\

+!MESSAGE "NETSVCS Direct Logging Client - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -29,7 +30,7 @@ CFG=direct_logging - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "direct_logging - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Direct Logging Client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -38,12 +39,13 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "."

+# PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

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

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

 BSC32=bscmake.exe

@@ -51,9 +53,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

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

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

 

-!ELSEIF  "$(CFG)" == "direct_logging - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Direct Logging Client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -62,12 +64,13 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

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

+# SUBTRACT CPP /YX

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

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

 BSC32=bscmake.exe

@@ -75,14 +78,14 @@ 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 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

 

 !ENDIF 

 

 # Begin Target

 

-# Name "direct_logging - Win32 Release"

-# Name "direct_logging - Win32 Debug"

+# Name "NETSVCS Direct Logging Client - Win32 Release"

+# Name "NETSVCS Direct Logging Client - Win32 Debug"

 # Begin Source File

 

 SOURCE=.\direct_logging.cpp

diff --git a/netsvcs/clients/Logger/indirect_logging.dsp b/netsvcs/clients/Logger/indirect_logging.dsp
index 59b94c55e3a..defd247421d 100644
--- a/netsvcs/clients/Logger/indirect_logging.dsp
+++ b/netsvcs/clients/Logger/indirect_logging.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="indirect_logging" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="NETSVCS Indirect Logging Client" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

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

 

-CFG=indirect_logging - Win32 Debug

+CFG=NETSVCS Indirect Logging Client - Win32 Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,13 +13,14 @@ CFG=indirect_logging - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

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

+!MESSAGE NMAKE /f "indirect_logging.mak"\

+ CFG="NETSVCS Indirect Logging Client - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "indirect_logging - Win32 Release" (based on\

+!MESSAGE "NETSVCS Indirect Logging Client - Win32 Release" (based on\

  "Win32 (x86) Console Application")

-!MESSAGE "indirect_logging - Win32 Debug" (based on\

+!MESSAGE "NETSVCS Indirect Logging Client - Win32 Debug" (based on\

  "Win32 (x86) Console Application")

 !MESSAGE 

 

@@ -29,7 +30,7 @@ CFG=indirect_logging - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "indirect_logging - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Indirect Logging Client - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -38,12 +39,13 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "."

+# PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

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

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

 BSC32=bscmake.exe

@@ -51,9 +53,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

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

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

 

-!ELSEIF  "$(CFG)" == "indirect_logging - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Indirect Logging Client - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -62,12 +64,13 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

+# PROP Output_Dir ""

 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

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

+# SUBTRACT CPP /YX

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

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

 BSC32=bscmake.exe

@@ -75,14 +78,14 @@ 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 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

 

 !ENDIF 

 

 # Begin Target

 

-# Name "indirect_logging - Win32 Release"

-# Name "indirect_logging - Win32 Debug"

+# Name "NETSVCS Indirect Logging Client - Win32 Release"

+# Name "NETSVCS Indirect Logging Client - Win32 Debug"

 # Begin Source File

 

 SOURCE=.\indirect_logging.cpp

diff --git a/netsvcs/clients/Naming/Client/Client_Test.dsp b/netsvcs/clients/Naming/Client/Client_Test.dsp
index 534b9b44306..da27c871324 100644
--- a/netsvcs/clients/Naming/Client/Client_Test.dsp
+++ b/netsvcs/clients/Naming/Client/Client_Test.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Client_Test" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="NETSVCS Naming Client DLL" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 

-CFG=Client_Test - Win32 Debug

+CFG=NETSVCS Naming Client DLL - Win32 Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,13 +13,14 @@ CFG=Client_Test - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

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

+!MESSAGE NMAKE /f "Client_Test.mak"\

+ CFG="NETSVCS Naming Client DLL - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Client_Test - Win32 Release" (based on\

+!MESSAGE "NETSVCS Naming Client DLL - Win32 Release" (based on\

  "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "Client_Test - Win32 Debug" (based on\

+!MESSAGE "NETSVCS Naming Client DLL - Win32 Debug" (based on\

  "Win32 (x86) Dynamic-Link Library")

 !MESSAGE 

 

@@ -30,7 +31,7 @@ CPP=cl.exe
 MTL=midl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Client_Test - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Naming Client DLL - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -44,7 +45,8 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\...." /I "..\..\..\..\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\...." /I "..\..\..\..\\" /D "NDEBUG" /D "_WINDOWS" /D "WIN32" /FD /c

+# SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32

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

@@ -54,9 +56,9 @@ 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:windows /dll /machine:I386

-# ADD LINK32 ace.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:windows /dll /machine:I386 /libpath:"..\..\..\..\ace"

+# ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "Client_Test - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Naming Client DLL - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -70,7 +72,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c

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

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

+# SUBTRACT CPP /YX

 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32

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

@@ -80,14 +83,14 @@ 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:windows /dll /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"Client_Testd.dll" /pdbtype:sept /libpath:"..\..\..\..\ace"

 

 !ENDIF 

 

 # Begin Target

 

-# Name "Client_Test - Win32 Release"

-# Name "Client_Test - Win32 Debug"

+# Name "NETSVCS Naming Client DLL - Win32 Release"

+# Name "NETSVCS Naming Client DLL - Win32 Debug"

 # Begin Source File

 

 SOURCE=.\Client_Test.cpp

diff --git a/netsvcs/clients/Naming/Client/main.dsp b/netsvcs/clients/Naming/Client/main.dsp
index f29fe74efbd..27d5106a8a5 100644
--- a/netsvcs/clients/Naming/Client/main.dsp
+++ b/netsvcs/clients/Naming/Client/main.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="main" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="NETSVCS Naming Client Test" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

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

 

-CFG=main - Win32 Debug

+CFG=NETSVCS Naming Client Test - Win32 Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,14 @@ CFG=main - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

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

+!MESSAGE NMAKE /f "main.mak" CFG="NETSVCS Naming Client Test - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "main - Win32 Release" (based on "Win32 (x86) Console Application")

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

+!MESSAGE "NETSVCS Naming Client Test - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Naming Client Test - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -27,7 +29,7 @@ CFG=main - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "main - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Naming Client Test - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -36,12 +38,13 @@ RSC=rc.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

+# PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\...." /I "..\..\..\..\\" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "UNICODE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /FD /c

+# SUBTRACT CPP /YX

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

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

 BSC32=bscmake.exe

@@ -49,9 +52,9 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

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

-# ADD LINK32 ace.lib Client_Test.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 ace.lib Client_Test.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace"

 

-!ELSEIF  "$(CFG)" == "main - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Naming Client Test - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -65,7 +68,8 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

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

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

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

+# SUBTRACT CPP /YX

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

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

 BSC32=bscmake.exe

@@ -73,14 +77,14 @@ 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 Client_Test.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\ace"

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

 

 !ENDIF 

 

 # Begin Target

 

-# Name "main - Win32 Release"

-# Name "main - Win32 Debug"

+# Name "NETSVCS Naming Client Test - Win32 Release"

+# Name "NETSVCS Naming Client Test - Win32 Debug"

 # Begin Source File

 

 SOURCE=.\main.cpp

diff --git a/netsvcs/clients/Tokens/collection/collection.dsp b/netsvcs/clients/Tokens/collection/collection.dsp
new file mode 100644
index 00000000000..a75dd93a82f
--- /dev/null
+++ b/netsvcs/clients/Tokens/collection/collection.dsp
@@ -0,0 +1,109 @@
+# Microsoft Developer Studio Project File - Name="NETSVCS Token Collection Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

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

+

+CFG=NETSVCS Token Collection Client - Win32 Debug

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

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "collection.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "collection.mak"\

+ CFG="NETSVCS Token Collection Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "NETSVCS Token Collection Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Token Collection Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "NETSVCS Token Collection Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

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

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

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token Collection Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

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

+# SUBTRACT CPP /Fr /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

+

+!ENDIF 

+

+# Begin Target

+

+# Name "NETSVCS Token Collection Client - Win32 Release"

+# Name "NETSVCS Token Collection Client - Win32 Debug"

+# Begin Group "Source"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\collection.cpp

+

+!IF  "$(CFG)" == "NETSVCS Token Collection Client - Win32 Release"

+

+# ADD CPP /MD

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token Collection Client - Win32 Debug"

+

+# ADD CPP /MDd

+

+!ENDIF 

+

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/netsvcs/clients/Tokens/collection/collection.dsw b/netsvcs/clients/Tokens/collection/collection.dsw
new file mode 100644
index 00000000000..925cd8b59fc
--- /dev/null
+++ b/netsvcs/clients/Tokens/collection/collection.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "collection"=.\collection.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/netsvcs/clients/Tokens/deadlock/deadlock.dsp b/netsvcs/clients/Tokens/deadlock/deadlock.dsp
new file mode 100644
index 00000000000..9cbeef87e46
--- /dev/null
+++ b/netsvcs/clients/Tokens/deadlock/deadlock.dsp
@@ -0,0 +1,112 @@
+# Microsoft Developer Studio Project File - Name="NETSVCS Token Deadlock Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

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

+

+CFG=NETSVCS Token Deadlock Client - Win32 Debug

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

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "deadlock.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "deadlock.mak"\

+ CFG="NETSVCS Token Deadlock Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "NETSVCS Token Deadlock Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Token Deadlock Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "NETSVCS Token Deadlock Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

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

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

+# SUBTRACT LINK32 /incremental:yes

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token Deadlock Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

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

+# SUBTRACT CPP /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

+

+!ENDIF 

+

+# Begin Target

+

+# Name "NETSVCS Token Deadlock Client - Win32 Release"

+# Name "NETSVCS Token Deadlock Client - Win32 Debug"

+# Begin Group "Source"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\deadlock_detection_test.cpp

+

+!IF  "$(CFG)" == "NETSVCS Token Deadlock Client - Win32 Release"

+

+# ADD CPP /MD

+# SUBTRACT CPP /YX

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token Deadlock Client - Win32 Debug"

+

+# ADD CPP /MDd

+# SUBTRACT CPP /YX

+

+!ENDIF 

+

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/netsvcs/clients/Tokens/deadlock/deadlock.dsw b/netsvcs/clients/Tokens/deadlock/deadlock.dsw
new file mode 100644
index 00000000000..cbeca019f6b
--- /dev/null
+++ b/netsvcs/clients/Tokens/deadlock/deadlock.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "deadlock"=.\deadlock.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/netsvcs/clients/Tokens/invariant/invariant.dsp b/netsvcs/clients/Tokens/invariant/invariant.dsp
new file mode 100644
index 00000000000..ce82233ec6f
--- /dev/null
+++ b/netsvcs/clients/Tokens/invariant/invariant.dsp
@@ -0,0 +1,99 @@
+# Microsoft Developer Studio Project File - Name="NETSVCS Token Invariant Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

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

+

+CFG=NETSVCS Token Invariant Client - Win32 Debug

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

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "invariant.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "invariant.mak"\

+ CFG="NETSVCS Token Invariant Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "NETSVCS Token Invariant Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Token Invariant Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "NETSVCS Token Invariant Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

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

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

+# SUBTRACT LINK32 /incremental:yes

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token Invariant Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

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

+# SUBTRACT CPP /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

+

+!ENDIF 

+

+# Begin Target

+

+# Name "NETSVCS Token Invariant Client - Win32 Release"

+# Name "NETSVCS Token Invariant Client - Win32 Debug"

+# Begin Group "Source"

+

+# PROP Default_Filter ""

+# Begin Source File

+

+SOURCE=.\invariant.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/netsvcs/clients/Tokens/invariant/invariant.dsw b/netsvcs/clients/Tokens/invariant/invariant.dsw
new file mode 100644
index 00000000000..79517be4f1b
--- /dev/null
+++ b/netsvcs/clients/Tokens/invariant/invariant.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "invariant"=.\invariant.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/netsvcs/clients/Tokens/manual/manual.dsp b/netsvcs/clients/Tokens/manual/manual.dsp
new file mode 100644
index 00000000000..da38fcf50f8
--- /dev/null
+++ b/netsvcs/clients/Tokens/manual/manual.dsp
@@ -0,0 +1,97 @@
+# Microsoft Developer Studio Project File - Name="NETSVCS Token Manual Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

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

+

+CFG=NETSVCS Token Manual Client - Win32 Debug

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

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "manual.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "manual.mak" CFG="NETSVCS Token Manual Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "NETSVCS Token Manual Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Token Manual Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "NETSVCS Token Manual Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

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

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

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token Manual Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

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

+# SUBTRACT CPP /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

+

+!ENDIF 

+

+# Begin Target

+

+# Name "NETSVCS Token Manual Client - Win32 Release"

+# Name "NETSVCS Token Manual Client - Win32 Debug"

+# Begin Group "Source"

+

+# PROP Default_Filter "cpp"

+# Begin Source File

+

+SOURCE=.\manual.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/netsvcs/clients/Tokens/manual/manual.dsw b/netsvcs/clients/Tokens/manual/manual.dsw
new file mode 100644
index 00000000000..59f215b094b
--- /dev/null
+++ b/netsvcs/clients/Tokens/manual/manual.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "manual"=.\manual.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/netsvcs/clients/Tokens/mutex/mutex.dsp b/netsvcs/clients/Tokens/mutex/mutex.dsp
new file mode 100644
index 00000000000..aa72f9c71de
--- /dev/null
+++ b/netsvcs/clients/Tokens/mutex/mutex.dsp
@@ -0,0 +1,97 @@
+# Microsoft Developer Studio Project File - Name="NETSVCS Token Mutex Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

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

+

+CFG=NETSVCS Token Mutex Client - Win32 Debug

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

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "mutex.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "mutex.mak" CFG="NETSVCS Token Mutex Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "NETSVCS Token Mutex Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Token Mutex Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "NETSVCS Token Mutex Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

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

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

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token Mutex Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

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

+# SUBTRACT CPP /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

+

+!ENDIF 

+

+# Begin Target

+

+# Name "NETSVCS Token Mutex Client - Win32 Release"

+# Name "NETSVCS Token Mutex Client - Win32 Debug"

+# Begin Group "Source"

+

+# PROP Default_Filter "cpp"

+# Begin Source File

+

+SOURCE=.\test_mutex.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/netsvcs/clients/Tokens/mutex/mutex.dsw b/netsvcs/clients/Tokens/mutex/mutex.dsw
new file mode 100644
index 00000000000..2ecbb68427c
--- /dev/null
+++ b/netsvcs/clients/Tokens/mutex/mutex.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "mutex"=.\mutex.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/netsvcs/clients/Tokens/rw_lock/rw_lock.dsp b/netsvcs/clients/Tokens/rw_lock/rw_lock.dsp
new file mode 100644
index 00000000000..82a57c409d7
--- /dev/null
+++ b/netsvcs/clients/Tokens/rw_lock/rw_lock.dsp
@@ -0,0 +1,98 @@
+# Microsoft Developer Studio Project File - Name="NETSVCS Token RW_Lock Client" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 5.00

+# ** DO NOT EDIT **

+

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

+

+CFG=NETSVCS Token RW_Lock Client - Win32 Debug

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

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "rw_lock.mak".

+!MESSAGE 

+!MESSAGE You can specify a configuration when running NMAKE

+!MESSAGE by defining the macro CFG on the command line. For example:

+!MESSAGE 

+!MESSAGE NMAKE /f "rw_lock.mak"\

+ CFG="NETSVCS Token RW_Lock Client - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "NETSVCS Token RW_Lock Client - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Token RW_Lock Client - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "NETSVCS Token RW_Lock Client - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# ADD BASE RSC /l 0x409 /d "NDEBUG"

+# ADD RSC /l 0x409 /d "NDEBUG"

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

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

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

+

+!ELSEIF  "$(CFG)" == "NETSVCS Token RW_Lock Client - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

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

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

+# SUBTRACT CPP /YX

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

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

+BSC32=bscmake.exe

+# ADD BASE BSC32 /nologo

+# ADD BSC32 /nologo

+LINK32=link.exe

+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

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

+

+!ENDIF 

+

+# Begin Target

+

+# Name "NETSVCS Token RW_Lock Client - Win32 Release"

+# Name "NETSVCS Token RW_Lock Client - Win32 Debug"

+# Begin Group "Source"

+

+# PROP Default_Filter "cpp"

+# Begin Source File

+

+SOURCE=.\rw_locks.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/netsvcs/clients/Tokens/rw_lock/rw_lock.dsw b/netsvcs/clients/Tokens/rw_lock/rw_lock.dsw
new file mode 100644
index 00000000000..b5e5ab81382
--- /dev/null
+++ b/netsvcs/clients/Tokens/rw_lock/rw_lock.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "rw_lock"=.\rw_lock.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/netsvcs/lib/netsvcs.dsp b/netsvcs/lib/netsvcs.dsp
index ff01e1cda51..a788a7ab751 100644
--- a/netsvcs/lib/netsvcs.dsp
+++ b/netsvcs/lib/netsvcs.dsp
@@ -1,11 +1,11 @@
-# Microsoft Developer Studio Project File - Name="netsvcs" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="NETSVCS Library" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

 # TARGTYPE "Win32 (ALPHA) Dynamic-Link Library" 0x0602

 

-CFG=netsvcs - Win32 Alpha Debug

+CFG=NETSVCS Library - Win32 Alpha Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,25 +14,25 @@ CFG=netsvcs - Win32 Alpha Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "netsvcs.mak" CFG="netsvcs - Win32 Alpha Debug"

+!MESSAGE NMAKE /f "netsvcs.mak" CFG="NETSVCS Library - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "netsvcs - Win32 Release" (based on\

+!MESSAGE "NETSVCS Library - Win32 Release" (based on\

  "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "netsvcs - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

-!MESSAGE "netsvcs - Win32 Alpha Debug" (based on\

+!MESSAGE "NETSVCS Library - Win32 Debug" (based on\

+ "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "NETSVCS Library - Win32 Alpha Debug" (based on\

  "Win32 (ALPHA) Dynamic-Link Library")

-!MESSAGE "netsvcs - Win32 Alpha Release" (based on\

+!MESSAGE "NETSVCS Library - Win32 Alpha Release" (based on\

  "Win32 (ALPHA) Dynamic-Link Library")

 !MESSAGE 

 

 # Begin Project

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -41,13 +41,14 @@ CFG=netsvcs - Win32 Alpha Debug
 # PROP BASE Target_Dir ".\netsvcs"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\Release"

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\netsvcs"

 CPP=cl.exe

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

+# SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "NDEBUG" /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

@@ -61,7 +62,7 @@ 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:windows /dll /machine:I386

 # ADD LINK32 ace.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\ace"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -70,13 +71,14 @@ LINK32=link.exe
 # PROP BASE Target_Dir ".\netsvcs"

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "."

-# PROP Intermediate_Dir ".\Debug"

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ".\netsvcs"

 CPP=cl.exe

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c

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

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

+# SUBTRACT CPP /YX

 MTL=midl.exe

 # ADD BASE MTL /nologo /D "_DEBUG" /win32

 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

@@ -88,9 +90,9 @@ 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:windows /dll /debug /machine:I386

-# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./netsvcsd.dll" /libpath:"..\..\ace"

+# ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"netsvcsd.dll" /libpath:"..\..\ace"

 

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

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -120,7 +122,7 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /libpath:"..\..\ace"

 # ADD LINK32 aced.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /libpath:"..\..\ace"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -154,10 +156,10 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "netsvcs - Win32 Release"

-# Name "netsvcs - Win32 Debug"

-# Name "netsvcs - Win32 Alpha Debug"

-# Name "netsvcs - Win32 Alpha Release"

+# Name "NETSVCS Library - Win32 Release"

+# Name "NETSVCS Library - Win32 Debug"

+# Name "NETSVCS Library - Win32 Alpha Debug"

+# Name "NETSVCS Library - Win32 Alpha Release"

 # Begin Group "Source Files"

 

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

@@ -165,13 +167,13 @@ LINK32=link.exe
 

 SOURCE=.\Client_Logging_Handler.cpp

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 !ENDIF 

 

@@ -180,13 +182,13 @@ SOURCE=.\Client_Logging_Handler.cpp
 

 SOURCE=.\Logging_Strategy.cpp

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 !ENDIF 

 

@@ -195,13 +197,13 @@ SOURCE=.\Logging_Strategy.cpp
 

 SOURCE=.\Name_Handler.cpp

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 !ENDIF 

 

@@ -210,13 +212,13 @@ SOURCE=.\Name_Handler.cpp
 

 SOURCE=.\Server_Logging_Handler.cpp

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 !ENDIF 

 

@@ -225,13 +227,13 @@ SOURCE=.\Server_Logging_Handler.cpp
 

 SOURCE=.\Token_Handler.cpp

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 !ENDIF 

 

@@ -240,13 +242,13 @@ SOURCE=.\Token_Handler.cpp
 

 SOURCE=.\TS_Clerk_Handler.cpp

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 !ENDIF 

 

@@ -255,13 +257,13 @@ SOURCE=.\TS_Clerk_Handler.cpp
 

 SOURCE=.\TS_Server_Handler.cpp

 

-!IF  "$(CFG)" == "netsvcs - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Library - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "netsvcs - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Library - Win32 Alpha Release"

 

 !ENDIF 

 

diff --git a/netsvcs/netsvcs.dsw b/netsvcs/netsvcs.dsw
new file mode 100644
index 00000000000..465aec30f7d
--- /dev/null
+++ b/netsvcs/netsvcs.dsw
@@ -0,0 +1,167 @@
+Microsoft Developer Studio Workspace File, Format Version 5.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "NETSVCS Direct Logging Client"=.\clients\Logger\direct_logging.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Indirect Logging Client"=.\clients\Logger\indirect_logging.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Library"=.\lib\netsvcs.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Naming Client DLL"=.\clients\Naming\Client\Client_Test.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Naming Client Test"=.\clients\Naming\Client\main.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name NETSVCS Naming Client DLL

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Servers"=.\servers\servers.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name NETSVCS Library

+    End Project Dependency

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Token Collection Client"=.\clients\Tokens\collection\collection.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Token Deadlock Client"=.\clients\Tokens\deadlock\deadlock.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Token Invariant Client"=.\clients\Tokens\invariant\invariant.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Token Manual Client"=.\clients\Tokens\manual\manual.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Token Mutex Client"=.\clients\Tokens\mutex\mutex.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "NETSVCS Token RW_Lock Client"=.\clients\Tokens\rw_lock\rw_lock.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/netsvcs/servers/servers.dsp b/netsvcs/servers/servers.dsp
index 17bd993d661..2331dbe8c23 100644
--- a/netsvcs/servers/servers.dsp
+++ b/netsvcs/servers/servers.dsp
@@ -1,11 +1,11 @@
-# Microsoft Developer Studio Project File - Name="servers" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="NETSVCS Servers" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 5.00

 # ** DO NOT EDIT **

 

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

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

 

-CFG=servers - Win32 Alpha Debug

+CFG=NETSVCS Servers - Win32 Alpha Debug

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

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -14,24 +14,25 @@ CFG=servers - Win32 Alpha Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "servers.mak" CFG="servers - Win32 Alpha Debug"

+!MESSAGE NMAKE /f "servers.mak" CFG="NETSVCS Servers - Win32 Alpha Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "servers - Win32 Release" (based on "Win32 (x86) Console Application")

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

-!MESSAGE "servers - Win32 Alpha Debug" (based on\

+!MESSAGE "NETSVCS Servers - Win32 Release" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Servers - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE "NETSVCS Servers - Win32 Alpha Debug" (based on\

  "Win32 (ALPHA) Console Application")

-!MESSAGE "servers - Win32 Alpha Release" (based on\

+!MESSAGE "NETSVCS Servers - Win32 Alpha Release" (based on\

  "Win32 (ALPHA) Console Application")

 !MESSAGE 

 

 # Begin Project

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-# PROP WCE_Configuration "H/PC Ver. 2.00"

 

-!IF  "$(CFG)" == "servers - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Servers - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -40,13 +41,14 @@ CFG=servers - Win32 Alpha Debug
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

-# PROP Output_Dir ""

-# PROP Intermediate_Dir ".\Release"

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\lib" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /FD /c

+# SUBTRACT CPP /YX

 RSC=rc.exe

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

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

@@ -55,9 +57,9 @@ 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 /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib netsvcs.lib /nologo /subsystem:console /machine:I386 /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

+# ADD LINK32 ace.lib netsvcs.lib /nologo /subsystem:console /machine:I386 /out:"Release/main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

 

-!ELSEIF  "$(CFG)" == "servers - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -67,12 +69,13 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir ""

-# PROP Intermediate_Dir ".\debug"

+# PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

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

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

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

+# SUBTRACT CPP /YX

 RSC=rc.exe

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

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

@@ -83,7 +86,7 @@ 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 /nologo /subsystem:console /debug /machine:I386

 # ADD LINK32 aced.lib netsvcsd.lib /nologo /subsystem:console /debug /machine:I386 /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

 

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

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

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -110,7 +113,7 @@ LINK32=link.exe
 # ADD BASE LINK32 aced.lib netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

 # ADD LINK32 aced.lib netsvcs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"main.exe" /libpath:"..\..\ace" /libpath:"..\lib"

 

-!ELSEIF  "$(CFG)" == "servers - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Alpha Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -141,10 +144,10 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "servers - Win32 Release"

-# Name "servers - Win32 Debug"

-# Name "servers - Win32 Alpha Debug"

-# Name "servers - Win32 Alpha Release"

+# Name "NETSVCS Servers - Win32 Release"

+# Name "NETSVCS Servers - Win32 Debug"

+# Name "NETSVCS Servers - Win32 Alpha Debug"

+# Name "NETSVCS Servers - Win32 Alpha Release"

 # Begin Group "Source Files"

 

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

@@ -152,13 +155,13 @@ LINK32=link.exe
 

 SOURCE=.\main.cpp

 

-!IF  "$(CFG)" == "servers - Win32 Release"

+!IF  "$(CFG)" == "NETSVCS Servers - Win32 Release"

 

-!ELSEIF  "$(CFG)" == "servers - Win32 Debug"

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Debug"

 

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

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

 

-!ELSEIF  "$(CFG)" == "servers - Win32 Alpha Release"

+!ELSEIF  "$(CFG)" == "NETSVCS Servers - Win32 Alpha Release"

 

 !ENDIF