WIN32 updates.

4 files changed, 624 insertions, 338 deletions

diff --git a/cpp/all.dsw b/cpp/all.dsw
index 01aa5bdf066..712c7ea27de 100644
--- a/cpp/all.dsw
+++ b/cpp/all.dsw
@@ -56,6 +56,9 @@ Package=<4>
     Begin Project Dependency

     Project_Dep_Name IceUtil

     End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Glacier

+    End Project Dependency

 }}}

 

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

@@ -1617,6 +1620,48 @@ Package=<4>
 

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

 

+Project: "sessionC"=.\demo\Glacier\session\sessionC.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Glacier

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name IceUtil

+    End Project Dependency

+}}}

+

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

+

+Project: "sessionS"=.\demo\Glacier\session\sessionS.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+    Begin Project Dependency

+    Project_Dep_Name Glacier

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name Ice

+    End Project Dependency

+    Begin Project Dependency

+    Project_Dep_Name IceUtil

+    End Project Dependency

+}}}

+

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

+

 Project: "simpleC"=.\test\IcePack\simple\simpleC.dsp - Package Owner=<4>

 

 Package=<5>

diff --git a/cpp/demo/Glacier/session/sessionC.dsp b/cpp/demo/Glacier/session/sessionC.dsp
index 6f7109856ae..2faa59b1afc 100644
--- a/cpp/demo/Glacier/session/sessionC.dsp
+++ b/cpp/demo/Glacier/session/sessionC.dsp
@@ -1,157 +1,157 @@
-# Microsoft Developer Studio Project File - Name="sessionC" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

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

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "sessionC - 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 /WX /GR /GX /O2 /I "." /I "../../../include" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c

-# SUBTRACT CPP /Fr

-# 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 kernel32.lib user32.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 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"

-# SUBTRACT LINK32 /debug /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "sessionC - 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 "Debug"

-# 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 /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

-# 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 kernel32.lib user32.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 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"

-# SUBTRACT LINK32 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "sessionC - Win32 Release"

-# Name "sessionC - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Client.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Hello.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\Hello.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# Begin Source File

-

-SOURCE=.\Hello.ice

-

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

-

-USERDEP__HELLO="../../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=.\Hello.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\slice2cpp.exe Hello.ice \

-	

-

-"Hello.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Hello.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-USERDEP__HELLO="../../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=.\Hello.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\slice2cpp.exe Hello.ice \

-	

-

-"Hello.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Hello.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="sessionC" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=sessionC - 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 "sessionC.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 "sessionC.mak" CFG="sessionC - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sessionC - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "sessionC - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sessionC - 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 /WX /GR /GX /O2 /I "." /I "../../../include" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c
+# SUBTRACT CPP /Fr
+# 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 kernel32.lib user32.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 /nologo /subsystem:console /machine:I386 /out:"client.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "sessionC - 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 "Debug"
+# 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 /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# 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 kernel32.lib user32.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 /nologo /subsystem:console /debug /machine:I386 /out:"client.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sessionC - Win32 Release"
+# Name "sessionC - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Client.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\HelloSession.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\HelloSession.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\HelloSession.ice
+
+!IF  "$(CFG)" == "sessionC - Win32 Release"
+
+USERDEP__HELLO="..\..\..\bin\slice2cpp.exe"	
+# Begin Custom Build
+InputPath=.\HelloSession.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\..\lib \
+	..\..\..\bin\slice2cpp.exe -I../../../slice HelloSession.ice \
+	
+
+"HelloSession.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"HelloSession.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "sessionC - Win32 Debug"
+
+USERDEP__HELLO="..\..\..\bin\slice2cpp.exe"	
+# Begin Custom Build
+InputPath=.\HelloSession.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\..\lib \
+	..\..\..\bin\slice2cpp.exe -I../../../slice HelloSession.ice \
+	
+
+"HelloSession.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"HelloSession.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/demo/Glacier/session/sessionS.dsp b/cpp/demo/Glacier/session/sessionS.dsp
index f978d5af5ab..2e2a43a6fab 100644
--- a/cpp/demo/Glacier/session/sessionS.dsp
+++ b/cpp/demo/Glacier/session/sessionS.dsp
@@ -1,165 +1,165 @@
-# Microsoft Developer Studio Project File - Name="sessionS" - Package Owner=<4>

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

-# ** DO NOT EDIT **

-

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

-

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

-!MESSAGE 

-!MESSAGE Possible choices for configuration are:

-!MESSAGE 

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

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

-!MESSAGE 

-

-# Begin Project

-# PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName ""

-# PROP Scc_LocalPath ""

-CPP=cl.exe

-RSC=rc.exe

-

-!IF  "$(CFG)" == "sessionS - 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 /WX /GR /GX /O2 /I "." /I "../../../include" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c

-# SUBTRACT CPP /Fr

-# 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 kernel32.lib user32.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 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"

-# SUBTRACT LINK32 /debug /nodefaultlib

-

-!ELSEIF  "$(CFG)" == "sessionS - 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 "Debug"

-# 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 /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c

-# SUBTRACT CPP /Fr

-# 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 kernel32.lib user32.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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"

-# SUBTRACT LINK32 /nodefaultlib

-

-!ENDIF 

-

-# Begin Target

-

-# Name "sessionS - Win32 Release"

-# Name "sessionS - Win32 Debug"

-# Begin Group "Source Files"

-

-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

-# Begin Source File

-

-SOURCE=.\Hello.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\HelloI.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\Server.cpp

-# End Source File

-# End Group

-# Begin Group "Header Files"

-

-# PROP Default_Filter "h;hpp;hxx;hm;inl"

-# Begin Source File

-

-SOURCE=.\Hello.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\HelloI.h

-# End Source File

-# End Group

-# Begin Group "Resource Files"

-

-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

-# Begin Source File

-

-SOURCE=.\Hello.ice

-

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

-

-USERDEP__HELLO="../../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=.\Hello.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\slice2cpp.exe Hello.ice \

-	

-

-"Hello.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Hello.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

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

-

-USERDEP__HELLO="../../../bin/slice2cpp.exe"	

-# Begin Custom Build

-InputPath=.\Hello.ice

-

-BuildCmds= \

-	set PATH=%PATH%;..\..\..\lib \

-	..\..\..\bin\slice2cpp.exe Hello.ice \

-	

-

-"Hello.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-

-"Hello.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-   $(BuildCmds)

-# End Custom Build

-

-!ENDIF 

-

-# End Source File

-# End Group

-# End Target

-# End Project

+# Microsoft Developer Studio Project File - Name="sessionS" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=sessionS - 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 "sessionS.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 "sessionS.mak" CFG="sessionS - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "sessionS - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "sessionS - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "sessionS - 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 /WX /GR /GX /O2 /I "." /I "../../../include" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c
+# SUBTRACT CPP /Fr
+# 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 kernel32.lib user32.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 /nologo /subsystem:console /machine:I386 /out:"server.exe" /libpath:"../../../lib"
+# SUBTRACT LINK32 /debug /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "sessionS - 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 "Debug"
+# 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 /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c
+# SUBTRACT CPP /Fr
+# 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 kernel32.lib user32.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 /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"../../../lib"
+# SUBTRACT LINK32 /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "sessionS - Win32 Release"
+# Name "sessionS - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\HelloSession.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\HelloSessionI.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=.\Server.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\HelloSession.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\HelloSessionI.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\HelloSession.ice
+
+!IF  "$(CFG)" == "sessionS - Win32 Release"
+
+USERDEP__HELLO="..\..\..\bin\slice2cpp.exe"	
+# Begin Custom Build
+InputPath=.\HelloSession.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\..\lib \
+	..\..\..\bin\slice2cpp.exe -I../../../slice HelloSession.ice \
+	
+
+"HelloSession.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"HelloSession.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "sessionS - Win32 Debug"
+
+USERDEP__HELLO="..\..\..\bin\slice2cpp.exe"	
+# Begin Custom Build
+InputPath=.\HelloSession.ice
+
+BuildCmds= \
+	set PATH=%PATH%;..\..\..\lib \
+	..\..\..\bin\slice2cpp.exe -I../../../slice HelloSession.ice \
+	
+
+"HelloSession.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+
+"HelloSession.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+   $(BuildCmds)
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/cpp/src/Glacier/glacier.dsp b/cpp/src/Glacier/glacier.dsp
index 543343eda15..7206b128796 100644
--- a/cpp/src/Glacier/glacier.dsp
+++ b/cpp/src/Glacier/glacier.dsp
@@ -43,7 +43,7 @@ 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" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c

-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "_USRDLL" /D "ICE_PACK_API_EXPORTS" /D "NDEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O2 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "GLACIER_API_EXPORTS" /D "_CONSOLE" /D "_UNICODE" /YX /FD /c

 # SUBTRACT CPP /Fr

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

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

@@ -75,7 +75,7 @@ PostBuild_Cmds=copy Release\glacier001.* ..\..\lib
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c

-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_USRDLL" /D "ICE_PACK_API_EXPORTS" /D "_DEBUG" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c

+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "GLACIER_API_EXPORTS" /D "_CONSOLE" /D "_UNICODE" /YX /FD /GZ /c

 # SUBTRACT CPP /Fr

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

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

@@ -104,7 +104,19 @@ PostBuild_Cmds=copy Debug\glacier001d.* ..\..\lib
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

 # Begin Source File

 

-SOURCE=.\Glacier.cpp

+SOURCE=.\Router.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Session.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\SessionManager.cpp

+# End Source File

+# Begin Source File

+

+SOURCE=.\Starter.cpp

 # End Source File

 # End Group

 # Begin Group "Header Files"

@@ -114,49 +126,278 @@ SOURCE=.\Glacier.cpp
 

 SOURCE=..\..\include\Glacier\Glacier.h

 # End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Glacier\Router.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Glacier\Session.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Glacier\SessionF.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Glacier\SessionManager.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Glacier\SessionManagerF.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\Glacier\Starter.h

+# End Source File

 # End Group

 # Begin Group "Resource Files"

 

 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

 # Begin Source File

 

-SOURCE=..\..\slice\Glacier\Glacier.ice

+SOURCE=..\..\slice\Glacier\Router.ice

+

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

+

+USERDEP__ROUTE="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\Router.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/Router.ice \

+	move Router.h ..\..\include\Glacier \

+	

+

+"..\..\include\Glacier\Router.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Router.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

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

+

+USERDEP__ROUTE="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\Router.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/Router.ice \

+	move Router.h ..\..\include\Glacier \

+	

+

+"..\..\include\Glacier\Router.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Router.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\slice\Glacier\Session.ice

+

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

+

+USERDEP__SESSI="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\Session.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/Session.ice \

+	move Session.h ..\..\include\Glacier \

+	

+

+"..\..\include\Glacier\Session.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Session.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

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

+

+USERDEP__SESSI="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\Session.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/Session.ice \

+	move Session.h ..\..\include\Glacier \

+	

+

+"..\..\include\Glacier\Session.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Session.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\slice\Glacier\SessionF.ice

+

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

+

+USERDEP__SESSIO="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\SessionF.ice

+

+"..\..\include\Glacier\SessionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/SessionF.ice 

+	move SessionF.h ..\..\include\Glacier 

+	del SessionF.cpp 

+	

+# End Custom Build

+

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

+

+USERDEP__SESSIO="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\SessionF.ice

+

+"..\..\include\Glacier\SessionF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/SessionF.ice 

+	move SessionF.h ..\..\include\Glacier 

+	del SessionF.cpp 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\slice\Glacier\SessionManager.ice

+

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

+

+USERDEP__SESSION="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\SessionManager.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/SessionManager.ice \

+	move SessionManager.h ..\..\include\Glacier \

+	

+

+"..\..\include\Glacier\SessionManager.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SessionManager.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

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

+

+USERDEP__SESSION="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\SessionManager.ice

+

+BuildCmds= \

+	set PATH=%PATH%;..\..\lib \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/SessionManager.ice \

+	move SessionManager.h ..\..\include\Glacier \

+	

+

+"..\..\include\Glacier\SessionManager.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"SessionManager.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\slice\Glacier\SessionManagerF.ice

+

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

+

+USERDEP__SESSIONM="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\SessionManagerF.ice

+

+"..\..\include\Glacier\SessionManagerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/SessionManagerF.ice 

+	move SessionManagerF.h ..\..\include\Glacier 

+	del SessionManagerF.cpp 

+	

+# End Custom Build

+

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

+

+USERDEP__SESSIONM="../../bin/slice2cpp.exe"	

+# Begin Custom Build

+InputPath=..\..\slice\Glacier\SessionManagerF.ice

+

+"..\..\include\Glacier\SessionManagerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	set PATH=%PATH%;..\..\lib 

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/SessionManagerF.ice 

+	move SessionManagerF.h ..\..\include\Glacier 

+	del SessionManagerF.cpp 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\slice\Glacier\Starter.ice

 

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

 

-USERDEP__GLACI="../../bin/slice2cpp.exe"	

+USERDEP__START="../../bin/slice2cpp.exe"	

 # Begin Custom Build

-InputPath=..\..\slice\Glacier\Glacier.ice

+InputPath=..\..\slice\Glacier\Starter.ice

 

 BuildCmds= \

 	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_PACK_API --include-dir Glacier -I../../slice ../../slice/Glacier/Glacier.ice \

-	move Glacier.h ..\..\include\Glacier \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/Starter.ice \

+	move Starter.h ..\..\include\Glacier \

 	

 

-"..\..\include\Glacier\Glacier.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Glacier\Starter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"Glacier.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"Starter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build

 

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

 

-USERDEP__GLACI="../../bin/slice2cpp.exe"	

+USERDEP__START="../../bin/slice2cpp.exe"	

 # Begin Custom Build

-InputPath=..\..\slice\Glacier\Glacier.ice

+InputPath=..\..\slice\Glacier\Starter.ice

 

 BuildCmds= \

 	set PATH=%PATH%;..\..\lib \

-	..\..\bin\slice2cpp.exe --dll-export ICE_PACK_API --include-dir Glacier -I../../slice ../../slice/Glacier/Glacier.ice \

-	move Glacier.h ..\..\include\Glacier \

+	..\..\bin\slice2cpp.exe --dll-export GLACIER_API --include-dir Glacier -I../../slice ../../slice/Glacier/Starter.ice \

+	move Starter.h ..\..\include\Glacier \

 	

 

-"..\..\include\Glacier\Glacier.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"..\..\include\Glacier\Starter.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 

-"Glacier.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+"Starter.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

 # End Custom Build