From 4294963c06cca6c22fe273a8e3366ec4159ab76c Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 24 Apr 2015 23:07:58 +0000 Subject: AvatarHistory - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13119 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- plugins/AvatarHistory/AvatarHistory.vcxproj | 37 ++++ .../AvatarHistory/AvatarHistory.vcxproj.filters | 4 + plugins/AvatarHistory/AvatarHistory_10.vcxproj | 218 -------------------- .../AvatarHistory/AvatarHistory_10.vcxproj.filters | 68 ------- plugins/AvatarHistory/AvatarHistory_12.vcxproj | 221 --------------------- .../AvatarHistory/AvatarHistory_12.vcxproj.filters | 68 ------- plugins/AvatarHistory/src/AvatarDlg.cpp | 4 +- plugins/AvatarHistory/src/AvatarHistory.cpp | 14 +- plugins/AvatarHistory/src/AvatarHistory.h | 88 -------- plugins/AvatarHistory/src/icolib.cpp | 6 +- plugins/AvatarHistory/src/options.cpp | 4 +- plugins/AvatarHistory/src/popup.cpp | 2 +- plugins/AvatarHistory/src/stdafx.cpp | 18 -- plugins/AvatarHistory/src/stdafx.cxx | 18 ++ plugins/AvatarHistory/src/stdafx.h | 86 ++++++++ plugins/AvatarHistory/src/utils.cpp | 2 +- 21 files changed, 166 insertions(+), 702 deletions(-) create mode 100644 plugins/AvatarHistory/AvatarHistory.vcxproj create mode 100644 plugins/AvatarHistory/AvatarHistory.vcxproj.filters delete mode 100644 plugins/AvatarHistory/AvatarHistory_10.vcxproj delete mode 100644 plugins/AvatarHistory/AvatarHistory_10.vcxproj.filters delete mode 100644 plugins/AvatarHistory/AvatarHistory_12.vcxproj delete mode 100644 plugins/AvatarHistory/AvatarHistory_12.vcxproj.filters delete mode 100644 plugins/AvatarHistory/src/AvatarHistory.h delete mode 100644 plugins/AvatarHistory/src/stdafx.cpp create mode 100644 plugins/AvatarHistory/src/stdafx.cxx create mode 100644 plugins/AvatarHistory/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index af0ec7440c..2ff33082d2 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -323,7 +323,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoRun", "..\plugins\AutoR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoShutdown", "..\plugins\AutoShutdown\shutdown.vcxproj", "{3F8EF54D-0593-4048-B0E5-C938F99B29F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory_10.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_10.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 2b50f066e3..77d19b50ac 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -325,7 +325,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoRun", "..\plugins\AutoR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoShutdown", "..\plugins\AutoShutdown\shutdown.vcxproj", "{3F8EF54D-0593-4048-B0E5-C938F99B29F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory_10.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_10.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index f7ae6d3ee7..1a8eff9205 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -361,7 +361,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoShutdown", "..\plugins\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BASS_interface", "..\plugins\BASS_interface\Bass_interface_10.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory_10.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_10.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index de7a7753e3..a5daa9fe3b 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -325,7 +325,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoRun", "..\plugins\AutoR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoShutdown", "..\plugins\AutoShutdown\shutdown.vcxproj", "{3F8EF54D-0593-4048-B0E5-C938F99B29F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory_12.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_12.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index a9f0f67f7a..a90ef0583f 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -329,7 +329,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoRun", "..\plugins\AutoR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AutoShutdown", "..\plugins\AutoShutdown\shutdown.vcxproj", "{3F8EF54D-0593-4048-B0E5-C938F99B29F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory_12.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AvatarHistory", "..\plugins\AvatarHistory\AvatarHistory.vcxproj", "{9D702039-F4A9-4978-92B3-3615E5C44BEE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BasicHistory", "..\plugins\BasicHistory\BasicHistory_12.vcxproj", "{155211F8-08E1-4864-A3B8-9F04F4270360}" EndProject diff --git a/plugins/AvatarHistory/AvatarHistory.vcxproj b/plugins/AvatarHistory/AvatarHistory.vcxproj new file mode 100644 index 0000000000..d0d37f559f --- /dev/null +++ b/plugins/AvatarHistory/AvatarHistory.vcxproj @@ -0,0 +1,37 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + AvatarHistory + {9D702039-F4A9-4978-92B3-3615E5C44BEE} + + + + + + + NotUsing + + + + + + + \ No newline at end of file diff --git a/plugins/AvatarHistory/AvatarHistory.vcxproj.filters b/plugins/AvatarHistory/AvatarHistory.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/AvatarHistory/AvatarHistory.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/AvatarHistory/AvatarHistory_10.vcxproj b/plugins/AvatarHistory/AvatarHistory_10.vcxproj deleted file mode 100644 index 806da6e16d..0000000000 --- a/plugins/AvatarHistory/AvatarHistory_10.vcxproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - AvatarHistory - {9D702039-F4A9-4978-92B3-3615E5C44BEE} - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_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 - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - true - EditAndContinue - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - AvatarHistory.h - Use - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - AvatarHistory.h - Use - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin10\lib - - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - AvatarHistory.h - Use - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - comctl32.lib;%(AdditionalDependencies) - true - $(IntDir)$(TargetName).lib - true - true - false - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - AvatarHistory.h - Use - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - comctl32.lib;%(AdditionalDependencies) - true - $(IntDir)$(TargetName).lib - true - true - false - $(ProfileDir)..\..\bin10\lib - /PDBALTPATH:%_PDB% - - - - - - Create - - - - NotUsing - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/AvatarHistory/AvatarHistory_10.vcxproj.filters b/plugins/AvatarHistory/AvatarHistory_10.vcxproj.filters deleted file mode 100644 index 1f951efcaf..0000000000 --- a/plugins/AvatarHistory/AvatarHistory_10.vcxproj.filters +++ /dev/null @@ -1,68 +0,0 @@ - - - - - {82b52cc9-91bf-46bb-b045-52e8df41b13d} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e28f6fa3-76df-4c8d-8454-ee929e07f290} - h;hpp;hxx;hm;inl - - - {6ad471fb-470c-4466-b817-ec90cb51260c} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source 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/AvatarHistory/AvatarHistory_12.vcxproj b/plugins/AvatarHistory/AvatarHistory_12.vcxproj deleted file mode 100644 index fb0a1f3301..0000000000 --- a/plugins/AvatarHistory/AvatarHistory_12.vcxproj +++ /dev/null @@ -1,221 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - AvatarHistory - {9D702039-F4A9-4978-92B3-3615E5C44BEE} - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - 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 - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - true - EditAndContinue - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - AvatarHistory.h - Use - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - false - - - - - MultiThreadedDebugDLL - false - Disabled - Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - EnableFastChecks - AvatarHistory.h - Use - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - true - Windows - comctl32.lib;%(AdditionalDependencies) - false - $(IntDir)$(TargetName).lib - $(ProfileDir)..\..\bin12\lib - - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - AvatarHistory.h - Use - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - comctl32.lib;%(AdditionalDependencies) - true - $(IntDir)$(TargetName).lib - true - true - false - $(ProfileDir)..\..\bin12\lib - - - - - OnlyExplicitInline - true - true - Full - Level3 - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - AvatarHistory.h - Use - Size - false - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - Windows - comctl32.lib;%(AdditionalDependencies) - true - $(IntDir)$(TargetName).lib - true - true - false - $(ProfileDir)..\..\bin12\lib - - - - - - Create - - - - NotUsing - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/AvatarHistory/AvatarHistory_12.vcxproj.filters b/plugins/AvatarHistory/AvatarHistory_12.vcxproj.filters deleted file mode 100644 index 1f951efcaf..0000000000 --- a/plugins/AvatarHistory/AvatarHistory_12.vcxproj.filters +++ /dev/null @@ -1,68 +0,0 @@ - - - - - {82b52cc9-91bf-46bb-b045-52e8df41b13d} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e28f6fa3-76df-4c8d-8454-ee929e07f290} - h;hpp;hxx;hm;inl - - - {6ad471fb-470c-4466-b817-ec90cb51260c} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source 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/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp index 5746cd3053..2fc20eeaa1 100644 --- a/plugins/AvatarHistory/src/AvatarDlg.cpp +++ b/plugins/AvatarHistory/src/AvatarDlg.cpp @@ -18,7 +18,7 @@ Avatar History Plugin */ -#include "AvatarHistory.h" +#include "stdafx.h" HGENMENU hMenu = NULL; DWORD WINAPI AvatarDialogThread(LPVOID param); @@ -512,7 +512,7 @@ int CleanupAvatarPic(HWND hwnd) return 0; } -int PreBuildContactMenu(WPARAM wParam,LPARAM lParam) +int PreBuildContactMenu(WPARAM wParam, LPARAM) { char *proto = GetContactProto(wParam); Menu_ShowItem(hMenu, ProtocolEnabled(proto)); diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp index 1f98aa149a..5280fc2064 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.cpp +++ b/plugins/AvatarHistory/src/AvatarHistory.cpp @@ -21,7 +21,7 @@ Avatar History Plugin Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "AvatarHistory.h" +#include "stdafx.h" HINSTANCE hInst; @@ -56,14 +56,14 @@ PLUGININFOEX pluginInfo = { {0xdbe8c990, 0x7aa0, 0x458d, {0xba, 0xb7, 0x33, 0xeb, 0x7, 0x23, 0x8e, 0x71}} }; -extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD) { return &pluginInfo; } ///////////////////////////////////////////////////////////////////////////////////////// -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) { hInst = hinstDLL; return TRUE; @@ -81,7 +81,7 @@ static INT_PTR GetCachedAvatar(WPARAM wParam, LPARAM lParam) return (INT_PTR)GetCachedAvatar((char*)wParam, hash); } -static INT_PTR IsEnabled(WPARAM wParam, LPARAM lParam) +static INT_PTR IsEnabled(WPARAM wParam, LPARAM) { MCONTACT hContact = (MCONTACT) wParam; return ContactEnabled(hContact, "LogToDisk", AVH_DEF_LOGTODISK) @@ -227,13 +227,13 @@ static int AvatarChanged(WPARAM hContact, LPARAM lParam) return 0; } -static int PreShutdown(WPARAM wParam, LPARAM lParam) +static int PreShutdown(WPARAM, LPARAM) { WindowList_Broadcast(hAvatarWindowsList,WM_CLOSE,0,0); return 0; } -static int ModulesLoaded(WPARAM wParam, LPARAM lParam) +static int ModulesLoaded(WPARAM, LPARAM) { mir_sntprintf(basedir, SIZEOF(basedir), _T("%s\\Avatars History"), profilePath); @@ -248,7 +248,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// -static INT_PTR CALLBACK FirstRunDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM lParam) +static INT_PTR CALLBACK FirstRunDlgProc(HWND hwnd,UINT uMsg,WPARAM wParam,LPARAM) { switch(uMsg) { case WM_INITDIALOG: diff --git a/plugins/AvatarHistory/src/AvatarHistory.h b/plugins/AvatarHistory/src/AvatarHistory.h deleted file mode 100644 index fb3900c4fe..0000000000 --- a/plugins/AvatarHistory/src/AvatarHistory.h +++ /dev/null @@ -1,88 +0,0 @@ -#define _CRT_SECURE_NO_WARNINGS - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "../utils/mir_options.h" - -#include "resource.h" -#include "Version.h" -#include "popup.h" - -// Globals -extern HINSTANCE hInst; -extern HGENMENU hMenu; -extern DWORD mirVer; -extern HANDLE hAvatarWindowsList; -extern Options opts; -extern HANDLE hFolder; -extern TCHAR basedir[]; - -#define MODULE_NAME "AvatarHistory" - -#define AVH_DEF_POPUPFG 0 -#define AVH_DEF_POPUPBG 0x2DB6FF -#define AVH_DEF_AVPOPUPS 0 -#define AVH_DEF_LOGTODISK 1 -#define AVH_DEF_LOGKEEPSAMEFOLDER 0 -#define AVH_DEF_LOGOLDSTYLE 0 -#define AVH_DEF_LOGTOHISTORY 1 -#define AVH_DEF_DEFPOPUPS 0 -#define AVH_DEF_SHOWMENU 1 - -#define DEFAULT_TEMPLATE_REMOVED LPGENT("removed his/her avatar") -#define DEFAULT_TEMPLATE_CHANGED LPGENT("changed his/her avatar") - -void LoadOptions(); - - // from icolib.cpp -void SetupIcoLib(); - -HICON createDefaultOverlayedIcon(BOOL big); -HICON createProtoOverlayedIcon(MCONTACT hContact); - -int PreBuildContactMenu(WPARAM wParam,LPARAM lParam); -int IcoLibIconsChanged(WPARAM wParam,LPARAM lParam); - -int OpenAvatarDialog(MCONTACT hContact, char* fn); - -// utils - -TCHAR* GetCachedAvatar(char *proto, TCHAR *hash); -BOOL ProtocolEnabled(const char *proto); -BOOL ContactEnabled(MCONTACT hContact, char *setting, int def); -BOOL CopyImageFile(TCHAR *old_file, TCHAR *new_file); -void ConvertToFilename(TCHAR *str, size_t size); - -void CreateOldStyleShortcut(MCONTACT hContact, TCHAR *history_filename); -BOOL CreateShortcut(TCHAR *file, TCHAR *shortcut); - -#define POPUP_ACTION_DONOTHING 0 -#define POPUP_ACTION_CLOSEPOPUP 1 -#define POPUP_ACTION_OPENAVATARHISTORY 2 -#define POPUP_ACTION_OPENHISTORY 3 - -#define POPUP_DELAY_DEFAULT 0 -#define POPUP_DELAY_CUSTOM 1 -#define POPUP_DELAY_PERMANENT 2 diff --git a/plugins/AvatarHistory/src/icolib.cpp b/plugins/AvatarHistory/src/icolib.cpp index 88e6b4cae7..7416cf0fc6 100644 --- a/plugins/AvatarHistory/src/icolib.cpp +++ b/plugins/AvatarHistory/src/icolib.cpp @@ -1,4 +1,4 @@ -#include "AvatarHistory.h" +#include "stdafx.h" enum IconIndex { @@ -31,7 +31,7 @@ static void IcoLibUpdateMenus() DestroyIcon(mi.hIcon); } -int IcoLibIconsChanged(WPARAM wParam, LPARAM lParam) +int IcoLibIconsChanged(WPARAM, LPARAM) { IcoLibUpdateMenus(); return 0; @@ -60,7 +60,7 @@ static HICON getOverlayedIcon(HICON icon, HICON overlay, BOOL big) } -HICON createDefaultOverlayedIcon(BOOL big) +HICON createDefaultOverlayedIcon(BOOL) { HICON icon0 = LoadIconEx(I_HISTORY); HICON icon1 = LoadIconEx(I_OVERLAY); diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index 37f8a9ef38..1bf2536dae 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -18,7 +18,7 @@ Avatar History Plugin */ -#include "AvatarHistory.h" +#include "stdafx.h" Options opts; @@ -144,7 +144,7 @@ static INT_PTR CALLBACK PopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA // Functions ////////////////////////////////////////////////////////////////////////////////////// -int OptInit(WPARAM wParam, LPARAM lParam) +int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; diff --git a/plugins/AvatarHistory/src/popup.cpp b/plugins/AvatarHistory/src/popup.cpp index 55f3a3ffd2..07810669c9 100644 --- a/plugins/AvatarHistory/src/popup.cpp +++ b/plugins/AvatarHistory/src/popup.cpp @@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "AvatarHistory.h" +#include "stdafx.h" // Prototypes ///////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/AvatarHistory/src/stdafx.cpp b/plugins/AvatarHistory/src/stdafx.cpp deleted file mode 100644 index 3b836be4da..0000000000 --- a/plugins/AvatarHistory/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 "AvatarHistory.h" \ No newline at end of file diff --git a/plugins/AvatarHistory/src/stdafx.cxx b/plugins/AvatarHistory/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/AvatarHistory/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/AvatarHistory/src/stdafx.h b/plugins/AvatarHistory/src/stdafx.h new file mode 100644 index 0000000000..f01d314e9d --- /dev/null +++ b/plugins/AvatarHistory/src/stdafx.h @@ -0,0 +1,86 @@ +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "../utils/mir_options.h" + +#include "resource.h" +#include "Version.h" +#include "popup.h" + +// Globals +extern HINSTANCE hInst; +extern HGENMENU hMenu; +extern DWORD mirVer; +extern HANDLE hAvatarWindowsList; +extern Options opts; +extern HANDLE hFolder; +extern TCHAR basedir[]; + +#define MODULE_NAME "AvatarHistory" + +#define AVH_DEF_POPUPFG 0 +#define AVH_DEF_POPUPBG 0x2DB6FF +#define AVH_DEF_AVPOPUPS 0 +#define AVH_DEF_LOGTODISK 1 +#define AVH_DEF_LOGKEEPSAMEFOLDER 0 +#define AVH_DEF_LOGOLDSTYLE 0 +#define AVH_DEF_LOGTOHISTORY 1 +#define AVH_DEF_DEFPOPUPS 0 +#define AVH_DEF_SHOWMENU 1 + +#define DEFAULT_TEMPLATE_REMOVED LPGENT("removed his/her avatar") +#define DEFAULT_TEMPLATE_CHANGED LPGENT("changed his/her avatar") + +void LoadOptions(); + + // from icolib.cpp +void SetupIcoLib(); + +HICON createDefaultOverlayedIcon(BOOL big); +HICON createProtoOverlayedIcon(MCONTACT hContact); + +int PreBuildContactMenu(WPARAM wParam,LPARAM lParam); +int IcoLibIconsChanged(WPARAM wParam,LPARAM lParam); + +int OpenAvatarDialog(MCONTACT hContact, char* fn); + +// utils + +TCHAR* GetCachedAvatar(char *proto, TCHAR *hash); +BOOL ProtocolEnabled(const char *proto); +BOOL ContactEnabled(MCONTACT hContact, char *setting, int def); +BOOL CopyImageFile(TCHAR *old_file, TCHAR *new_file); +void ConvertToFilename(TCHAR *str, size_t size); + +void CreateOldStyleShortcut(MCONTACT hContact, TCHAR *history_filename); +BOOL CreateShortcut(TCHAR *file, TCHAR *shortcut); + +#define POPUP_ACTION_DONOTHING 0 +#define POPUP_ACTION_CLOSEPOPUP 1 +#define POPUP_ACTION_OPENAVATARHISTORY 2 +#define POPUP_ACTION_OPENHISTORY 3 + +#define POPUP_DELAY_DEFAULT 0 +#define POPUP_DELAY_CUSTOM 1 +#define POPUP_DELAY_PERMANENT 2 diff --git a/plugins/AvatarHistory/src/utils.cpp b/plugins/AvatarHistory/src/utils.cpp index 4f9dc23773..657b2d4197 100644 --- a/plugins/AvatarHistory/src/utils.cpp +++ b/plugins/AvatarHistory/src/utils.cpp @@ -22,7 +22,7 @@ Avatar History Plugin */ -#include "AvatarHistory.h" +#include "stdafx.h" BOOL ProtocolEnabled(const char *proto) { -- cgit v1.2.3