added version info

git-svn-id: http://svn.miranda-ng.org/main/trunk@3926 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

19 files changed, 46 insertions, 147 deletions

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 <m_stdhdr.h>

-

-// Windows API

 #include <windows.h>

-#include <wingdi.h>

 #include <winsock2.h>

 #include <commdlg.h>

 #include <commctrl.h>

-#include <stdio.h>

-#include <stdlib.h>

-#include <io.h>

 #include <shlwapi.h>

 #include <process.h>

 #include <time.h>

 

-#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 <win2k.h>

+#include <m_stdhdr.h>

+#include <newpluginapi.h>

+#include <m_database.h>

+#include <m_protomod.h>

+#include <m_langpack.h>

+#include <m_options.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_extraicons.h>

+

+#include <m_metacontacts.h>

+#include <m_folders.h>

  

-#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 <windows.h>

-

 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 <windows.h>

-

 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 <windows.h>

-

 //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 <windows.h>

-#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 <windows.h>

-

 #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 <windows.h>

-

 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 <windows.h>

-

 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 <windows.h>

-

 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 <windows.h>

-

 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 <windows.h>

-

 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 <windows.h>

-

 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"