Removed activex-pjsua from projects (no longer desired)

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@504 74dad513-b988-da41-8d7b-12977e46ad98

13 files changed, 0 insertions, 2322 deletions

diff --git a/pjsip-apps/build/activex-pjsua.dsp b/pjsip-apps/build/activex-pjsua.dsp
deleted file mode 100644
index 529e8115..00000000
--- a/pjsip-apps/build/activex-pjsua.dsp
+++ /dev/null
@@ -1,346 +0,0 @@
-# Microsoft Developer Studio Project File - Name="activex_pjsua" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=activex_pjsua - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "activex-pjsua.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "activex-pjsua.mak" CFG="activex_pjsua - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "activex_pjsua - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "activex_pjsua - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "activex_pjsua - Win32 Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "activex_pjsua - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "activex_pjsua - Win32 Unicode Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "activex_pjsua - Win32 Unicode Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "activex_pjsua - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "./output/activex-pjsua-i386-debug"
-# PROP BASE Intermediate_Dir "./output/activex-pjsua-i386-debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "./output/activex-pjsua-i386-debug"
-# PROP Intermediate_Dir "./output/activex-pjsua-i386-debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "_DEBUG" /D "_MBCS" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D PJ_M_I386=1 /D PJ_WIN32=1 /FR /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# Begin Custom Build - Performing registration
-OutDir=.\./output/activex-pjsua-i386-debug
-TargetPath=.\output\activex-pjsua-i386-debug\activex-pjsua.dll
-InputPath=.\output\activex-pjsua-i386-debug\activex-pjsua.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "activex_pjsua - Win32 Unicode Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir ".\output\activex-pjsua-i386-unicode-debug"
-# PROP BASE Intermediate_Dir ".\output\activex-pjsua-i386-unicode-debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ".\output\activex-pjsua-i386-unicode-debug"
-# PROP Intermediate_Dir ".\output\activex-pjsua-i386-unicode-debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /D "_DEBUG" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D PJ_M_I386=1 /D PJ_WIN32=1 /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# Begin Custom Build - Performing registration
-OutDir=.\output\activex-pjsua-i386-unicode-debug
-TargetPath=.\output\activex-pjsua-i386-unicode-debug\activex-pjsua.dll
-InputPath=.\output\activex-pjsua-i386-unicode-debug\activex-pjsua.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if "%OS%"=="" goto NOTNT 
-	if not "%OS%"=="Windows_NT" goto NOTNT 
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	goto end 
-	:NOTNT 
-	echo Warning : Cannot register Unicode DLL on Windows 95 
-	:end 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "activex_pjsua - Win32 Release MinSize"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\activex-pjsua-i386-ReleaseMinSize"
-# PROP BASE Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseMinSize"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\activex-pjsua-i386-ReleaseMinSize"
-# PROP Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseMinSize"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D PJ_M_I386=1 /D PJ_WIN32=1 /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\output\activex-pjsua-i386-ReleaseMinSize
-TargetPath=.\output\activex-pjsua-i386-ReleaseMinSize\activex-pjsua.dll
-InputPath=.\output\activex-pjsua-i386-ReleaseMinSize\activex-pjsua.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "activex_pjsua - Win32 Release MinDependency"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\activex-pjsua-i386-ReleaseMinDependency"
-# PROP BASE Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseMinDependency"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\activex-pjsua-i386-ReleaseMinDependency"
-# PROP Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseMinDependency"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D PJ_M_I386=1 /D PJ_WIN32=1 /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\output\activex-pjsua-i386-ReleaseMinDependency
-TargetPath=.\output\activex-pjsua-i386-ReleaseMinDependency\activex-pjsua.dll
-InputPath=.\output\activex-pjsua-i386-ReleaseMinDependency\activex-pjsua.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "activex_pjsua - Win32 Unicode Release MinSize"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\activex-pjsua-i386-ReleaseUMinSize"
-# PROP BASE Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseUMinSize"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\activex-pjsua-i386-ReleaseUMinSize"
-# PROP Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseUMinSize"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "NDEBUG" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D PJ_M_I386=1 /D PJ_WIN32=1 /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\output\activex-pjsua-i386-ReleaseUMinSize
-TargetPath=.\output\activex-pjsua-i386-ReleaseUMinSize\activex-pjsua.dll
-InputPath=.\output\activex-pjsua-i386-ReleaseUMinSize\activex-pjsua.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if "%OS%"=="" goto NOTNT 
-	if not "%OS%"=="Windows_NT" goto NOTNT 
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	goto end 
-	:NOTNT 
-	echo Warning : Cannot register Unicode DLL on Windows 95 
-	:end 
-	
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "activex_pjsua - Win32 Unicode Release MinDependency"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir ".\output\activex-pjsua-i386-ReleaseUMinDependency"
-# PROP BASE Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseUMinDependency"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ".\output\activex-pjsua-i386-ReleaseUMinDependency"
-# PROP Intermediate_Dir ".\output\activex-pjsua-i386-ReleaseUMinDependency"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /O1 /D "NDEBUG" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D PJ_M_I386=1 /D PJ_WIN32=1 /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\output\activex-pjsua-i386-ReleaseUMinDependency
-TargetPath=.\output\activex-pjsua-i386-ReleaseUMinDependency\activex-pjsua.dll
-InputPath=.\output\activex-pjsua-i386-ReleaseUMinDependency\activex-pjsua.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	if "%OS%"=="" goto NOTNT 
-	if not "%OS%"=="Windows_NT" goto NOTNT 
-	regsvr32 /s /c "$(TargetPath)" 
-	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" 
-	goto end 
-	:NOTNT 
-	echo Warning : Cannot register Unicode DLL on Windows 95 
-	:end 
-	
-# End Custom Build
-
-!ENDIF 
-
-# Begin Target
-
-# Name "activex_pjsua - Win32 Debug"
-# Name "activex_pjsua - Win32 Unicode Debug"
-# Name "activex_pjsua - Win32 Release MinSize"
-# Name "activex_pjsua - Win32 Release MinDependency"
-# Name "activex_pjsua - Win32 Unicode Release MinSize"
-# Name "activex_pjsua - Win32 Unicode Release MinDependency"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\activex-pjsua.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\activex-pjsua.def"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\activex-pjsua.idl"
-# ADD MTL /tlb "..\src\activex-pjsua\activex-pjsua.tlb" /h "../src/activex-pjsua/activex-pjsua.h" /iid "../src/activex-pjsua/activex-pjsua_i.c" /Oicf
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\activex-pjsua.rc"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\app.cpp"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\pjsua-structs.idl"
-# ADD MTL /h "../src/activex-pjsua/pjsua-structs.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\stdafx.cpp"
-# ADD CPP /Yc"stdafx.h"
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\activex-pjsua.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\activex-pjsuaCP.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\app.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\pjsua-structs.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\resource.h"
-# End Source File
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\stdafx.h"
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE="..\src\activex-pjsua\app.rgs"
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/pjsip-apps/build/pjsip_apps.dsw b/pjsip-apps/build/pjsip_apps.dsw
index a21da5b4..240e30a5 100644
--- a/pjsip-apps/build/pjsip_apps.dsw
+++ b/pjsip-apps/build/pjsip_apps.dsw
@@ -3,42 +3,6 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "activex_pjsua"=".\activex-pjsua.dsp" - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name pjlib
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pjlib_util
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pjmedia
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pjmedia_codec
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pjsip_core
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pjsip_simple
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pjsip_ua
-    End Project Dependency
-    Begin Project Dependency
-    Project_Dep_Name pjsua_lib
-    End Project Dependency
-}}}
-
-###############################################################################
-
 Project: "pjlib"="..\..\pjlib\build\pjlib.dsp" - Package Owner=<4>
 
 Package=<5>
diff --git a/pjsip-apps/src/activex-pjsua/activex-pjsua.cpp b/pjsip-apps/src/activex-pjsua/activex-pjsua.cpp
deleted file mode 100644
index 2736affd..00000000
--- a/pjsip-apps/src/activex-pjsua/activex-pjsua.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// ActivePJSUA.cpp : Implementation of DLL Exports.
-
-
-// Note: Proxy/Stub Information
-//      To build a separate proxy/stub DLL, 
-//      run nmake -f ActivePJSUAps.mk in the project directory.
-
-#include "stdafx.h"
-#include "resource.h"
-#include <initguid.h>
-#include "activex-pjsua.h"
-
-#include "activex-pjsua_i.c"
-#include "app.h"
-
-
-CComModule _Module;
-
-BEGIN_OBJECT_MAP(ObjectMap)
-OBJECT_ENTRY(CLSID_App, CApp)
-END_OBJECT_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// DLL Entry Point
-
-extern "C"
-BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
-{
-    if (dwReason == DLL_PROCESS_ATTACH)
-    {
-        _Module.Init(ObjectMap, hInstance, &LIBID_ACTIVEPJSUALib);
-        DisableThreadLibraryCalls(hInstance);
-    }
-    else if (dwReason == DLL_PROCESS_DETACH)
-        _Module.Term();
-    return TRUE;    // ok
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Used to determine whether the DLL can be unloaded by OLE
-
-STDAPI DllCanUnloadNow(void)
-{
-    return (_Module.GetLockCount()==0) ? S_OK : S_FALSE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Returns a class factory to create an object of the requested type
-
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
-{
-    return _Module.GetClassObject(rclsid, riid, ppv);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// DllRegisterServer - Adds entries to the system registry
-
-STDAPI DllRegisterServer(void)
-{
-    // registers object, typelib and all interfaces in typelib
-    return _Module.RegisterServer(TRUE);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// DllUnregisterServer - Removes entries from the system registry
-
-STDAPI DllUnregisterServer(void)
-{
-    return _Module.UnregisterServer(TRUE);
-}
-
-
diff --git a/pjsip-apps/src/activex-pjsua/activex-pjsua.def b/pjsip-apps/src/activex-pjsua/activex-pjsua.def
deleted file mode 100644
index 3ed6a66b..00000000
--- a/pjsip-apps/src/activex-pjsua/activex-pjsua.def
+++ /dev/null
@@ -1,9 +0,0 @@
-; ActivePJSUA.def : Declares the module parameters.
-
-LIBRARY      "activex-pjsua.DLL"
-
-EXPORTS
-	DllCanUnloadNow     @1 PRIVATE
-	DllGetClassObject   @2 PRIVATE
-	DllRegisterServer   @3 PRIVATE
-	DllUnregisterServer	@4 PRIVATE
diff --git a/pjsip-apps/src/activex-pjsua/activex-pjsua.idl b/pjsip-apps/src/activex-pjsua/activex-pjsua.idl
deleted file mode 100644
index 6b85d2c6..00000000
--- a/pjsip-apps/src/activex-pjsua/activex-pjsua.idl
+++ /dev/null
@@ -1,123 +0,0 @@
-// ActivePJSUA.idl : IDL source for ActivePJSUA.dll
-//
-
-// This file will be processed by the MIDL tool to
-// produce the type library (ActivePJSUA.tlb) and marshalling code.
-
-import "oaidl.idl";
-import "ocidl.idl";
-import "../src/activex-pjsua/pjsua-structs.idl";
-
-
-	[
-		object,
-		uuid(93462247-DA4E-4602-817B-26BA0C824E23),
-		dual,
-		helpstring("IApp Interface"),
-		pointer_default(unique)
-	]
-	interface IApp : IDispatch
-	{
-		[id(1), helpstring("method app_create")] HRESULT app_create([out,retval] Pj_Status *retStatus);
-		[id(2), helpstring("method app_default_config")] HRESULT app_default_config([out] Pjsua_Config *pConfig);
-		[id(3), helpstring("method app_test_config")] HRESULT app_test_config([in] Pjsua_Config *pConfig, [out,retval] BSTR *errmsg);
-		[id(4), helpstring("method app_init")] HRESULT app_init([in] Pjsua_Config *pConfig, [out,retval] Pj_Status *pStatus);
-		[id(5), helpstring("method app_start")] HRESULT app_start([out,retval] Pj_Status *retStatus);
-		[id(6), helpstring("method app_destroy")] HRESULT app_destroy([out,retval] Pj_Status *retStatus);
-		[id(7), helpstring("method call_get_max_count")] HRESULT call_get_max_count([out,retval] int *retCount);
-		[id(8), helpstring("method call_get_count")] HRESULT call_get_count([out,retval] int *retCount);
-		[id(9), helpstring("method call_is_active")] HRESULT call_is_active([in] int call_index, [out,retval] Pj_Bool *retVal);
-		[id(10), helpstring("method call_has_media")] HRESULT call_has_media([in] int call_index, [out,retval] Pj_Bool *pRet);
-		[id(11), helpstring("method call_get_info")] HRESULT call_get_info([in] int call_index, [out] Pjsua_Call_Info *pInfo, [out,retval] Pj_Status *pRet);
-		[id(12), helpstring("method call_make_call")] HRESULT call_make_call([in] int acc_id, [in,string] Pj_String dst_uri, [out] int *call_index, [out,retval] Pj_Status *pRet);
-		[id(13), helpstring("method call_answer")] HRESULT call_answer([in] int call_index, [in] int status_code, [out,retval] Pj_Status *pRet);
-		[id(14), helpstring("method call_hangup")] HRESULT call_hangup([in] int call_index, [out,retval] Pj_Status *pRet);
-		[id(15), helpstring("method call_set_hold")] HRESULT call_set_hold([in] int call_index, [out,retval] Pj_Status *pRet);
-		[id(16), helpstring("method call_release_hold")] HRESULT call_release_hold([in] int call_index, [out,retval] Pj_Status *pRet);
-		[id(17), helpstring("method call_xfer")] HRESULT call_xfer([in] int call_index, [in,string] Pj_String dst_uri, [out,retval] Pj_Status *pRet);
-		[id(18), helpstring("method call_dial_dtmf")] HRESULT call_dial_dtmf([in] int call_index, [in,string] Pj_String digits, [out,retval] Pj_Status *pRet);
-		[id(19), helpstring("method call_send_im")] HRESULT call_send_im([in] int call_index, [in,string] Pj_String text, [out,retval] Pj_Status *pRet);
-		[id(20), helpstring("method call_typing")] HRESULT call_typing([in] int call_index, [in] int is_typing, [out,retval] Pj_Status *pRet);
-		[id(21), helpstring("method call_hangup_all")] HRESULT call_hangup_all();
-		[id(22), helpstring("method acc_get_count")] HRESULT acc_get_count([out,retval] int *pCount);
-		[id(23), helpstring("method acc_get_info")] HRESULT acc_get_info([in] int acc_id, [out] Pjsua_Acc_Info *pInfo, [out,retval] Pj_Status *pRet);
-		[id(24), helpstring("method acc_add")] HRESULT acc_add([in] Pjsua_Acc_Config *pConfig, [out] int *pAcc_Index, [out,retval] Pj_Status *pRet);
-		[id(25), helpstring("method acc_set_online_status")] HRESULT acc_set_online_status([in] int acc_id, [in] int is_online, [out,retval] Pj_Status *pRet);
-		[id(26), helpstring("method acc_set_registration")] HRESULT acc_set_registration([in] int acc_id, [in] int reg_active, [out,retval] Pj_Status *pRet);
-		[id(27), helpstring("method buddy_get_count")] HRESULT buddy_get_count([out,retval] int *pCount);
-		[id(28), helpstring("method buddy_get_info")] HRESULT buddy_get_info([in] int buddy_index, [out] Pjsua_Buddy_Info *pInfo, [out,retval] Pj_Status *pRet);
-		[id(29), helpstring("method buddy_add")] HRESULT buddy_add([in,string] Pj_String uri, [out] int *pBuddy_Index, [out,retval] Pj_Status *pRet);
-		[id(30), helpstring("method buddy_subscribe_pres")] HRESULT buddy_subscribe_pres([in] int buddy_index, [in] int subscribe, [out,retval] Pj_Status *pRet);
-		[id(31), helpstring("method im_send_text")] HRESULT im_send_text([in] int acc_id, [in,string] Pj_String dst_uri, [in,string] Pj_String text, [out,retval] Pj_Status *pRet);
-		[id(32), helpstring("method im_typing")] HRESULT im_typing([in] int acc_id, [in,string] Pj_URI dst_uri, [in] int is_typing, [out,retval] Pj_Status *pRet);
-		[id(33), helpstring("method conf_connect")] HRESULT conf_connect([in] int src_port, [in] int sink_port, [out,retval] Pj_Status *pRet);
-		[id(34), helpstring("method conf_disconnect")] HRESULT conf_disconnect([in] int src_port, [in] int sink_port, [out,retval] Pj_Status *pRet);
-		[id(35), helpstring("method player_create")] HRESULT player_create([in,string] Pj_String filename, [out] int *pPlayer_Id, [out,retval] Pj_Status *pRet);
-		[id(36), helpstring("method player_get_conf_port")] HRESULT player_get_conf_port([in] int player_id, [out,retval] int *pPort);
-		[id(37), helpstring("method player_set_pos")] HRESULT player_set_pos([in] int player_id, [in] int sample_pos, [out,retval] Pj_Status *pRet);
-		[id(38), helpstring("method player_destroy")] HRESULT player_destroy([in] int player_id, [out,retval] Pj_Status *pRet);
-		[id(39), helpstring("method recorder_create")] HRESULT recorder_create([in,string] Pj_String filename, [out] int *pRecorder_Id, [out,retval] Pj_Status *pRet);
-		[id(40), helpstring("method recorder_get_conf_port")] HRESULT recorder_get_conf_port([in] int recorder_id, [out,retval] int *pPort);
-		[id(41), helpstring("method recorder_destroy")] HRESULT recorder_destroy([in] int recorder_id, [out,retval] Pj_Status *pRet);
-		[id(42), helpstring("method app_load_config")] HRESULT app_load_config([in,string] Pj_String filename, [out] Pjsua_Config *pConfig, [out,retval] Pj_Status *pRet);
-		[id(43), helpstring("method app_save_config")] HRESULT app_save_config([in,string] Pj_String filename, [in] Pjsua_Config *pConfig, [out,retval] Pj_Status *pRet);
-		[id(44), helpstring("method app_get_current_config")] HRESULT app_get_current_config([out,retval] Pjsua_Config *pConfig);
-		[id(45), helpstring("method app_get_error_msg")] HRESULT app_get_error_msg([in] Pj_Status status, [out,retval] BSTR *errmsg);
-		[id(46), helpstring("method app_verify_sip_url")] HRESULT app_verify_sip_url([in,string] Pj_String uri, [out,retval] Pj_Status *pRet);
-		[id(47), helpstring("method call_get_textstat")] HRESULT call_get_textstat([in] int call_index, [out,retval] BSTR *textstat);
-		[id(48), helpstring("method app_handle_events")] HRESULT app_handle_events([in] int msec_timeout, [out,retval] int *pEvCount);
-		[id(49), helpstring("method app_parse_uri")] HRESULT app_parse_uri([in] BSTR uriString, [out] Pjsip_Sip_Uri *pSipUri, [out,retval] Pj_Status *pStatus);
-		[id(50), helpstring("method app_print_uri")] HRESULT app_print_uri([in] Pjsip_Sip_Uri *pSipURI, [in] Pjsip_Uri_Context context, [out,retval] BSTR *uriText);
-		[id(51), helpstring("method app_compare_uri_string")] HRESULT app_compare_uri_string([in] Pjsip_Uri_Context context, [in] BSTR uri1, [in] BSTR uri2, [out,retval] Pj_Status *pStatus);
-		[id(52), helpstring("method buddy_del")] HRESULT buddy_del([in] int buddy_index, [out,retval] Pj_Status *pRet);
-		[id(53), helpstring("method acc_del")] HRESULT acc_del([in] int acc_id, [out,retval] Pj_Status *pRet);
-		[id(54), helpstring("method acc_find_for_outgoing")] HRESULT acc_find_for_outgoing([in] BSTR url, [out,retval] int *acc_id);
-		[id(55), helpstring("method acc_enum_id")] HRESULT acc_enum_id([out,retval] SAFEARRAY(int) *accIdArray);
-		[id(56), helpstring("method conf_enum_ports")] HRESULT conf_enum_ports([out,retval] SAFEARRAY(int) *pPortsArray);
-		[id(57), helpstring("method conf_get_port_info")] HRESULT conf_get_port_info([in] int port_id, [out] Pjsua_Conf_Port_Info *pInfo, [out,retval] Pj_Status *pRet);
-	};
-
-[
-	uuid(11E70413-8434-41B6-A5B6-F7DF79FEFC1A),
-	version(1.0),
-	helpstring("ActivePJSUA 1.0 Type Library")
-]
-library ACTIVEPJSUALib
-{
-	importlib("stdole32.tlb");
-	importlib("stdole2.tlb");
-
-	struct Pjsip_Cred_Info;
-	struct Pjsua_Acc_Config;
-	struct Pjsua_Config;
-	struct Pjsua_Call_Info;
-	struct Pjsua_Buddy_Info;
-	struct Pjsua_Acc_Info;
-	struct Pjsua_Conf_Port_Info;
-
-	[
-	    uuid(DC91CBCE-4B9E-4369-80B9-39341EEFD814),
-	    helpstring("_IPjsuaEvents Interface")
-	]
-	dispinterface _IPjsuaEvents
-	{
-	    properties:
-	    methods:
-		[id(1), helpstring("method OnCallState")] void OnCallState([in] int call_index, [in] Pjsua_Call_Info *pInfo);
-		[id(2), helpstring("method OnRegState")] void OnRegState([in] int acc_id);
-		[id(3), helpstring("method OnBuddyState")] void OnBuddyState([in] int buddy_index);
-		[id(4), helpstring("method OnIncomingPager")] void OnIncomingPager([in] int call_index, [in] BSTR fromUri, [in] BSTR toURI, [in] BSTR pagerText);
-		[id(5), helpstring("method OnTypingIndication")] void OnTypingIndication([in] int call_index, [in] BSTR fromUri, [in] BSTR toURI, [in] int isTyping);
-		[id(6), helpstring("method OnIncomingCall")] void OnIncomingCall([in] int call_index);
-	};
-
-	[
-		uuid(F89DA516-42E5-43A0-8EF7-A960BA386CAB),
-		helpstring("App Class")
-	]
-	coclass App
-	{
-		[default] interface IApp;
-		[default, source] dispinterface _IPjsuaEvents;
-	};
-};
diff --git a/pjsip-apps/src/activex-pjsua/activex-pjsua.rc b/pjsip-apps/src/activex-pjsua/activex-pjsua.rc
deleted file mode 100644
index 739867e6..00000000
--- a/pjsip-apps/src/activex-pjsua/activex-pjsua.rc
+++ /dev/null
@@ -1,124 +0,0 @@
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""winres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "1 TYPELIB ""activex-pjsua.tlb""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-#ifndef _MAC
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904B0"
-        BEGIN
-            VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "ActivePJSUA Module\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "ActivePJSUA\0"
-            VALUE "LegalCopyright", "Copyright 2006\0"
-            VALUE "OriginalFilename", "ActivePJSUA.DLL\0"
-            VALUE "ProductName", "ActivePJSUA Module\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "OLESelfRegister", "\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
-
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// REGISTRY
-//
-
-IDR_APP                 REGISTRY DISCARDABLE    "App.rgs"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_PROJNAME            "ActivePJSUA"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-1 TYPELIB "activex-pjsua.tlb"
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/pjsip-apps/src/activex-pjsua/activex-pjsuaCP.h b/pjsip-apps/src/activex-pjsua/activex-pjsuaCP.h
deleted file mode 100644
index b9aaea41..00000000
--- a/pjsip-apps/src/activex-pjsua/activex-pjsuaCP.h
+++ /dev/null
@@ -1,175 +0,0 @@
-#ifndef _ACTIVEXPJSUACP_H_
-#define _ACTIVEXPJSUACP_H_
-
-//#import "C:\project\pjproject\pjsip-apps\src\activex-pjsua\activex-pjsua.tlb" raw_interfaces_only, raw_native_types, no_namespace, named_guids	//"Import typelib"
-
-template <class T>
-class CProxy_IPjsuaEvents : public IConnectionPointImpl<T, &DIID__IPjsuaEvents, CComDynamicUnkArray>
-{
-	//Warning this class may be recreated by the wizard.
-public:
-	VOID Fire_OnCallState(INT call_index, Pjsua_Call_Info * pInfo)
-	{
-		T* pT = static_cast<T*>(this);
-		int nConnectionIndex;
-		CComVariant* pvars = new CComVariant[2];
-		int nConnections = m_vec.GetSize();
-		HRESULT hr;
-		
-		IRecordInfo *pRI = NULL;
-		hr = GetRecordInfoFromGuids( LIBID_ACTIVEPJSUALib,
-					1, 0, 
-					0,
-					IID_Pjsua_Call_Info,
-					&pRI );
-		assert(SUCCEEDED(hr));
-
-		pvars[1] = call_index;
-
-		VARIANT v;
-		memset(&v, 0, sizeof(v));
-		v.vt = VT_RECORD;
-		v.pRecInfo = pRI;
-		v.pvRecord = pInfo;
-
-		pvars[0] = v;
-
-		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
-		{
-			pT->Lock();
-			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
-			pT->Unlock();
-			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
-			if (pDispatch != NULL)
-			{
-				
-				DISPPARAMS disp = { pvars, NULL, 2, 0 };
-				hr = pDispatch->Invoke(0x1, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
-			}
-		}
-		delete[] pvars;
-	
-	}
-	VOID Fire_OnRegState(INT acc_index)
-	{
-		T* pT = static_cast<T*>(this);
-		int nConnectionIndex;
-		CComVariant* pvars = new CComVariant[1];
-		int nConnections = m_vec.GetSize();
-		
-		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
-		{
-			pT->Lock();
-			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
-			pT->Unlock();
-			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
-			if (pDispatch != NULL)
-			{
-				pvars[0] = acc_index;
-				DISPPARAMS disp = { pvars, NULL, 1, 0 };
-				pDispatch->Invoke(0x2, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
-			}
-		}
-		delete[] pvars;
-	
-	}
-	VOID Fire_OnBuddyState(INT buddy_index)
-	{
-		T* pT = static_cast<T*>(this);
-		int nConnectionIndex;
-		CComVariant* pvars = new CComVariant[1];
-		int nConnections = m_vec.GetSize();
-		
-		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
-		{
-			pT->Lock();
-			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
-			pT->Unlock();
-			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
-			if (pDispatch != NULL)
-			{
-				pvars[0] = buddy_index;
-				DISPPARAMS disp = { pvars, NULL, 1, 0 };
-				pDispatch->Invoke(0x3, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
-			}
-		}
-		delete[] pvars;
-	
-	}
-	VOID Fire_OnIncomingPager(INT call_index, BSTR fromUri, BSTR toURI, BSTR pagerText)
-	{
-		T* pT = static_cast<T*>(this);
-		int nConnectionIndex;
-		CComVariant* pvars = new CComVariant[4];
-		int nConnections = m_vec.GetSize();
-		
-		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
-		{
-			pT->Lock();
-			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
-			pT->Unlock();
-			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
-			if (pDispatch != NULL)
-			{
-				pvars[3] = call_index;
-				pvars[2] = fromUri;
-				pvars[1] = toURI;
-				pvars[0] = pagerText;
-				DISPPARAMS disp = { pvars, NULL, 4, 0 };
-				pDispatch->Invoke(0x4, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
-			}
-		}
-		delete[] pvars;
-	
-	}
-	VOID Fire_OnTypingIndication(INT call_index, BSTR fromUri, BSTR toURI, INT isTyping)
-	{
-		T* pT = static_cast<T*>(this);
-		int nConnectionIndex;
-		CComVariant* pvars = new CComVariant[4];
-		int nConnections = m_vec.GetSize();
-		
-		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
-		{
-			pT->Lock();
-			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
-			pT->Unlock();
-			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
-			if (pDispatch != NULL)
-			{
-				pvars[3] = call_index;
-				pvars[2] = fromUri;
-				pvars[1] = toURI;
-				pvars[0] = isTyping;
-				DISPPARAMS disp = { pvars, NULL, 4, 0 };
-				pDispatch->Invoke(0x5, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
-			}
-		}
-		delete[] pvars;
-	
-	}
-	VOID Fire_OnIncomingCall(INT call_index)
-	{
-		T* pT = static_cast<T*>(this);
-		int nConnectionIndex;
-		CComVariant* pvars = new CComVariant[1];
-		int nConnections = m_vec.GetSize();
-		
-		for (nConnectionIndex = 0; nConnectionIndex < nConnections; nConnectionIndex++)
-		{
-			pT->Lock();
-			CComPtr<IUnknown> sp = m_vec.GetAt(nConnectionIndex);
-			pT->Unlock();
-			IDispatch* pDispatch = reinterpret_cast<IDispatch*>(sp.p);
-			if (pDispatch != NULL)
-			{
-				pvars[0] = call_index;
-				DISPPARAMS disp = { pvars, NULL, 1, 0 };
-				pDispatch->Invoke(0x6, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &disp, NULL, NULL, NULL);
-			}
-		}
-		delete[] pvars;
-	
-	}
-};
-#endif
\ No newline at end of file
diff --git a/pjsip-apps/src/activex-pjsua/app.cpp b/pjsip-apps/src/activex-pjsua/app.cpp
deleted file mode 100644
index 6686279d..00000000
--- a/pjsip-apps/src/activex-pjsua/app.cpp
+++ /dev/null
@@ -1,1065 +0,0 @@
-// App.cpp : Implementation of CApp
-#include "stdafx.h"
-#include <pj/types.h>
-#include <pjsua-lib/pjsua.h>
-#include "activex-pjsua.h"
-#include "app.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CApp
-
-// {9CE3052A-7A32-4229-B31C-5E02E0667A77}
-static const GUID IID_Pjsip_Cred_Info = 
-{ 0x9ce3052a, 0x7a32, 0x4229, { 0xb3, 0x1c, 0x5e, 0x2, 0xe0, 0x66, 0x7a, 0x77 } };
-
-// {7F6CFF0F-C5B3-41e8-B278-61CD584C1F34}
-static const GUID IID_Pjsip_Sip_Uri = 
-{ 0x7f6cff0f, 0xc5b3, 0x41e8, { 0xb2, 0x78, 0x61, 0xcd, 0x58, 0x4c, 0x1f, 0x34 } };
-
-// {3B12B04F-6E48-46a7-B9E0-6C4BF1594A96}
-static const GUID IID_Pjsua_Acc_Config = 
-{ 0x3b12b04f, 0x6e48, 0x46a7, { 0xb9, 0xe0, 0x6c, 0x4b, 0xf1, 0x59, 0x4a, 0x96 } };
-
-// {E4B6573D-CF5E-484d-863F-ADAD5947FBE4}
-static const GUID IID_Pjsua_Config = 
-{ 0xe4b6573d, 0xcf5e, 0x484d, { 0x86, 0x3f, 0xad, 0xad, 0x59, 0x47, 0xfb, 0xe4 } };
-
-// {5043AC9E-A417-4f03-927E-D7AE52DDD064}
-static const GUID IID_Pjsua_Call_Info = 
-{ 0x5043ac9e, 0xa417, 0x4f03, { 0x92, 0x7e, 0xd7, 0xae, 0x52, 0xdd, 0xd0, 0x64 } };
-
-// {2729F0BC-8A5E-4f3f-BC29-C1740A86393A}
-static const GUID IID_Pjsua_Buddy_Info = 
-{ 0x2729f0bc, 0x8a5e, 0x4f3f, { 0xbc, 0x29, 0xc1, 0x74, 0xa, 0x86, 0x39, 0x3a } };
-
-// {8D345956-10B7-4450-8A06-A80D2F319EFD}
-static const GUID IID_Pjsua_Acc_Info = 
-{ 0x8d345956, 0x10b7, 0x4450, { 0x8a, 0x6, 0xa8, 0xd, 0x2f, 0x31, 0x9e, 0xfd } };
-
-// {0D05907A-3E1F-4c92-9FD0-26CB6E1CC56A}
-static const GUID IID_Pjsua_Conf_Port_Info = 
-{ 0xd05907a, 0x3e1f, 0x4c92, { 0x9f, 0xd0, 0x26, 0xcb, 0x6e, 0x1c, 0xc5, 0x6a } };
-
-
-#define SA_SIZE(lbound,ubound)	(ubound-lbound)
-
-
-class Temp_Pool
-{
-public:
-    Temp_Pool()
-    {
-	pool_ = pjsip_endpt_create_pool( pjsua_get_pjsip_endpt(), "ActivePJSUA",
-					 4000, 4000);
-    }
-    ~Temp_Pool()
-    {
-	pj_pool_release(pool_);
-    }
-
-    pj_pool_t *get_pool()
-    {
-	return pool_;
-    }
-
-private:
-    pj_pool_t *pool_;
-};
-
-static pj_str_t Pj_str(pj_pool_t *pool, Pj_String s)
-{
-    pj_str_t ret;
-    unsigned len;
-    
-    len = wcslen(s);
-    if (len) {
-	ret.ptr = (char*)pj_pool_alloc(pool, len+1);
-	ret.slen = len;
-	pj_unicode_to_ansi(s, len, ret.ptr, len+1);
-	ret.ptr[ret.slen] = '\0';
-    } else {
-	ret.ptr = NULL;
-	ret.slen = 0;
-    }
-
-    return ret;
-}
-
-BSTR str2bstr(const char *str, unsigned len)
-{
-    if (len == 0) {
-	return SysAllocString(L"");
-    } else {
-	OLECHAR *tmp;
-	BSTR result;
-	tmp = (OLECHAR*) malloc((len+1) * sizeof(OLECHAR));
-	pj_ansi_to_unicode(str, len, tmp, len+1);
-	result = SysAllocString(tmp);
-	free(tmp);
-	return result;
-    }
-}
-
-#define Cp(d,s)	Cp2(&d,s)
-static void Cp2(BSTR *dst, const pj_str_t *src)
-{
-    *dst = str2bstr(src->ptr, src->slen);
-}
-
-
-
-static void SafeStringArray2pjstrarray(pj_pool_t *pool,
-				       SAFEARRAY *sa, unsigned *count,
-				       pj_str_t a[])
-{
-    if (!sa)
-	*count = 0;
-    else {
-	HRESULT hr;
-	long lbound;
-	unsigned i;
-
-	hr = SafeArrayGetLBound(sa, 1, &lbound);
-	if (FAILED(hr))
-	    *count = 0;
-	else {
-	    *count = 0;
-	    for (i=0; i<sa->cbElements; ++i) {
-		BSTR str = NULL;
-		long rg = lbound + i;
-		hr = SafeArrayGetElement(sa, &rg, &str);
-		if (FAILED(hr))
-		    break;
-		a[*count] = Pj_str(pool, str);
-		*count = *count + 1;
-	    }
-	}
-    }
-}
-
-static void pjstrarray2SafeStringArray(unsigned count, const pj_str_t a[],
-				       SAFEARRAY **psa)
-{
-    unsigned i;
-    SAFEARRAY *sa;
-
-    sa = SafeArrayCreateVector( VT_BSTR, 0, count);
-
-    for (i=0; i<count; ++i) {
-	BSTR value;
-	Cp(value, &a[i]);
-	long rg = i;
-	SafeArrayPutElement(sa, &rg, value);
-    }
-
-    *psa = sa;
-}
-
-static void AccConfig2accconfig(pj_pool_t *pool,
-				Pjsua_Acc_Config *c1,
-				pjsua_acc_config *c2)
-{
-    pj_memset(c2, 0, sizeof(pjsua_acc_config));
-
-    c2->id = Pj_str(pool, c1->acc_uri);
-    c2->reg_uri = Pj_str(pool, c1->reg_uri);
-    c2->contact = Pj_str(pool, c1->contact_uri);
-    c2->proxy = Pj_str(pool, c1->proxy_uri);
-    c2->reg_timeout = c1->reg_timeout;
-
-    if (c1->cred_info == NULL) {
-	c2->cred_count = 0;
-    } else {
-	unsigned i;
-	long lbound;
-	HRESULT hr;
-
-	hr = SafeArrayGetLBound(c1->cred_info, 1, &lbound);
-	if (FAILED(hr)) {
-	    c2->cred_count = 0;
-	} else {
-	    c2->cred_count = 0;
-	    for (i=0; i<c1->cred_info->cbElements; ++i) {
-		Pjsip_Cred_Info cred_info;
-		long rg = lbound + i;
-		pj_memset(&cred_info, 0, sizeof(cred_info));
-		hr = SafeArrayGetElement(c1->cred_info, &rg, &cred_info);
-		if (FAILED(hr))
-		    break;
-		c2->cred_info[i].realm = Pj_str(pool, cred_info.realm);
-		c2->cred_info[i].scheme = Pj_str(pool, cred_info.scheme);
-		c2->cred_info[i].username = Pj_str(pool, cred_info.username);
-		c2->cred_info[i].data_type = cred_info.hashed;
-		c2->cred_info[i].data = Pj_str(pool, cred_info.data);
-	    }
-	    c2->cred_count = i;
-	}
-    }
-}
-
-static HRESULT accconfig2AccConfig(pjsua_acc_config *c1,
-				  Pjsua_Acc_Config *c2)
-{
-    unsigned i;
-
-    //pj_memset(c2, 0, sizeof(Pjsua_Acc_Config));
-
-    Cp(c2->acc_uri, &c1->id);
-    Cp(c2->reg_uri, &c1->reg_uri);
-    Cp(c2->contact_uri, &c1->contact);
-    Cp(c2->proxy_uri, &c1->proxy);
-    c2->reg_timeout = c1->reg_timeout;
-
-
-    IRecordInfo *pUdtRecordInfo = NULL;
-    HRESULT hr = GetRecordInfoFromGuids( LIBID_ACTIVEPJSUALib,
-                                         1, 0, 
-                                         0,
-                                         IID_Pjsip_Cred_Info,
-                                         &pUdtRecordInfo );
-    if( FAILED( hr ) ) {
-        return( hr ); //Return original HRESULT hr2 is for debug only
-    }
-
-    SAFEARRAYBOUND rgsabound[1];
-    rgsabound[0].lLbound = 0;
-    rgsabound[0].cElements = c1->cred_count;
-
-    c2->cred_info = ::SafeArrayCreateEx( VT_RECORD, 1, rgsabound, pUdtRecordInfo );
-
-    pUdtRecordInfo->Release(); //do not forget to release the interface
-
-    for (i=0; i<c1->cred_count; ++i) {
-	Pjsip_Cred_Info cred_info;
-
-	Cp(cred_info.realm, &c1->cred_info[i].realm);
-	Cp(cred_info.scheme, &c1->cred_info[i].scheme);
-	Cp(cred_info.username, &c1->cred_info[i].username);
-	cred_info.hashed = (c1->cred_info[i].data_type != 0);
-	Cp(cred_info.data, &c1->cred_info[i].data);
-
-	long rg = i;
-	SafeArrayPutElement(c2->cred_info, &rg, &cred_info);
-    }
-
-    return S_OK;
-}
-
-static HRESULT Config2config(pj_pool_t *pool, Pjsua_Config *c1, pjsua_config *c2)
-{
-    pj_memset(c2, 0, sizeof(pjsua_config));
-
-    c2->udp_port = c1->udp_port;
-    c2->sip_host = Pj_str(pool, c1->sip_host);
-    c2->sip_port = c1->sip_port;
-    c2->start_rtp_port = c1->rtp_port;
-    c2->msg_logging = c1->msg_logging;
-    c2->max_calls = c1->max_calls;
-    c2->conf_ports = c1->conf_ports;
-    c2->thread_cnt = c1->thread_cnt;
-    c2->stun_srv1 = Pj_str(pool, c1->stun_srv1);
-    c2->stun_port1 = c1->stun_port1;
-    c2->stun_srv2 = Pj_str(pool, c1->stun_srv2);
-    c2->stun_port2 = c1->stun_port2;
-    c2->snd_player_id = c1->snd_player_id;
-    c2->snd_capture_id = c1->snd_capture_id;
-    c2->clock_rate = c1->clock_rate;
-    c2->null_audio = c1->null_audio;
-    c2->quality = c1->quality;
-    c2->complexity = c1->complexity;
-
-    SafeStringArray2pjstrarray(pool, c1->codec_arg, &c2->codec_cnt, c2->codec_arg);
-
-    c2->auto_answer = c1->auto_answer;
-    c2->uas_refresh = c1->uas_refresh;
-    c2->outbound_proxy = Pj_str(pool, c1->outbound_proxy);
-
-    if (!c1->acc_config)
-	c2->acc_cnt = 0;
-    else {
-	HRESULT hr;
-	long lbound;
-	unsigned i;
-
-	hr = SafeArrayGetLBound(c1->acc_config, 1, &lbound);
-	if (FAILED(hr))
-	    c2->acc_cnt = 0;
-	else {
-	    c2->acc_cnt = 0;
-
-	    for (i=0; i<c1->acc_config->cbElements; ++i) {
-		Pjsua_Acc_Config acc_config;
-		long rg = lbound + i;
-		pj_memset(&acc_config, 0, sizeof(acc_config));
-		hr = SafeArrayGetElement(c1->acc_config, &rg, &acc_config);
-		if (FAILED(hr))
-		    break;
-		AccConfig2accconfig(pool, &acc_config, &c2->acc_config[i]);
-	    }
-
-	    c2->acc_cnt = i;
-	}
-    }
-
-    c2->log_level = c1->log_level;
-    c2->app_log_level = c1->app_log_level;
-    c2->log_decor = c1->log_decor;
-    c2->log_filename = Pj_str(pool, c1->log_filename);
-
-    SafeStringArray2pjstrarray(pool, c1->buddy_uri, &c2->buddy_cnt, c2->buddy_uri);
-
-    return S_OK;
-}
-
-static HRESULT config2Config(pjsua_config *c1, Pjsua_Config *c2)
-{
-    unsigned i;
-    HRESULT hr;
-
-    //pj_memset(c2, 0, sizeof(Pjsua_Config));
-
-    c2->udp_port = c1->udp_port;
-    Cp(c2->sip_host, &c1->sip_host);
-    c2->sip_port = c1->sip_port;
-    c2->rtp_port = c1->start_rtp_port;
-    c2->msg_logging = c1->msg_logging;
-    c2->max_calls = c1->max_calls;
-    c2->conf_ports = c1->conf_ports;
-    c2->thread_cnt = c1->thread_cnt;
-    Cp(c2->stun_srv1, &c1->stun_srv1);
-    c2->stun_port1 = c1->stun_port1;
-    Cp(c2->stun_srv2, &c1->stun_srv2);
-    c2->stun_port2 = c1->stun_port2;
-    c2->snd_player_id = c1->snd_player_id;
-    c2->snd_capture_id = c1->snd_capture_id;
-    c2->clock_rate = c1->clock_rate;
-    c2->null_audio = c1->null_audio;
-    c2->quality = c1->quality;
-    c2->complexity = c1->complexity;
-
-    pjstrarray2SafeStringArray(c1->codec_cnt, c1->codec_arg, &c2->codec_arg);
-
-    c2->auto_answer = c1->auto_answer;
-    c2->uas_refresh = c1->uas_refresh;
-
-    Cp(c2->outbound_proxy, &c1->outbound_proxy);
-
-    IRecordInfo *pUdtRecordInfo = NULL;
-    hr = GetRecordInfoFromGuids( LIBID_ACTIVEPJSUALib,
-                                 1, 0, 
-                                 0,
-                                 IID_Pjsua_Acc_Config,
-                                 &pUdtRecordInfo );
-    if( FAILED( hr ) ) {
-        return( hr ); //Return original HRESULT hr2 is for debug only
-    }
-
-    SAFEARRAYBOUND rgsabound[1];
-    rgsabound[0].lLbound = 0;
-    rgsabound[0].cElements = c1->acc_cnt;
-
-    c2->acc_config = ::SafeArrayCreateEx( VT_RECORD, 1, rgsabound, pUdtRecordInfo );
-
-    pUdtRecordInfo->Release(); //do not forget to release the interface
-
-    for (i=0; i<c1->acc_cnt; ++i) {
-	Pjsua_Acc_Config acc_cfg;
-
-	hr = accconfig2AccConfig(&c1->acc_config[i], &acc_cfg);
-	if (FAILED(hr))
-	    return hr;
-
-	long rg = i;
-	SafeArrayPutElement(c2->acc_config, &rg, &acc_cfg);
-    }
-
-
-    c2->log_level = c1->log_level;
-    c2->app_log_level = c1->app_log_level;
-    c2->log_decor = c1->log_decor;
-
-    Cp(c2->log_filename, &c1->log_filename);
-
-    pjstrarray2SafeStringArray(c1->buddy_cnt, c1->buddy_uri, &c2->buddy_uri);
-
-    return S_OK;
-}
-
-static void callinfo2CallInfo(pjsua_call_info *c1, Pjsua_Call_Info *c2)
-{
-    pj_memset(c2, 0, sizeof(Pjsua_Call_Info));
-
-    c2->index = c1->index;
-    c2->active = c1->active;
-    c2->is_uac = (c1->role == PJSIP_ROLE_UAC);
-    Cp(c2->local_info, &c1->local_info);
-    Cp(c2->remote_info, &c1->remote_info);
-    c2->state = (Pjsua_Call_State)c1->state;
-    Cp(c2->state_text, &c1->state_text);
-    c2->connect_duration = c1->connect_duration.sec;
-    c2->total_duration = c1->total_duration.sec;
-    c2->last_status = c1->last_status;
-    Cp(c2->last_status_text, &c1->last_status_text);
-    c2->has_media = c1->has_media;
-    c2->conf_slot = c1->conf_slot;
-}
-
-static void accinfo2AccInfo(pjsua_acc_info *info1, Pjsua_Acc_Info *info2)
-{
-    pj_memset(info2, 0, sizeof(Pjsua_Acc_Info));
-
-    info2->index = info1->index;
-    Cp(info2->acc_uri, &info1->acc_id);
-    info2->has_registration = info1->has_registration;
-    info2->expires = info1->expires;
-    info2->status_code = info1->status;
-    Cp(info2->status_text, &info1->status_text);
-    info2->online_status = info1->online_status;
-}
-
-static void buddyinfo2BuddyInfo(pjsua_buddy_info *info1, Pjsua_Buddy_Info *info2)
-{
-    pj_memset(info2, 0, sizeof(Pjsua_Buddy_Info));
-
-    info2->index = info1->index;
-    info2->is_valid = info1->is_valid;
-    Cp(info2->name, &info1->name);
-    Cp(info2->display, &info1->display_name);
-    Cp(info2->host, &info1->host);
-    info2->port = info1->port;
-    Cp(info2->uri, &info1->uri);
-    info2->status = (Pjsua_Buddy_State)info1->status;
-    Cp(info2->status_text, &info1->status_text);
-    info2->monitor = info1->monitor;
-}
-
-static CApp *CApp_Instance;
-
-CApp::CApp()
-{
-    CApp_Instance = this;
-}
-
-STDMETHODIMP CApp::app_create(Pj_Status *ret)
-{
-    *ret = pjsua_create();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_default_config(Pjsua_Config *pConfig)
-{
-    pjsua_config cfg;
-    pjsua_default_config(&cfg);
-    return config2Config(&cfg, pConfig);
-}
-
-STDMETHODIMP CApp::app_test_config(Pjsua_Config *pConfig, BSTR *retmsg)
-{
-    pjsua_config cfg;
-    HRESULT hr;
-    Temp_Pool tp;
-    char errmsg[PJ_ERR_MSG_SIZE];
-
-    hr = Config2config(tp.get_pool(), pConfig, &cfg);
-    if (FAILED(hr))
-	return hr;
-
-    pjsua_test_config(&cfg, errmsg, sizeof(errmsg));
-    *retmsg = str2bstr(errmsg, strlen(errmsg));
-    return S_OK;
-}
-
-static void on_call_state(int call_index, pjsip_event *e)
-{
-    pjsua_call_info call_info;
-    Pjsua_Call_Info *Call_Info = new Pjsua_Call_Info;
-
-    pjsua_call_get_info(call_index, &call_info);
-    callinfo2CallInfo(&call_info, Call_Info);
-
-    CApp_Instance->Fire_OnCallState(call_index, Call_Info);
-}
-
-static void on_incoming_call(int acc_id, int call_index,
-			     pjsip_rx_data *rdata)
-{
-    CApp_Instance->Fire_OnIncomingCall(call_index);
-}
-
-static void on_reg_state(int acc_id)
-{
-    CApp_Instance->Fire_OnRegState(acc_id);
-}
-
-static void on_buddy_state(int buddy_index)
-{
-    CApp_Instance->Fire_OnBuddyState(buddy_index);
-}
-
-static void on_pager(int call_index, const pj_str_t *from,
-		     const pj_str_t *to, const pj_str_t *txt)
-{
-    BSTR fromURI, toURI, imText;
-
-    Cp2(&fromURI, from);
-    Cp2(&toURI, to);
-    Cp2(&imText, txt);
-
-    CApp_Instance->Fire_OnIncomingPager(call_index, fromURI, toURI, imText);
-}
-
-static void on_typing(int call_index, const pj_str_t *from,
-		      const pj_str_t *to, pj_bool_t is_typing)
-{
-    BSTR fromURI, toURI;
-
-    Cp2(&fromURI, from);
-    Cp2(&toURI, to);
-
-    CApp_Instance->Fire_OnTypingIndication(call_index, fromURI, toURI, is_typing);
-}
-
-
-STDMETHODIMP CApp::app_init(Pjsua_Config *pConfig, Pj_Status *pStatus)
-{
-    pjsua_config cfg;
-    pjsua_callback cb;
-    Temp_Pool tp;
-    HRESULT hr;
-
-    pj_memset(&cb, 0, sizeof(cb));
-    cb.on_call_state = &on_call_state;
-    cb.on_incoming_call = &on_incoming_call;
-    cb.on_reg_state = &on_reg_state;
-    cb.on_buddy_state = &on_buddy_state;
-    cb.on_pager = &on_pager;
-    cb.on_typing = &on_typing;
-
-    hr = Config2config(tp.get_pool(), pConfig, &cfg);
-    if (FAILED(hr))
-	return hr;
-    
-    *pStatus = pjsua_init(&cfg, &cb);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_start(Pj_Status *retStatus)
-{
-    *retStatus = pjsua_start();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_destroy(Pj_Status *retStatus)
-{
-    *retStatus = pjsua_destroy();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_get_max_count(int *retCount)
-{
-    *retCount = pjsua_call_get_max_count();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_get_count(int *retCount)
-{
-    *retCount = pjsua_call_get_count();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_is_active(int call_index, Pj_Bool *retVal)
-{
-    *retVal = pjsua_call_is_active(call_index);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_has_media(int call_index, Pj_Bool *pRet)
-{
-    *pRet = pjsua_call_has_media(call_index);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_get_info(int call_index, Pjsua_Call_Info *pInfo, Pj_Status *pRet)
-{
-    pjsua_call_info info;
-    *pRet = pjsua_call_get_info(call_index, &info);
-    callinfo2CallInfo(&info, pInfo);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_make_call(int acc_id, Pj_String dst_uri, int *call_index, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), dst_uri);
-
-    *pRet = pjsua_call_make_call(acc_id, &tmp, call_index);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_answer(int call_index, int status_code, Pj_Status *pRet)
-{
-    *pRet = pjsua_call_answer(call_index, status_code);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_hangup(int call_index, Pj_Status *pRet)
-{
-    pjsua_call_hangup(call_index);
-    *pRet = PJ_SUCCESS;
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_set_hold(int call_index, Pj_Status *pRet)
-{
-    pjsua_call_set_hold(call_index);
-    *pRet = PJ_SUCCESS;
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_release_hold(int call_index, Pj_Status *pRet)
-{
-    *pRet = pjsua_call_reinvite(call_index);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_xfer(int call_index, Pj_String dst_uri, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), dst_uri);
-    *pRet = pjsua_call_xfer(call_index, &tmp);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_dial_dtmf(int call_index, Pj_String digits, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), digits);
-    *pRet = pjsua_call_dial_dtmf(call_index, &tmp);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_send_im(int call_index, Pj_String text, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), text);
-    *pRet = pjsua_call_send_im(call_index, &tmp);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_typing(int call_index, int is_typing, Pj_Status *pRet)
-{
-    *pRet = pjsua_call_send_typing_ind(call_index, is_typing);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_hangup_all()
-{
-    pjsua_call_hangup_all();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::call_get_textstat(int call_index, BSTR *textstat)
-{
-    char buf[1024];
-    pjsua_call_dump(call_index, 1, buf, sizeof(buf), "");
-
-    OLECHAR wbuf[1024];
-    pj_ansi_to_unicode(buf, strlen(buf), wbuf, PJ_ARRAY_SIZE(wbuf));
-    *textstat = SysAllocString(wbuf);
-    return S_OK;
-}
-
-
-STDMETHODIMP CApp::acc_get_count(int *pCount)
-{
-    *pCount = pjsua_get_acc_count();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::acc_get_info(int acc_id, Pjsua_Acc_Info *pInfo, Pj_Status *pRet)
-{
-    pjsua_acc_info info;
-    *pRet = pjsua_acc_get_info(acc_id, &info);
-    accinfo2AccInfo(&info, pInfo);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::acc_add(Pjsua_Acc_Config *pConfig, int *pAcc_Index, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pjsua_acc_config config;
-    AccConfig2accconfig(tp.get_pool(), pConfig,  &config);
-    *pRet = pjsua_acc_add(&config, pAcc_Index);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::acc_set_online_status(int acc_id, int is_online, Pj_Status *pRet)
-{
-    *pRet = pjsua_acc_set_online_status(acc_id, is_online);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::acc_set_registration(int acc_id, int reg_active, Pj_Status *pRet)
-{
-    *pRet = pjsua_acc_set_registration(acc_id, reg_active);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::buddy_get_count(int *pCount)
-{
-    *pCount = pjsua_get_buddy_count();
-    return S_OK;
-}
-
-STDMETHODIMP CApp::buddy_get_info(int buddy_index, Pjsua_Buddy_Info *pInfo, Pj_Status *pRet)
-{
-    pjsua_buddy_info info;
-    *pRet = pjsua_buddy_get_info(buddy_index, &info);
-    buddyinfo2BuddyInfo(&info, pInfo);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::buddy_add(Pj_String uri, int *pBuddy_Index, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), uri);
-    *pRet = pjsua_buddy_add(&tmp, pBuddy_Index);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::buddy_subscribe_pres(int buddy_index, int subscribe, Pj_Status *pRet)
-{
-    *pRet = pjsua_buddy_subscribe_pres(buddy_index, subscribe);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::im_send_text(int acc_id, Pj_String dst_uri, Pj_String text, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp_uri = Pj_str(tp.get_pool(), dst_uri);
-    pj_str_t tmp_text = Pj_str(tp.get_pool(), text);
-    *pRet = pjsua_im_send(acc_id, &tmp_uri, &tmp_text);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::im_typing(int acc_id, Pj_URI dst_uri, int is_typing, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp_uri = Pj_str(tp.get_pool(), dst_uri);
-    *pRet = pjsua_im_typing(acc_id, &tmp_uri, is_typing);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::conf_connect(int src_port, int sink_port, Pj_Status *pRet)
-{
-    *pRet = pjsua_conf_connect(src_port, sink_port);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::conf_disconnect(int src_port, int sink_port, Pj_Status *pRet)
-{
-    *pRet = pjsua_conf_disconnect(src_port, sink_port);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::player_create(Pj_String filename, int *pPlayer_Id, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), filename);
-    *pRet = pjsua_player_create(&tmp, pPlayer_Id);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::player_get_conf_port(int player_id, int *pPort)
-{
-    *pPort = pjsua_player_get_conf_port(player_id);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::player_set_pos(int player_id, int pos, Pj_Status *pRet)
-{
-    *pRet = pjsua_player_set_pos(player_id, pos);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::player_destroy(int player_id, Pj_Status *pRet)
-{
-    *pRet = pjsua_player_destroy(player_id);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::recorder_create(Pj_String filename, int *pRecorder_Id, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), filename);
-    *pRet = pjsua_recorder_create(&tmp, pRecorder_Id);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::recorder_get_conf_port(int recorder_id, int *pPort)
-{
-    *pPort = pjsua_recorder_get_conf_port(recorder_id);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::recorder_destroy(int recorder_id, Pj_Status *pRet)
-{
-    *pRet = pjsua_recorder_destroy(recorder_id);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_load_config(Pj_String filename, Pjsua_Config *pConfig, Pj_Status *pRet)
-{
-    pjsua_config config;
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), filename);
-    pjsua_default_config(&config);
-    *pRet = pjsua_load_settings(tmp.ptr, &config, NULL);
-    if (*pRet == PJ_SUCCESS)
-	*pRet = config2Config(&config, pConfig);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_save_config(Pj_String filename, Pjsua_Config *pConfig, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pjsua_config config;
-    pj_str_t tmp = Pj_str(tp.get_pool(), filename);
-    HRESULT hr;
-
-    hr = Config2config(tp.get_pool(), pConfig, &config);
-    if (FAILED(hr))
-	return hr;
-
-    *pRet = pjsua_save_settings(tmp.ptr, &config);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_get_current_config(Pjsua_Config *pConfig)
-{
-    Temp_Pool tp;
-    pjsua_config config;
-
-    pjsua_get_config(tp.get_pool(), &config);
-    return config2Config(&config, pConfig);
-}
-
-STDMETHODIMP CApp::app_get_error_msg(Pj_Status status, BSTR * pRet)
-{
-    char errmsg[PJ_ERR_MSG_SIZE];
-    OLECHAR werrmsg[PJ_ERR_MSG_SIZE];
-    pj_strerror(status, errmsg, sizeof(errmsg));
-    pj_ansi_to_unicode(errmsg, strlen(errmsg), werrmsg, PJ_ARRAY_SIZE(werrmsg));
-    *pRet = SysAllocString(werrmsg);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_verify_sip_url(Pj_String uri, Pj_Status *pRet)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), uri);
-    *pRet = pjsua_verify_sip_url(tmp.ptr);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_handle_events(int msec_timeout, int *pEvCount)
-{
-    if (msec_timeout < 0)
-	msec_timeout = 0;
-
-    *pEvCount = pjsua_handle_events(msec_timeout);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_parse_uri(BSTR uriString, Pjsip_Sip_Uri *pSipUri, Pj_Status *pStatus)
-{
-    Temp_Pool tp;
-    pj_str_t tmp = Pj_str(tp.get_pool(), uriString);
-    pjsip_name_addr *addr;
-    char buf[1024];
-    pj_str_t s;
-
-    addr = (pjsip_name_addr*)
-	pjsip_parse_uri(tp.get_pool(), tmp.ptr, tmp.slen, PJSIP_PARSE_URI_AS_NAMEADDR);
-    if (addr == NULL) {
-	*pStatus = PJSIP_EINVALIDURI;
-	return S_OK;
-    }
-
-    if (!PJSIP_URI_SCHEME_IS_SIP(addr) && !PJSIP_URI_SCHEME_IS_SIPS(addr)) {
-	*pStatus = PJSIP_EINVALIDSCHEME;
-	return S_OK;
-    }
-
-    pjsip_sip_uri *sip = (pjsip_sip_uri*)addr->uri;
-
-    Cp2(&pSipUri->display, &addr->display);
-    Cp2(&pSipUri->user, &sip->user);
-    Cp2(&pSipUri->passwd, &sip->passwd);
-    Cp2(&pSipUri->host, &sip->host);
-    pSipUri->port = sip->port;
-    Cp2(&pSipUri->param_user, &sip->user_param);
-    Cp2(&pSipUri->param_method, &sip->method_param);
-    Cp2(&pSipUri->param_transport, &sip->transport_param);
-    pSipUri->param_ttl = sip->ttl_param;
-    pSipUri->param_lr = sip->lr_param;
-    Cp2(&pSipUri->param_maddr, &sip->maddr_param);
-
-    s.ptr = buf;
-    s.slen = pjsip_param_print_on(&sip->other_param, buf, sizeof(buf), 
-				  &pjsip_PARAM_CHAR_SPEC, &pjsip_PARAM_CHAR_SPEC, ';');
-    Cp2(&pSipUri->param_other, &s);
-
-    s.slen = pjsip_param_print_on(&sip->header_param, buf, sizeof(buf), 
-				  &pjsip_HDR_CHAR_SPEC, &pjsip_HDR_CHAR_SPEC, '?');
-    Cp2(&pSipUri->param_header, &s);
-
-    *pStatus = PJ_SUCCESS;
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_print_uri(Pjsip_Sip_Uri *pSipURI, Pjsip_Uri_Context context, BSTR *uriText)
-{
-    Temp_Pool tp;
-    pjsip_name_addr *addr;
-    pj_str_t tmp;
-    char buf[1024];
-    pjsip_sip_uri *sip;
-
-    addr = pjsip_name_addr_create(tp.get_pool());
-    sip = pjsip_sip_uri_create(tp.get_pool(), PJ_FALSE);
-    addr->uri = (pjsip_uri*)sip;
-
-    addr->display = Pj_str(tp.get_pool(), pSipURI->display);
-    sip->user = Pj_str(tp.get_pool(), pSipURI->user);
-    sip->passwd = Pj_str(tp.get_pool(), pSipURI->passwd);
-    sip->host = Pj_str(tp.get_pool(), pSipURI->host);
-    sip->port = pSipURI->port;
-    sip->user_param = Pj_str(tp.get_pool(), pSipURI->param_user);
-    sip->method_param = Pj_str(tp.get_pool(), pSipURI->param_method);
-    sip->transport_param = Pj_str(tp.get_pool(), pSipURI->param_transport);
-    sip->ttl_param = pSipURI->param_ttl;
-    sip->lr_param = pSipURI->param_lr;
-    sip->maddr_param = Pj_str(tp.get_pool(), pSipURI->param_maddr);
-    
-    /* Unfortunately can't transport params yet (no parsing function) */
-
-    tmp.ptr = buf;
-    tmp.slen = pjsip_uri_print((pjsip_uri_context_e)context, addr, buf, sizeof(buf));
-
-    Cp2(uriText, &tmp);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::app_compare_uri_string(Pjsip_Uri_Context context, BSTR uri1, BSTR uri2, Pj_Status *pStatus)
-{
-    Temp_Pool tp;
-
-    pj_str_t tmp_uri1 = Pj_str(tp.get_pool(), uri1);
-    pj_str_t tmp_uri2 = Pj_str(tp.get_pool(), uri2);
-
-    pjsip_uri *u1, *u2;
-
-    u1 = pjsip_parse_uri(tp.get_pool(), tmp_uri1.ptr, tmp_uri1.slen, PJSIP_PARSE_URI_AS_NAMEADDR);
-    if (u1 == NULL) {
-	*pStatus = PJSIP_EINVALIDURI;
-	return S_OK;
-    }
-
-    u2 = pjsip_parse_uri(tp.get_pool(), tmp_uri2.ptr, tmp_uri2.slen, PJSIP_PARSE_URI_AS_NAMEADDR);
-    if (u2 == NULL) {
-	*pStatus = PJSIP_EINVALIDURI;
-	return S_OK;
-    }
-    
-    *pStatus = pjsip_uri_cmp((pjsip_uri_context_e)context, u1, u2);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::buddy_del(int buddy_index, Pj_Status *pRet)
-{
-    *pRet = pjsua_buddy_del(buddy_index);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::acc_del(int acc_id, Pj_Status *pRet)
-{
-    *pRet = pjsua_acc_del(acc_id);
-    return S_OK;
-}
-
-STDMETHODIMP CApp::acc_find_for_outgoing(BSTR url, int *acc_id)
-{
-    Temp_Pool tp;
-
-    pj_str_t tmp_uri = Pj_str(tp.get_pool(), url);
-
-    *acc_id = pjsua_acc_find_for_outgoing(&tmp_uri);
-
-    return S_OK;
-}
-
-STDMETHODIMP CApp::acc_enum_id(SAFEARRAY **accIdArray)
-{
-    int id[32];
-    unsigned count = PJ_ARRAY_SIZE(id);
-    unsigned i;
-
-    pjsua_acc_enum_id(id, &count);
-
-    *accIdArray = SafeArrayCreateVector(VT_INT, 0, count);
-
-    for (i=0; i<count; ++i) {
-	long rg = i;
-	SafeArrayPutElement(*accIdArray, &rg, &id[i]);
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP CApp::conf_enum_ports(SAFEARRAY **pPortsArray)
-{
-    int id[128];
-    unsigned count = PJ_ARRAY_SIZE(id);
-    unsigned i;
-
-    pjsua_conf_enum_port_ids(id, &count);
-
-    *pPortsArray = SafeArrayCreateVector(VT_INT, 0, count);
-
-    for (i=0; i<count; ++i) {
-	long rg = i;
-	SafeArrayPutElement(*pPortsArray, &rg, &id[i]);
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP CApp::conf_get_port_info(int port_id, Pjsua_Conf_Port_Info *pInfo, Pj_Status *pRet)
-{
-    unsigned i;
-    pjsua_conf_port_info info;
-
-    *pRet = pjsua_conf_get_port_info(port_id, &info);
-    if (*pRet != PJ_SUCCESS)
-	return S_OK;
-
-    pInfo->slot_id = info.slot_id;
-    Cp2(&pInfo->name, &info.name);
-    pInfo->clock_rate = info.clock_rate;
-    pInfo->channel_count = info.channel_count;
-    pInfo->samples_per_frame = info.samples_per_frame;
-    pInfo->bits_per_sample = info.bits_per_sample;
-    
-
-    pInfo->listeners = SafeArrayCreateVector(VT_INT, 0, info.listener_cnt);
-
-    for (i=0; i<info.listener_cnt; ++i) {
-	long rg = i;
-	SafeArrayPutElement(pInfo->listeners, &rg, &info.listeners[i]);
-    }
-
-    return S_OK;
-}
-
diff --git a/pjsip-apps/src/activex-pjsua/app.h b/pjsip-apps/src/activex-pjsua/app.h
deleted file mode 100644
index 1c8483a5..00000000
--- a/pjsip-apps/src/activex-pjsua/app.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// App.h : Declaration of the CApp
-
-#ifndef __APP_H_
-#define __APP_H_
-
-#include "resource.h"       // main symbols
-#include "activex-pjsuaCP.h"
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CApp
-class ATL_NO_VTABLE CApp : 
-	public CComObjectRootEx<CComSingleThreadModel>,
-	public CComCoClass<CApp, &CLSID_App>,
-	public IConnectionPointContainerImpl<CApp>,
-	public IDispatchImpl<IApp, &IID_IApp, &LIBID_ACTIVEPJSUALib>,
-	public CProxy_IPjsuaEvents<CApp>
-{
-public:
-	CApp();
-
-DECLARE_REGISTRY_RESOURCEID(IDR_APP)
-
-DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-BEGIN_COM_MAP(CApp)
-	COM_INTERFACE_ENTRY(IApp)
-	COM_INTERFACE_ENTRY(IDispatch)
-	COM_INTERFACE_ENTRY(IConnectionPointContainer)
-	COM_INTERFACE_ENTRY_IMPL(IConnectionPointContainer)
-END_COM_MAP()
-
-BEGIN_CONNECTION_POINT_MAP(CApp)
-CONNECTION_POINT_ENTRY(DIID__IPjsuaEvents)
-END_CONNECTION_POINT_MAP()
-
-
-// IApp
-public:
-	STDMETHOD(app_destroy)(/*[out,retval]*/ Pj_Status *retStatus);
-	STDMETHOD(app_start)(/*[out,retval]*/ Pj_Status *retStatus);
-	STDMETHOD(app_init)(/*[in]*/ Pjsua_Config *pConfig, /*[out,retval]*/ Pj_Status *pStatus);
-	STDMETHOD(app_test_config)(/*[in]*/ Pjsua_Config *pConfig, /*[out,retval,string]*/ BSTR *retmsg);
-	STDMETHOD(app_default_config)(/*[in,out]*/ Pjsua_Config *pConfig);
-	STDMETHOD(app_create)(/*[out,retval]*/ Pj_Status *ret);
-	STDMETHOD(app_compare_uri_string)(/*[in]*/ Pjsip_Uri_Context context, /*[in]*/ BSTR uri1, /*[in]*/ BSTR uri2, /*[out,retval]*/ Pj_Status *pStatus);
-	STDMETHOD(app_print_uri)(/*[in]*/ Pjsip_Sip_Uri *pSipURI, Pjsip_Uri_Context context, /*[out,retval]*/ BSTR *uriText);
-	STDMETHOD(app_parse_uri)(/*[in]*/ BSTR uriString, /*[out]*/ Pjsip_Sip_Uri *pSipUri, /*[out,retval]*/ Pj_Status *pStatus);
-	STDMETHOD(app_handle_events)(/*[in]*/ int msec_timeout, /*[out,retval]*/ int *pEvCount);
-	STDMETHOD(app_verify_sip_url)(/*[in,string]*/ Pj_String uri, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(app_get_error_msg)(/*[in]*/ Pj_Status status, /*[out,retval]*/ BSTR * errmsg);
-	STDMETHOD(app_get_current_config)(/*[out,retval]*/ Pjsua_Config *pConfig);
-	STDMETHOD(app_save_config)(/*[in,string]*/ Pj_String filename, /*[in]*/ Pjsua_Config *pConfig, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(app_load_config)(/*[in,string]*/ Pj_String filename, /*[out]*/ Pjsua_Config *pConfig, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(recorder_destroy)(/*[in]*/ int recorder_id, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(recorder_get_conf_port)(/*[in]*/ int recorder_id, /*[out,retval]*/ int *pPort);
-	STDMETHOD(recorder_create)(/*[in,string]*/ Pj_String filename, /*[out]*/ int *pRecorder_Id, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(player_destroy)(/*[in]*/ int player_id, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(player_set_pos)(/*[in]*/ int player_id, /*[in]*/ int pos, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(player_get_conf_port)(/*[in]*/ int player_id, /*[out,retval]*/ int *pPort);
-	STDMETHOD(player_create)(/*[in,string]*/ Pj_String filename, /*[out]*/ int *pPlayer_Id, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(conf_disconnect)(/*[in]*/ int src_port, /*[in]*/ int sink_port, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(conf_connect)(/*[in]*/ int src_port, /*[in]*/ int sink_port, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(conf_enum_ports)(SAFEARRAY **pPortsArray);
-	STDMETHOD(conf_get_port_info)(int port_id, Pjsua_Conf_Port_Info *pInfo, Pj_Status *pRet);
-	STDMETHOD(im_typing)(/*[in]*/ int acc_index, /*[in,string]*/ Pj_URI dst_uri, /*[in]*/ int is_typing, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(im_send_text)(/*[in]*/ int acc_index, /*[in,string]*/ Pj_String dst_uri, /*[in,string]*/ Pj_String text, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(buddy_subscribe_pres)(/*[in]*/ int buddy_index, /*[in]*/ int subscribe, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(buddy_add)(/*[in,string]*/ Pj_String uri, /*[out]*/ int *pBuddy_Index, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(buddy_get_info)(/*[in]*/ int buddy_index, /*[out]*/ Pjsua_Buddy_Info *pInfo, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(buddy_get_count)(/*[out,retval]*/ int *pCount);
-	STDMETHOD(buddy_del)(/*[in]*/ int buddy_index, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(acc_set_registration)(/*[in]*/ int acc_index, /*[in]*/ int reg_active, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(acc_set_online_status)(/*[in]*/ int acc_index, /*[in]*/ int is_online, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(acc_add)(/*[in]*/ Pjsua_Acc_Config *pConfig, /*[out]*/ int *pAcc_Index, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(acc_del)(/*[out,retval]*/ int acc_index, Pj_Status *pRet);
-	STDMETHOD(acc_get_info)(/*[in]*/ int acc_index, /*[out]*/ Pjsua_Acc_Info *pInfo, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(acc_get_count)(/*[out,retval]*/ int *pCount);
-	STDMETHOD(acc_enum_id)(SAFEARRAY **accIdArray);
-	STDMETHOD(acc_find_for_outgoing)(/*[in]*/ BSTR url, /*[out,retval]*/ int *acc_index);
-	STDMETHOD(call_hangup_all)();
-	STDMETHOD(call_typing)(/*[in]*/ int call_index, /*[in]*/ int is_typing, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_send_im)(/*[in]*/ int call_index, /*[in,string]*/ Pj_String text, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_dial_dtmf)(/*[in]*/ int call_index, /*[in,string]*/ Pj_String digits, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_xfer)(/*[in]*/ int call_index, /*[in,string]*/ Pj_String dst_uri, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_release_hold)(/*[in]*/ int call_index, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_set_hold)(/*[in]*/ int call_index, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_hangup)(/*[in]*/ int call_index, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_answer)(/*[in]*/ int call_index, /*[in]*/ int status_code, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_make_call)(/*[in]*/ int acc_index, /*[in,string]*/ Pj_String dst_uri, /*[out]*/ int *call_index, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_get_info)(/*[in]*/ int call_index, /*[out]*/ Pjsua_Call_Info *pInfo, /*[out,retval]*/ Pj_Status *pRet);
-	STDMETHOD(call_has_media)(/*[in]*/ int call_index, /*[out,retval]*/ Pj_Bool *pRet);
-	STDMETHOD(call_is_active)(/*[in]*/ int call_index, /*[out,retval]*/ Pj_Bool *retVal);
-	STDMETHOD(call_get_count)(/*[out,retval]*/ int *retCount);
-	STDMETHOD(call_get_max_count)(/*[out,retval]*/ int *retCount);
-	STDMETHOD(call_get_textstat)(/* [in] */ int call_index,    /* [retval][out] */ BSTR *textstat);
-
-};
-
-#endif //__APP_H_
diff --git a/pjsip-apps/src/activex-pjsua/app.rgs b/pjsip-apps/src/activex-pjsua/app.rgs
deleted file mode 100644
index 0b5322a0..00000000
--- a/pjsip-apps/src/activex-pjsua/app.rgs
+++ /dev/null
@@ -1,26 +0,0 @@
-HKCR
-{
-	ActivePJSUA.App.1 = s 'App Class'
-	{
-		CLSID = s '{F89DA516-42E5-43A0-8EF7-A960BA386CAB}'
-	}
-	ActivePJSUA.App = s 'App Class'
-	{
-		CLSID = s '{F89DA516-42E5-43A0-8EF7-A960BA386CAB}'
-		CurVer = s 'ActivePJSUA.App.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {F89DA516-42E5-43A0-8EF7-A960BA386CAB} = s 'App Class'
-		{
-			ProgID = s 'ActivePJSUA.App.1'
-			VersionIndependentProgID = s 'ActivePJSUA.App'
-			ForceRemove 'Programmable'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'Apartment'
-			}
-			'TypeLib' = s '{11E70413-8434-41B6-A5B6-F7DF79FEFC1A}'
-		}
-	}
-}
diff --git a/pjsip-apps/src/activex-pjsua/pjsua-structs.idl b/pjsip-apps/src/activex-pjsua/pjsua-structs.idl
deleted file mode 100644
index e41f6711..00000000
--- a/pjsip-apps/src/activex-pjsua/pjsua-structs.idl
+++ /dev/null
@@ -1,207 +0,0 @@
-import "oaidl.idl";
-import "ocidl.idl";
-
-typedef long Pj_Status;
-typedef BSTR Pj_URI;
-typedef BSTR Pj_String;
-typedef int  Pj_Bool;
-
-
-[
-    uuid(9CE3052A-7A32-4229-B31C-5E02E0667A77),
-    version(1.0),
-    helpstring("PJSIP credential information"),
-]
-typedef struct Pjsip_Cred_Info
-{
-    Pj_String   realm;
-    Pj_String	scheme;
-    Pj_String	username;
-    int		hashed;
-    Pj_String	data;
-} Pjsip_Cred_Info;
-
-
-[
-    uuid(7F6CFF0F-C5B3-41e8-B278-61CD584C1F34),
-    version(1.0),
-    helpstring("PJSIP SIP URI"),
-]
-typedef struct Pjsip_Sip_Uri
-{
-    Pj_String   display;
-    Pj_String	user;
-    Pj_String	passwd;
-    Pj_String	host;
-    int		port;
-    Pj_String	param_user;
-    Pj_String	param_method;
-    Pj_String	param_transport;
-    int		param_ttl;
-    int		param_lr;
-    Pj_String	param_maddr;
-    Pj_String	param_other;
-    Pj_String	param_header;
-} Pjsip_Sip_Uri;
-
-
-typedef enum Pjsip_Uri_Context
-{
-    PJSIPX_URI_IN_REQ_URI,
-    PJSIPX_URI_IN_FROMTO_HDR,
-    PJSIPX_URI_IN_CONTACT_HDR,
-    PJSIPX_URI_IN_ROUTING_HDR,
-    PJSIPX_URI_IN_OTHER
-} Pjsip_Uri_Context;
-
-
-[
-    uuid(3B12B04F-6E48-46a7-B9E0-6C4BF1594A96),
-    version(1.0),
-    helpstring("PJSUA Account configuration"),
-]
-typedef struct Pjsua_Acc_Config
-{
-    Pj_URI			acc_uri;
-    Pj_URI			reg_uri;
-    Pj_URI			contact_uri;
-    Pj_URI			proxy_uri;
-    int				reg_timeout;
-    SAFEARRAY(Pjsip_Cred_Info)	cred_info;
-} Pjsua_Acc_Config;
-
-[
-    uuid(E4B6573D-CF5E-484d-863F-ADAD5947FBE4),
-    version(1.0),
-    helpstring("PJSUA configuration"),
-]
-typedef struct Pjsua_Config
-{
-    int			    udp_port;
-    Pj_String		    sip_host;
-    int			    sip_port;
-    int			    rtp_port;
-    int			    msg_logging;
-    int			    max_calls;
-    int			    conf_ports;
-    int			    thread_cnt;
-    Pj_String		    stun_srv1;
-    int			    stun_port1;
-    Pj_String		    stun_srv2;
-    int			    stun_port2;
-    int			    snd_player_id;
-    int			    snd_capture_id;
-    int			    clock_rate;
-    Pj_Bool		    null_audio;
-    int			    quality;
-    int			    complexity;
-    SAFEARRAY(Pj_String)    codec_arg;
-    int			    auto_answer;
-    int			    uas_refresh;
-    Pj_String		    outbound_proxy;
-    SAFEARRAY(Pjsua_Acc_Config) acc_config;
-    int			    log_level;
-    int			    app_log_level;
-    long		    log_decor;
-    Pj_String		    log_filename;
-    SAFEARRAY(Pj_String)    buddy_uri;
-} Pjsua_Config;
-
-
-typedef enum Pjsua_Call_State
-{
-    PJSUA_CALL_STATE_NULL,
-    PJSUA_CALL_STATE_CALLING,
-    PJSUA_CALL_STATE_INCOMING,
-    PJSUA_CALL_STATE_EARLY,
-    PJSUA_CALL_STATE_CONNECTING,
-    PJSUA_CALL_STATE_CONFIRMED,
-    PJSUA_CALL_STATE_DISCONNECTED,
-} Pjsua_Call_State;
-
-
-[
-    uuid(5043AC9E-A417-4f03-927E-D7AE52DDD064),
-    version(1.0),
-    helpstring("PJSUA Call Information"),
-]
-typedef struct Pjsua_Call_Info
-{
-    int			index;
-    Pj_Bool		active;
-    Pj_Bool		is_uac;
-    Pj_String		local_info;
-    Pj_String		remote_info;
-    Pjsua_Call_State	state;
-    Pj_String		state_text;
-    int			connect_duration;
-    int			total_duration;
-    int			last_status;
-    Pj_String		last_status_text;
-    Pj_Bool		has_media;
-    int			conf_slot;
-} Pjsua_Call_Info;
-
-
-typedef enum Pjsua_Buddy_State
-{
-    PJSUA_BUDDY_STATE_UNKNOWN,
-    PJSUA_BUDDY_STATE_ONLINE,
-    PJSUA_BUDDY_STATE_OFFLINE,
-} Pjsua_Buddy_State;	
-
-
-[
-    uuid(2729F0BC-8A5E-4f3f-BC29-C1740A86393A),
-    version(1.0),
-    helpstring("PJSUA Buddy Information"),
-]
-typedef struct Pjsua_Buddy_Info
-{
-    int	index;
-    Pj_Bool		is_valid;
-    Pj_String		name;
-    Pj_String		display;
-    Pj_String		host;
-    int  		port;
-    Pj_URI		uri;
-    Pjsua_Buddy_State	status;
-    Pj_String		status_text;
-    Pj_Bool		monitor;
-} Pjsua_Buddy_Info;
-
-
-[
-    uuid(8D345956-10B7-4450-8A06-A80D2F319EFD),
-    version(1.0),
-    helpstring("PJSUA Account Information"),
-]
-typedef struct Pjsua_Acc_Info
-{
-    int			index;
-    Pj_URI		acc_uri;
-    Pj_Bool		has_registration;
-    int			expires;
-    int			status_code;
-    Pj_String		status_text;
-    Pj_Bool		online_status;
-} Pjsua_Acc_Info;
-
-
-
-[
-    uuid(0D05907A-3E1F-4c92-9FD0-26CB6E1CC56A),
-    version(1.0),
-    helpstring("PJSUA Conference Port Information"),
-]
-typedef struct Pjsua_Conf_Port_Info
-{
-    int			slot_id;
-    Pj_String		name;
-    int			clock_rate;
-    int			channel_count;
-    int			samples_per_frame;
-    int			bits_per_sample;
-    SAFEARRAY(int)	listeners;
-} Pjsua_Conf_Port_Info;
-
diff --git a/pjsip-apps/src/activex-pjsua/stdafx.cpp b/pjsip-apps/src/activex-pjsua/stdafx.cpp
deleted file mode 100644
index a5eea178..00000000
--- a/pjsip-apps/src/activex-pjsua/stdafx.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-//  stdafx.pch will be the pre-compiled header
-//  stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-#ifdef _ATL_STATIC_REGISTRY
-#include <statreg.h>
-#include <statreg.cpp>
-#endif
-
-#include <atlimpl.cpp>
diff --git a/pjsip-apps/src/activex-pjsua/stdafx.h b/pjsip-apps/src/activex-pjsua/stdafx.h
deleted file mode 100644
index fba5b6c9..00000000
--- a/pjsip-apps/src/activex-pjsua/stdafx.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// stdafx.h : include file for standard system include files,
-//      or project specific include files that are used frequently,
-//      but are changed infrequently
-
-#if !defined(AFX_STDAFX_H__D1920725_3220_40F4_9B04_762A3AB60D6C__INCLUDED_)
-#define AFX_STDAFX_H__D1920725_3220_40F4_9B04_762A3AB60D6C__INCLUDED_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif // _MSC_VER > 1000
-
-#define STRICT
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0400
-#endif
-#define _ATL_APARTMENT_THREADED
-
-#include <atlbase.h>
-//You may derive a class from CComModule and use it if you want to override
-//something, but do not change the name of _Module
-extern CComModule _Module;
-#include <atlcom.h>
-
-//{{AFX_INSERT_LOCATION}}
-// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
-
-#endif // !defined(AFX_STDAFX_H__D1920725_3220_40F4_9B04_762A3AB60D6C__INCLUDED)