From 94c575dc25f045c7083f3aa1cfdbdfac7e08bd00 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Wed, 26 Sep 2012 06:27:36 +0000 Subject: default folders structure git-svn-id: http://svn.miranda-ng.org/main/trunk@1659 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/Skype.vcxproj | 52 +++++++++++++++--------- protocols/Skype/Skype.vcxproj.filters | 18 +++++---- protocols/Skype/Skype.vcxproj.user | 3 -- protocols/Skype/res/Version.rc | 42 ++++++++++++++++++++ protocols/Skype/skype.cpp | 75 ----------------------------------- protocols/Skype/skype.h | 53 ------------------------- protocols/Skype/skype_proto.cpp | 46 --------------------- protocols/Skype/skype_proto.h | 64 ------------------------------ protocols/Skype/src/skype.cpp | 73 ++++++++++++++++++++++++++++++++++ protocols/Skype/src/skype.h | 51 ++++++++++++++++++++++++ protocols/Skype/src/skype_proto.cpp | 46 +++++++++++++++++++++ protocols/Skype/src/skype_proto.h | 64 ++++++++++++++++++++++++++++++ protocols/Skype/src/version.h | 20 ++++++++++ protocols/Skype/version.h | 3 -- 14 files changed, 339 insertions(+), 271 deletions(-) delete mode 100644 protocols/Skype/Skype.vcxproj.user create mode 100644 protocols/Skype/res/Version.rc delete mode 100644 protocols/Skype/skype.cpp delete mode 100644 protocols/Skype/skype.h delete mode 100644 protocols/Skype/skype_proto.cpp delete mode 100644 protocols/Skype/skype_proto.h create mode 100644 protocols/Skype/src/skype.cpp create mode 100644 protocols/Skype/src/skype.h create mode 100644 protocols/Skype/src/skype_proto.cpp create mode 100644 protocols/Skype/src/skype_proto.h create mode 100644 protocols/Skype/src/version.h delete mode 100644 protocols/Skype/version.h (limited to 'protocols') diff --git a/protocols/Skype/Skype.vcxproj b/protocols/Skype/Skype.vcxproj index 8d42f31684..4a9be34c70 100644 --- a/protocols/Skype/Skype.vcxproj +++ b/protocols/Skype/Skype.vcxproj @@ -12,8 +12,6 @@ {F5282DBC-756B-4071-B186-3E82C0E8E1F7} - Win32Proj - Skype @@ -37,14 +35,13 @@ - - - - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - - - false + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Plugins\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + true @@ -62,38 +59,55 @@ Windows true $(SolutionDir)\lib - true + false $(IntDir)$(TargetName).lib + /PDBALTPATH:%_PDB% $(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cyassl_lib.lib;$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cppwrapper_2_lib.lib;%(AdditionalDependencies) + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + Level3 - Use - MaxSpeed + NotUsing + Full true true WIN32;NDEBUG;_WINDOWS;_USRDLL;SKYPE_EXPORTS;%(PreprocessorDefinitions) + +..\..\include;..\..\plugins\ExternalAPI;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\api;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\ipc;..\..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\types;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading;..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\src\platform\threading\win;..\..\SkypeKit\SDK\ipc\cpp;..\..\SkypeKit\SDK\ipc\cpp\VideoBuffers;..\..\SkypeKit\SDK\ipc\cpp\platform\se;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\include\openssl;..\..\SkypeKit\SDK\ipc\cpp\ssl\cyassl\ctaocrypt\include;%(AdditionalIncludeDirectories) + skype.h + 4996;%(DisableSpecificWarnings) Windows true true true + false + /PDBALTPATH:%_PDB% + +$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cyassl_lib.lib;$(SolutionDir)..\..\SkypeKit\SDK\interfaces\skype\cpp_embedded\build\skypekit-cppwrapper_2_lib.lib;%(AdditionalDependencies) + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + - + + + - - - + + - - + diff --git a/protocols/Skype/Skype.vcxproj.filters b/protocols/Skype/Skype.vcxproj.filters index 911b429cea..ca6ffdb4e4 100644 --- a/protocols/Skype/Skype.vcxproj.filters +++ b/protocols/Skype/Skype.vcxproj.filters @@ -15,25 +15,27 @@ - - - - + Header Files - + Header Files - + Header Files - + Source Files - + Source Files + + + Resource Files + + \ No newline at end of file diff --git a/protocols/Skype/Skype.vcxproj.user b/protocols/Skype/Skype.vcxproj.user deleted file mode 100644 index 695b5c78b9..0000000000 --- a/protocols/Skype/Skype.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/protocols/Skype/res/Version.rc b/protocols/Skype/res/Version.rc new file mode 100644 index 0000000000..d741488c4f --- /dev/null +++ b/protocols/Skype/res/Version.rc @@ -0,0 +1,42 @@ +// Microsoft Visual C++ generated resource script. +// +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#include "afxres.h" +#include "..\src\version.h" + +#ifdef _WIN32 +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#endif //_WIN32 + +VS_VERSION_INFO VERSIONINFO + FILEVERSION __FILEVERSION_STRING + PRODUCTVERSION __FILEVERSION_STRING + FILEFLAGSMASK 0x17L +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x0L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/protocols/Skype/skype.cpp b/protocols/Skype/skype.cpp deleted file mode 100644 index 098ea96697..0000000000 --- a/protocols/Skype/skype.cpp +++ /dev/null @@ -1,75 +0,0 @@ -#include "skype.h" -#include "version.h" -#include "skype_proto.h" - -int hLangpack; -HINSTANCE g_hInstance; - -PLUGININFOEX pluginInfo = -{ - sizeof(PLUGININFOEX), - "Skype Plugin", - __VERSION_DWORD, - "Provides basic support for Skype protocol.", - "unsane", - "", - "© 2012 unsane", - "http://miranda-ng.org/", - UNICODE_AWARE, - // {9C448C61-FC3F-42F9-B9F0-4A30E1CF8671} - { 0x9c448c61, 0xfc3f, 0x42f9, { 0xb9, 0xf0, 0x4a, 0x30, 0xe1, 0xcf, 0x86, 0x71 } } -}; - -static int compare_protos(const CSkypeProto *p1, const CSkypeProto *p2) -{ - return _tcscmp(p1->m_tszUserName, p2->m_tszUserName); -} - -OBJLIST g_Instances(1, compare_protos); - -DWORD WINAPI DllMain(HINSTANCE hInstance, DWORD, LPVOID) -{ - g_hInstance = hInstance; - return TRUE; -} - -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) -{ - return &pluginInfo; -} - -extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST}; - -static CSkypeProto* SkypeProtoInit(const char* pszProtoName, const TCHAR* tszUserName) -{ - //CSkypeProto *ppro = new CSkypeProto(pszProtoName, tszUserName); - //g_Instances.insert(ppro); - //return ppro; - return 0; -} - -static int SkypeProtoUninit(CSkypeProto* ppro) -{ - g_Instances.remove(ppro); - delete ppro; - return 0; -} - -extern "C" int __declspec(dllexport) Load(void) -{ - //mir_getLP(&pluginInfo); - - PROTOCOLDESCRIPTOR pd = { sizeof(pd) }; - pd.szName = "Skype"; - pd.type = PROTOTYPE_PROTOCOL; - pd.fnInit = (pfnInitProto)SkypeProtoInit; - pd.fnUninit = (pfnUninitProto)SkypeProtoUninit; - CallService(MS_PROTO_REGISTERMODULE, 0, reinterpret_cast(&pd)); - - return 0; -} - -extern "C" int __declspec(dllexport) Unload(void) -{ - return 0; -} \ No newline at end of file diff --git a/protocols/Skype/skype.h b/protocols/Skype/skype.h deleted file mode 100644 index 7484ee7482..0000000000 --- a/protocols/Skype/skype.h +++ /dev/null @@ -1,53 +0,0 @@ -#pragma once - -#define MIRANDA_VER 0x0A00 - -#include - -#pragma warning(push) -# pragma warning(disable:4312) -#include -#include -#include -#include -#include -#include -#include -#include -//#include "m_cluiframes.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#pragma warning(pop) - -// skype - -#define SSL_LIB_CYASSL -#define NO_FILESYSTEM - -// Enable desktop video -//#define SKYPEKIT_SURFACE_RENDERING - -// Additional flags for desktop video for non-Windows targets -//#define VIDEO_TRANSPORT_SYSV -//#define VIDEO_TRANSPORT_POSIX - -extern HINSTANCE g_hInstance; \ No newline at end of file diff --git a/protocols/Skype/skype_proto.cpp b/protocols/Skype/skype_proto.cpp deleted file mode 100644 index eede6c744e..0000000000 --- a/protocols/Skype/skype_proto.cpp +++ /dev/null @@ -1,46 +0,0 @@ -#include "skype_proto.h" - -CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName) -{ - m_iVersion = 2; - m_iStatus = ID_STATUS_OFFLINE; - m_tszUserName = mir_tstrdup(userName); - m_szModuleName = mir_strdup(protoName); - m_szProtoName = mir_strdup(protoName); - _strlwr(m_szProtoName); - m_szProtoName[0] = toupper(m_szProtoName[0]); - - TCHAR name[128]; - mir_sntprintf(name, SIZEOF(name), TranslateT("%s connection"), m_tszUserName); - - NETLIBUSER nlu = {0}; - nlu.cbSize = sizeof( nlu ); - nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_TCHAR; // | NUF_HTTPGATEWAY; - nlu.ptszDescriptiveName = name; - nlu.szSettingsModule = m_szModuleName; - m_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu); - - this->Log("Setting protocol/module name to '%s/%s'", m_szProtoName, m_szModuleName); -} - -CSkypeProto::~CSkypeProto() -{ - Netlib_CloseHandle(m_hNetlibUser); - m_hNetlibUser = NULL; - - mir_free(m_szProtoName); - mir_free(m_szModuleName); - mir_free(m_tszUserName); -} - -void CSkypeProto::Log( const char* fmt, ... ) -{ - va_list va; - char msg[1024]; - - va_start(va, fmt); - mir_vsnprintf(msg, sizeof(msg), fmt, va); - va_end(va); - - CallService(MS_NETLIB_LOG, ( WPARAM )m_hNetlibUser, (LPARAM)msg); -} \ No newline at end of file diff --git a/protocols/Skype/skype_proto.h b/protocols/Skype/skype_proto.h deleted file mode 100644 index a4613fcb3b..0000000000 --- a/protocols/Skype/skype_proto.h +++ /dev/null @@ -1,64 +0,0 @@ -#pragma once - -#include "skype.h" -#include - -struct CSkypeProto : public PROTO_INTERFACE, public MZeroedObject -{ -public: - CSkypeProto(const char*, const TCHAR*); - ~CSkypeProto(); - - // PROTO_INTERFACE - /*virtual HANDLE __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr ); - virtual HANDLE __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent ); - - virtual int __cdecl Authorize( HANDLE hDbEvent ); - virtual int __cdecl AuthDeny( HANDLE hDbEvent, const TCHAR* szReason ); - virtual int __cdecl AuthRecv( HANDLE hContact, PROTORECVEVENT* ); - virtual int __cdecl AuthRequest( HANDLE hContact, const TCHAR* szMessage ); - - virtual HANDLE __cdecl ChangeInfo( int iInfoType, void* pInfoData ); - - virtual HANDLE __cdecl FileAllow( HANDLE hContact, HANDLE hTransfer, const TCHAR* szPath ); - virtual int __cdecl FileCancel( HANDLE hContact, HANDLE hTransfer ); - virtual int __cdecl FileDeny( HANDLE hContact, HANDLE hTransfer, const TCHAR* szReason ); - virtual int __cdecl FileResume( HANDLE hTransfer, int* action, const TCHAR** szFilename ); - - virtual DWORD_PTR __cdecl GetCaps( int type, HANDLE hContact = NULL ); - virtual HICON __cdecl GetIcon( int iconIndex ); - virtual int __cdecl GetInfo( HANDLE hContact, int infoType ); - - virtual HANDLE __cdecl SearchBasic( const TCHAR* id ); - virtual HANDLE __cdecl SearchByEmail( const TCHAR* email ); - virtual HANDLE __cdecl SearchByName( const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName ); - virtual HWND __cdecl SearchAdvanced( HWND owner ); - virtual HWND __cdecl CreateExtendedSearchUI( HWND owner ); - - virtual int __cdecl RecvContacts( HANDLE hContact, PROTORECVEVENT* ); - virtual int __cdecl RecvFile( HANDLE hContact, PROTORECVFILET* ); - virtual int __cdecl RecvMsg( HANDLE hContact, PROTORECVEVENT* ); - virtual int __cdecl RecvUrl( HANDLE hContact, PROTORECVEVENT* ); - - virtual int __cdecl SendContacts( HANDLE hContact, int flags, int nContacts, HANDLE* hContactsList ); - virtual HANDLE __cdecl SendFile( HANDLE hContact, const TCHAR* szDescription, TCHAR** ppszFiles ); - virtual int __cdecl SendMsg( HANDLE hContact, int flags, const char* msg ); - virtual int __cdecl SendUrl( HANDLE hContact, int flags, const char* url ); - - virtual int __cdecl SetApparentMode( HANDLE hContact, int mode ); - virtual int __cdecl SetStatus( int iNewStatus ); - - virtual HANDLE __cdecl GetAwayMsg( HANDLE hContact ); - virtual int __cdecl RecvAwayMsg( HANDLE hContact, int mode, PROTORECVEVENT* evt ); - virtual int __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg ); - virtual int __cdecl SetAwayMsg( int m_iStatus, const TCHAR* msg ); - - virtual int __cdecl UserIsTyping( HANDLE hContact, int type ); - - virtual int __cdecl OnEvent( PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam );*/ - -protected: - HANDLE m_hNetlibUser; - - void Log( const char* fmt, ... ); -}; \ No newline at end of file diff --git a/protocols/Skype/src/skype.cpp b/protocols/Skype/src/skype.cpp new file mode 100644 index 0000000000..47e9ea0c5e --- /dev/null +++ b/protocols/Skype/src/skype.cpp @@ -0,0 +1,73 @@ +#include "skype.h" + +int hLangpack; +HINSTANCE g_hInstance; + +PLUGININFOEX pluginInfo = +{ + sizeof(PLUGININFOEX), + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // {9C448C61-FC3F-42F9-B9F0-4A30E1CF8671} + { 0x9c448c61, 0xfc3f, 0x42f9, { 0xb9, 0xf0, 0x4a, 0x30, 0xe1, 0xcf, 0x86, 0x71 } } +}; + +static int compare_protos(const CSkypeProto *p1, const CSkypeProto *p2) +{ + return _tcscmp(p1->m_tszUserName, p2->m_tszUserName); +} + +OBJLIST g_Instances(1, compare_protos); + +DWORD WINAPI DllMain(HINSTANCE hInstance, DWORD, LPVOID) +{ + g_hInstance = hInstance; + return TRUE; +} + +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +{ + return &pluginInfo; +} + +extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST}; + +static CSkypeProto* SkypeProtoInit(const char* pszProtoName, const TCHAR* tszUserName) +{ + //CSkypeProto *ppro = new CSkypeProto(pszProtoName, tszUserName); + //g_Instances.insert(ppro); + //return ppro; + return 0; +} + +static int SkypeProtoUninit(CSkypeProto* ppro) +{ + g_Instances.remove(ppro); + delete ppro; + return 0; +} + +extern "C" int __declspec(dllexport) Load(void) +{ + //mir_getLP(&pluginInfo); + + PROTOCOLDESCRIPTOR pd = { sizeof(pd) }; + pd.szName = "Skype"; + pd.type = PROTOTYPE_PROTOCOL; + pd.fnInit = (pfnInitProto)SkypeProtoInit; + pd.fnUninit = (pfnUninitProto)SkypeProtoUninit; + CallService(MS_PROTO_REGISTERMODULE, 0, reinterpret_cast(&pd)); + + return 0; +} + +extern "C" int __declspec(dllexport) Unload(void) +{ + return 0; +} \ No newline at end of file diff --git a/protocols/Skype/src/skype.h b/protocols/Skype/src/skype.h new file mode 100644 index 0000000000..908b8bda21 --- /dev/null +++ b/protocols/Skype/src/skype.h @@ -0,0 +1,51 @@ +#define MIRANDA_VER 0x0A00 + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +//#include "m_cluiframes.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "version.h" +#include "skype_proto.h" + +// skype + +#define SSL_LIB_CYASSL +#define NO_FILESYSTEM + +// Enable desktop video +//#define SKYPEKIT_SURFACE_RENDERING + +// Additional flags for desktop video for non-Windows targets +//#define VIDEO_TRANSPORT_SYSV +//#define VIDEO_TRANSPORT_POSIX + +extern HINSTANCE g_hInstance; \ No newline at end of file diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp new file mode 100644 index 0000000000..b01329ca4e --- /dev/null +++ b/protocols/Skype/src/skype_proto.cpp @@ -0,0 +1,46 @@ +#include "skype.h" + +CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName) +{ + m_iVersion = 2; + m_iStatus = ID_STATUS_OFFLINE; + m_tszUserName = mir_tstrdup(userName); + m_szModuleName = mir_strdup(protoName); + m_szProtoName = mir_strdup(protoName); + _strlwr(m_szProtoName); + m_szProtoName[0] = toupper(m_szProtoName[0]); + + TCHAR name[128]; + mir_sntprintf(name, SIZEOF(name), TranslateT("%s connection"), m_tszUserName); + + NETLIBUSER nlu = {0}; + nlu.cbSize = sizeof( nlu ); + nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_TCHAR; // | NUF_HTTPGATEWAY; + nlu.ptszDescriptiveName = name; + nlu.szSettingsModule = m_szModuleName; + m_hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu); + + this->Log("Setting protocol/module name to '%s/%s'", m_szProtoName, m_szModuleName); +} + +CSkypeProto::~CSkypeProto() +{ + Netlib_CloseHandle(m_hNetlibUser); + m_hNetlibUser = NULL; + + mir_free(m_szProtoName); + mir_free(m_szModuleName); + mir_free(m_tszUserName); +} + +void CSkypeProto::Log( const char* fmt, ... ) +{ + va_list va; + char msg[1024]; + + va_start(va, fmt); + mir_vsnprintf(msg, sizeof(msg), fmt, va); + va_end(va); + + CallService(MS_NETLIB_LOG, ( WPARAM )m_hNetlibUser, (LPARAM)msg); +} \ No newline at end of file diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h new file mode 100644 index 0000000000..a4613fcb3b --- /dev/null +++ b/protocols/Skype/src/skype_proto.h @@ -0,0 +1,64 @@ +#pragma once + +#include "skype.h" +#include + +struct CSkypeProto : public PROTO_INTERFACE, public MZeroedObject +{ +public: + CSkypeProto(const char*, const TCHAR*); + ~CSkypeProto(); + + // PROTO_INTERFACE + /*virtual HANDLE __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr ); + virtual HANDLE __cdecl AddToListByEvent( int flags, int iContact, HANDLE hDbEvent ); + + virtual int __cdecl Authorize( HANDLE hDbEvent ); + virtual int __cdecl AuthDeny( HANDLE hDbEvent, const TCHAR* szReason ); + virtual int __cdecl AuthRecv( HANDLE hContact, PROTORECVEVENT* ); + virtual int __cdecl AuthRequest( HANDLE hContact, const TCHAR* szMessage ); + + virtual HANDLE __cdecl ChangeInfo( int iInfoType, void* pInfoData ); + + virtual HANDLE __cdecl FileAllow( HANDLE hContact, HANDLE hTransfer, const TCHAR* szPath ); + virtual int __cdecl FileCancel( HANDLE hContact, HANDLE hTransfer ); + virtual int __cdecl FileDeny( HANDLE hContact, HANDLE hTransfer, const TCHAR* szReason ); + virtual int __cdecl FileResume( HANDLE hTransfer, int* action, const TCHAR** szFilename ); + + virtual DWORD_PTR __cdecl GetCaps( int type, HANDLE hContact = NULL ); + virtual HICON __cdecl GetIcon( int iconIndex ); + virtual int __cdecl GetInfo( HANDLE hContact, int infoType ); + + virtual HANDLE __cdecl SearchBasic( const TCHAR* id ); + virtual HANDLE __cdecl SearchByEmail( const TCHAR* email ); + virtual HANDLE __cdecl SearchByName( const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName ); + virtual HWND __cdecl SearchAdvanced( HWND owner ); + virtual HWND __cdecl CreateExtendedSearchUI( HWND owner ); + + virtual int __cdecl RecvContacts( HANDLE hContact, PROTORECVEVENT* ); + virtual int __cdecl RecvFile( HANDLE hContact, PROTORECVFILET* ); + virtual int __cdecl RecvMsg( HANDLE hContact, PROTORECVEVENT* ); + virtual int __cdecl RecvUrl( HANDLE hContact, PROTORECVEVENT* ); + + virtual int __cdecl SendContacts( HANDLE hContact, int flags, int nContacts, HANDLE* hContactsList ); + virtual HANDLE __cdecl SendFile( HANDLE hContact, const TCHAR* szDescription, TCHAR** ppszFiles ); + virtual int __cdecl SendMsg( HANDLE hContact, int flags, const char* msg ); + virtual int __cdecl SendUrl( HANDLE hContact, int flags, const char* url ); + + virtual int __cdecl SetApparentMode( HANDLE hContact, int mode ); + virtual int __cdecl SetStatus( int iNewStatus ); + + virtual HANDLE __cdecl GetAwayMsg( HANDLE hContact ); + virtual int __cdecl RecvAwayMsg( HANDLE hContact, int mode, PROTORECVEVENT* evt ); + virtual int __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg ); + virtual int __cdecl SetAwayMsg( int m_iStatus, const TCHAR* msg ); + + virtual int __cdecl UserIsTyping( HANDLE hContact, int type ); + + virtual int __cdecl OnEvent( PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam );*/ + +protected: + HANDLE m_hNetlibUser; + + void Log( const char* fmt, ... ); +}; \ No newline at end of file diff --git a/protocols/Skype/src/version.h b/protocols/Skype/src/version.h new file mode 100644 index 0000000000..281233e9ec --- /dev/null +++ b/protocols/Skype/src/version.h @@ -0,0 +1,20 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM +#define __FILEVERSION_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM + +#define __STRINGIFY_IMPL(x) #x +#define __STRINGIFY(x) __STRINGIFY_IMPL(x) +#define __VERSION_STRING __STRINGIFY(__FILEVERSION_DOTS) + +#define __PLUGIN_NAME "Skype Plugin" +#define __INTERNAL_NAME "Skype" +#define __FILENAME "Skype.dll" +#define __DESCRIPTION "Provides basic support for Skype protocol." +#define __AUTHOR "Unsane, Mataes" +#define __AUTHOREMAIL "mataes2007@gmail.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2012 Unsane, Mataes" diff --git a/protocols/Skype/version.h b/protocols/Skype/version.h deleted file mode 100644 index d66bebe741..0000000000 --- a/protocols/Skype/version.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define __VERSION_DWORD PLUGIN_MAKE_VERSION(0, 1, 0, 0) \ No newline at end of file -- cgit v1.2.3