Wed Jun 02 00:07:44 1999 <alex@cs.wustl.edu>

7 files changed, 91 insertions, 77 deletions

diff --git a/examples/Reactor/Proactor/post_completions.dsp b/examples/Reactor/Proactor/post_completions.dsp
index e98c90df575..3391d2b1c5a 100644
--- a/examples/Reactor/Proactor/post_completions.dsp
+++ b/examples/Reactor/Proactor/post_completions.dsp
@@ -18,8 +18,6 @@ CFG=test_post_completion - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

- "Win32 (x86) Console Application")

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

  "Win32 (x86) Console Application")

 !MESSAGE 

@@ -29,32 +27,6 @@ CFG=test_post_completion - Win32 Debug
 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "test_post_completion - 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 Target_Dir ""

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

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

-# 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 kernel32.lib user32.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

-

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

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "test_pos"

@@ -62,8 +34,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "test_pos"

-# PROP Intermediate_Dir "test_pos"

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

@@ -75,18 +47,18 @@ 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 wsock32.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 /pdb:"test_post_completion.pdb" /debug /machine:I386 /out:"post_completions.exe" /pdbtype:sept /libpath:"..\..\..\ace"

+# ADD LINK32 wsock32.lib aced.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /pdb:"test_post_completion.pdb" /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\ace"

 # SUBTRACT LINK32 /pdb:none

-

-!ENDIF 

-

 # Begin Target

 

-# Name "test_post_completion - Win32 Release"

 # Name "test_post_completion - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "*.cpp"

 # Begin Source File

 

 SOURCE=.\post_completions.cpp

 # End Source File

+# End Group

 # End Target

 # End Project

diff --git a/examples/Reactor/Proactor/test_cancel.dsp b/examples/Reactor/Proactor/test_cancel.dsp
new file mode 100644
index 00000000000..49ddc9a40b8
--- /dev/null
+++ b/examples/Reactor/Proactor/test_cancel.dsp
@@ -0,0 +1,61 @@
+# Microsoft Developer Studio Project File - Name="test_cancel" - Package Owner=<4>

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

+# ** DO NOT EDIT **

+

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

+

+CFG=test_cancel - 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 "test_cancel.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 "test_cancel.mak" CFG="test_cancel - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "test_cancel - Win32 Debug" (based on\

+ "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "test_can"

+# PROP BASE Intermediate_Dir "test_can"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir ""

+# PROP Intermediate_Dir "Debug"

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

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

+# Begin Target

+

+# Name "test_cancel - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "*.cpp"

+# Begin Source File

+

+SOURCE=.\test_cancel.cpp

+# End Source File

+# End Group

+# End Target

+# End Project

diff --git a/examples/Reactor/Proactor/test_end_event_loop.dsp b/examples/Reactor/Proactor/test_end_event_loop.dsp
index 660e00e3f2b..d06cf6e318b 100644
--- a/examples/Reactor/Proactor/test_end_event_loop.dsp
+++ b/examples/Reactor/Proactor/test_end_event_loop.dsp
@@ -18,8 +18,6 @@ CFG=test_end_event_loop - Win32 Debug
 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

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

- "Win32 (x86) Console Application")

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

  "Win32 (x86) Console Application")

 !MESSAGE 

@@ -29,32 +27,6 @@ CFG=test_end_event_loop - Win32 Debug
 # PROP Scc_LocalPath ""

 CPP=cl.exe

 RSC=rc.exe

-

-!IF  "$(CFG)" == "test_end_event_loop - 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 Target_Dir ""

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

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

-# 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 kernel32.lib user32.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

-

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

-

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

 # PROP BASE Output_Dir "test_end"

@@ -62,8 +34,8 @@ LINK32=link.exe
 # PROP BASE Target_Dir ""

 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

-# PROP Output_Dir "test_end_event_loop"

-# PROP Intermediate_Dir "test_end"

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

@@ -72,16 +44,13 @@ LINK32=link.exe
 # ADD RSC /l 0x409 /d "_DEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

-# ADD BSC32 /nologo

+# ADD BSC32 /nologo /o"ttest_end_event_loop.bsc"

 LINK32=link.exe

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

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

-

-!ENDIF 

-

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

+# SUBTRACT LINK32 /pdb:none

 # Begin Target

 

-# Name "test_end_event_loop - Win32 Release"

 # Name "test_end_event_loop - Win32 Debug"

 # Begin Source File

 

diff --git a/examples/Reactor/Proactor/test_multiple_loops.dsp b/examples/Reactor/Proactor/test_multiple_loops.dsp
index fc8cdf9f25f..ad1b472f639 100644
--- a/examples/Reactor/Proactor/test_multiple_loops.dsp
+++ b/examples/Reactor/Proactor/test_multiple_loops.dsp
@@ -34,8 +34,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ".\test_multiple_loops"

 # 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 ".\test_multiple_loops"

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

diff --git a/examples/Reactor/Proactor/test_proactor.dsp b/examples/Reactor/Proactor/test_proactor.dsp
index ad5368d7b2c..44d956c012c 100644
--- a/examples/Reactor/Proactor/test_proactor.dsp
+++ b/examples/Reactor/Proactor/test_proactor.dsp
@@ -30,8 +30,8 @@ RSC=rc.exe
 # PROP BASE Use_Debug_Libraries 1

 # 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

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

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

diff --git a/examples/Reactor/Proactor/test_proactor.dsw b/examples/Reactor/Proactor/test_proactor.dsw
index 916ace5cf99..78f457cd968 100644
--- a/examples/Reactor/Proactor/test_proactor.dsw
+++ b/examples/Reactor/Proactor/test_proactor.dsw
@@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 

 ###############################################################################

 

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

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

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

+

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

 

 Package=<5>

diff --git a/examples/Reactor/Proactor/test_timeout.dsp b/examples/Reactor/Proactor/test_timeout.dsp
index 9569ef200ad..9d2341b000b 100644
--- a/examples/Reactor/Proactor/test_timeout.dsp
+++ b/examples/Reactor/Proactor/test_timeout.dsp
@@ -33,8 +33,8 @@ RSC=rc.exe
 # PROP BASE Target_Dir ".\test_timeout"

 # 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 ".\test_timeout"

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