From 1d14eafc4f0cf923e5bc835ae5c09c4b75c76b85 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 25 Apr 2015 18:51:08 +0000 Subject: ContactsPlus - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13146 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ContactsPlus/contacts.vcxproj | 28 ++++ plugins/ContactsPlus/contacts.vcxproj.filters | 4 + plugins/ContactsPlus/contacts_10.vcxproj | 201 ---------------------- plugins/ContactsPlus/contacts_10.vcxproj.filters | 62 ------- plugins/ContactsPlus/contacts_12.vcxproj | 204 ----------------------- plugins/ContactsPlus/contacts_12.vcxproj.filters | 62 ------- plugins/ContactsPlus/src/contacts.h | 57 ------- plugins/ContactsPlus/src/main.cpp | 16 +- plugins/ContactsPlus/src/receive.cpp | 4 +- plugins/ContactsPlus/src/send.cpp | 2 +- plugins/ContactsPlus/src/stdafx.cpp | 18 -- plugins/ContactsPlus/src/stdafx.cxx | 18 ++ plugins/ContactsPlus/src/stdafx.h | 54 ++++++ plugins/ContactsPlus/src/utils.cpp | 2 +- 14 files changed, 116 insertions(+), 616 deletions(-) create mode 100644 plugins/ContactsPlus/contacts.vcxproj create mode 100644 plugins/ContactsPlus/contacts.vcxproj.filters delete mode 100644 plugins/ContactsPlus/contacts_10.vcxproj delete mode 100644 plugins/ContactsPlus/contacts_10.vcxproj.filters delete mode 100644 plugins/ContactsPlus/contacts_12.vcxproj delete mode 100644 plugins/ContactsPlus/contacts_12.vcxproj.filters delete mode 100644 plugins/ContactsPlus/src/contacts.h delete mode 100644 plugins/ContactsPlus/src/stdafx.cpp create mode 100644 plugins/ContactsPlus/src/stdafx.cxx create mode 100644 plugins/ContactsPlus/src/stdafx.h (limited to 'plugins') diff --git a/plugins/ContactsPlus/contacts.vcxproj b/plugins/ContactsPlus/contacts.vcxproj new file mode 100644 index 0000000000..81d7fe8294 --- /dev/null +++ b/plugins/ContactsPlus/contacts.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + Contacts + {F4F2FD25-1553-FB72-F695-0701D20C3168} + + + + + \ No newline at end of file diff --git a/plugins/ContactsPlus/contacts.vcxproj.filters b/plugins/ContactsPlus/contacts.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/ContactsPlus/contacts.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/ContactsPlus/contacts_10.vcxproj b/plugins/ContactsPlus/contacts_10.vcxproj deleted file mode 100644 index 8dec9c47fe..0000000000 --- a/plugins/ContactsPlus/contacts_10.vcxproj +++ /dev/null @@ -1,201 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Contacts - {F4F2FD25-1553-FB72-F695-0701D20C3168} - - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Use - contacts.h - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - comctl32.lib;%(AdditionalDependencies) - true - true - $(IntDir)$(TargetName).lib - true - false - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Use - contacts.h - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - comctl32.lib;%(AdditionalDependencies) - true - true - $(IntDir)$(TargetName).lib - true - Windows - false - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - true - EditAndContinue - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - Use - contacts.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin10\lib - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - false - Use - contacts.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin10\lib - - - - - Create - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/ContactsPlus/contacts_10.vcxproj.filters b/plugins/ContactsPlus/contacts_10.vcxproj.filters deleted file mode 100644 index 0cf5dc0a92..0000000000 --- a/plugins/ContactsPlus/contacts_10.vcxproj.filters +++ /dev/null @@ -1,62 +0,0 @@ - - - - - {c0e9ea51-8fc0-4db3-a0d9-491b3e4fecde} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {05b2429f-b6fd-4862-97a2-f5686ee35703} - h;hpp;hxx;hm;inl - - - {56ec564b-af99-40f8-ae70-af5307bdc3f5} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/ContactsPlus/contacts_12.vcxproj b/plugins/ContactsPlus/contacts_12.vcxproj deleted file mode 100644 index d27aa9584d..0000000000 --- a/plugins/ContactsPlus/contacts_12.vcxproj +++ /dev/null @@ -1,204 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Contacts - {F4F2FD25-1553-FB72-F695-0701D20C3168} - - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Use - contacts.h - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - comctl32.lib;%(AdditionalDependencies) - true - true - $(IntDir)$(TargetName).lib - true - false - $(ProfileDir)..\..\bin12\lib - - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - Use - contacts.h - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - comctl32.lib;%(AdditionalDependencies) - true - true - $(IntDir)$(TargetName).lib - true - Windows - false - $(ProfileDir)..\..\bin12\lib - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - true - EditAndContinue - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - Use - contacts.h - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin12\lib - false - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - ..\..\include;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - false - Use - contacts.h - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - $(IntDir)$(TargetName).lib - false - $(ProfileDir)..\..\bin12\lib - - - - - Create - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/ContactsPlus/contacts_12.vcxproj.filters b/plugins/ContactsPlus/contacts_12.vcxproj.filters deleted file mode 100644 index 0cf5dc0a92..0000000000 --- a/plugins/ContactsPlus/contacts_12.vcxproj.filters +++ /dev/null @@ -1,62 +0,0 @@ - - - - - {c0e9ea51-8fc0-4db3-a0d9-491b3e4fecde} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {05b2429f-b6fd-4862-97a2-f5686ee35703} - h;hpp;hxx;hm;inl - - - {56ec564b-af99-40f8-ae70-af5307bdc3f5} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/ContactsPlus/src/contacts.h b/plugins/ContactsPlus/src/contacts.h deleted file mode 100644 index 3183c942b8..0000000000 --- a/plugins/ContactsPlus/src/contacts.h +++ /dev/null @@ -1,57 +0,0 @@ -// --------------------------------------------------------------------------- -// Contacts+ for Miranda Instant Messenger -// _______________________________________ -// -// Copyright © 2002 Dominus Procellarum -// Copyright © 2004-2008 Joe Kucera -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -// -// --------------------------------------------------------------------------- - -#define _CRT_SECURE_NO_WARNINGS -#define _CRT_NONSTDC_NO_WARNINGS - -#include -#include -#include -#include - -#include "newpluginapi.h" -#include "m_protosvc.h" -#include "m_database.h" -#include "m_langpack.h" -#include "m_skin.h" -#include "m_clist.h" -#include "m_clistint.h" -#include "m_clc.h" -#include "m_clui.h" -#include "m_addcontact.h" -#include "m_history.h" -#include "m_userinfo.h" -#include "m_button.h" -#include "m_message.h" -#include "win2k.h" - -#include "resource.h" -#include "Version.h" -#include "utils.h" -#include "send.h" -#include "receive.h" - -#define MODULENAME "SendReceiveContacts" - -#define MS_CONTACTS_SEND "ContactsTransfer/SendContacts" -#define MS_CONTACTS_RECEIVE "ContactsTransfer/ReceiveContacts" diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index a34c8ed315..77a50dc048 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------------- -#include "contacts.h" +#include "stdafx.h" CLIST_INTERFACE *pcli; @@ -51,7 +51,7 @@ PLUGININFOEX pluginInfo = { { 0x0324785E, 0x74CE, 0x4600, { 0xB7, 0x81, 0x85, 0x17, 0x73, 0xB3, 0xEF, 0xC5 } } }; -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; @@ -111,7 +111,7 @@ static bool CheckContactsServiceSupport(const char* szProto) return false; } -static int HookPreBuildContactMenu(WPARAM hContact, LPARAM lParam) +static int HookPreBuildContactMenu(WPARAM hContact, LPARAM) { char *szProto = GetContactProto(hContact); int bVisible = FALSE; @@ -128,7 +128,7 @@ static int HookPreBuildContactMenu(WPARAM hContact, LPARAM lParam) return 0; } -static int HookModulesLoaded(WPARAM wParam, LPARAM lParam) +static int HookModulesLoaded(WPARAM, LPARAM) { char* modules[2] = { 0 }; @@ -160,7 +160,7 @@ static int HookContactSettingChanged(WPARAM hContact, LPARAM lParam) return 0; } -static int HookContactDeleted(WPARAM wParam, LPARAM lParam) +static int HookContactDeleted(WPARAM wParam, LPARAM) { // if our contact gets deleted close his window HWND h = WindowList_Find(ghSendWindowList, wParam); @@ -173,7 +173,7 @@ static int HookContactDeleted(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM lParam) +static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM) { //find window for hContact HWND hWnd = WindowList_Find(ghSendWindowList, wParam); @@ -186,13 +186,13 @@ static INT_PTR ServiceSendCommand(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR ServiceReceiveCommand(WPARAM wParam, LPARAM lParam) +static INT_PTR ServiceReceiveCommand(WPARAM, LPARAM lParam) { CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_RECEIVE), NULL, RecvDlgProc, lParam); return 0; } -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp index 4f46d4db21..0d5f3f600c 100644 --- a/plugins/ContactsPlus/src/receive.cpp +++ b/plugins/ContactsPlus/src/receive.cpp @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------------- -#include "contacts.h" +#include "stdafx.h" /* TRecvContactsData */ @@ -56,7 +56,7 @@ TReceivedItem* TRecvContactsData::AddReceivedItem() } -static int RecvDlg_Resize(HWND hwndDlg,LPARAM lParam,UTILRESIZECONTROL *urc) +static int RecvDlg_Resize(HWND, LPARAM, UTILRESIZECONTROL *urc) { switch (urc->wId) { case IDC_CONTACTS: diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index d7454dfc84..38a11e0b45 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -21,7 +21,7 @@ // // ----------------------------------------------------------------------------- -#include "contacts.h" +#include "stdafx.h" /* TSendProcessList */ diff --git a/plugins/ContactsPlus/src/stdafx.cpp b/plugins/ContactsPlus/src/stdafx.cpp deleted file mode 100644 index d9883c8dbe..0000000000 --- a/plugins/ContactsPlus/src/stdafx.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation version 2 -of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see . -*/ - -#include "contacts.h" \ No newline at end of file diff --git a/plugins/ContactsPlus/src/stdafx.cxx b/plugins/ContactsPlus/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/ContactsPlus/src/stdafx.cxx @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-15 Miranda NG project (http://miranda-ng.org) + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation version 2 +of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#include "stdafx.h" \ No newline at end of file diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h new file mode 100644 index 0000000000..0d52891be5 --- /dev/null +++ b/plugins/ContactsPlus/src/stdafx.h @@ -0,0 +1,54 @@ +// --------------------------------------------------------------------------- +// Contacts+ for Miranda Instant Messenger +// _______________________________________ +// +// Copyright © 2002 Dominus Procellarum +// Copyright © 2004-2008 Joe Kucera +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +// --------------------------------------------------------------------------- + +#include +#include +#include +#include + +#include "newpluginapi.h" +#include "m_protosvc.h" +#include "m_database.h" +#include "m_langpack.h" +#include "m_skin.h" +#include "m_clist.h" +#include "m_clistint.h" +#include "m_clc.h" +#include "m_clui.h" +#include "m_addcontact.h" +#include "m_history.h" +#include "m_userinfo.h" +#include "m_button.h" +#include "m_message.h" +#include "win2k.h" + +#include "resource.h" +#include "Version.h" +#include "utils.h" +#include "send.h" +#include "receive.h" + +#define MODULENAME "SendReceiveContacts" + +#define MS_CONTACTS_SEND "ContactsTransfer/SendContacts" +#define MS_CONTACTS_RECEIVE "ContactsTransfer/ReceiveContacts" diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp index f523873c27..c6a9b6ed87 100644 --- a/plugins/ContactsPlus/src/utils.cpp +++ b/plugins/ContactsPlus/src/utils.cpp @@ -21,7 +21,7 @@ // // --------------------------------------------------------------------------- -#include "contacts.h" +#include "stdafx.h" /* a strlennull() that likes NULL */ size_t __fastcall strlennull(const char *string) -- cgit v1.2.3