From 9b3b48266470ccda4e270c6a81e91b1319b4ca22 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 24 Apr 2015 23:40:44 +0000 Subject: AVS - common project git-svn-id: http://svn.miranda-ng.org/main/trunk@13122 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_dev.sln | 2 +- bin10/mir_full.sln | 2 +- bin10/mir_full_pro.sln | 2 +- bin10/miranda32.sln | 2 +- bin12/mir_dev.sln | 2 +- bin12/mir_full.sln | 2 +- bin12/miranda32.sln | 2 +- plugins/AVS/avs.vcxproj | 28 +++++ plugins/AVS/avs.vcxproj.filters | 4 + plugins/AVS/avs_10.vcxproj | 239 ------------------------------------ plugins/AVS/avs_10.vcxproj.filters | 74 ----------- plugins/AVS/avs_12.vcxproj | 243 ------------------------------------- plugins/AVS/avs_12.vcxproj.filters | 77 ------------ plugins/AVS/src/acc.cpp | 2 +- plugins/AVS/src/cache.cpp | 2 +- plugins/AVS/src/commonheaders.h | 165 ------------------------- plugins/AVS/src/image_utils.cpp | 2 +- plugins/AVS/src/main.cpp | 2 +- plugins/AVS/src/options.cpp | 2 +- plugins/AVS/src/poll.cpp | 2 +- plugins/AVS/src/services.cpp | 2 +- plugins/AVS/src/stdafx.cpp | 18 --- plugins/AVS/src/stdafx.cxx | 18 +++ plugins/AVS/src/stdafx.h | 165 +++++++++++++++++++++++++ plugins/AVS/src/utils.cpp | 2 +- 25 files changed, 230 insertions(+), 831 deletions(-) create mode 100644 plugins/AVS/avs.vcxproj create mode 100644 plugins/AVS/avs.vcxproj.filters delete mode 100644 plugins/AVS/avs_10.vcxproj delete mode 100644 plugins/AVS/avs_10.vcxproj.filters delete mode 100644 plugins/AVS/avs_12.vcxproj delete mode 100644 plugins/AVS/avs_12.vcxproj.filters delete mode 100644 plugins/AVS/src/commonheaders.h delete mode 100644 plugins/AVS/src/stdafx.cpp create mode 100644 plugins/AVS/src/stdafx.cxx create mode 100644 plugins/AVS/src/stdafx.h diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln index 2ff33082d2..30d79a1d99 100644 --- a/bin10/mir_dev.sln +++ b/bin10/mir_dev.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\plugins\Zlib\zlib_10.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}" EndProject diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 77d19b50ac..01fd4c75c8 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\plugins\Zlib\zlib_10.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}" EndProject diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index 1a8eff9205..f6052d3ed9 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\plugins\Zlib\zlib_10.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}" EndProject diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln index 8fdd6cbe8c..7996e9bcb6 100644 --- a/bin10/miranda32.sln +++ b/bin10/miranda32.sln @@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_10.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\plugins\Zlib\zlib_10.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}" EndProject diff --git a/bin12/mir_dev.sln b/bin12/mir_dev.sln index a5daa9fe3b..15b7fa64a9 100644 --- a/bin12/mir_dev.sln +++ b/bin12/mir_dev.sln @@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_12.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_12.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\plugins\Zlib\zlib_12.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}" EndProject diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln index a90ef0583f..0f0d3c7405 100644 --- a/bin12/mir_full.sln +++ b/bin12/mir_full.sln @@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_12.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_12.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\plugins\Zlib\zlib_12.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}" EndProject diff --git a/bin12/miranda32.sln b/bin12/miranda32.sln index 81185a8283..ad2dea0f26 100644 --- a/bin12/miranda32.sln +++ b/bin12/miranda32.sln @@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_12.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs_12.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Zlib", "..\plugins\Zlib\zlib_12.vcxproj", "{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C}" EndProject diff --git a/plugins/AVS/avs.vcxproj b/plugins/AVS/avs.vcxproj new file mode 100644 index 0000000000..5f1a9c1a69 --- /dev/null +++ b/plugins/AVS/avs.vcxproj @@ -0,0 +1,28 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + AVS + {7711F563-6473-4ABD-B5E3-477CE8384AD6} + + + + + \ No newline at end of file diff --git a/plugins/AVS/avs.vcxproj.filters b/plugins/AVS/avs.vcxproj.filters new file mode 100644 index 0000000000..de5ad9f66c --- /dev/null +++ b/plugins/AVS/avs.vcxproj.filters @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/plugins/AVS/avs_10.vcxproj b/plugins/AVS/avs_10.vcxproj deleted file mode 100644 index 0b0bfe2be3..0000000000 --- a/plugins/AVS/avs_10.vcxproj +++ /dev/null @@ -1,239 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - AVS - {7711F563-6473-4ABD-B5E3-477CE8384AD6} - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - commonheaders.h - Level3 - EditAndContinue - 4996;%(DisableSpecificWarnings) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - comctl32.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x5130000 - $(ProfileDir)..\..\bin10\lib - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - false - Use - commonheaders.h - Level3 - ProgramDatabase - 4996;%(DisableSpecificWarnings) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - comctl32.lib;%(AdditionalDependencies) - true - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - $(TargetDir)$(TargetName).pdb - false - $(IntDir)$(TargetName).lib - MachineX64 - 0x5130000 - $(ProfileDir)..\..\bin10\lib - Windows - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - Use - commonheaders.h - Level3 - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - /PDBALTPATH:%_PDB% - comctl32.lib;%(AdditionalDependencies) - true - true - true - 0x5130000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - Use - commonheaders.h - Level3 - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - /PDBALTPATH:%_PDB% - comctl32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x5130000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin10\lib - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/AVS/avs_10.vcxproj.filters b/plugins/AVS/avs_10.vcxproj.filters deleted file mode 100644 index 209ee1048d..0000000000 --- a/plugins/AVS/avs_10.vcxproj.filters +++ /dev/null @@ -1,74 +0,0 @@ - - - - - {8803e79e-1c62-4fcc-8daf-35634ce5e990} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {533b0c62-6839-47b0-bf0d-03e20a1a4e06} - h;hpp;hxx;hm;inl - - - {214ac298-955e-4931-a01c-3516a7206928} - 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 - - - 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/AVS/avs_12.vcxproj b/plugins/AVS/avs_12.vcxproj deleted file mode 100644 index c4be768f8b..0000000000 --- a/plugins/AVS/avs_12.vcxproj +++ /dev/null @@ -1,243 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - AVS - {7711F563-6473-4ABD-B5E3-477CE8384AD6} - - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - Unicode - v120_xp - - - DynamicLibrary - Unicode - true - v120_xp - - - DynamicLibrary - false - Unicode - v120_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30128.1 - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Plugins\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Plugins\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - Use - commonheaders.h - Level4 - EditAndContinue - 4996;%(DisableSpecificWarnings) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - comctl32.lib;%(AdditionalDependencies) - true - false - $(IntDir)$(TargetName).lib - Windows - 0x5130000 - $(ProfileDir)..\..\bin12\lib - false - - - - - Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - _DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - Fast - false - Use - commonheaders.h - Level4 - ProgramDatabase - 4996;%(DisableSpecificWarnings) - false - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - comctl32.lib;%(AdditionalDependencies) - true - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - $(TargetDir)$(TargetName).pdb - false - $(IntDir)$(TargetName).lib - MachineX64 - 0x5130000 - $(ProfileDir)..\..\bin12\lib - Windows - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - Use - commonheaders.h - Level4 - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - comctl32.lib;%(AdditionalDependencies) - true - true - true - 0x5130000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - Full - OnlyExplicitInline - Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) - NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - false - false - true - Fast - Use - commonheaders.h - Level4 - 4996;%(DisableSpecificWarnings) - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include;..\..\include\msapi - - - comctl32.lib;%(AdditionalDependencies) - type=%27Win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies) - true - true - true - 0x5130000 - false - $(IntDir)$(TargetName).lib - Windows - $(ProfileDir)..\..\bin12\lib - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/plugins/AVS/avs_12.vcxproj.filters b/plugins/AVS/avs_12.vcxproj.filters deleted file mode 100644 index 1ca784fa69..0000000000 --- a/plugins/AVS/avs_12.vcxproj.filters +++ /dev/null @@ -1,77 +0,0 @@ - - - - - {8803e79e-1c62-4fcc-8daf-35634ce5e990} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {533b0c62-6839-47b0-bf0d-03e20a1a4e06} - h;hpp;hxx;hm;inl - - - {214ac298-955e-4931-a01c-3516a7206928} - 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 - - - Source Files - - - - - Header 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/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp index 272f55cc96..75ba7bdbf9 100644 --- a/plugins/AVS/src/acc.cpp +++ b/plugins/AVS/src/acc.cpp @@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #define DM_AVATARCHANGED (WM_USER + 20) #define DM_MYAVATARCHANGED (WM_USER + 21) diff --git a/plugins/AVS/src/cache.cpp b/plugins/AVS/src/cache.cpp index a81ca58e99..87c6c4e7ca 100644 --- a/plugins/AVS/src/cache.cpp +++ b/plugins/AVS/src/cache.cpp @@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" CacheNode::CacheNode() { diff --git a/plugins/AVS/src/commonheaders.h b/plugins/AVS/src/commonheaders.h deleted file mode 100644 index 7027783b64..0000000000 --- a/plugins/AVS/src/commonheaders.h +++ /dev/null @@ -1,165 +0,0 @@ -/* - -Miranda NG: the free IM client for Microsoft* Windows* - -Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org) -Copyright (c) 2000-04 Miranda ICQ/IM project, -all portions of this codebase are copyrighted to the people -listed in contributors.txt. - -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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include "resource.h" -#include "version.h" -#include "image_utils.h" -#include "poll.h" -#include "acc.h" - -#ifndef SHVIEW_THUMBNAIL -#define SHVIEW_THUMBNAIL 0x702D -#endif - -/* most free()'s are invalid when the code is executed from a dll, so this changes - all the bad free()'s to good ones, however it's still incorrect code. The reasons for not - changing them include: - - * db_unset has a CallService() lookup - * free() is executed in some large loops to do with clist creation of group data - * easy search and replace - -*/ - -struct CacheNode : public avatarCacheEntry, public MZeroedObject -{ - CacheNode(); - ~CacheNode(); - - BOOL loaded; - DWORD dwFlags; - int pa_format; - - void wipeInfo(); -}; - -// The same fields as avatarCacheEntry + proto name -struct protoPicCacheEntry : public avatarCacheEntry, public MZeroedObject -{ - protoPicCacheEntry() { memset(this, 0, sizeof(*this)); }; - ~protoPicCacheEntry(); - - void clear(); - - char* szProtoname; - TCHAR* tszAccName; -}; - -extern OBJLIST g_ProtoPictures, g_MyAvatars; - -struct SetMyAvatarHookData -{ - char *protocol; - BOOL square; - BOOL grow; - - BOOL thumbnail; -}; - -extern FI_INTERFACE *fei; - -#define GAIR_FAILED 1000 - -#define AVS_IGNORENOTIFY 0x1000 - -#define AVS_DEFAULT "Global avatar" - -void mir_sleep(int time); -extern bool g_shutDown; -extern TCHAR g_szDataPath[]; // user datae path (read at startup only) -extern BOOL g_AvatarHistoryAvail; -extern HWND hwndSetMyAvatar; - -extern HINSTANCE g_hInst; - -extern HANDLE hMyAvatarsFolder; -extern HANDLE hGlobalAvatarFolder; -extern HANDLE hLoaderEvent, hShutdownEvent; -extern HANDLE hEventChanged, hEventContactAvatarChanged, hMyAvatarChanged; - -int GetFileHash(TCHAR* filename); -DWORD GetFileSize(TCHAR *szFilename); -void MakePathRelative(MCONTACT hContact); -void MakePathRelative(MCONTACT hContact, TCHAR *dest); -void MyPathToAbsolute(const TCHAR *ptszPath, TCHAR *ptszDest); - -HBITMAP LoadPNG(struct avatarCacheEntry *ace, char *szFilename); - -void UnloadCache(void); -int CreateAvatarInCache(MCONTACT hContact, avatarCacheEntry *ace, char *szProto); -void DeleteAvatarFromCache(MCONTACT hContact, bool bForever); -void PicLoader(LPVOID param); - -void InternalDrawAvatar(AVATARDRAWREQUEST *r, HBITMAP hbm, LONG bmWidth, LONG bmHeight, DWORD dwFlags); - -int ChangeAvatar(MCONTACT hContact, bool fLoad, bool fNotifyHist = false, int pa_format = 0); -void DeleteGlobalUserAvatar(); -int FetchAvatarFor(MCONTACT hContact, char *szProto = NULL); -CacheNode* FindAvatarInCache(MCONTACT hContact, bool add, bool findAny = false); -void PushAvatarRequest(CacheNode *cc); -int SetAvatarAttribute(MCONTACT hContact, DWORD attrib, int mode); -void SetIgnoreNotify(char *protocol, BOOL ignore); - -INT_PTR DrawAvatarPicture(WPARAM wParam, LPARAM lParam); -INT_PTR GetAvatarBitmap(WPARAM wParam, LPARAM lParam); -INT_PTR GetMyAvatar(WPARAM wParam, LPARAM lParam); -INT_PTR ProtectAvatar(WPARAM wParam, LPARAM lParam); -INT_PTR ReportMyAvatarChanged(WPARAM wParam, LPARAM lParam); - -MCONTACT GetContactThatHaveTheAvatar(MCONTACT hContact, int locked = -1); - -void ProcessAvatarInfo(MCONTACT hContact, int type, PROTO_AVATAR_INFORMATIONT *pai, const char *szProto); - -int Proto_GetDelayAfterFail(const char *proto); -BOOL Proto_NeedDelaysForAvatars(const char *proto); -BOOL Proto_IsAvatarsEnabled(const char *proto); -BOOL Proto_IsAvatarFormatSupported(const char *proto, int format); -int Proto_AvatarImageProportion(const char *proto); -void Proto_GetAvatarMaxSize(const char *proto, int *width, int *height); -int Proto_GetAvatarMaxFileSize(const char *proto); - -protoPicCacheEntry* GetProtoDefaultAvatar(MCONTACT hContact); diff --git a/plugins/AVS/src/image_utils.cpp b/plugins/AVS/src/image_utils.cpp index 520e077254..1f251954ed 100644 --- a/plugins/AVS/src/image_utils.cpp +++ b/plugins/AVS/src/image_utils.cpp @@ -1,4 +1,4 @@ -#include "commonheaders.h" +#include "stdafx.h" #include "image_utils.h" #define GET_PIXEL(__P__, __X__, __Y__) ( __P__ + width * 4 * (__Y__) + 4 * (__X__)) diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 426c1dd8d2..1c33df43ae 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" CLIST_INTERFACE *pcli; diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 36a6af0d05..19f2068aaa 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" #define DM_SETAVATARNAME (WM_USER + 10) #define DM_REALODAVATAR (WM_USER + 11) diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp index 45ed5067b7..4b4c5511e3 100644 --- a/plugins/AVS/src/poll.cpp +++ b/plugins/AVS/src/poll.cpp @@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" /* It has 1 queue: diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 3072055a6d..2760420853 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -22,7 +22,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/AVS/src/stdafx.cpp b/plugins/AVS/src/stdafx.cpp deleted file mode 100644 index 048b14e9d2..0000000000 --- a/plugins/AVS/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 "commonheaders.h" \ No newline at end of file diff --git a/plugins/AVS/src/stdafx.cxx b/plugins/AVS/src/stdafx.cxx new file mode 100644 index 0000000000..6fb37564b7 --- /dev/null +++ b/plugins/AVS/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/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h new file mode 100644 index 0000000000..7027783b64 --- /dev/null +++ b/plugins/AVS/src/stdafx.h @@ -0,0 +1,165 @@ +/* + +Miranda NG: the free IM client for Microsoft* Windows* + +Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org) +Copyright (c) 2000-04 Miranda ICQ/IM project, +all portions of this codebase are copyrighted to the people +listed in contributors.txt. + +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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include "resource.h" +#include "version.h" +#include "image_utils.h" +#include "poll.h" +#include "acc.h" + +#ifndef SHVIEW_THUMBNAIL +#define SHVIEW_THUMBNAIL 0x702D +#endif + +/* most free()'s are invalid when the code is executed from a dll, so this changes + all the bad free()'s to good ones, however it's still incorrect code. The reasons for not + changing them include: + + * db_unset has a CallService() lookup + * free() is executed in some large loops to do with clist creation of group data + * easy search and replace + +*/ + +struct CacheNode : public avatarCacheEntry, public MZeroedObject +{ + CacheNode(); + ~CacheNode(); + + BOOL loaded; + DWORD dwFlags; + int pa_format; + + void wipeInfo(); +}; + +// The same fields as avatarCacheEntry + proto name +struct protoPicCacheEntry : public avatarCacheEntry, public MZeroedObject +{ + protoPicCacheEntry() { memset(this, 0, sizeof(*this)); }; + ~protoPicCacheEntry(); + + void clear(); + + char* szProtoname; + TCHAR* tszAccName; +}; + +extern OBJLIST g_ProtoPictures, g_MyAvatars; + +struct SetMyAvatarHookData +{ + char *protocol; + BOOL square; + BOOL grow; + + BOOL thumbnail; +}; + +extern FI_INTERFACE *fei; + +#define GAIR_FAILED 1000 + +#define AVS_IGNORENOTIFY 0x1000 + +#define AVS_DEFAULT "Global avatar" + +void mir_sleep(int time); +extern bool g_shutDown; +extern TCHAR g_szDataPath[]; // user datae path (read at startup only) +extern BOOL g_AvatarHistoryAvail; +extern HWND hwndSetMyAvatar; + +extern HINSTANCE g_hInst; + +extern HANDLE hMyAvatarsFolder; +extern HANDLE hGlobalAvatarFolder; +extern HANDLE hLoaderEvent, hShutdownEvent; +extern HANDLE hEventChanged, hEventContactAvatarChanged, hMyAvatarChanged; + +int GetFileHash(TCHAR* filename); +DWORD GetFileSize(TCHAR *szFilename); +void MakePathRelative(MCONTACT hContact); +void MakePathRelative(MCONTACT hContact, TCHAR *dest); +void MyPathToAbsolute(const TCHAR *ptszPath, TCHAR *ptszDest); + +HBITMAP LoadPNG(struct avatarCacheEntry *ace, char *szFilename); + +void UnloadCache(void); +int CreateAvatarInCache(MCONTACT hContact, avatarCacheEntry *ace, char *szProto); +void DeleteAvatarFromCache(MCONTACT hContact, bool bForever); +void PicLoader(LPVOID param); + +void InternalDrawAvatar(AVATARDRAWREQUEST *r, HBITMAP hbm, LONG bmWidth, LONG bmHeight, DWORD dwFlags); + +int ChangeAvatar(MCONTACT hContact, bool fLoad, bool fNotifyHist = false, int pa_format = 0); +void DeleteGlobalUserAvatar(); +int FetchAvatarFor(MCONTACT hContact, char *szProto = NULL); +CacheNode* FindAvatarInCache(MCONTACT hContact, bool add, bool findAny = false); +void PushAvatarRequest(CacheNode *cc); +int SetAvatarAttribute(MCONTACT hContact, DWORD attrib, int mode); +void SetIgnoreNotify(char *protocol, BOOL ignore); + +INT_PTR DrawAvatarPicture(WPARAM wParam, LPARAM lParam); +INT_PTR GetAvatarBitmap(WPARAM wParam, LPARAM lParam); +INT_PTR GetMyAvatar(WPARAM wParam, LPARAM lParam); +INT_PTR ProtectAvatar(WPARAM wParam, LPARAM lParam); +INT_PTR ReportMyAvatarChanged(WPARAM wParam, LPARAM lParam); + +MCONTACT GetContactThatHaveTheAvatar(MCONTACT hContact, int locked = -1); + +void ProcessAvatarInfo(MCONTACT hContact, int type, PROTO_AVATAR_INFORMATIONT *pai, const char *szProto); + +int Proto_GetDelayAfterFail(const char *proto); +BOOL Proto_NeedDelaysForAvatars(const char *proto); +BOOL Proto_IsAvatarsEnabled(const char *proto); +BOOL Proto_IsAvatarFormatSupported(const char *proto, int format); +int Proto_AvatarImageProportion(const char *proto); +void Proto_GetAvatarMaxSize(const char *proto, int *width, int *height); +int Proto_GetAvatarMaxFileSize(const char *proto); + +protoPicCacheEntry* GetProtoDefaultAvatar(MCONTACT hContact); diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp index c0a90ee325..70d0349948 100644 --- a/plugins/AVS/src/utils.cpp +++ b/plugins/AVS/src/utils.cpp @@ -17,7 +17,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "commonheaders.h" +#include "stdafx.h" void mir_sleep(int time) { -- cgit v1.2.3