Changeset 4692 for pjproject

Timestamp:

Dec 13, 2013 11:44:51 AM (11 years ago)

Author:

nanang

Message:

Re #1519: Misc fixes in pjsua2:

• Changed AccountConfig::toPj() signature, because a pjsua_acc_config instance should not be copied/assigned to another pjsua_acc_config instance as it contains list.
• Fixed assertion in Endpoint destructor caused by access to pjlib mutex after pjlib is destroyed.
• Changed VS2005 sample_debug project to allow debugging C++ code such as pjsua2_demo.cpp.
• Compile warnings on VS2005.
• Fixed SWIG python unit test.

Location:

pjproject/branches/projects/pjsua2

Files:

• pjlib-util/build/pjlib_util_test.vcproj (modified) (53 diffs)
• pjlib/src/pj/string.c (modified) (2 diffs)
• pjproject-vs8.sln (modified) (3 diffs)
• pjsip-apps/build/sample_debug.vcproj (modified) (79 diffs)
• pjsip-apps/src/samples/debug.cpp (moved) (moved from pjproject/branches/projects/pjsua2/pjsip-apps/src/samples/debug.c)
• pjsip-apps/src/samples/pjsua2_demo.cpp (modified) (1 diff)
• pjsip-apps/src/swig/python/test.py (modified) (3 diffs)
• pjsip/include/pjsua2/account.hpp (modified) (1 diff)
• pjsip/src/pjsip/sip_endpoint.c (modified) (1 diff)
• pjsip/src/pjsua2/account.cpp (modified) (4 diffs)
• pjsip/src/pjsua2/endpoint.cpp (modified) (4 diffs)
• pjsip/src/pjsua2/media.cpp (modified) (2 diffs)
• pjsip/src/pjsua2/siptypes.cpp (modified) (1 diff)
• pjsip/src/pjsua2/util.hpp (modified) (1 diff)

pjproject/branches/projects/pjsua2/pjlib-util/build/pjlib_util_test.vcproj

@@ -307 +307 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Debug|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -414 +346 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -441 +373 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -480 +412 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -507 +439 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
+                        Name="Debug|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -528 +460 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TargetEnvironment="3"
                         />
                         <Tool
@@ -535 +466 @@
                                 PreprocessorDefinitions="_CONSOLE;"
                                 PrecompiledHeaderFile=""
-                                DebugInformationFormat="3"
                         />
                         <Tool
@@ -550 +480 @@
                                 AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
                                 OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                TargetMachine="17"
                         />
                         <Tool
@@ -578 +507 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Debug-Static|Pocket PC 2003 (ARMV4)"
+                        Name="Debug|Pocket PC 2003 (ARMV4)"
                         ConfigurationType="1"
                         InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
@@ -712 +573 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Smartphone 2003 (ARMV4)"
+                        Name="Debug|Smartphone 2003 (ARMV4)"
                         ConfigurationType="1"
                         InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
@@ -778 +639 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|x64"
+                        Name="Debug|x64"
                         ConfigurationType="1"
                         InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
@@ -849 +710 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -956 +749 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -983 +776 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -1022 +815 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1049 +842 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        Name="Debug-Static|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1070 +863 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TargetEnvironment="3"
                         />
                         <Tool
@@ -1091 +883 @@
                                 AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
                                 OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                TargetMachine="17"
                         />
                         <Tool
@@ -1119 +910 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Debug-Static|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -1253 +976 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Debug-Static|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -1319 +1042 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
+                        Name="Debug-Static|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1390 +1113 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../include,../../pjlib/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release-Static|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -1497 +1152 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1524 +1179 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
@@ -1563 +1218 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1590 +1245 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        Name="Release-Dynamic|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1611 +1266 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TargetEnvironment="3"
                         />
                         <Tool
@@ -1632 +1286 @@
                                 AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
                                 OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                TargetMachine="17"
                         />
                         <Tool
@@ -1660 +1313 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -1699 +1352 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1726 +1379 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -1765 +1418 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1792 +1445 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Dynamic|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                                TargetEnvironment="3"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../include,../../pjlib/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                TargetMachine="17"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -1858 +1581 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -1924 +1647 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Debug-Dynamic|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../include,../../pjlib/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -1963 +1754 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1990 +1781 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -2029 +1820 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2056 +1847 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug-Dynamic|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                                TargetEnvironment="3"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../include,../../pjlib/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                TargetMachine="17"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -2122 +1984 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -2188 +2050 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Static|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../include,../../pjlib/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release-Static|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -2227 +2157 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2254 +2184 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Static|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -2293 +2223 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="ws2.lib"
-                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2320 +2250 @@
                 </Configuration>
                 <Configuration
+                        Name="Release-Static|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                                TargetEnvironment="3"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../include,../../pjlib/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib ole32.lib"
+                                OutputFile="..\bin\pjlib-util-test-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                TargetMachine="17"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
                         Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
                         InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -2387 +2387 @@
                 <Configuration
                         Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
                         InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         ATLMinimizesCRunTimeLibraryUsage="false"
                         CharacterSet="1"
-                        ConfigurationType="1"
                         >
                         <Tool
@@ -3260 +3260 @@
                         </File>
                         <File
+                                RelativePath="..\src\pjlib-util-test\json_test.c"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\src\pjlib-util-test\main.c"
                                 >
@@ -3297 +3301 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Debug|Win32"
                                         >
@@ -3331 +3351 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Debug-Static|Win32"
                                         >
@@ -3365 +3401 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Release-Dynamic|Win32"
                                         >
@@ -3399 +3451 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Debug-Dynamic|Win32"
                                         >
@@ -3433 +3501 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Release-Static|Win32"
                                         >
@@ -3464 +3548 @@
                                                 AdditionalIncludeDirectories=""
                                                 PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        ExcludedFromBuild="true"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
                                         />
                                 </FileConfiguration>

pjproject/branches/projects/pjsua2/pjlib/src/pj/string.c

@@ -190 +190 @@
 
     if (part.slen)
-        val = pj_strtol(&part);
+        val = (float)pj_strtol(&part);
     else
         val = 0;
@@ -200 +200 @@
             pj_str_t endptr;
             float fpart, fdiv;
-            unsigned i;
-            fpart = pj_strtoul2(&part, &endptr, 10);
+            int i;
+            fpart = (float)pj_strtoul2(&part, &endptr, 10);
             fdiv = 1.0;
             for (i=0; i<(part.slen - endptr.slen); ++i)

pjproject/branches/projects/pjsua2/pjproject-vs8.sln

@@ -36 +36 @@
         ProjectSection(ProjectDependencies) = postProject
                 {23D7679C-764C-4E02-8B29-BB882CEEEFE2} = {23D7679C-764C-4E02-8B29-BB882CEEEFE2}
+                {B82CDD25-6903-430E-BD38-D8129A2015C1} = {B82CDD25-6903-430E-BD38-D8129A2015C1}
         EndProjectSection
 EndProject
@@ -101 +102 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpjproject", "pjsip-apps\build\libpjproject.vcproj", "{23D7679C-764C-4E02-8B29-BB882CEEEFE2}"
         ProjectSection(ProjectDependencies) = postProject
+                {B82CDD25-6903-430E-BD38-D8129A2015C1} = {B82CDD25-6903-430E-BD38-D8129A2015C1}
                 {2BB84911-C1B4-4747-B93D-36AA82CC5031} = {2BB84911-C1B4-4747-B93D-36AA82CC5031}
                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA} = {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}
@@ -117 +119 @@
                 {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8}
                 {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D}
+                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
                 {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D}
                 {A1989FF3-9894-40F4-B5A6-6EA364476E45} = {A1989FF3-9894-40F4-B5A6-6EA364476E45}
                 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}
-                {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37} = {9CA0FDFB-2172-41FC-B7F1-5CE915EDCB37}
         EndProjectSection
 EndProject

pjproject/branches/projects/pjsua2/pjsip-apps/build/sample_debug.vcproj

@@ -312 +312 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                IgnoreDefaultLibraryNames=""
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -421 +352 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -448 +379 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -488 +419 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -515 +446 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        Name="Release|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -536 +467 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TargetEnvironment="3"
                         />
                         <Tool
@@ -558 +488 @@
                                 OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
                                 IgnoreDefaultLibraryNames=""
-                                TargetMachine="17"
                         />
                         <Tool
@@ -586 +515 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Debug-Static|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Release|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -722 +582 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Release|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -789 +649 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
+                        Name="Release|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -811 +671 @@
                                 Name="VCMIDLTool"
                                 TargetEnvironment="3"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                                DebugInformationFormat="3"
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
-                                TargetMachine="17"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release-Dynamic|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
                         />
                         <Tool
@@ -903 +692 @@
                                 OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
                                 IgnoreDefaultLibraryNames=""
+                                TargetMachine="17"
                         />
                         <Tool
@@ -930 +720 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -970 +760 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -997 +787 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1037 +827 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1064 +854 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                                TargetEnvironment="3"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                IgnoreDefaultLibraryNames=""
-                                TargetMachine="17"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Debug-Dynamic|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
+                        Name="Debug-Static|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1204 +923 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Debug-Static|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1271 +990 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
+                        Name="Debug-Static|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1338 +1057 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
+                        Name="Debug-Static|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1410 +1129 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|Win32"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
-                        UseOfMFC="0"
-                        ATLMinimizesCRunTimeLibraryUsage="false"
-                        CharacterSet="2"
-                        >
-                        <Tool
-                                Name="VCPreBuildEventTool"
-                        />
-                        <Tool
-                                Name="VCCustomBuildTool"
-                        />
-                        <Tool
-                                Name="VCXMLDataGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCWebServiceProxyGeneratorTool"
-                        />
-                        <Tool
-                                Name="VCMIDLTool"
-                        />
-                        <Tool
-                                Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
-                                PreprocessorDefinitions="_CONSOLE;"
-                                PrecompiledHeaderFile=""
-                        />
-                        <Tool
-                                Name="VCManagedResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCResourceCompilerTool"
-                        />
-                        <Tool
-                                Name="VCPreLinkEventTool"
-                        />
-                        <Tool
-                                Name="VCLinkerTool"
-                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
-                        />
-                        <Tool
-                                Name="VCALinkTool"
-                        />
-                        <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
-                                Name="VCXDCMakeTool"
-                        />
-                        <Tool
-                                Name="VCBscMakeTool"
-                        />
-                        <Tool
-                                Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
-                        />
-                        <Tool
-                                Name="VCPostBuildEventTool"
-                        />
-                </Configuration>
-                <Configuration
-                        Name="Release-Static|Pocket PC 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1519 +1169 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1546 +1196 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|Smartphone 2003 (ARMV4)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
+                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1586 +1236 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1613 +1263 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|x64"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        Name="Release-Dynamic|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1634 +1284 @@
                         <Tool
                                 Name="VCMIDLTool"
-                                TargetEnvironment="3"
                         />
                         <Tool
@@ -1655 +1304 @@
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
                                 OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
-                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
-                                TargetMachine="17"
+                                IgnoreDefaultLibraryNames=""
                         />
                         <Tool
@@ -1684 +1332 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Dynamic|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1724 +1372 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1751 +1399 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Dynamic|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1791 +1439 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1818 +1466 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+                        Name="Release-Dynamic|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                                TargetEnvironment="3"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                IgnoreDefaultLibraryNames=""
+                                TargetMachine="17"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1858 +1577 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1885 +1604 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1925 +1644 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -1952 +1671 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug-Dynamic|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-common-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Debug-Dynamic|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -1992 +1780 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2019 +1807 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug-Dynamic|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2059 +1847 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2086 +1874 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+                        Name="Debug-Dynamic|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-common-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                                TargetEnvironment="3"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                                DebugInformationFormat="3"
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
+                                TargetMachine="17"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2126 +1986 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2153 +2013 @@
                 </Configuration>
                 <Configuration
-                        Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
+                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2193 +2053 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2220 +2080 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Static|Win32"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win32-release-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release-Static|Pocket PC 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2260 +2189 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2287 +2216 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Release-Static|Smartphone 2003 (ARMV4)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm2003-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2327 +2256 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm2003sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2354 +2283 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+                        Name="Release-Static|x64"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-win64-release-defaults.vsprops"
+                        UseOfMFC="0"
+                        ATLMinimizesCRunTimeLibraryUsage="false"
+                        CharacterSet="2"
+                        >
+                        <Tool
+                                Name="VCPreBuildEventTool"
+                        />
+                        <Tool
+                                Name="VCCustomBuildTool"
+                        />
+                        <Tool
+                                Name="VCXMLDataGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCWebServiceProxyGeneratorTool"
+                        />
+                        <Tool
+                                Name="VCMIDLTool"
+                                TargetEnvironment="3"
+                        />
+                        <Tool
+                                Name="VCCLCompilerTool"
+                                AdditionalIncludeDirectories="../../pjsip/include,../../pjlib/include,../../pjlib-util/include,../../pjmedia/include,../../pjnath/include"
+                                PreprocessorDefinitions="_CONSOLE;"
+                                PrecompiledHeaderFile=""
+                        />
+                        <Tool
+                                Name="VCManagedResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCResourceCompilerTool"
+                        />
+                        <Tool
+                                Name="VCPreLinkEventTool"
+                        />
+                        <Tool
+                                Name="VCLinkerTool"
+                                AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-$(PlatformName)-vc$(VSVer)-$(ConfigurationName).exe"
+                                IgnoreDefaultLibraryNames="MSVCRT.LIB"
+                                TargetMachine="17"
+                        />
+                        <Tool
+                                Name="VCALinkTool"
+                        />
+                        <Tool
+                                Name="VCManifestTool"
+                        />
+                        <Tool
+                                Name="VCXDCMakeTool"
+                        />
+                        <Tool
+                                Name="VCBscMakeTool"
+                        />
+                        <Tool
+                                Name="VCFxCopTool"
+                        />
+                        <Tool
+                                Name="VCAppVerifierTool"
+                        />
+                        <Tool
+                                Name="VCWebDeploymentTool"
+                        />
+                        <Tool
+                                Name="VCPostBuildEventTool"
+                        />
+                </Configuration>
+                <Configuration
+                        Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2394 +2394 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2421 +2421 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+                        Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2461 +2461 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2488 +2488 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2528 +2528 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2555 +2555 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2595 +2595 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2622 +2622 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+                        Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
                         ConfigurationType="1"
                         InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
@@ -2689 +2689 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+                        Name="Release|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
                         ConfigurationType="1"
                         InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
@@ -2756 +2756 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2796 +2796 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2823 +2823 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-common-defaults.vsprops"
+                        Name="Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2863 +2863 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -2890 +2890 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+                        Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -2957 +2957 @@
                 </Configuration>
                 <Configuration
-                        Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
+                        Name="Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-release-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -3024 +3024 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -3064 +3064 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6std-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5ppc-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -3091 +3091 @@
                 </Configuration>
                 <Configuration
-                        Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
-                        ConfigurationType="1"
-                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-release-static-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm6-release-defaults.vsprops"
+                        Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
+                        ConfigurationType="1"
+                        InheritedPropertySheets="..\..\build\vs\pjproject-vs8-debug-dynamic-defaults.vsprops;..\..\build\vs\pjproject-vs8-wm5-common-defaults.vsprops"
                         UseOfMFC="0"
                         ATLMinimizesCRunTimeLibraryUsage="false"
@@ -3131 +3131 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="iphlpapi.lib dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib oleaut32.lib uuid.lib ole32.lib user32.lib"
-                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm6pro-vc$(VSVer)-$(ConfigurationName).exe"
+                                OutputFile="..\bin\sample-debug-$(TargetCPU)-wm5sp-vc$(VSVer)-$(ConfigurationName).exe"
                         />
                         <Tool
@@ -3300 +3300 @@
                         >
                         <File
-                                RelativePath="..\src\samples\debug.c"
+                                RelativePath="..\src\samples\debug.cpp"
                                 >
                                 <FileConfiguration
@@ -3339 +3339 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Release|Win32"
                                         >
@@ -3375 +3393 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Debug-Static|Win32"
                                         >
@@ -3411 +3447 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Release-Dynamic|Win32"
                                         >
@@ -3447 +3501 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Debug-Dynamic|Win32"
                                         >
@@ -3483 +3555 @@
                                 </FileConfiguration>
                                 <FileConfiguration
+                                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
                                         Name="Release-Static|Win32"
                                         >
@@ -3519 +3609 @@
                                 </FileConfiguration>
                                 <FileConfiguration
-                                        Name="Debug|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug|Windows Mobile 6 Professional SDK (ARMV4I)"
+                                        Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                                AdditionalIncludeDirectories=""
+                                                PreprocessorDefinitions=""
+                                        />
+                                </FileConfiguration>
+                                <FileConfiguration
+                                        Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
                                         >
                                         <Tool
@@ -3555 +3645 @@
                                 </FileConfiguration>
                                 <FileConfiguration
-                                        Name="Release|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
                                         Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
                                         >
@@ -3591 +3663 @@
                                 </FileConfiguration>
                                 <FileConfiguration
-                                        Name="Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
                                         Name="Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
                                         >
@@ -3627 +3681 @@
                                 </FileConfiguration>
                                 <FileConfiguration
-                                        Name="Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
                                         Name="Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
                                         >
@@ -3663 +3699 @@
                                 </FileConfiguration>
                                 <FileConfiguration
-                                        Name="Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
                                         Name="Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
                                         >
@@ -3691 +3709 @@
                                 <FileConfiguration
                                         Name="Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release-Static|Windows Mobile 6 Standard SDK (ARMV4I)"
-                                        >
-                                        <Tool
-                                                Name="VCCLCompilerTool"
-                                                AdditionalIncludeDirectories=""
-                                                PreprocessorDefinitions=""
-                                        />
-                                </FileConfiguration>
-                                <FileConfiguration
-                                        Name="Release-Static|Windows Mobile 6 Professional SDK (ARMV4I)"
                                         >
                                         <Tool

pjproject/branches/projects/pjsua2/pjsip-apps/src/samples/pjsua2_demo.cpp

@@ -267 +267 @@
     int ret = 0;
 
+    /* Test endpoint instantiation and destruction without libCreate(),
+     * libInit() etc.
+     */
+    {
+        Endpoint ep;
+        ep.natDetectType();
+        {
+        }
+    }
+
     try {
         mainProg1();

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/python/test.py

@@ -48 +48 @@
 def ua_run_test_exception():
         print "Exception test.."
-        ep = pj.Endpoint.instance()
+        ep = pj.Endpoint()
+        ep.libCreate()
         got_exception = False
         try:
-                ep.testException()
+                ep.natDetectType()
         except pj.Error, e:
                 got_exception = True
                 print "  Got exception: status=%u, reason=%s,\n  title=%s,\n  srcFile=%s, srcLine=%d" % \
                         (e.status, e.reason, e.title, e.srcFile, e.srcLine)
-                assert e.status == 70013
-                assert e.reason == "Invalid operation (PJ_EINVALIDOP)"
-                #assert e.title == "Endpoint::testException()"
+                assert e.status == 370050
+                assert e.reason.find("PJNATH_ESTUNINSERVER") >= 0
+                assert e.title == "pjsua_detect_nat_type()"
         assert got_exception
 
@@ -79 +80 @@
         ep_cfg.logConfig.decor = ep_cfg.logConfig.decor & ~(pj.PJ_LOG_HAS_CR | pj.PJ_LOG_HAS_NEWLINE) 
         
-        ep = pj.Endpoint.instance()
+        ep = pj.Endpoint()
         ep.libCreate()
         ep.libInit(ep_cfg)
@@ -91 +92 @@
         ep_cfg = pj.EpConfig()
         
-        ep = pj.Endpoint.instance()
+        ep = pj.Endpoint()
         ep.libCreate()
         ep.libInit(ep_cfg)

pjproject/branches/projects/pjsua2/pjsip/include/pjsua2/account.hpp

@@ -888 +888 @@
      * temporary pjsua_acc_config that was returned by the previous call.
      */
-    pjsua_acc_config toPj() const;
+    void toPj(pjsua_acc_config &cfg) const;
 
     /**

pjproject/branches/projects/pjsua2/pjsip/src/pjsip/sip_endpoint.c

@@ -924 +924 @@
     pj_bool_t handled = PJ_FALSE;
 
+    PJ_UNUSED_ARG(msg);
+
     if (status != PJ_SUCCESS) {
         char info[30];

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/account.cpp

@@ -301 +301 @@
 
 /* Convert to pjsip. */
-pjsua_acc_config AccountConfig::toPj() const
-{
-    pjsua_acc_config ret;
+void AccountConfig::toPj(pjsua_acc_config &ret) const
+{
     unsigned i;
 
@@ -425 +424 @@
     ret.vid_stream_rc_cfg.method= videoConfig.rateControlMethod;
     ret.vid_stream_rc_cfg.bandwidth = videoConfig.rateControlBandwidth;
-
-    return ret;
 }
 
@@ -670 +667 @@
                      bool make_default) throw(Error)
 {
-    pjsua_acc_config pj_acc_cfg = acc_cfg.toPj();
-
+    pjsua_acc_config pj_acc_cfg;
+    
+    acc_cfg.toPj(pj_acc_cfg);
     pj_acc_cfg.user_data = (void*)this;
     PJSUA2_CHECK_EXPR( pjsua_acc_add(&pj_acc_cfg, make_default, &id) );
@@ -678 +676 @@
 void Account::modify(const AccountConfig &acc_cfg) throw(Error)
 {
-    pjsua_acc_config pj_acc_cfg = acc_cfg.toPj();
+    pjsua_acc_config pj_acc_cfg;
+    
+    acc_cfg.toPj(pj_acc_cfg);
     pj_acc_cfg.user_data = (void*)this;
     PJSUA2_CHECK_EXPR( pjsua_acc_modify(id, &pj_acc_cfg) );

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/endpoint.cpp

@@ -384 +384 @@
     }
 
+    delete writer;
+    
+    while(mediaList.size() > 0) {
+        AudioMedia *cur_media = mediaList[0];
+        delete cur_media; /* this will remove itself from the list */
+    }
+
+    clearCodecInfoList();
+
     try {
         libDestroy();
@@ -390 +399 @@
         PJ_UNUSED_ARG(err);
     }
-    delete writer;
-    
-    while(mediaList.size() > 0) {
-        AudioMedia *cur_media = mediaList[0];
-        delete cur_media; /* this will remove itself from the list */
-    }
-
-    clearCodecInfoList();
 
     instance_ = NULL;
@@ -1567 +1568 @@
     PJSUA2_CHECK_EXPR( pjsua_enum_codecs(pj_codec, &count) );
 
+    pj_enter_critical_section();
     clearCodecInfoList();
-
-    pj_enter_critical_section();
     for (unsigned i=0;(i<count && i<MAX_CODEC_NUM);++i) {
         CodecInfo *codec_info = new CodecInfo;
@@ -1608 +1608 @@
 void Endpoint::clearCodecInfoList()
 {
-    pj_enter_critical_section();
     for (unsigned i=0;i<codecInfoList.size();++i) {
         delete codecInfoList[i];
     }
     codecInfoList.clear();
-    pj_leave_critical_section();
-}
+}

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/media.cpp

@@ -454 +454 @@
     PJSUA2_CHECK_EXPR( pjsua_enum_aud_devs(pj_info, &count) );
 
+    pj_enter_critical_section();
     clearAudioDevList();
-
-    pj_enter_critical_section();
     for (unsigned i = 0; (i<count && i<MAX_DEV_COUNT) ;++i) {
         AudioDevInfo *dev_info = new AudioDevInfo;
@@ -748 +747 @@
 void AudDevManager::clearAudioDevList()
 {
-    pj_enter_critical_section();
     for(unsigned i=0;i<audioDevList.size();++i) {
         delete audioDevList[i];
     }
     audioDevList.clear();
-    pj_leave_critical_section();
 }
 

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/siptypes.cpp

@@ -167 +167 @@
     // The following will only work if sizeof(enum)==sizeof(int)
     pj_assert(sizeof(ts.ciphers[0]) == sizeof(int));
-    ts.ciphers          = (pj_ssl_cipher*)&this->ciphers[0];
+    ts.ciphers          = ts.ciphers_num? 
+                            (pj_ssl_cipher*)&this->ciphers[0] : NULL;
     ts.verify_server    = this->verifyServer;
     ts.verify_client    = this->verifyClient;

pjproject/branches/projects/pjsua2/pjsip/src/pjsua2/util.hpp

@@ -37 +37 @@
 inline string pj2Str(const pj_str_t &input_str)
 {
-    return string(input_str.ptr, input_str.slen);
+    if (input_str.ptr)
+        return string(input_str.ptr, input_str.slen);
+    return string();
 }