added version info

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

13 files changed, 42 insertions, 133 deletions

diff --git a/plugins/VersionInfo/src/CPlugin.cpp b/plugins/VersionInfo/src/CPlugin.cpp
index 54d762064a..8e1a57399b 100644
--- a/plugins/VersionInfo/src/CPlugin.cpp
+++ b/plugins/VersionInfo/src/CPlugin.cpp
@@ -18,12 +18,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "CPlugin.h"

-

 #include "common.h"

 

-#pragma comment(lib, "version.lib")

-

 const int cPLUGIN_UUID_MARK = 4;

 TCHAR PLUGIN_UUID_MARK[cPLUGIN_UUID_MARK];

 

diff --git a/plugins/VersionInfo/src/CPlugin.h b/plugins/VersionInfo/src/CPlugin.h
index 5da1b1dc6b..32b564653c 100644
--- a/plugins/VersionInfo/src/CPlugin.h
+++ b/plugins/VersionInfo/src/CPlugin.h
@@ -22,18 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef CPLUGIN_H

 #define CPLUGIN_H

 

-//#define STRICT

-#define WIN32_LEAN_AND_MEAN

-

-#define _CRT_SECURE_NO_DEPRECATE

-

-#include <windows.h>

-#include <string>

-

-#ifndef M_NEWPLUGINAPI_H__

-	#include "newpluginapi.h"

-#endif

-

 #define DEF_UUID_CHARMARK "¤"

 

 extern const int cPLUGIN_UUID_MARK;

diff --git a/plugins/VersionInfo/src/CVersionInfo.cpp b/plugins/VersionInfo/src/CVersionInfo.cpp
index e26a6dc233..c67099874f 100644
--- a/plugins/VersionInfo/src/CVersionInfo.cpp
+++ b/plugins/VersionInfo/src/CVersionInfo.cpp
@@ -18,14 +18,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 "CVersionInfo.h"

-//#include "AggressiveOptimize.h"

-

 #include "common.h"

-#include "resource.h"

-

-//using namespace std;

 

 BOOL (WINAPI *MyGetDiskFreeSpaceEx)(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULARGE_INTEGER);

 BOOL (WINAPI *MyIsWow64Process)(HANDLE, PBOOL);

diff --git a/plugins/VersionInfo/src/CVersionInfo.h b/plugins/VersionInfo/src/CVersionInfo.h
index eb55b808fc..8f78fc382d 100644
--- a/plugins/VersionInfo/src/CVersionInfo.h
+++ b/plugins/VersionInfo/src/CVersionInfo.h
@@ -21,22 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef CVERSIONINFO_H

 #define CVERSIONINFO_H

 

-//#define STRICT

-#define WIN32_LEAN_AND_MEAN

-//#include "AggressiveOptimize.h"

-

-#define _CRT_SECURE_NO_DEPRECATE

-

 #ifndef PF_NX_ENABLED

 	#define PF_NX_ENABLED 12

 #endif

 

-#include <list>

-#include <string>

-//using namespace std;

-

-#include "CPlugin.h"

-

 class CVersionInfo

 {

 	private:

diff --git a/plugins/VersionInfo/src/common.h b/plugins/VersionInfo/src/common.h
index cbbf057daa..c446a76469 100644
--- a/plugins/VersionInfo/src/common.h
+++ b/plugins/VersionInfo/src/common.h
@@ -18,55 +18,46 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#define STRICT

-#define WIN32_LEAN_AND_MEAN

-

 #ifndef M_VERSIONINFO_COMMON_H

 #define M_VERSIONINFO_COMMON_H

 

-#pragma warning(disable:4005)

-#define _CRT_SECURE_NO_DEPRECATE

-#pragma warning(default:4005)

-

-#define VIPF_NONE      0x0000

-#define VIPF_UNCERTAIN 0x0010

+#define STRICT

+#define WIN32_LEAN_AND_MEAN

 

-#define VISF_FORUMSTYLE 0x0001

-#define VISF_SHOWUUID   0x0002

-#define VISF_SHOWFLAGS  0x0004

+#define _CRT_SECURE_NO_DEPRECATE

 

 #include <windows.h>

-#include <time.h>

-

 #include <commctrl.h>

-#include <list>

 #include <imagehlp.h>

-#include <winsock.h>

+#include <list>

+#include <string>

 

-#include <String>

-//using namespace std;

+#include <newpluginapi.h>

+#include <m_langpack.h>

+#include <m_database.h>

+#include <m_clist.h>

+#include <m_options.h>

+#include <m_popup.h>

+#include <win2k.h>

 

-#include "version.h"

+#include <m_versioninfo.h>

+#include <m_folders.h>

 

-#include "m_versioninfo.h"

+#include "CPlugin.h"

+#include "version.h"

 #include "hooked_events.h"

 #include "services.h"

 #include "dlgHandlers.h"

+#include "utils.h"

+#include "CVersionInfo.h"

+#include "resource.h"

 

-#include "newpluginapi.h"

-#include "m_system.h"

-#include "m_langpack.h"

-#include "m_database.h"

-#include "m_skin.h"

-#include "m_clist.h"

-#include "m_options.h"

-#include "m_popup.h"

-

-#include "m_utils.h"

-#include "m_folders.h"

-#include "win2k.h"

+#define VIPF_NONE      0x0000

+#define VIPF_UNCERTAIN 0x0010

 

-#include "utils.h"

+#define VISF_FORUMSTYLE 0x0001

+#define VISF_SHOWUUID   0x0002

+#define VISF_SHOWFLAGS  0x0004

 

 #ifndef MS_DB_GETPROFILEPATH_BASIC //db3xSA

 #define MS_DB_GETPROFILEPATH_BASIC	"DB/GetProfilePathBasic"

diff --git a/plugins/VersionInfo/src/dlgHandlers.cpp b/plugins/VersionInfo/src/dlgHandlers.cpp
index 733a4cd3dc..3fb436b04e 100644
--- a/plugins/VersionInfo/src/dlgHandlers.cpp
+++ b/plugins/VersionInfo/src/dlgHandlers.cpp
@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "common.h"

-#include "dlgHandlers.h"

 

 const char *szQuoteStrings[] = {"[quote] | [/quote]", "[code] | [/code]", ""};

 const char *szSizeStrings[]	= {"[size=1] | [/size]", "[size=1px] | [/size]", "[size=12] | [/size]", "[size=80] | [/size]", ""};

diff --git a/plugins/VersionInfo/src/dlgHandlers.h b/plugins/VersionInfo/src/dlgHandlers.h
index bab1876ea2..b2a66f014c 100644
--- a/plugins/VersionInfo/src/dlgHandlers.h
+++ b/plugins/VersionInfo/src/dlgHandlers.h
@@ -21,9 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef M_VERSIONINFO_DLGHEADERS_H

 #define M_VERSIONINFO_DLGHEADERS_H

 

-#include "resource.h"

-#include "CVersionInfo.h"

-

 #define TO_ASK                0

 #define TO_FILE               1

 #define TO_MESSAGEBOX         2

diff --git a/plugins/VersionInfo/src/hooked_events.cpp b/plugins/VersionInfo/src/hooked_events.cpp
index 2173fff405..9d0aa826c2 100644
--- a/plugins/VersionInfo/src/hooked_events.cpp
+++ b/plugins/VersionInfo/src/hooked_events.cpp
@@ -19,13 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "common.h"

-#include "hooked_events.h"

-

-#define HOST "http://eblis.tla.ro/projects"

-

-#define VERSIONINFO_VERSION_URL HOST "/miranda/VersionInfo/updater/VersionInfo.html"

-#define VERSIONINFO_UPDATE_URL HOST "/miranda/VersionInfo/updater/VersionInfo.zip"

-#define VERSIONINFO_VERSION_PREFIX "Version Information version "

 

 int HookEvents()

 {

diff --git a/plugins/VersionInfo/src/main.cpp b/plugins/VersionInfo/src/main.cpp
index f9143d34c7..63d9b51339 100644
--- a/plugins/VersionInfo/src/main.cpp
+++ b/plugins/VersionInfo/src/main.cpp
@@ -20,8 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "common.h"

 

-#include "CVersionInfo.h"

-

 HINSTANCE hInst;

 

 int hLangpack;

@@ -46,15 +44,15 @@ char ModuleName[] = "VersionInfo";
 

 PLUGININFOEX pluginInfo={

 	sizeof(PLUGININFOEX),

-	__PLUGIN_DISPLAY_NAME,

-	VERSION,

-	__DESC,

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

 	__AUTHOR,

 	__AUTHOREMAIL,

 	__COPYRIGHT,

 	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {2f174488-489c-4fe1-940d-596cf0f35e65}

+	// {2F174488-489C-4FE1-940D-596CF0F35E65}

 	{0x2f174488, 0x489c, 0x4fe1, {0x94, 0x0d, 0x59, 0x6c, 0xf0, 0xf3, 0x5e, 0x65}}

 };

 

diff --git a/plugins/VersionInfo/src/services.cpp b/plugins/VersionInfo/src/services.cpp
index d78810637a..2f7ad03534 100644
--- a/plugins/VersionInfo/src/services.cpp
+++ b/plugins/VersionInfo/src/services.cpp
@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "common.h"

-#include "services.h"

 

 int bServiceMode = 0; //true only if plugin is running in service mode

 

diff --git a/plugins/VersionInfo/src/utils.cpp b/plugins/VersionInfo/src/utils.cpp
index b89eb94a46..1822880a3f 100644
--- a/plugins/VersionInfo/src/utils.cpp
+++ b/plugins/VersionInfo/src/utils.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //#define USE_LOG_FUNCTIONS

 

 #include "common.h"

-#include "utils.h"

 

 /*

 My usual MessageBoxes :-)

diff --git a/plugins/VersionInfo/src/utils.h b/plugins/VersionInfo/src/utils.h
index 5db4b1a811..9f8bf4a653 100644
--- a/plugins/VersionInfo/src/utils.h
+++ b/plugins/VersionInfo/src/utils.h
@@ -1,8 +1,6 @@
 #ifndef _M_VERSIONINFO_UTILS_H

 #define _M_VERSIONINFO_UTILS_H

 

-#include "common.h"

-

 //utils.cpp

 void MB(const TCHAR*);

 void Log(const TCHAR*);

diff --git a/plugins/VersionInfo/src/version.h b/plugins/VersionInfo/src/version.h
index 69771bb202..490f827307 100644
--- a/plugins/VersionInfo/src/version.h
+++ b/plugins/VersionInfo/src/version.h
@@ -1,44 +1,14 @@
-/*

-Version information plugin for Miranda IM

-

-Copyright © 2002-2005 Luca Santarelli, © 2005-2008 Cristian Libotean

-

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

-*/

-

-#ifndef M_VERSIONINFO_VERSION_H

-#define M_VERSIONINFO_VERSION_H

-

-#define __MAJOR_VERSION   1

-#define __MINOR_VERSION   5

-#define __RELEASE_NUM     0

-#define __BUILD_NUM       3

-

-#define VERSION PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)

-

-#define __PLUGINVERSION_STRING      __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-#define __PLUGINVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

-#define __STRINGIFY_(x) #x

-#define __STRINGIFY(x) __STRINGIFY_(x)

-#define __VERSION_STRING            __STRINGIFY(__PLUGINVERSION_STRING_DOTS)

-

-#define __DESC                  "Collects and prints information related to Miranda, the plugins and the OS."

-#define __AUTHOR                "Luca Santarelli, Cristian Libotean, George Hazan"

-#define __AUTHOREMAIL           "hrk@users.sourceforge.net, eblis102@yahoo.com, ghazan@miranda.im"

-#define __COPYRIGHT             "© 2002-2005 Luca Santarelli, © 2005-2009 Cristian Libotean"

-#define __AUTHORWEB             "http://miranda-ng.org/"

-#define __PLUGIN_DISPLAY_NAME   "Version Information"

-

-#endif //M_VERSIONINFO_VERSION_H

+#define __MAJOR_VERSION				1

+#define __MINOR_VERSION				5

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					3

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"Version information"

+#define __FILENAME					"VersionInfo.dll"

+#define __DESCRIPTION 				"Collects and prints information related to Miranda, the plugins and the OS."

+#define __AUTHOR					"Luca Santarelli, Cristian Libotean, George Hazan"

+#define __AUTHOREMAIL				"hrk@users.sourceforge.net, eblis102@yahoo.com, ghazan@miranda.im"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2002-2005 Luca Santarelli, 2005-2009 Cristian Libotean"