From 92e2a3f31edc21a0ceb5691cbe7cb122e1d58e45 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 9 Mar 2013 09:06:29 +0000 Subject: added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3926 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/SecureIM_icons/res/cl_dis.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/cl_est.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/cm_dis.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/cm_est.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/mw_dis.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/mw_est.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/ov_gpg.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/ov_nat.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/ov_pgp.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/ov_rsa.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/pu_dis.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/pu_est.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/pu_msg.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/pu_prc.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/resource.rc | 63 +++++++++ plugins/SecureIM/SecureIM_icons/res/st_dis.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/st_ena.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/st_try.ico | Bin 0 -> 1150 bytes plugins/SecureIM/SecureIM_icons/res/version.rc | 38 ++++++ .../SecureIM_icons/secureim_icons_10.vcxproj | 135 +++++++++++++++++++ .../secureim_icons_10.vcxproj.filters | 28 ++++ .../SecureIM_icons/secureim_icons_11.vcxproj | 139 +++++++++++++++++++ .../secureim_icons_11.vcxproj.filters | 28 ++++ plugins/SecureIM/SecureIM_icons/src/Version.h | 11 ++ plugins/SecureIM/SecureIM_icons/src/resource.h | 32 +++++ plugins/SecureIM/res/cl_dis.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/cl_est.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/cm_dis.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/cm_est.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/mw_dis.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/mw_est.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/ov_gpg.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/ov_nat.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/ov_pgp.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/ov_rsa.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/pu_dis.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/pu_est.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/pu_msg.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/pu_prc.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/resource.rc | 2 +- plugins/SecureIM/res/resource_icons.rc | 63 --------- plugins/SecureIM/res/st_dis.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/st_ena.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/st_try.ico | Bin 1150 -> 0 bytes plugins/SecureIM/res/version.rc | 25 ++-- plugins/SecureIM/res/version_icons.rc | 44 ------ plugins/SecureIM/secureim_10.vcxproj.filters | 150 ++++++++++----------- plugins/SecureIM/secureim_icons_10.vcxproj | 131 ------------------ plugins/SecureIM/secureim_icons_10.vcxproj.filters | 17 --- plugins/SecureIM/secureim_icons_11.vcxproj | 135 ------------------- plugins/SecureIM/secureim_icons_11.vcxproj.filters | 17 --- plugins/SecureIM/src/commonheaders.cpp | 22 +-- plugins/SecureIM/src/commonheaders.h | 93 +++---------- plugins/SecureIM/src/crypt.h | 4 - plugins/SecureIM/src/dbevent.h | 2 - plugins/SecureIM/src/gettime.h | 2 - plugins/SecureIM/src/language.h | 2 - plugins/SecureIM/src/loadicons.cpp | 2 +- plugins/SecureIM/src/loadlib.h | 3 - plugins/SecureIM/src/mmi.h | 2 - plugins/SecureIM/src/resource.h | 19 --- plugins/SecureIM/src/rtfconv.h | 2 - plugins/SecureIM/src/secureim.h | 2 - plugins/SecureIM/src/splitmsg.h | 2 - plugins/SecureIM/src/svcs_clist.h | 2 - plugins/SecureIM/src/svcs_menu.h | 2 - plugins/SecureIM/src/svcs_proto.h | 2 - plugins/SecureIM/src/svcs_rsa.h | 2 - plugins/SecureIM/src/svcs_srmm.h | 2 - plugins/SecureIM/src/version.h | 26 ++-- 70 files changed, 604 insertions(+), 647 deletions(-) create mode 100644 plugins/SecureIM/SecureIM_icons/res/cl_dis.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/cl_est.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/cm_dis.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/cm_est.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/mw_dis.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/mw_est.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/ov_gpg.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/ov_nat.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/ov_pgp.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/ov_rsa.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/pu_dis.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/pu_est.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/pu_msg.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/pu_prc.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/resource.rc create mode 100644 plugins/SecureIM/SecureIM_icons/res/st_dis.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/st_ena.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/st_try.ico create mode 100644 plugins/SecureIM/SecureIM_icons/res/version.rc create mode 100644 plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj create mode 100644 plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj.filters create mode 100644 plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj create mode 100644 plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj.filters create mode 100644 plugins/SecureIM/SecureIM_icons/src/Version.h create mode 100644 plugins/SecureIM/SecureIM_icons/src/resource.h delete mode 100644 plugins/SecureIM/res/cl_dis.ico delete mode 100644 plugins/SecureIM/res/cl_est.ico delete mode 100644 plugins/SecureIM/res/cm_dis.ico delete mode 100644 plugins/SecureIM/res/cm_est.ico delete mode 100644 plugins/SecureIM/res/mw_dis.ico delete mode 100644 plugins/SecureIM/res/mw_est.ico delete mode 100644 plugins/SecureIM/res/ov_gpg.ico delete mode 100644 plugins/SecureIM/res/ov_nat.ico delete mode 100644 plugins/SecureIM/res/ov_pgp.ico delete mode 100644 plugins/SecureIM/res/ov_rsa.ico delete mode 100644 plugins/SecureIM/res/pu_dis.ico delete mode 100644 plugins/SecureIM/res/pu_est.ico delete mode 100644 plugins/SecureIM/res/pu_msg.ico delete mode 100644 plugins/SecureIM/res/pu_prc.ico delete mode 100644 plugins/SecureIM/res/resource_icons.rc delete mode 100644 plugins/SecureIM/res/st_dis.ico delete mode 100644 plugins/SecureIM/res/st_ena.ico delete mode 100644 plugins/SecureIM/res/st_try.ico delete mode 100644 plugins/SecureIM/res/version_icons.rc delete mode 100644 plugins/SecureIM/secureim_icons_10.vcxproj delete mode 100644 plugins/SecureIM/secureim_icons_10.vcxproj.filters delete mode 100644 plugins/SecureIM/secureim_icons_11.vcxproj delete mode 100644 plugins/SecureIM/secureim_icons_11.vcxproj.filters diff --git a/plugins/SecureIM/SecureIM_icons/res/cl_dis.ico b/plugins/SecureIM/SecureIM_icons/res/cl_dis.ico new file mode 100644 index 0000000000..081b3607db Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/cl_dis.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/cl_est.ico b/plugins/SecureIM/SecureIM_icons/res/cl_est.ico new file mode 100644 index 0000000000..2e1ac4aa9c Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/cl_est.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/cm_dis.ico b/plugins/SecureIM/SecureIM_icons/res/cm_dis.ico new file mode 100644 index 0000000000..081b3607db Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/cm_dis.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/cm_est.ico b/plugins/SecureIM/SecureIM_icons/res/cm_est.ico new file mode 100644 index 0000000000..eaad459570 Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/cm_est.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/mw_dis.ico b/plugins/SecureIM/SecureIM_icons/res/mw_dis.ico new file mode 100644 index 0000000000..081b3607db Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/mw_dis.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/mw_est.ico b/plugins/SecureIM/SecureIM_icons/res/mw_est.ico new file mode 100644 index 0000000000..2e1ac4aa9c Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/mw_est.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/ov_gpg.ico b/plugins/SecureIM/SecureIM_icons/res/ov_gpg.ico new file mode 100644 index 0000000000..d0974eb4de Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/ov_gpg.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/ov_nat.ico b/plugins/SecureIM/SecureIM_icons/res/ov_nat.ico new file mode 100644 index 0000000000..8af8c751f2 Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/ov_nat.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/ov_pgp.ico b/plugins/SecureIM/SecureIM_icons/res/ov_pgp.ico new file mode 100644 index 0000000000..83d5563331 Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/ov_pgp.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/ov_rsa.ico b/plugins/SecureIM/SecureIM_icons/res/ov_rsa.ico new file mode 100644 index 0000000000..40471c0c86 Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/ov_rsa.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/pu_dis.ico b/plugins/SecureIM/SecureIM_icons/res/pu_dis.ico new file mode 100644 index 0000000000..081b3607db Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/pu_dis.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/pu_est.ico b/plugins/SecureIM/SecureIM_icons/res/pu_est.ico new file mode 100644 index 0000000000..2e1ac4aa9c Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/pu_est.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/pu_msg.ico b/plugins/SecureIM/SecureIM_icons/res/pu_msg.ico new file mode 100644 index 0000000000..d604cbdf2d Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/pu_msg.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/pu_prc.ico b/plugins/SecureIM/SecureIM_icons/res/pu_prc.ico new file mode 100644 index 0000000000..10d061de77 Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/pu_prc.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/resource.rc b/plugins/SecureIM/SecureIM_icons/res/resource.rc new file mode 100644 index 0000000000..8f9e8edf85 --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/res/resource.rc @@ -0,0 +1,63 @@ +// Microsoft Visual C++ generated resource script. +// +#include "..\src\resource.h" +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#define APSTUDIO_HIDDEN_SYMBOLS +#include "windows.h" +#undef APSTUDIO_HIDDEN_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// Russian resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +#pragma code_page(1251) + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_CL_DIS ICON "cl_dis.ico" +IDI_CL_EST ICON "cl_est.ico" +IDI_CM_DIS ICON "cm_dis.ico" +IDI_CM_EST ICON "cm_est.ico" +IDI_MW_DIS ICON "mw_dis.ico" +IDI_MW_EST ICON "mw_est.ico" +IDI_PU_DIS ICON "pu_dis.ico" +IDI_PU_EST ICON "pu_est.ico" +IDI_PU_PRC ICON "pu_prc.ico" +IDI_PU_MSG ICON "pu_msg.ico" +IDI_ST_DIS ICON "st_dis.ico" +IDI_ST_ENA ICON "st_ena.ico" +IDI_ST_TRY ICON "st_try.ico" +IDI_OV_NAT ICON "ov_nat.ico" +IDI_OV_PGP ICON "ov_pgp.ico" +IDI_OV_GPG ICON "ov_gpg.ico" +IDI_OV_RSA ICON "ov_rsa.ico" + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "..\\src\\resource.h\0" + "afxres.h\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // Russian resources +///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/SecureIM/SecureIM_icons/res/st_dis.ico b/plugins/SecureIM/SecureIM_icons/res/st_dis.ico new file mode 100644 index 0000000000..1b884c7f52 Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/st_dis.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/st_ena.ico b/plugins/SecureIM/SecureIM_icons/res/st_ena.ico new file mode 100644 index 0000000000..6a4f0fa503 Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/st_ena.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/st_try.ico b/plugins/SecureIM/SecureIM_icons/res/st_try.ico new file mode 100644 index 0000000000..35ea0ed1bc Binary files /dev/null and b/plugins/SecureIM/SecureIM_icons/res/st_try.ico differ diff --git a/plugins/SecureIM/SecureIM_icons/res/version.rc b/plugins/SecureIM/SecureIM_icons/res/version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/res/version.rc @@ -0,0 +1,38 @@ +// 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" + +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/plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj b/plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj new file mode 100644 index 0000000000..e85bbd0cc7 --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj @@ -0,0 +1,135 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SecureIM_icons + {3FAB6AC7-6B7F-4779-B519-34E8035074A4} + + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + true + + + DynamicLibrary + Unicode + + + DynamicLibrary + Unicode + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\Icons\ + $(SolutionDir)$(Configuration)64\Icons\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Icons\ + $(SolutionDir)$(Configuration)64\Icons\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + $(SolutionDir)\lib + + + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + $(SolutionDir)\lib + + + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + true + true + $(SolutionDir)\lib + + + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + true + true + $(SolutionDir)\lib + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj.filters b/plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj.filters new file mode 100644 index 0000000000..c73f2469f9 --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/secureim_icons_10.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {d6176538-1c22-41e7-b82c-e4c9344fd47f} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + {8811babb-9e6a-42a5-9802-12b70bce5045} + + + + + Resource Files + + + Resource Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj b/plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj new file mode 100644 index 0000000000..c21769313d --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj @@ -0,0 +1,139 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SecureIM_icons + {3FAB6AC7-6B7F-4779-B519-34E8035074A4} + + + + DynamicLibrary + Unicode + true + v110_xp + + + DynamicLibrary + Unicode + true + v110_xp + + + DynamicLibrary + Unicode + v110_xp + + + DynamicLibrary + Unicode + v110_xp + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(SolutionDir)$(Configuration)\Icons\ + $(SolutionDir)$(Configuration)64\Icons\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)\Icons\ + $(SolutionDir)$(Configuration)64\Icons\ + $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ + $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ + true + + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + $(SolutionDir)\lib + + + + + _DEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + $(SolutionDir)\lib + + + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + true + true + $(SolutionDir)\lib + + + + + NDEBUG;%(PreprocessorDefinitions) + ..\..\include\msapi + + + true + false + Windows + true + true + $(SolutionDir)\lib + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj.filters b/plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj.filters new file mode 100644 index 0000000000..c73f2469f9 --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/secureim_icons_11.vcxproj.filters @@ -0,0 +1,28 @@ + + + + + {d6176538-1c22-41e7-b82c-e4c9344fd47f} + ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + + {8811babb-9e6a-42a5-9802-12b70bce5045} + + + + + Resource Files + + + Resource Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/plugins/SecureIM/SecureIM_icons/src/Version.h b/plugins/SecureIM/SecureIM_icons/src/Version.h new file mode 100644 index 0000000000..af774be248 --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/src/Version.h @@ -0,0 +1,11 @@ +#define __MAJOR_VERSION 1 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 12 +#define __BUILD_NUM 4 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "SecureIM icons" +#define __FILENAME "SecureIM_icons.dll" +#define __DESCRIPTION "Iconpack for SecureIM plugin of Miranda NG." +#define __COPYRIGHT "© 2003 Johell, 2005-09 Baloo" diff --git a/plugins/SecureIM/SecureIM_icons/src/resource.h b/plugins/SecureIM/SecureIM_icons/src/resource.h new file mode 100644 index 0000000000..9bceae8ea6 --- /dev/null +++ b/plugins/SecureIM/SecureIM_icons/src/resource.h @@ -0,0 +1,32 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by resource.rc +// +#define IDI_CL_DIS 1 +#define IDI_CL_EST 2 +#define IDI_CM_DIS 3 +#define IDI_CM_EST 4 +#define IDI_MW_DIS 5 +#define IDI_MW_EST 6 +#define IDI_PU_DIS 7 +#define IDI_PU_EST 8 +#define IDI_PU_PRC 9 +#define IDI_PU_MSG 10 +#define IDI_ST_DIS 11 +#define IDI_ST_ENA 12 +#define IDI_ST_TRY 13 +#define IDI_OV_NAT 14 +#define IDI_OV_PGP 15 +#define IDI_OV_GPG 16 +#define IDI_OV_RSA 17 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 119 +#define _APS_NEXT_COMMAND_VALUE 40002 +#define _APS_NEXT_CONTROL_VALUE 1400 +#define _APS_NEXT_SYMED_VALUE 119 +#endif +#endif diff --git a/plugins/SecureIM/res/cl_dis.ico b/plugins/SecureIM/res/cl_dis.ico deleted file mode 100644 index 081b3607db..0000000000 Binary files a/plugins/SecureIM/res/cl_dis.ico and /dev/null differ diff --git a/plugins/SecureIM/res/cl_est.ico b/plugins/SecureIM/res/cl_est.ico deleted file mode 100644 index 2e1ac4aa9c..0000000000 Binary files a/plugins/SecureIM/res/cl_est.ico and /dev/null differ diff --git a/plugins/SecureIM/res/cm_dis.ico b/plugins/SecureIM/res/cm_dis.ico deleted file mode 100644 index 081b3607db..0000000000 Binary files a/plugins/SecureIM/res/cm_dis.ico and /dev/null differ diff --git a/plugins/SecureIM/res/cm_est.ico b/plugins/SecureIM/res/cm_est.ico deleted file mode 100644 index eaad459570..0000000000 Binary files a/plugins/SecureIM/res/cm_est.ico and /dev/null differ diff --git a/plugins/SecureIM/res/mw_dis.ico b/plugins/SecureIM/res/mw_dis.ico deleted file mode 100644 index 081b3607db..0000000000 Binary files a/plugins/SecureIM/res/mw_dis.ico and /dev/null differ diff --git a/plugins/SecureIM/res/mw_est.ico b/plugins/SecureIM/res/mw_est.ico deleted file mode 100644 index 2e1ac4aa9c..0000000000 Binary files a/plugins/SecureIM/res/mw_est.ico and /dev/null differ diff --git a/plugins/SecureIM/res/ov_gpg.ico b/plugins/SecureIM/res/ov_gpg.ico deleted file mode 100644 index d0974eb4de..0000000000 Binary files a/plugins/SecureIM/res/ov_gpg.ico and /dev/null differ diff --git a/plugins/SecureIM/res/ov_nat.ico b/plugins/SecureIM/res/ov_nat.ico deleted file mode 100644 index 8af8c751f2..0000000000 Binary files a/plugins/SecureIM/res/ov_nat.ico and /dev/null differ diff --git a/plugins/SecureIM/res/ov_pgp.ico b/plugins/SecureIM/res/ov_pgp.ico deleted file mode 100644 index 83d5563331..0000000000 Binary files a/plugins/SecureIM/res/ov_pgp.ico and /dev/null differ diff --git a/plugins/SecureIM/res/ov_rsa.ico b/plugins/SecureIM/res/ov_rsa.ico deleted file mode 100644 index 40471c0c86..0000000000 Binary files a/plugins/SecureIM/res/ov_rsa.ico and /dev/null differ diff --git a/plugins/SecureIM/res/pu_dis.ico b/plugins/SecureIM/res/pu_dis.ico deleted file mode 100644 index 081b3607db..0000000000 Binary files a/plugins/SecureIM/res/pu_dis.ico and /dev/null differ diff --git a/plugins/SecureIM/res/pu_est.ico b/plugins/SecureIM/res/pu_est.ico deleted file mode 100644 index 2e1ac4aa9c..0000000000 Binary files a/plugins/SecureIM/res/pu_est.ico and /dev/null differ diff --git a/plugins/SecureIM/res/pu_msg.ico b/plugins/SecureIM/res/pu_msg.ico deleted file mode 100644 index d604cbdf2d..0000000000 Binary files a/plugins/SecureIM/res/pu_msg.ico and /dev/null differ diff --git a/plugins/SecureIM/res/pu_prc.ico b/plugins/SecureIM/res/pu_prc.ico deleted file mode 100644 index 10d061de77..0000000000 Binary files a/plugins/SecureIM/res/pu_prc.ico and /dev/null differ diff --git a/plugins/SecureIM/res/resource.rc b/plugins/SecureIM/res/resource.rc index 45ea911955..b18e181cd5 100644 --- a/plugins/SecureIM/res/resource.rc +++ b/plugins/SecureIM/res/resource.rc @@ -7,7 +7,7 @@ // Generated from the TEXTINCLUDE 2 resource. // #define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" +#include "afxres.h" #undef APSTUDIO_HIDDEN_SYMBOLS ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/SecureIM/res/resource_icons.rc b/plugins/SecureIM/res/resource_icons.rc deleted file mode 100644 index 8f9e8edf85..0000000000 --- a/plugins/SecureIM/res/resource_icons.rc +++ /dev/null @@ -1,63 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "..\src\resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Russian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -#pragma code_page(1251) - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_CL_DIS ICON "cl_dis.ico" -IDI_CL_EST ICON "cl_est.ico" -IDI_CM_DIS ICON "cm_dis.ico" -IDI_CM_EST ICON "cm_est.ico" -IDI_MW_DIS ICON "mw_dis.ico" -IDI_MW_EST ICON "mw_est.ico" -IDI_PU_DIS ICON "pu_dis.ico" -IDI_PU_EST ICON "pu_est.ico" -IDI_PU_PRC ICON "pu_prc.ico" -IDI_PU_MSG ICON "pu_msg.ico" -IDI_ST_DIS ICON "st_dis.ico" -IDI_ST_ENA ICON "st_ena.ico" -IDI_ST_TRY ICON "st_try.ico" -IDI_OV_NAT ICON "ov_nat.ico" -IDI_OV_PGP ICON "ov_pgp.ico" -IDI_OV_GPG ICON "ov_gpg.ico" -IDI_OV_RSA ICON "ov_rsa.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "..\\src\\resource.h\0" - "afxres.h\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Russian resources -///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/SecureIM/res/st_dis.ico b/plugins/SecureIM/res/st_dis.ico deleted file mode 100644 index 1b884c7f52..0000000000 Binary files a/plugins/SecureIM/res/st_dis.ico and /dev/null differ diff --git a/plugins/SecureIM/res/st_ena.ico b/plugins/SecureIM/res/st_ena.ico deleted file mode 100644 index 6a4f0fa503..0000000000 Binary files a/plugins/SecureIM/res/st_ena.ico and /dev/null differ diff --git a/plugins/SecureIM/res/st_try.ico b/plugins/SecureIM/res/st_try.ico deleted file mode 100644 index 35ea0ed1bc..0000000000 Binary files a/plugins/SecureIM/res/st_try.ico and /dev/null differ diff --git a/plugins/SecureIM/res/version.rc b/plugins/SecureIM/res/version.rc index ca3a7a8ba7..5bfbab4754 100644 --- a/plugins/SecureIM/res/version.rc +++ b/plugins/SecureIM/res/version.rc @@ -1,14 +1,12 @@ +// 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" -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - VS_VERSION_INFO VERSIONINFO FILEVERSION __FILEVERSION_STRING PRODUCTVERSION __FILEVERSION_STRING @@ -19,21 +17,18 @@ VS_VERSION_INFO VERSIONINFO FILEFLAGS 0x0L #endif FILEOS 0x4L - FILETYPE 0x2L + FILETYPE 0x0L FILESUBTYPE 0x0L BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "000004b0" BEGIN - VALUE "Comments", "Licensed under the terms of the GNU General Public License" - VALUE "FileDescription", "SecureIM plugin for Miranda NG" - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", "SecureIM" - VALUE "LegalCopyright", "Copyright é 2003 Johell, é 2005-09 Baloo" - VALUE "OriginalFilename", "secureim.dll" - VALUE "ProductName", "SecureIM plugin" - VALUE "ProductVersion", __VERSION_STRING + VALUE "FileDescription", __DESCRIPTION + VALUE "InternalName", __PLUGIN_NAME + VALUE "LegalCopyright", __COPYRIGHT + VALUE "OriginalFilename", __FILENAME + VALUE "ProductName", __PLUGIN_NAME END END BLOCK "VarFileInfo" @@ -41,5 +36,3 @@ BEGIN VALUE "Translation", 0x0, 1200 END END - - diff --git a/plugins/SecureIM/res/version_icons.rc b/plugins/SecureIM/res/version_icons.rc deleted file mode 100644 index 21256762bc..0000000000 --- a/plugins/SecureIM/res/version_icons.rc +++ /dev/null @@ -1,44 +0,0 @@ -#ifdef APSTUDIO_INVOKED -#error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "..\src\version.h" - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION __FILEVERSION_STRING - PRODUCTVERSION __FILEVERSION_STRING - FILEFLAGSMASK 0x17L -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "000004b0" - BEGIN - VALUE "FileDescription", "Iconpack for SecureIM plugin of Miranda NG" - VALUE "FileVersion", __VERSION_STRING - VALUE "InternalName", "SecureIM_icons" - VALUE "LegalCopyright", "Copyright é 2006-09 Baloo" - VALUE "OriginalFilename", "SecureIM_icons.dll" - VALUE "ProductName", "Iconpack for SecureIM plugin" - VALUE "ProductVersion", __VERSION_STRING - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x0, 1200 - END -END - - diff --git a/plugins/SecureIM/secureim_10.vcxproj.filters b/plugins/SecureIM/secureim_10.vcxproj.filters index 74d648b4d8..1c91709e99 100644 --- a/plugins/SecureIM/secureim_10.vcxproj.filters +++ b/plugins/SecureIM/secureim_10.vcxproj.filters @@ -2,16 +2,14 @@ - {67c1526e-31b3-4942-9d85-83e62d07f458} + {d6176538-1c22-41e7-b82c-e4c9344fd47f} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - {392b3b30-de7e-42ad-ae68-49938ab85649} - h;hpp;hxx;hm;inl + {87772876-2b10-44eb-a948-de3a36aa73a4} - {5c5bb985-18c1-42aa-8630-9c8d94df2a58} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat + {bbfa3038-7ce3-4eed-a147-91ba647d3b67} @@ -22,74 +20,6 @@ Resource Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - Source Files @@ -151,6 +81,9 @@ Source Files + + Source Files + Source Files @@ -166,8 +99,73 @@ Source Files - - Source Files - + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file diff --git a/plugins/SecureIM/secureim_icons_10.vcxproj b/plugins/SecureIM/secureim_icons_10.vcxproj deleted file mode 100644 index aff7599b79..0000000000 --- a/plugins/SecureIM/secureim_icons_10.vcxproj +++ /dev/null @@ -1,131 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - SecureIM_icons - {3FAB6AC7-6B7F-4779-B519-34E8035074A4} - - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - true - - - DynamicLibrary - Unicode - - - DynamicLibrary - Unicode - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - $(SolutionDir)\lib - - - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - $(SolutionDir)\lib - - - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - true - true - $(SolutionDir)\lib - - - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - true - true - $(SolutionDir)\lib - - - - - - - - - - \ No newline at end of file diff --git a/plugins/SecureIM/secureim_icons_10.vcxproj.filters b/plugins/SecureIM/secureim_icons_10.vcxproj.filters deleted file mode 100644 index 62b3db57fd..0000000000 --- a/plugins/SecureIM/secureim_icons_10.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {d6176538-1c22-41e7-b82c-e4c9344fd47f} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/SecureIM/secureim_icons_11.vcxproj b/plugins/SecureIM/secureim_icons_11.vcxproj deleted file mode 100644 index e8e4a6fffe..0000000000 --- a/plugins/SecureIM/secureim_icons_11.vcxproj +++ /dev/null @@ -1,135 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - SecureIM_icons - {3FAB6AC7-6B7F-4779-B519-34E8035074A4} - - - - DynamicLibrary - Unicode - true - v110_xp - - - DynamicLibrary - Unicode - true - v110_xp - - - DynamicLibrary - Unicode - v110_xp - - - DynamicLibrary - Unicode - v110_xp - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)\Icons\ - $(SolutionDir)$(Configuration)64\Icons\ - $(SolutionDir)$(Configuration)\Obj\$(ProjectName)\ - $(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\ - true - - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - $(SolutionDir)\lib - - - - - _DEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - $(SolutionDir)\lib - - - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - true - true - $(SolutionDir)\lib - - - - - NDEBUG;%(PreprocessorDefinitions) - ..\..\include\msapi - - - true - false - Windows - true - true - $(SolutionDir)\lib - - - - - - - - - - \ No newline at end of file diff --git a/plugins/SecureIM/secureim_icons_11.vcxproj.filters b/plugins/SecureIM/secureim_icons_11.vcxproj.filters deleted file mode 100644 index 62b3db57fd..0000000000 --- a/plugins/SecureIM/secureim_icons_11.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {d6176538-1c22-41e7-b82c-e4c9344fd47f} - ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe - - - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/SecureIM/src/commonheaders.cpp b/plugins/SecureIM/src/commonheaders.cpp index 75749b083f..f8de40fc35 100644 --- a/plugins/SecureIM/src/commonheaders.cpp +++ b/plugins/SecureIM/src/commonheaders.cpp @@ -27,19 +27,19 @@ CRITICAL_SECTION localQueueMutex; PLUGININFOEX pluginInfoEx = { sizeof(PLUGININFOEX), - MODULENAME, - __VERSION_DWORD, - MODULENAME" plugin for Miranda NG.", - "Johell, Ghost, Nightwish, __alex, Baloo", - "Johell@ifrance.com, baloo@bk.ru", - "© 2003 Johell, © 2005-09 Baloo", - "http://miranda-ng.org/", - UNICODE_AWARE, - //1B2A39E5-E2F6-494D-958D-1808FD110DD5 - {0x1B2A39E5, 0xE2F6, 0x494D, {0x95, 0x8D, 0x18, 0x08, 0xFD, 0x11, 0x0D, 0xD5}} + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, + UNICODE_AWARE, + // {1B2A39E5-E2F6-494D-958D-1808FD110DD5} + {0x1B2A39E5, 0xE2F6, 0x494D, {0x95, 0x8D, 0x18, 0x08, 0xFD, 0x11, 0x0D, 0xD5}} }; -LPSTR myDBGetString(HANDLE hContact,const char *szModule,const char *szSetting) +LPSTR myDBGetString(HANDLE hContact, const char *szModule, const char *szSetting) { char *val=NULL; DBVARIANT dbv; diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index 16c5c827c9..d803db21b2 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -1,31 +1,9 @@ -// Windows API - #define WIN32_LEAN_AND_MEAN #define NETLIB_LOG -#ifdef _MSC_VER -#pragma once #define _CRT_SECURE_NO_WARNINGS -// _MSC_VER: 1200=6.0 1300=7.0(2003) 1400=8.0(2005) 1500=9.0(2008) -#if _MSC_VER >= 1300 -// MSVC 7.0 and above #define mir_itoa _itoa #define mir_unlink _unlink -#else -// MSVC 6.0 and below -#ifndef _DEBUG -#pragma optimize("gsy", on) -#endif -#endif -#endif - -#ifndef mir_itoa -#define mir_itoa itoa -#endif - -#ifndef mir_unlink -#define mir_unlink unlink -#endif #ifndef WINVER #define WINVER 0x0501 @@ -42,69 +20,37 @@ #ifndef M_SIM_COMMONHEADERS_H #define M_SIM_COMMONHEADERS_H -#define MIRANDA_VER 0x0A00 -#include - -// Windows API #include -#include #include #include #include -#include -#include -#include #include #include #include -#define MODULENAME "SecureIM" - -#ifndef ListView_SetCheckState -#define ListView_SetCheckState(hwndLV, i, fCheck) \ - ListView_SetItemState(hwndLV, i, INDEXTOSTATEIMAGEMASK((fCheck)?2:1), LVIS_STATEIMAGEMASK) -#endif - -#ifndef SIZEOF -#define SIZEOF(X) (sizeof(X)/sizeof(X[0])) -#endif - -#ifndef M_API_H__ -#define M_API_H__ - -// Miranda API -#include "newpluginapi.h" -#include "m_stdhdr.h" -#include "m_system.h" -#include "m_system_cpp.h" -#include "m_database.h" -#include "m_protomod.h" -#include "m_protosvc.h" -#include "m_langpack.h" -#include "m_options.h" -#include "m_clist.h" -#include "m_clc.h" -#include "m_clui.h" -#include "m_cluiframes.h" -#include "m_utils.h" -#include "m_skin.h" -#include "m_popup.h" -#include "m_genmenu.h" -#include "m_icolib.h" -#include "m_message.h" -#include "m_netlib.h" -#include "m_metacontacts.h" -#include "m_extraicons.h" -#include "m_folders.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include -#endif - -// my libs #include "secureim.h" #include "version.h" #include "resource.h" +#include "..\SecureIM_icons\src\resource.h" #include "language.h" -#include "loadlib.h" #include "mmi.h" #include "crypt.h" #include "gettime.h" @@ -114,6 +60,7 @@ #include "loadicons.h" #include "rtfconv.h" #include "cryptopp.h" +#include "loadlib.h" #include "images.h" #include "dbevent.h" #include "splitmsg.h" @@ -123,6 +70,8 @@ #include "svcs_srmm.h" #include "svcs_rsa.h" +#define MODULENAME "SecureIM" + extern LPCSTR szModuleName; extern LPCSTR szVersionStr; extern char TEMP[MAX_PATH]; diff --git a/plugins/SecureIM/src/crypt.h b/plugins/SecureIM/src/crypt.h index 1e0bea6060..8825655048 100644 --- a/plugins/SecureIM/src/crypt.h +++ b/plugins/SecureIM/src/crypt.h @@ -1,10 +1,6 @@ #ifndef __CRYPT_H__ #define __CRYPT_H__ -#include "secureim.h" -#include "cryptopp.h" -#include "gettime.h" - #define KEYSIZE 256 #define NAMSIZE 512 #define DEFMSGS 4096 diff --git a/plugins/SecureIM/src/dbevent.h b/plugins/SecureIM/src/dbevent.h index 68719c21c0..c46ead73a1 100644 --- a/plugins/SecureIM/src/dbevent.h +++ b/plugins/SecureIM/src/dbevent.h @@ -1,8 +1,6 @@ #ifndef __DBEVENT_H__ #define __DBEVENT_H__ -#include - void HistoryLog(HANDLE,LPCSTR); #endif diff --git a/plugins/SecureIM/src/gettime.h b/plugins/SecureIM/src/gettime.h index e84276c609..05d2d1b96a 100644 --- a/plugins/SecureIM/src/gettime.h +++ b/plugins/SecureIM/src/gettime.h @@ -1,8 +1,6 @@ #ifndef __GETTIME_H__ #define __GETTIME_H__ -#include - DWORD gettime(void); #endif diff --git a/plugins/SecureIM/src/language.h b/plugins/SecureIM/src/language.h index 154e306814..d3937d0418 100644 --- a/plugins/SecureIM/src/language.h +++ b/plugins/SecureIM/src/language.h @@ -1,8 +1,6 @@ #ifndef __LANGUAGE_H__ #define __LANGUAGE_H__ -#include - //Popup Messages extern LPCSTR sim001; extern LPCSTR sim002; diff --git a/plugins/SecureIM/src/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp index 1febb8376c..1119a63f8e 100644 --- a/plugins/SecureIM/src/loadicons.cpp +++ b/plugins/SecureIM/src/loadicons.cpp @@ -46,7 +46,7 @@ HINSTANCE LoadIconsPack(const char* szIconsPack) { HINSTANCE hNewIconInst = LoadLibrary(szIconsPack); if (hNewIconInst != NULL) { - for(int i=ID_FIRSTICON; i <= ID_LASTICON; i++) + for(int i = ID_FIRSTICON; i <= ID_LASTICON; i++) if (LoadIcon(hNewIconInst, MAKEINTRESOURCE(i)) == NULL) { FreeLibrary(hNewIconInst); hNewIconInst = NULL; diff --git a/plugins/SecureIM/src/loadlib.h b/plugins/SecureIM/src/loadlib.h index 105f441dc9..ecf7ee7c8c 100644 --- a/plugins/SecureIM/src/loadlib.h +++ b/plugins/SecureIM/src/loadlib.h @@ -1,9 +1,6 @@ #ifndef __LOADLIB_H__ #define __LOADLIB_H__ -#include -#include "cryptopp.h" - BOOL loadlib(void); typedef HANDLE (__cdecl * _cpp_create_context) (int); diff --git a/plugins/SecureIM/src/mmi.h b/plugins/SecureIM/src/mmi.h index 7b3027e232..022de440de 100644 --- a/plugins/SecureIM/src/mmi.h +++ b/plugins/SecureIM/src/mmi.h @@ -1,8 +1,6 @@ #ifndef __MMI_H__ #define __MMI_H__ -#include "commonheaders.h" - char *m_wwstrcat(LPCSTR,LPCSTR); char *m_awstrcat(LPCSTR,LPCSTR); char *m_aastrcat(LPCSTR,LPCSTR); diff --git a/plugins/SecureIM/src/resource.h b/plugins/SecureIM/src/resource.h index fc800bdd56..8a24991218 100644 --- a/plugins/SecureIM/src/resource.h +++ b/plugins/SecureIM/src/resource.h @@ -3,25 +3,7 @@ // Used by resource.rc // #define ID_FIRSTICON 1 -#define IDI_CL_DIS 1 -#define IDI_CL_EST 2 -#define IDI_CM_DIS 3 -#define IDI_CM_EST 4 -#define IDI_MW_DIS 5 -#define IDI_MW_EST 6 -#define IDI_PU_DIS 7 -#define IDI_PU_EST 8 -#define IDI_PU_PRC 9 -#define IDI_PU_MSG 10 -#define IDI_ST_DIS 11 -#define IDI_ST_ENA 12 -#define IDI_ST_TRY 13 -#define IDI_OV_NAT 14 -#define IDI_OV_PGP 15 -#define IDI_OV_GPG 16 -#define IDI_OV_RSA 17 #define ID_LASTICON 17 - #define ID_DISABLED 111 #define ID_ENABLED 112 #define ID_ALWAYS 113 @@ -144,7 +126,6 @@ #define IDC_TMPPATHON_CBOX 1311 #define IDC_GPGTMPPATH_EDIT 1312 -#define IDC_STATIC -1 #define ID_ENCRYPTION 40001 // Next default values for new objects diff --git a/plugins/SecureIM/src/rtfconv.h b/plugins/SecureIM/src/rtfconv.h index 2a3e75089b..c051836e25 100644 --- a/plugins/SecureIM/src/rtfconv.h +++ b/plugins/SecureIM/src/rtfconv.h @@ -1,8 +1,6 @@ #ifndef __RTFCONV_H__ #define __RTFCONV_H__ -#include - #ifndef _INTPTR_T_DEFINED #define intptr_t int #endif diff --git a/plugins/SecureIM/src/secureim.h b/plugins/SecureIM/src/secureim.h index c2c3ff3eea..2c2b93b364 100644 --- a/plugins/SecureIM/src/secureim.h +++ b/plugins/SecureIM/src/secureim.h @@ -1,8 +1,6 @@ #ifndef __SECURE_IM__ #define __SECURE_IM__ -#include "resource.h" - // ðåæèìû øèôðîâàíèÿ SecureIM #define MODE_NATIVE 0 #define MODE_PGP 1 diff --git a/plugins/SecureIM/src/splitmsg.h b/plugins/SecureIM/src/splitmsg.h index 9f55c2784e..09edc2e53f 100644 --- a/plugins/SecureIM/src/splitmsg.h +++ b/plugins/SecureIM/src/splitmsg.h @@ -1,8 +1,6 @@ #ifndef __SPLITMSG_H__ #define __SPLITMSG_H__ -#include - LPSTR combineMessage(pUinKey,LPSTR); int splitMessageSend(pUinKey,LPSTR); diff --git a/plugins/SecureIM/src/svcs_clist.h b/plugins/SecureIM/src/svcs_clist.h index 8c2dd192b6..c9c6bcd68b 100644 --- a/plugins/SecureIM/src/svcs_clist.h +++ b/plugins/SecureIM/src/svcs_clist.h @@ -1,8 +1,6 @@ #ifndef __SVCS_CLIST_H__ #define __SVCS_CLIST_H__ -#include - int __cdecl onContactSettingChanged(WPARAM,LPARAM); int __cdecl onContactAdded(WPARAM,LPARAM); int __cdecl onContactDeleted(WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/svcs_menu.h b/plugins/SecureIM/src/svcs_menu.h index 69b079ebf7..7ec89add0c 100644 --- a/plugins/SecureIM/src/svcs_menu.h +++ b/plugins/SecureIM/src/svcs_menu.h @@ -1,8 +1,6 @@ #ifndef __SVCS_MENU_H__ #define __SVCS_MENU_H__ -#include - INT_PTR __cdecl Service_IsContactSecured(WPARAM,LPARAM); INT_PTR __cdecl Service_CreateIM(WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/svcs_proto.h b/plugins/SecureIM/src/svcs_proto.h index 64ce1c43a3..c2a9506742 100644 --- a/plugins/SecureIM/src/svcs_proto.h +++ b/plugins/SecureIM/src/svcs_proto.h @@ -1,8 +1,6 @@ #ifndef __SVCS_PROTO_H__ #define __SVCS_PROTO_H__ -#include - INT_PTR __cdecl onRecvMsg(WPARAM,LPARAM); INT_PTR __cdecl onSendMsgW(WPARAM,LPARAM); INT_PTR __cdecl onSendMsg(WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/svcs_rsa.h b/plugins/SecureIM/src/svcs_rsa.h index 3f43e71d30..7535a61276 100644 --- a/plugins/SecureIM/src/svcs_rsa.h +++ b/plugins/SecureIM/src/svcs_rsa.h @@ -1,8 +1,6 @@ #ifndef __SVCS_RSA_H__ #define __SVCS_RSA_H__ -#include - extern pRSA_EXPORT exp; extern RSA_IMPORT imp; extern BOOL rsa_4096; diff --git a/plugins/SecureIM/src/svcs_srmm.h b/plugins/SecureIM/src/svcs_srmm.h index d64c89ab4e..5d85abcfe3 100644 --- a/plugins/SecureIM/src/svcs_srmm.h +++ b/plugins/SecureIM/src/svcs_srmm.h @@ -1,8 +1,6 @@ #ifndef __SVCS_SRMM_H__ #define __SVCS_SRMM_H__ -#include - int __cdecl onWindowEvent(WPARAM,LPARAM); int __cdecl onIconPressed(WPARAM,LPARAM); diff --git a/plugins/SecureIM/src/version.h b/plugins/SecureIM/src/version.h index 22b458eac8..176e7a6974 100644 --- a/plugins/SecureIM/src/version.h +++ b/plugins/SecureIM/src/version.h @@ -1,16 +1,16 @@ -#ifndef __VERSION_H_INCLUDED -#define __VERSION_H_INCLUDED - -#define __MAJOR_VERSION 1 -#define __MINOR_VERSION 0 -#define __RELEASE_NUM 12 -#define __BUILD_NUM 4 +#define __MAJOR_VERSION 1 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 12 +#define __BUILD_NUM 4 #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __FILEVERSION_STRING_DOTS __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM -#define __STRINGIFY(x) #x -#define __TOSTRING(x) __STRINGIFY(x) -#define __VERSION_STRING __TOSTRING(__FILEVERSION_STRING_DOTS) -#define __VERSION_DWORD ((__MAJOR_VERSION<<24) | (__MINOR_VERSION<<16) | (__RELEASE_NUM<<8) | __BUILD_NUM) +#define __TOSTRING(x) #x +#define __VERSION_STRING __TOSTRING(__FILEVERSION_STRING) -#endif //__VERSION_H_INCLUDED +#define __PLUGIN_NAME "SecureIM" +#define __FILENAME "SecureIM.dll" +#define __DESCRIPTION "SecureIM plugin for Miranda NG." +#define __AUTHOR "Johell, Ghost, Nightwish, __alex, Baloo" +#define __AUTHOREMAIL "Johell@ifrance.com, baloo@bk.ru" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2003 Johell, 2005-09 Baloo" -- cgit v1.2.3