From 827a3d8f363cb252460c5d94b9c11189c60e8437 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 24 Feb 2013 08:54:54 +0000 Subject: added precompiled header added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3748 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Dbx_tree/dbx_tree_10.vcxproj | 15 +++++++++-- plugins/Dbx_tree/dbx_tree_11.vcxproj | 15 +++++++++-- plugins/Dbx_tree/dbx_tree_11.vcxproj.filters | 23 +++++++++-------- plugins/Dbx_tree/res/Version.rc | 38 ++++++++++++++++++++++++++++ plugins/Dbx_tree/src/BlockManager.cpp | 1 + plugins/Dbx_tree/src/Compatibility.cpp | 1 + plugins/Dbx_tree/src/DataBase.cpp | 1 + plugins/Dbx_tree/src/DatabaseLink.cpp | 5 ++-- plugins/Dbx_tree/src/DirectAccess.cpp | 1 + plugins/Dbx_tree/src/EncryptionManager.cpp | 1 + plugins/Dbx_tree/src/Entities.cpp | 1 + plugins/Dbx_tree/src/Events.cpp | 1 + plugins/Dbx_tree/src/FileAccess.cpp | 1 + plugins/Dbx_tree/src/Hash.cpp | 1 + plugins/Dbx_tree/src/Interface.h | 17 ++----------- plugins/Dbx_tree/src/Logger.cpp | 5 ++-- plugins/Dbx_tree/src/MREWSync.cpp | 1 + plugins/Dbx_tree/src/MappedMemory.cpp | 1 + plugins/Dbx_tree/src/SHA256.cpp | 1 + plugins/Dbx_tree/src/Services.cpp | 1 + plugins/Dbx_tree/src/Settings.cpp | 1 + plugins/Dbx_tree/src/Thread.cpp | 1 + plugins/Dbx_tree/src/Version.h | 15 +++++++++++ plugins/Dbx_tree/src/init.cpp | 20 +++++++-------- plugins/Dbx_tree/src/stdafx.cpp | 18 +++++++++++++ 25 files changed, 142 insertions(+), 44 deletions(-) create mode 100644 plugins/Dbx_tree/res/Version.rc create mode 100644 plugins/Dbx_tree/src/Version.h create mode 100644 plugins/Dbx_tree/src/stdafx.cpp (limited to 'plugins/Dbx_tree') diff --git a/plugins/Dbx_tree/dbx_tree_10.vcxproj b/plugins/Dbx_tree/dbx_tree_10.vcxproj index e160da87fb..b919e61052 100644 --- a/plugins/Dbx_tree/dbx_tree_10.vcxproj +++ b/plugins/Dbx_tree/dbx_tree_10.vcxproj @@ -80,6 +80,8 @@ EditAndContinue false true + Use + Interface.h ..\..\include\msapi @@ -106,6 +108,8 @@ true true true + Use + Interface.h ..\..\include\msapi @@ -132,6 +136,8 @@ MultiThreadedDebugDLL Level3 true + Use + Interface.h ..\..\include\msapi @@ -158,6 +164,8 @@ Fast Level3 true + Use + Interface.h ..\..\include\msapi @@ -177,11 +185,10 @@ - + - @@ -210,6 +217,7 @@ + @@ -229,6 +237,9 @@ + + Create + diff --git a/plugins/Dbx_tree/dbx_tree_11.vcxproj b/plugins/Dbx_tree/dbx_tree_11.vcxproj index d4a159ac28..b3798d13ab 100644 --- a/plugins/Dbx_tree/dbx_tree_11.vcxproj +++ b/plugins/Dbx_tree/dbx_tree_11.vcxproj @@ -84,6 +84,8 @@ EditAndContinue false true + Use + Interface.h ..\..\include\msapi @@ -110,6 +112,8 @@ true true true + Use + Interface.h ..\..\include\msapi @@ -136,6 +140,8 @@ MultiThreadedDebugDLL Level3 true + Use + Interface.h ..\..\include\msapi @@ -162,6 +168,8 @@ Fast Level3 true + Use + Interface.h ..\..\include\msapi @@ -181,11 +189,10 @@ - + - @@ -214,6 +221,7 @@ + @@ -233,6 +241,9 @@ + + Create + diff --git a/plugins/Dbx_tree/dbx_tree_11.vcxproj.filters b/plugins/Dbx_tree/dbx_tree_11.vcxproj.filters index 48c1982158..43faae7f14 100644 --- a/plugins/Dbx_tree/dbx_tree_11.vcxproj.filters +++ b/plugins/Dbx_tree/dbx_tree_11.vcxproj.filters @@ -40,17 +40,11 @@ Resource - + Resource - - Resource - - - Resource - Database\HeaderFiles @@ -90,9 +84,6 @@ Interface\HeaderFiles - - Interface\HeaderFiles - Interface\HeaderFiles @@ -135,6 +126,15 @@ Utils\HeaderFiles + + Interface\HeaderFiles + + + Interface\HeaderFiles + + + Interface\HeaderFiles + @@ -191,5 +191,8 @@ Utils + + Interface + \ No newline at end of file diff --git a/plugins/Dbx_tree/res/Version.rc b/plugins/Dbx_tree/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/Dbx_tree/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/Dbx_tree/src/BlockManager.cpp b/plugins/Dbx_tree/src/BlockManager.cpp index b52298602f..82fe27e4f2 100644 --- a/plugins/Dbx_tree/src/BlockManager.cpp +++ b/plugins/Dbx_tree/src/BlockManager.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "BlockManager.h" #include "Logger.h" diff --git a/plugins/Dbx_tree/src/Compatibility.cpp b/plugins/Dbx_tree/src/Compatibility.cpp index 3ce47b6ac6..95836bb5d5 100644 --- a/plugins/Dbx_tree/src/Compatibility.cpp +++ b/plugins/Dbx_tree/src/Compatibility.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Compatibility.h" #include "Logger.h" #define DB_NOHELPERFUNCTIONS diff --git a/plugins/Dbx_tree/src/DataBase.cpp b/plugins/Dbx_tree/src/DataBase.cpp index b8b0648b30..fec7cab8a3 100644 --- a/plugins/Dbx_tree/src/DataBase.cpp +++ b/plugins/Dbx_tree/src/DataBase.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "DataBase.h" #include "newpluginapi.h" #ifndef _MSC_VER diff --git a/plugins/Dbx_tree/src/DatabaseLink.cpp b/plugins/Dbx_tree/src/DatabaseLink.cpp index 8c99052eb6..8d3d489341 100644 --- a/plugins/Dbx_tree/src/DatabaseLink.cpp +++ b/plugins/Dbx_tree/src/DatabaseLink.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "DatabaseLink.h" #ifndef _MSC_VER #include "savestrings_gcc.h" @@ -84,8 +85,8 @@ static int UnloadDatabase(MIDatabase* db) DATABASELINK gDBLink = { sizeof(DATABASELINK), - gInternalName, - _T(gInternalNameLong), + __INTERNAL_NAME, + _T(__PLUGIN_NAME), makeDatabase, grokHeader, LoadDatabase, diff --git a/plugins/Dbx_tree/src/DirectAccess.cpp b/plugins/Dbx_tree/src/DirectAccess.cpp index 33785af7c4..7095bdaa8a 100644 --- a/plugins/Dbx_tree/src/DirectAccess.cpp +++ b/plugins/Dbx_tree/src/DirectAccess.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "DirectAccess.h" #include "Logger.h" diff --git a/plugins/Dbx_tree/src/EncryptionManager.cpp b/plugins/Dbx_tree/src/EncryptionManager.cpp index 7afdcb248f..7274178ee7 100644 --- a/plugins/Dbx_tree/src/EncryptionManager.cpp +++ b/plugins/Dbx_tree/src/EncryptionManager.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "EncryptionManager.h" #include diff --git a/plugins/Dbx_tree/src/Entities.cpp b/plugins/Dbx_tree/src/Entities.cpp index 73e9487ac6..4b6ec7dbdf 100644 --- a/plugins/Dbx_tree/src/Entities.cpp +++ b/plugins/Dbx_tree/src/Entities.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Entities.h" CVirtuals::CVirtuals(CBlockManager & BlockManager, TNodeRef RootNode) diff --git a/plugins/Dbx_tree/src/Events.cpp b/plugins/Dbx_tree/src/Events.cpp index 732f6241c2..41228b69ce 100644 --- a/plugins/Dbx_tree/src/Events.cpp +++ b/plugins/Dbx_tree/src/Events.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Events.h" #ifndef _MSC_VER #include "savestrings_gcc.h" diff --git a/plugins/Dbx_tree/src/FileAccess.cpp b/plugins/Dbx_tree/src/FileAccess.cpp index fe23293f3f..8f1158dbfc 100644 --- a/plugins/Dbx_tree/src/FileAccess.cpp +++ b/plugins/Dbx_tree/src/FileAccess.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "FileAccess.h" #include #ifndef _MSC_VER diff --git a/plugins/Dbx_tree/src/Hash.cpp b/plugins/Dbx_tree/src/Hash.cpp index f0541c2da0..ae02000c3e 100644 --- a/plugins/Dbx_tree/src/Hash.cpp +++ b/plugins/Dbx_tree/src/Hash.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Hash.h" diff --git a/plugins/Dbx_tree/src/Interface.h b/plugins/Dbx_tree/src/Interface.h index f845707fde..b207c58391 100644 --- a/plugins/Dbx_tree/src/Interface.h +++ b/plugins/Dbx_tree/src/Interface.h @@ -20,11 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#pragma once - #ifndef INTERFACE_VERSION_ONLY -#define MIRANDA_VER 0x0A00 #include #include "newpluginapi.h" #include "m_system.h" @@ -33,23 +30,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "m_db_int.h" #include "m_utils.h" #include "win2k.h" - #include "m_langpack.h" #include "m_dbx_tree.h" +#include "version.h" + extern HINSTANCE hInstance; extern DATABASELINK gDBLink; #endif - - -#define gVersion 0x00000012 -#define gResVersion 0,0,0,18 -#define gResVersionString "0.0.0.18" -#define gInternalName "dbx_tree" -#define gInternalNameLong "Miranda dbx_tree database driver" -#define gDescription "Provides extended Miranda database support." -#define gAutor "Michael 'Protogenes' Kunz" -#define gAutorEmail "Michael.Kunz@s2005.TU-Chemnitz.de" -#define gCopyright "2007 - 2010 Michael 'Protogenes' Kunz" diff --git a/plugins/Dbx_tree/src/Logger.cpp b/plugins/Dbx_tree/src/Logger.cpp index 551824d905..7ca9452460 100644 --- a/plugins/Dbx_tree/src/Logger.cpp +++ b/plugins/Dbx_tree/src/Logger.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Logger.h" #include @@ -96,7 +97,7 @@ CLogger::TLevel CLogger::ShowMessage(TLevel CanAsyncTill) p->hwndOwner = 0; p->hInstance = NULL; p->lpszText = msg; - p->lpszCaption = _T(gInternalNameLong); + p->lpszCaption = _T(__PLUGIN_NAME); p->dwStyle = MB_OK | (m_Level >= logERROR)?MB_ICONHAND:((m_Level == logWARNING)?MB_ICONWARNING:MB_ICONINFORMATION); p->lpszIcon = NULL; p->dwContextHelpId = 0; @@ -105,7 +106,7 @@ CLogger::TLevel CLogger::ShowMessage(TLevel CanAsyncTill) _beginthread(&CLogger::MessageBoxAsync, 0, p); } else { - MessageBox(0, msg, _T(gInternalNameLong), MB_OK | (m_Level >= logERROR)?MB_ICONHAND:((m_Level == logWARNING)?MB_ICONWARNING:MB_ICONINFORMATION)); + MessageBox(0, msg, _T(__PLUGIN_NAME), MB_OK | (m_Level >= logERROR)?MB_ICONHAND:((m_Level == logWARNING)?MB_ICONWARNING:MB_ICONINFORMATION)); delete [] msg; } diff --git a/plugins/Dbx_tree/src/MREWSync.cpp b/plugins/Dbx_tree/src/MREWSync.cpp index 6e08be6475..d61867b15f 100644 --- a/plugins/Dbx_tree/src/MREWSync.cpp +++ b/plugins/Dbx_tree/src/MREWSync.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "MREWSync.h" #include #include "intrinsics.h" diff --git a/plugins/Dbx_tree/src/MappedMemory.cpp b/plugins/Dbx_tree/src/MappedMemory.cpp index 09a1471a90..5a8d264844 100644 --- a/plugins/Dbx_tree/src/MappedMemory.cpp +++ b/plugins/Dbx_tree/src/MappedMemory.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "MappedMemory.h" #include "Logger.h" diff --git a/plugins/Dbx_tree/src/SHA256.cpp b/plugins/Dbx_tree/src/SHA256.cpp index 9ca7df329c..d0b16f907f 100644 --- a/plugins/Dbx_tree/src/SHA256.cpp +++ b/plugins/Dbx_tree/src/SHA256.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "SHA256.h" #include #include diff --git a/plugins/Dbx_tree/src/Services.cpp b/plugins/Dbx_tree/src/Services.cpp index 1330a5390b..f7495e2225 100644 --- a/plugins/Dbx_tree/src/Services.cpp +++ b/plugins/Dbx_tree/src/Services.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Database.h" INT_PTR CDataBase::DBEntityGetRoot(WPARAM wParam, LPARAM lParam) diff --git a/plugins/Dbx_tree/src/Settings.cpp b/plugins/Dbx_tree/src/Settings.cpp index b4ba799c55..54c0f03b6b 100644 --- a/plugins/Dbx_tree/src/Settings.cpp +++ b/plugins/Dbx_tree/src/Settings.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Settings.h" #include // floor function #include "Hash.h" diff --git a/plugins/Dbx_tree/src/Thread.cpp b/plugins/Dbx_tree/src/Thread.cpp index bdb01f18aa..d4a5396e03 100644 --- a/plugins/Dbx_tree/src/Thread.cpp +++ b/plugins/Dbx_tree/src/Thread.cpp @@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "Interface.h" #include "Thread.h" #include "intrinsics.h" diff --git a/plugins/Dbx_tree/src/Version.h b/plugins/Dbx_tree/src/Version.h new file mode 100644 index 0000000000..1383b94bef --- /dev/null +++ b/plugins/Dbx_tree/src/Version.h @@ -0,0 +1,15 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 18 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "Miranda dbx_tree database driver" +#define __INTERNAL_NAME "Dbx_tree" +#define __FILENAME "Dbx_tree.dll" +#define __DESCRIPTION "Provides extended Miranda database support." +#define __AUTHOR "Michael 'Protogenes' Kunz" +#define __AUTHOREMAIL "Michael.Kunz@s2005.TU-Chemnitz.de" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2007 - 2010 Michael 'Protogenes' Kunz" diff --git a/plugins/Dbx_tree/src/init.cpp b/plugins/Dbx_tree/src/init.cpp index 843c662b41..2a18a988dd 100644 --- a/plugins/Dbx_tree/src/init.cpp +++ b/plugins/Dbx_tree/src/init.cpp @@ -26,20 +26,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. HINSTANCE hInstance = NULL; int hLangpack; -static const DWORD gMinMirVer = 0x00080000; - - static PLUGININFOEX gPluginInfoEx = { sizeof(PLUGININFOEX), - gInternalNameLong, - gVersion, - gDescription, - gAutor, - gAutorEmail, - gCopyright, - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE | STATIC_PLUGIN, - { 0x28f45248, 0x8c9c, 0x4bee, { 0x93, 0x07, 0x7b, 0xcf, 0x3e, 0x12, 0xbf, 0x99 } } // {28F45248-8C9C-4bee-9307-7BCF3E12BF99} + // {28F45248-8C9C-4BEE-9307-7BCF3E12BF99} + {0x28f45248, 0x8c9c, 0x4bee, {0x93, 0x07, 0x7b, 0xcf, 0x3e, 0x12, 0xbf, 0x99}} }; extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD MirandaVersion) diff --git a/plugins/Dbx_tree/src/stdafx.cpp b/plugins/Dbx_tree/src/stdafx.cpp new file mode 100644 index 0000000000..3fab47cba1 --- /dev/null +++ b/plugins/Dbx_tree/src/stdafx.cpp @@ -0,0 +1,18 @@ +/* +Copyright (C) 2012-13 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 "Interface.h" \ No newline at end of file -- cgit v1.2.3