From 9a4be1a673e76cb205a11076b7d8162eb593feab Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 10 Mar 2013 15:11:51 +0000 Subject: added precompiled header added version info git-svn-id: http://svn.miranda-ng.org/main/trunk@3962 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserGuide/UserGuide_10.vcxproj | 23 +++++++++++++--- plugins/UserGuide/UserGuide_10.vcxproj.filters | 14 ++++++++++ plugins/UserGuide/UserGuide_11.vcxproj | 23 +++++++++++++--- plugins/UserGuide/UserGuide_11.vcxproj.filters | 14 ++++++++++ plugins/UserGuide/res/Version.rc | 38 ++++++++++++++++++++++++++ plugins/UserGuide/src/Version.h | 14 ++++++++++ plugins/UserGuide/src/commonheaders.h | 7 ++--- plugins/UserGuide/src/main.cpp | 32 ++++++++++------------ plugins/UserGuide/src/stdafx.cpp | 18 ++++++++++++ 9 files changed, 154 insertions(+), 29 deletions(-) create mode 100644 plugins/UserGuide/res/Version.rc create mode 100644 plugins/UserGuide/src/Version.h create mode 100644 plugins/UserGuide/src/stdafx.cpp (limited to 'plugins/UserGuide') diff --git a/plugins/UserGuide/UserGuide_10.vcxproj b/plugins/UserGuide/UserGuide_10.vcxproj index e4197e1ec8..abcb3b3140 100644 --- a/plugins/UserGuide/UserGuide_10.vcxproj +++ b/plugins/UserGuide/UserGuide_10.vcxproj @@ -74,12 +74,14 @@ Full AnySuitable Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 false + Use + commonheaders.h false @@ -97,12 +99,14 @@ Full AnySuitable Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 false + Use + commonheaders.h false @@ -118,7 +122,7 @@ Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -126,6 +130,8 @@ Level3 EditAndContinue false + Use + commonheaders.h false @@ -138,12 +144,14 @@ Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 false + Use + commonheaders.h false @@ -155,9 +163,16 @@ + + Create + + + + + diff --git a/plugins/UserGuide/UserGuide_10.vcxproj.filters b/plugins/UserGuide/UserGuide_10.vcxproj.filters index c40fe0a474..0102a58107 100644 --- a/plugins/UserGuide/UserGuide_10.vcxproj.filters +++ b/plugins/UserGuide/UserGuide_10.vcxproj.filters @@ -9,15 +9,29 @@ {72da96a4-67f9-49cc-94d3-6730544c949f} h;hpp;hxx;hm;inl + + {b442efc0-16eb-481a-897b-2bd4a00d2b4e} + Source Files + + Source Files + Header Files + + Header Files + + + + + Resource Files + \ No newline at end of file diff --git a/plugins/UserGuide/UserGuide_11.vcxproj b/plugins/UserGuide/UserGuide_11.vcxproj index 9126dc8674..576530de5e 100644 --- a/plugins/UserGuide/UserGuide_11.vcxproj +++ b/plugins/UserGuide/UserGuide_11.vcxproj @@ -78,12 +78,14 @@ Full AnySuitable Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 false + Use + commonheaders.h false @@ -101,12 +103,14 @@ Full AnySuitable Size - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true true Level3 false + Use + commonheaders.h false @@ -122,7 +126,7 @@ Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -130,6 +134,8 @@ Level3 EditAndContinue false + Use + commonheaders.h false @@ -142,12 +148,14 @@ Disabled - ..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories) + ..\..\include;%(AdditionalIncludeDirectories) WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL Level3 false + Use + commonheaders.h false @@ -159,9 +167,16 @@ + + Create + + + + + diff --git a/plugins/UserGuide/UserGuide_11.vcxproj.filters b/plugins/UserGuide/UserGuide_11.vcxproj.filters index c40fe0a474..0102a58107 100644 --- a/plugins/UserGuide/UserGuide_11.vcxproj.filters +++ b/plugins/UserGuide/UserGuide_11.vcxproj.filters @@ -9,15 +9,29 @@ {72da96a4-67f9-49cc-94d3-6730544c949f} h;hpp;hxx;hm;inl + + {b442efc0-16eb-481a-897b-2bd4a00d2b4e} + Source Files + + Source Files + Header Files + + Header Files + + + + + Resource Files + \ No newline at end of file diff --git a/plugins/UserGuide/res/Version.rc b/plugins/UserGuide/res/Version.rc new file mode 100644 index 0000000000..5bfbab4754 --- /dev/null +++ b/plugins/UserGuide/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/UserGuide/src/Version.h b/plugins/UserGuide/src/Version.h new file mode 100644 index 0000000000..7ceb9027ff --- /dev/null +++ b/plugins/UserGuide/src/Version.h @@ -0,0 +1,14 @@ +#define __MAJOR_VERSION 0 +#define __MINOR_VERSION 0 +#define __RELEASE_NUM 0 +#define __BUILD_NUM 1 + +#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM + +#define __PLUGIN_NAME "User guide" +#define __FILENAME "UserGuide.dll" +#define __DESCRIPTION "This plug-in adds the main menu item used to view miranda-im pack user guide." +#define __AUTHOR "Yasnovidyashii" +#define __AUTHOREMAIL "yasnovidyashii@gmail.com" +#define __AUTHORWEB "http://miranda-ng.org/" +#define __COPYRIGHT "© 2009 Mikhail Yuriev" diff --git a/plugins/UserGuide/src/commonheaders.h b/plugins/UserGuide/src/commonheaders.h index cf71412494..03ce9e5ec0 100644 --- a/plugins/UserGuide/src/commonheaders.h +++ b/plugins/UserGuide/src/commonheaders.h @@ -1,12 +1,11 @@ #define _CRT_SECURE_NO_WARNINGS -#define MIRANDA_VER 0x0A00 - #include + #include #include -#include #include #include #include -#include + +#include "Version.h" diff --git a/plugins/UserGuide/src/main.cpp b/plugins/UserGuide/src/main.cpp index 1e99ce017f..5650084b91 100644 --- a/plugins/UserGuide/src/main.cpp +++ b/plugins/UserGuide/src/main.cpp @@ -2,24 +2,24 @@ HINSTANCE hInst; -HANDLE hModulesLoaded, hShowGuide; +HANDLE hShowGuide; int hLangpack; -PLUGININFOEX pluginInfo={ +PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), - "User Guide Plugin", - PLUGIN_MAKE_VERSION(0,0,0,1), - "This plug-in adds the main menu item used to view miranda-im pack user guide.", - "Yasnovidyashii", - "yasnovidyashii@gmail.com", - "© 2009 Mikhail Yuriev", - "http://miranda-ng.org/", + __PLUGIN_NAME, + PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM), + __DESCRIPTION, + __AUTHOR, + __AUTHOREMAIL, + __COPYRIGHT, + __AUTHORWEB, UNICODE_AWARE, - {0x297ec1e7, 0x41b7, 0x41f9, { 0xbb, 0x91, 0xef, 0xa9, 0x50, 0x28, 0xf1, 0x6c }} //297ec1e7-41b7-41f9-bb91-efa95028f16c - + // 297EC1E7-41B7-41F9-BB91-EFA95028F16C + {0x297ec1e7, 0x41b7, 0x41f9, {0xbb, 0x91, 0xef, 0xa9, 0x50, 0x28, 0xf1, 0x6c}} }; -static INT_PTR ShowGuideFile(WPARAM wParam,LPARAM lParam) +static INT_PTR ShowGuideFile(WPARAM wParam, LPARAM lParam) { DBVARIANT dbv = {0}; int iRes; @@ -78,7 +78,7 @@ static INT_PTR ShowGuideFile(WPARAM wParam,LPARAM lParam) return 0; } -int ModulesLoaded(WPARAM wParam,LPARAM lParam) +int ModulesLoaded(WPARAM wParam, LPARAM lParam) { hShowGuide = CreateServiceFunction("UserGuide/ShowGuide", ShowGuideFile); @@ -93,7 +93,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) return 0; } -BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInst = hinstDLL; return TRUE; @@ -107,15 +107,13 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda extern "C" __declspec(dllexport) int Load(void) { - mir_getLP(&pluginInfo); - hModulesLoaded = HookEvent(ME_SYSTEM_MODULESLOADED,ModulesLoaded); + HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); return 0; } extern "C" __declspec(dllexport) int Unload(void) { - UnhookEvent(hModulesLoaded); DestroyServiceFunction(hShowGuide); return 0; } \ No newline at end of file diff --git a/plugins/UserGuide/src/stdafx.cpp b/plugins/UserGuide/src/stdafx.cpp new file mode 100644 index 0000000000..e7e41dae3c --- /dev/null +++ b/plugins/UserGuide/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 "commonheaders.h" \ No newline at end of file -- cgit v1.2.3